Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
337 commits
Select commit Hold shift + click to select a range
6047d63
Next forward master (#428)
skinkie Feb 22, 2023
414fb52
Merge branch 'master' into next
skinkie Feb 22, 2023
dccffa0
Fix xsd's
skinkie Feb 22, 2023
4889e9e
Update netex_ifopt_site_version.xsd (#410)
ue71603 Mar 2, 2023
86d641c
Merge branch 'master' into EPIAP
skinkie Mar 2, 2023
fbd071b
Merge branch 'EPIAP' into next
skinkie Mar 2, 2023
b28946e
Fix branch
skinkie Mar 2, 2023
47260aa
Manual lint
skinkie Mar 2, 2023
3c9abe6
examples adapted to new RelativeLevelOrder and RelativeLevelOrder opt…
ue71603 Mar 13, 2023
6020431
XSD Validation issue (#431) (#432)
skinkie Mar 15, 2023
cc8ed54
adding RelativeLevelOrder to Levels (#439)
ue71603 Apr 17, 2023
9e48ff2
Update netex_mode_support.xsd (#438)
ue71603 Jun 14, 2023
0470b05
Merge pull request #491 from NeTEx-CEN/master
skinkie Sep 21, 2023
4aefeef
Merge pull request #492 from NeTEx-CEN/master
skinkie Sep 21, 2023
8221b61
Harmonise DatedVehicleJourney and DatedServiceJourney
Aurige Sep 27, 2023
297d18d
Update xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_…
Aurige Sep 27, 2023
1d0883f
Merge pull request #502 from NeTEx-CEN/master
skinkie Sep 27, 2023
571f9ba
Merge pull request #503 from NeTEx-CEN/master
skinkie Sep 27, 2023
d4ab6d9
Merge pull request #411 from Aurige/Extended-DatedVehicleJourney+Repl…
Aurige Sep 27, 2023
3367500
Revert "Extended-DatedVehicleJourney+Replace-PR368"
skinkie Sep 27, 2023
bfc17e1
Merge pull request #505 from NeTEx-CEN/revert-411-Extended-DatedVehic…
skinkie Sep 27, 2023
5ce5e4f
Add qr code (#504)
skinkie Sep 27, 2023
a505efb
BeaconEquipment added and example VehicleType modeling for EPIAP (#365)
ue71603 Sep 27, 2023
37a2106
Lint and update documentation tables
github-actions[bot] Sep 27, 2023
0e11258
Update DatedServiceJourney and DatedVehicleJourney for rail
Aurige Oct 13, 2023
80646ff
Lint and update documentation tables
github-actions[bot] Oct 13, 2023
b7c3df9
Fix railIslandPlatform (#524)
skinkie Oct 14, 2023
7dfed97
Merge pull request #520 from Aurige/Rail-Dated-Journey-fix-without-ex…
Aurige Oct 16, 2023
8d278fb
Addition of TypeOfProductCategory to JourneyPart (#527)
Aurige Oct 19, 2023
0215777
Addition of reviews to comments about (#519)
Aurige Oct 27, 2023
cf4ba0b
Fix example
skinkie Oct 27, 2023
076f847
Lint and update documentation tables
github-actions[bot] Oct 27, 2023
c6c3485
Fix #533 (#534)
skinkie Nov 1, 2023
a2d5aaf
Addition of Alighting and Boarding request methods (#528)
Aurige Nov 6, 2023
f441a62
Changes to booking arrangement (#525)
Aurige Nov 6, 2023
210753d
Addition of contracts (#530)
Aurige Nov 6, 2023
d63cfa4
Implement privateCodes, deprecate PrivateCode, replace #403 (#544)
skinkie Nov 7, 2023
ecf023d
Fix epiap example validation (#547)
skinkie Nov 7, 2023
ee3c27a
Fix #539 (#540)
skinkie Nov 10, 2023
80abd49
Enh driver permit (#545)
skinkie Nov 21, 2023
45c03d3
Proposal for URI with an object reference. (#291)
skinkie Nov 21, 2023
6228bdb
Update netex_ifopt_site_version.xsd (#559)
ue71603 Nov 27, 2023
7f76c93
Added CustomerServiceContactDetails
ue71603 Dec 12, 2023
7b69a31
added VehicleRef to ServiceJourney
ue71603 Dec 12, 2023
ce54bd5
Lint and update documentation tables
github-actions[bot] Dec 12, 2023
1804f5e
adapted documentation #472 (#586)
ue71603 Dec 12, 2023
d87ff6d
Remove External entities with for VDV compatibility in favor of Priva…
skinkie Dec 13, 2023
1867f1a
Update uk_fxc_addon_HSP_plusbus.xml
ue71603 Dec 13, 2023
5069f6b
Arrival instead Departure in JourneyFrequencyGroupGroup (#581)
ue71603 Dec 13, 2023
ddac81c
First update from PrivateCode, ExternalOperatorRef and ExternalStopPo…
skinkie Dec 13, 2023
df7585c
More updated examples
skinkie Dec 13, 2023
2813a83
More VDV updates
skinkie Dec 13, 2023
ce24b8e
More external to privatecodes
skinkie Dec 13, 2023
a22017b
Fix
skinkie Dec 13, 2023
898b6db
Extend telecabin submode and better focu (#580)
ue71603 Dec 14, 2023
54c5fe3
FuelType and PropulsionType unbounded (#582)
ue71603 Dec 14, 2023
6697af3
new enum values for large vehicles in transporters (#577)
ue71603 Dec 14, 2023
410b024
better docu (#606)
ue71603 Dec 14, 2023
cfca152
Drop Call-Z and DatedCall-Z as discussed in #463 (#603)
skinkie Dec 14, 2023
18b48c6
Remove datedCalls, and when it is valid, make it Calls (#596)
skinkie Dec 14, 2023
9251e19
Fare profile enhancement zone in series (#573)
nick-knowles Dec 18, 2023
504b826
Ramp equipment with maximal load and an explanation for Length for mo…
ue71603 Dec 18, 2023
7f5bd2f
Lint and update documentation tables
github-actions[bot] Dec 18, 2023
446d22a
Integrate LineEquipment air conditioning (#601)
ue71603 Dec 19, 2023
cce65a0
Make sure that the PassengerCategoryies and the PrivateMode are done …
ue71603 Dec 19, 2023
2f9e02a
Update description multi lingual string next (#595)
skinkie Dec 19, 2023
86cf10c
Delfiplus extensions (#388)
ue71603 Dec 19, 2023
47fed4d
Enhance door control element height (Fix #541) (#542)
DWillDB Dec 19, 2023
b205bc4
Adding projectionsto ServiceFrame (#619)
ue71603 Dec 29, 2023
724545a
better docu for ServiceAlterationEnumeration (#626)
ue71603 Dec 29, 2023
f466c58
Create epiap_test_Crossing_Equipment.xml (#611)
ue71603 Dec 30, 2023
0e34649
Better definitions for telecabin by Nick (#621)
ue71603 Jan 3, 2024
f21340d
Epiap accessibility path link enhancement (in next) (#624)
ue71603 Jan 5, 2024
3f8f3aa
Corrections to #525 changes to BOOKING ARRANGEMENTs and SERVCIE BOOKI…
nick-knowles Jan 8, 2024
b0ae91d
changing QuayType for "on street" bus/tram (#629)
ue71603 Jan 8, 2024
116e772
Passenger capacity align with siri (#598)
ue71603 Jan 17, 2024
2e229e8
PublicCode settled (#614)
ue71603 Jan 19, 2024
f00b4f7
Correction of the resides annotation (#646)
Aurige Jan 23, 2024
d234ef4
fixing external ids (no longer extern in the "normal" sense
ue71603 Jan 24, 2024
6127105
other example
ue71603 Jan 24, 2024
79d49dc
Lint and update documentation tables
github-actions[bot] Jan 24, 2024
2bd32de
Next example privatecodes (#602)
skinkie Jan 31, 2024
321d8f3
Enhancement service exclusions #391 (#608)
nick-knowles Jan 31, 2024
8a5f247
Site Entrance qualifier (on next) (#633)
trurlurl Feb 2, 2024
3ef0635
LiftCallEquipment (#634)
trurlurl Feb 7, 2024
1946bcb
Merge pull request #658 from NeTEx-CEN/master
skinkie Feb 7, 2024
ff5dbd3
Remove versions and Version-elements (#642)
skinkie Feb 8, 2024
c5ed5f4
EPIAP Equipments Enhancement (#555)
Aurige Feb 8, 2024
e9c1988
Merge branch 'master' into next
skinkie Feb 9, 2024
2ca904f
Merge branch 'EPIAP' into next
skinkie Feb 9, 2024
ed836a7
removing xpath to non-defined objects (#655)
ue71603 Feb 19, 2024
3ab5249
VehicleType: MaximumSpeed (#651)
ue71603 Mar 7, 2024
6801947
Deck plan examples and fixes (#656)
nick-knowles Mar 8, 2024
dfc4ee7
Revert "Deck plan examples and fixes (#656)"
skinkie Mar 12, 2024
3d18496
Merge pull request #675 from NeTEx-CEN/revert-656-Deck-Plan-examples-…
skinkie Mar 12, 2024
93281db
Refactor ChargingEquipmentProfile to RechargingEquipmentProfile (#676)
skinkie Mar 19, 2024
6b0fbe1
Merge branch 'master' into next
skinkie Mar 25, 2024
c7f5064
Feature deckplan (#681)
skinkie Apr 10, 2024
aed4075
Make OrganisationRef abstract (#685)
skinkie Apr 15, 2024
d684b1d
PublicCodeStructure instead PublicCodeType (#708)
ue71603 Apr 17, 2024
40be9eb
improve documentation (#709)
ue71603 Apr 17, 2024
babaef8
Implements PASSENGER AT STOP TIME and TimetabledTime constraints (#678)
skinkie Apr 17, 2024
b8925c6
Feature add contract for journey accounting and shuffle Responsibilit…
skinkie Apr 17, 2024
95d15d6
clarification when to use VehicleRef
ue71603 Apr 19, 2024
3f87632
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 Apr 19, 2024
98afad4
Update netex_vehicleType_version.xsd
ue71603 Apr 19, 2024
f231007
fixing ambiguity and double VehicleCodeGroup
ue71603 Apr 19, 2024
f0516e6
Introduce the examples from Norway & change Covered from boolean to e…
skinkie Apr 19, 2024
bcba971
More information to PassengerStopAssignment usage (#712)
ue71603 Apr 19, 2024
bfe7b69
Clear up the documentation regarding weekend and weekday. (#713)
ue71603 Apr 24, 2024
f3eb94e
Merge master to next 20240502 (#721)
skinkie May 3, 2024
e602d6a
Fix typo (#722)
skinkie May 3, 2024
99e0799
Update neTactileActuators attribute on Escalators and Travelators #66…
ue71603 May 3, 2024
a5b80a0
Update netex_facility_support.xsd (#724)
ue71603 May 3, 2024
d50b5fd
TypeOfEntity is abstract (#723)
skinkie May 3, 2024
03db8ea
Fixes from #721 (#725)
skinkie May 4, 2024
15cb2ae
fixing imports to make files validate (multilingualstring) (#623)
ue71603 May 8, 2024
caef150
Update netex_ifopt_stopPlace_version.xsd (#715)
ue71603 May 8, 2024
3a81cbf
Order attribute in documentation on FareTableColumn and FareTableRow …
ue71603 May 8, 2024
094602a
Fix passenger category change for line modularisation (#639)
nick-knowles May 8, 2024
28539cd
typos, fixing import
ue71603 May 10, 2024
93a596a
typos and equipmentProfiles added to VehicleModel
ue71603 May 10, 2024
af51d62
also VehicleModelProfileRef to VehicleModel
ue71603 May 10, 2024
94d7e81
HoistOperatingRadius introduced again. (#729)
ue71603 May 10, 2024
be64880
RouteInstructionRef reintroduced (#588)
ue71603 May 10, 2024
448692b
GBFSMapping - mustPickUpandDRopOffToSameStop #716 (#730)
ue71603 May 15, 2024
c943c29
update branch list and release log for netex 1.3 (#732)
juliustens-db May 15, 2024
6e7ae5e
Propose change, and fix #726 (#727)
skinkie May 15, 2024
e190c35
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 22, 2024
c327e7a
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 23, 2024
8afc953
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 23, 2024
4299a4b
make the codes only deprecated
ue71603 May 30, 2024
8369fd7
Lint and update documentation tables
github-actions[bot] May 30, 2024
5c47533
Fix Interchangse (#737)
skinkie Jun 3, 2024
4ab1889
changed equipmentProfiles
ue71603 Jun 5, 2024
7a7e971
modeled the Contacts correct and corrected that contacts must allow m…
ue71603 Jun 5, 2024
ae93675
Lint and update documentation tables
github-actions[bot] Jun 5, 2024
2f2d932
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Jun 5, 2024
1d7a9a0
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Jun 5, 2024
168b6fd
Lint and update documentation tables
github-actions[bot] Jun 5, 2024
539e798
TypeOfNotice referential constraint fixes (#741)
skinkie Jun 10, 2024
2583637
AccessRightParameterAssignment - TypeOfProofRef (#599)
ue71603 Jun 22, 2024
72b82c7
Update NeTEx.spp
nick-knowles Jun 25, 2024
6cd63e7
Split out journey assignment files to separate subproject
nick-knowles Jun 25, 2024
4dc02e5
Rename TRAIN STOP ASSIGNMENT to PASSSENGER BOARDING POSITION STOP ASS…
nick-knowles Jun 25, 2024
9b93bf6
Merge pull request #594 from NeTEx-CEN/remove_externalelements
Aurige Jun 26, 2024
5047b65
DeclPlanAssignment revisions
nick-knowles Jun 26, 2024
e95f6c7
DeckPlan Asihnment
nick-knowles Jun 26, 2024
0e6c6ec
Update netex_responsibility_support.xsd
nick-knowles Jun 26, 2024
04de35d
Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAs…
ue71603 Jun 27, 2024
10dfc5d
Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAs…
ue71603 Jun 27, 2024
10295cf
Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAs…
ue71603 Jun 27, 2024
77fb3bd
Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_s…
ue71603 Jul 1, 2024
169bfc3
Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_s…
ue71603 Jul 1, 2024
96ee6d9
Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan…
ue71603 Jul 1, 2024
544fb85
Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan…
ue71603 Jul 1, 2024
774543e
Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan…
ue71603 Jul 1, 2024
3fa0d65
Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_s…
ue71603 Jul 1, 2024
ae0f2c9
Update netex_seatingPlan_support.xsd
ue71603 Jul 1, 2024
814485c
fixing missing deckEntranceAssignments
ue71603 Jul 1, 2024
836741d
Lint and update documentation tables
github-actions[bot] Jul 1, 2024
7644033
Addition of missing monitored indicator
Aurige Jul 2, 2024
4d95205
TAP TSI Example validation (#754)
Aurige Jul 24, 2024
b7d1c90
Merge branch 'next' into DeckplanRevisions
skinkie Jul 25, 2024
f2a8c7f
Merge pull request #744 from nick-knowles/DeckplanRevisions
Aurige Jul 25, 2024
c665677
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 Jul 25, 2024
05531c3
Enhancement=fare-debit Internal restructuring to enable reuse of pay…
nick-knowles Jul 25, 2024
3465eec
Merge pull request #584 from NeTEx-CEN/Customer-Information-On-Vehicle
Aurige Jul 25, 2024
c00ccdd
Predicted occupation (#605)
ue71603 Jul 25, 2024
c532097
Corrections to NeTEx examples for casing and refs VVS, Normal, etc (…
nick-knowles Jul 26, 2024
2d03b04
Remove references to non-existent email addresses (next) (#759)
skinkie Jul 27, 2024
e30f7a9
Fixed typos: netex_alternativeText_version.xsd
JohanEntur Jul 30, 2024
a9d5974
Labelling v2.0 changes (#762)
trurlurl Aug 5, 2024
a3df288
Labels +v1.2.2 for PR 305
trurlurl Aug 17, 2024
ccf4a4d
Lint and update documentation tables
github-actions[bot] Aug 17, 2024
925b630
Update xsd/netex_framework/netex_reusableComponents/netex_submode_ver…
ue71603 Aug 17, 2024
0c1c7a5
Merge pull request #764 from NeTEx-CEN/v2_labels_second_series
Aurige Sep 3, 2024
f08e5ca
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
skinkie Sep 4, 2024
592fc94
Update xsd/netex_framework/netex_reusableComponents/netex_vehicle_ver…
skinkie Sep 4, 2024
d1cb941
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
Aurige Sep 4, 2024
dd578a5
Review of the CHARGING PLAN
Aurige Sep 6, 2024
c817d31
Update NeTEx VDV Example.xml
Aurige Sep 6, 2024
eea0d45
Lint and update documentation tables
github-actions[bot] Sep 6, 2024
f290bde
+v2.0 and some other labels
trurlurl Sep 19, 2024
8bfc8df
Merge pull request #781 from NeTEx-CEN/v2_labels_third_series
Aurige Sep 25, 2024
764cc6d
Merge pull request #776 from NeTEx-CEN/CHARGING-PLAN-Review
Aurige Sep 25, 2024
1a41506
Merge pull request #747 from Aurige/Addition-of-missing-monitored-flag
Aurige Sep 25, 2024
7a73a73
Remove one Description from PathLinkInSequenceGroup (#786)
ue71603 Oct 19, 2024
d1bdbc8
RestrictedServiceFacilityRef in ServiceJourney/facilities with a rest…
ue71603 Oct 29, 2024
13e0418
Remove unused chargingEquipmenProfilesInFrame_RelStructure (#792)
trurlurl Oct 29, 2024
712bf94
Annotation to version attribute (#794)
trurlurl Oct 31, 2024
87fc109
Labels for parts 2 through 5 (#799)
trurlurl Nov 18, 2024
ef50e92
Annotions RestrictedServiceFacilitySet (#798)
trurlurl Nov 18, 2024
315f33c
Changed type of PublicCode (#800)
trurlurl Nov 19, 2024
7b0a7a3
Operating day view integrated dated service journey (#805)
ue71603 Dec 5, 2024
f77c9b4
Sync gbfs from Christophe (#804)
ue71603 Dec 11, 2024
d21722b
added a NoticeAssignment to a passing time (#812)
ue71603 Dec 11, 2024
80fd9b4
typo in netex_line_version.xsd (#822)
TuThoThai Jan 15, 2025
a0d069a
Update netex_flexibleNetwork_support.xsd (#828)
TuThoThai Feb 3, 2025
fb7a871
TrainBlock and TrainBlockPart definition update (#830)
Aurige Feb 5, 2025
fce3114
Addition of neigbouring to SameZoneEnumeration (#823)
Aurige Feb 5, 2025
7396fb1
Update enums in netex_facility_support.xsd (#832)
TuThoThai Feb 13, 2025
4943475
handSanitizer -> handSanitiser (#840)
trurlurl Mar 17, 2025
c6517e0
Seating Plan Seat Context changes (#813)
nick-knowles Apr 3, 2025
5894bd0
Adding noTicketRequired-enum (#845)
JohanEntur Apr 7, 2025
522776f
Corrections (#847)
trurlurl Apr 9, 2025
dab7346
PrintColourValueType (#852)
trurlurl Apr 19, 2025
8b6c409
Example that shows how to implement estimated delay in timetables (#848)
ue71603 Apr 22, 2025
6993530
Stratification of transport mode enumerations (#791)
trurlurl Apr 22, 2025
3bbd59d
Adding facilities to netex_line_version.xsd (#841)
TuThoThai Apr 22, 2025
85b7301
Required ssp spijp (#859)
skinkie Apr 22, 2025
a36ba85
Remove all order attributes in favor of XML ordering. (#860)
skinkie Apr 22, 2025
f30f754
Adding bookingArrangements in netex_journeyPattern_version.xsd (#856)
TuThoThai Apr 22, 2025
4906e68
Fix #842 (#868)
skinkie Apr 22, 2025
bdeb16a
Deprecate BaselineVersionRef (#871)
skinkie Apr 22, 2025
9bc5cef
Remove duplicate PassingTimeRefStructure
skinkie Apr 22, 2025
d651658
Emergency fix
skinkie Apr 22, 2025
c35c973
Merge of FlexibleLineType into LineType (#861)
TuThoThai Apr 23, 2025
67a48c5
Emergency fix 2
skinkie Apr 23, 2025
c7f61be
MultilingualString with embedded translations (#849)
ue71603 Apr 23, 2025
65b953c
Only linting
skinkie Apr 26, 2025
c0089de
Corrections to includes to fix missing to dependencies (#879)
skinkie Apr 29, 2025
7ff278c
A few fixes (#895)
trurlurl May 6, 2025
749e425
Private codes now done, and potentially filtered out all other change…
skinkie May 6, 2025
438eea3
All changes from Nick (#893)
nick-knowles May 7, 2025
6766b67
Issue #906 - Update netex_coupledJourney_version.xsd (#912)
Ulf9 May 30, 2025
9630ed0
Fix minor spelling mistakes in SpotAffinityTypeEnumeration (#911)
Robbendebiene Jun 2, 2025
5cd2b73
SeatContext proposal (#909)
TuThoThai Jun 3, 2025
c35b30f
Temporary xmllint master (#915)
skinkie Jun 4, 2025
5f4cdcb
Validate all examples (#916)
skinkie Jun 10, 2025
25ff49b
Remove redundant Description (#917)
skinkie Jun 10, 2025
08650bf
fixing From/To JourneyRefStructure (#914)
ue71603 Jun 18, 2025
a56f57d
Recharging point & plan revisions (#793)
nick-knowles Jun 18, 2025
63d58c7
Don't use windows paths (#923)
skinkie Jun 18, 2025
b057085
Fix netex_nm_singleJourneyService_version.xsd (#924)
TuThoThai Jun 23, 2025
a51aeb1
Entrance deprecation as instance (#926)
Aurige Jun 25, 2025
c56cd9c
MandatoryEnumeration comment correction (#925) (#928)
skinkie Jun 30, 2025
362a2df
Only changes from automatic tests (#929)
ue71603 Jul 1, 2025
cdeb8c6
Make dummy elements abstract
skinkie Jul 3, 2025
90c30fd
Remove all abstract="false" attributes, these are redundant, abstract…
skinkie Jul 3, 2025
25131b2
Remove Call_
skinkie Jul 3, 2025
4913f4a
Remaining dummy as abstract
skinkie Jul 3, 2025
ee54d6d
Remove all end white space
skinkie Jul 3, 2025
c4333dd
Fix double spaces in documentation tags
skinkie Jul 3, 2025
2d1ed80
Merge pull request #933 from NeTEx-CEN/next_documentationtags
skinkie Jul 8, 2025
3807fa2
Merge pull request #932 from NeTEx-CEN/next_abstract
skinkie Jul 8, 2025
121f3da
DayOffset are not integer but DayOffsetType (#935)
Aurige Jul 8, 2025
1f43da2
buttons height in metres (not cm) (#934)
Aurige Jul 9, 2025
98583f5
Tooling for renaming and validation
skinkie Jul 9, 2025
5ba1fd7
Rename _ to _Dummy
skinkie Jul 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .github/scripts/validate-and-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
set -e

SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

echo "Validating XML file structure and linting XSD and XML files ..."

PARSING_ERROR=0
# Iterate all XML and XSD files
while IFS= read -r -d $'\0' filename; do
# Prettify the file using xmllint and save the result to ${filename}.pretty
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
if XMLLINT_INDENT=$'\t' $SCRIPT_DIR/xmllint --encode UTF-8 --format --pretty 1 "${filename}" >"${filename}.pretty"; then
# Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
else
Expand Down
4 changes: 3 additions & 1 deletion .github/scripts/validate-examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
set -e

SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

echo "Validating NeTEx XML examples ..."

if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
if /usr/bin/find examples/functions examples/standards -type f -name "*.xml" -print0 | xargs -0 $SCRIPT_DIR/xmllint --noout --schema xsd/NeTEx_publication.xsd; then
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
Expand Down
Binary file added .github/scripts/xmllint
Binary file not shown.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v3

- name: Install xmllint and xsltproc
run: |
sudo apt-get update
sudo apt-get install libxml2-utils xsltproc
# - name: Install xmllint and xsltproc
# run: |
# sudo apt-get update
# sudo apt-get install libxml2-utils xsltproc

- name: Validate structure and lint XSD and XML files
run: ./.github/scripts/validate-and-lint.sh
Expand Down
2,999 changes: 2,999 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

206 changes: 154 additions & 52 deletions NeTEx.spp

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,14 @@ The schema is systematically divided into small modular files. Generally, for ea
| ----------- | ------------------------------------------------------- | ----------------------------------------------- |
| `master` | Current head of the project | [GitHub](https://github.com/NeTEx-CEN/NeTEx) |
| `next` | Work for the next release | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/next) |
| `epiap` | CEN NeTEx European Passenger Information Accessibility Profile | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/EPIAP) |

# Change Log
## Releases
| Release Number | Release Date | Description | Link | Release Notes |
| -------------- | ------------- | ---------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------- |
| 1.2 | March 2022 | Latest productive version before new modes merge | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2/README.md) |
| 1.2.2 | August 2023 | First version of new modes | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2.2/README.md) |
| 1.3 | 2024 | European Passenger Information Accessibility Profile (EPIAP) - upcoming | N/A | N/A |
| 1.3.1 | May 2024 | European Passenger Information Accessibility Profile (EPIAP) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.3.1) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.3.1/README.md) |
| 2.0 | 2024 | Upcoming release ⏳ | N/A | N/A |
## Full Version History 📚
The comprehensive versions history is available in [change_log.md](https://github.com/ITxPT/NeTEx/blob/NeTEx/change_log.md)
26 changes: 26 additions & 0 deletions examples/functions/bookingArrangements/generalframe.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
<PublicationTimestamp>2023-10-04T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>NDOV</ParticipantRef>
<dataObjects>
<GeneralFrame id="test:GeneralFrame:1" version="1.0">
<Name>BookingArrangement test</Name>
<members>
<BookingArrangement id="test:BookingArrangement:1" version="1.0">
<LatestBookingTime>16:00:00</LatestBookingTime>
<MinimumBookingPeriod>PT1H</MinimumBookingPeriod>
<BookingUrl>assitace.org.uk/wibledon</BookingUrl>
</BookingArrangement>
</members>
</GeneralFrame>
<ResourceFrame id="test:GeneralFrame:1" version="1.0">
<bookingArrangements>
<BookingArrangement id="test:BookingArrangement:2" version="1.0">
<LatestBookingTime>16:00:00</LatestBookingTime>
<MinimumBookingPeriod>PT1H</MinimumBookingPeriod>
<BookingUrl>assitace.org.uk/wibledon</BookingUrl>
</BookingArrangement>
</bookingArrangements>
</ResourceFrame>
</dataObjects>
</PublicationDelivery>
Loading