diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index 45041a37a..32a3a0bc4 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e 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 xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deprecation/*.xml 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 echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' diff --git a/examples/functions/deprecation/organisationref.xml b/examples/functions/deprecation/organisationref.xml new file mode 100644 index 000000000..5f87dd2b5 --- /dev/null +++ b/examples/functions/deprecation/organisationref.xml @@ -0,0 +1,38 @@ + + + + 2015-04-17T09:30:47.0Z + AURIGE001 + P1Y + Keeps OrganisationRef + + + Frame NETEX_ARRET Le Corbusier + Frame NETEX_ARRET pour l'exemple d'arrêt Le Corbusier + + + + + Le Corbusier + Pôle monomodal regroupant les arrêts monomodaux Le Corbusier, Lycée de Villaroy et Jules Michelet + + + 2.068554 + 48.764788 + + + Intersection Avenue de l'Europe, Rue Eugène Violet Le Duc et Rue Le Corbusier + Lycée Villaroy et Gymnase de l'Aviation + + bus + onstreetBus + + + 768 + SQYBUS + operator + + + + + diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index 5e2669caf..ead88c3a2 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -5753,7 +5753,7 @@ Changes - + Transport for London @@ -6463,7 +6463,7 @@ Changes - + Transport for London @@ -6599,7 +6599,7 @@ Changes - + Transport for London diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml index 5f637f7a1..d069ff16d 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml @@ -5854,7 +5854,7 @@ Changes - + Transport for London @@ -6564,7 +6564,7 @@ Changes - + Transport for London @@ -6700,7 +6700,7 @@ Changes - + Transport for London diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index dd5280ece..e067ef6c7 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -5840,7 +5840,7 @@ Changes - + Transport for London @@ -6589,7 +6589,7 @@ Changes - + Transport for London @@ -6725,7 +6725,7 @@ Changes - + Transport for London diff --git a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml index 02716deec..498a2f9ba 100644 --- a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml +++ b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml @@ -739,13 +739,13 @@ The Calendar is shown coded as - EXTERNAL + subsidy false 20 - EXTERNAL + contract false 20 diff --git a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml index a8c0d2e29..228194b25 100644 --- a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml +++ b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml @@ -588,13 +588,13 @@ The Calendar is shown coded as - EXTERNAL + subsidy false 20 - EXTERNAL + contract false 20 diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index 7edad9d46..2d937274b 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -775,7 +775,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Network Rail @@ -1208,7 +1208,7 @@ Q.4. Public holiday - Services do not run on a christams day - GMT - + Network Rail diff --git a/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret - External Quays.xml b/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret - External Quays.xml index 133f0672d..2b146aef2 100644 --- a/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret - External Quays.xml +++ b/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret - External Quays.xml @@ -176,7 +176,7 @@ Pour NETEX_COMMUN les classes présentes sont Face à l'école maternelle Jeanne Moreau - + bus diff --git a/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml b/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml index c44b95a2f..3bbf72974 100644 --- a/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml +++ b/examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml @@ -177,7 +177,7 @@ Pour NETEX_COMMUN les classes présentes sont Intersection Avenue de l'Europe, Rue Eugène Violet Le Duc et Rue Le Corbusier Lycée Villaroy et Gymnase de l'Aviation - + bus @@ -205,7 +205,7 @@ Pour NETEX_COMMUN les classes présentes sont Gymnase de l'Aviation - + bus @@ -287,7 +287,7 @@ Pour NETEX_COMMUN les classes présentes sont Entre le Gymnase de l'Aviation et le Lycèe Villaroy - + bus @@ -387,7 +387,7 @@ Pour NETEX_COMMUN les classes présentes sont Face à l'école maternelle Jeanne Moreau - + bus diff --git a/examples/standards/norway/stops/OsloS_station_example.xml b/examples/standards/norway/stops/OsloS_station_example.xml index 238561b8b..7a99043a6 100644 --- a/examples/standards/norway/stops/OsloS_station_example.xml +++ b/examples/standards/norway/stops/OsloS_station_example.xml @@ -168,7 +168,7 @@ outdoors openArea - + bus tram diff --git a/examples/standards/norway/stops/submodel-StationWithEquipment.xml b/examples/standards/norway/stops/submodel-StationWithEquipment.xml index 0ac06764e..fba26bb45 100644 --- a/examples/standards/norway/stops/submodel-StationWithEquipment.xml +++ b/examples/standards/norway/stops/submodel-StationWithEquipment.xml @@ -42,7 +42,7 @@ This example contains a autogenerated example of a station with two levels, an a y a - + Norges Statsbaner NSB AS diff --git a/xsd/NX.xsd b/xsd/NX.xsd index 09bbb1726..43f6fedbe 100644 --- a/xsd/NX.xsd +++ b/xsd/NX.xsd @@ -132,7 +132,7 @@ - + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index a6475c81b..ddc26337c 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1285,17 +1285,6 @@ Provides a general purose wrapper for NeTEx data content. - - - - - - - - - - - diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 11baf46dc..7837a60fc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -406,7 +406,7 @@ Rail transport, Roads and Road transport Coordinates of ORGANISATIONAL UNIT. - + @@ -604,7 +604,7 @@ Rail transport, Roads and Road transport Description of the nature pf the Relationship. - + Role of the related Organbisation @@ -686,7 +686,7 @@ Rail transport, Roads and Road transport Public Code assosociated with Zone - + RESPONSIBILITY SETs allocated to ADMINISTRATIVE ZONE. @@ -988,7 +988,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index ad4f6faf5..5e5c74b08 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport - + @@ -180,11 +180,16 @@ Rail transport, Roads and Road transport - + Reference to an ORGANISATION. + + + DEPRECATED reference to any ORGANISATION meeting the substitutiongroup. -v2.0 + + Type for a reference to an ORGANISATION. @@ -218,7 +223,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd index 5991efa8a..e067aa6ce 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd @@ -58,7 +58,7 @@ Rail transport, Roads and Road transport - + Reference to an OTHER ORGANISATION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd index 720d3a02a..2b33f4199 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport - + Items in SECURITY LIST. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index e10afa28b..c5c708876 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -92,7 +92,7 @@ Rail transport, Roads and Road transport - + Reference to a TRANSPORT ORGANISATION. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 9c81f924e..a44e04749 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd @@ -235,7 +235,7 @@ Rail transport, Roads and Road transport - + Reference to OPERATOR of SITE - derived details can be included. diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd index 1ed2ee029..379ceebaa 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd @@ -415,7 +415,7 @@ Rail transport, Roads and Road transport Contact details for GARAGE. - + OPERATORs assoicated with GARAGE. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd index a1e066cf9..4575fbe5f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd @@ -150,7 +150,7 @@ Rail transport, Roads and Road transport Object for which this accounts. - + ORGANISATION contracting service. diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd index 44f022728..f4a4457bd 100644 --- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd @@ -903,7 +903,7 @@ Rail transport, Roads and Road transport Name of PRICING SERVICE parameter set. - + URL at which service is available. diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd index 75698aed4..18c8ba75a 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -271,7 +271,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd index 4fc6160bd..926f02637 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd @@ -236,7 +236,7 @@ Rail transport, Roads and Road transport Calculation Elements for TARIFF. - + diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd index 31ece9bdf..e1ca5b0b1 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd @@ -277,7 +277,7 @@ Rail transport, Roads and Road transport Elements that use FARE TABLE that are not PRICEABLE OBJECTs. - + diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd index bf6adaeeb..887577492 100644 --- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport Contact details for distribution channel - + Payment methods allowed. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd index 50cc816ec..81ef47eb2 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - + Reference to a RETAIL CONSORTIUM. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd index 950afea69..8b3657436 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd @@ -262,7 +262,7 @@ Rail transport, Roads and Road transport Status of Retail device. - + diff --git a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd index 6d76ec839..860cb492b 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd index 35ab8f6bf..a395ecf38 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd @@ -74,7 +74,7 @@ Rail transport, Roads and Road transport - + Reference to an ONLINE SERVICE OPERATOR. +v1.2.2