From 5cbfb69edbcbf3ccb655d98f2c314c203958a8c3 Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Fri, 1 Mar 2019 17:54:07 +0100 Subject: [PATCH 1/2] Comment-NL27 Addition of TypeOfProductCategoryRef and TypeOfServiceRef on a Line (requires to move them from Part 2 to Part 1) --- .../netex_line_support.xsd | 77 +++++++++++++ .../netex_line_version.xsd | 109 ++++++++++++++++++ .../netex_journey_version.xsd | 99 +--------------- .../netex_vehicleJourney_support.xsd | 77 ------------- 4 files changed, 187 insertions(+), 175 deletions(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd index 4a1a32c1b..f6bbd09db 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd @@ -307,4 +307,81 @@ Rail transport, Roads and Road transport + + + + Type for identifier of a TYPE OF SERVICE. + + + + + + Reference to a TYPE OF SERVICE. + + + + + Type for a reference to a TYPE OF SERVICE. + + + + + + Reference to a TYPE OF SERVICE. + + + + + + + + Type for a list of TYPEs OF SERVICE. + + + + + + + + + + + + + Type for identifier of a TYPE OF PRODUCT CATEGORY. + + + + + + Reference to a TYPE OF PRODUCT CATEGORY. Product of a LINE or JOURNEY. e.g. ICS, Thales etc +See ERA B.4 7037 Characteristic description code. + + + + + Type for a reference to a TYPE OF PRODUCT CATEGORY. + + + + + + Reference to a TYPE OF PRODUCT CATEGORY. + + + + + + + + Type for a list of TYPEs OF PRODUCT CATEGORY. + + + + + + + + + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index c1025f482..ead5b2eff 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -114,6 +114,16 @@ Rail transport, Roads and Road transport DESTINATION DISPLAYs in frame. + + + + TYPE OF SERVICEs in frame. + + + + + + @@ -164,6 +174,18 @@ Rail transport, Roads and Road transport + + + Type for containment in frame of TYPE OF SERVICE. + + + + + + + + + @@ -405,6 +427,8 @@ Rail transport, Roads and Road transport Additional transport MODEs for LINE. + + @@ -1097,4 +1121,89 @@ Rail transport, Roads and Road transport + + + Classification of a PRODUCT CATEGORY. + + + + + + + + + + + + + + + + + + Reference to a TYPE OF PRODUCT CATEGORY. + + + + + + + + + Type for a TYPE OF PRODUCT CATEGORY. + + + + + + + + + + + + Elements for a TYPE OF PRODUCT CATEGORY. + + + + + An alternative code that uniquely identifies the PRODUCT CATEGORY. Specifically for use in AVMS systems that require an alias, if code is different from main identifier. For VDV compatibility. + + + + + + + + Classification of a Service. + + + + + + + + + + + + + + + Reference to a TYPE OF SERVICE. + + + + + + + + + Type for a TYPE OF SERVICE. + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd index b8ed82488..de0bd9c6b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd @@ -7,6 +7,7 @@ + @@ -64,19 +65,6 @@ Rail transport, Roads and Road transport JOURNEY types for NeTEx. - - - - Type for containment in frame of TYPE OF SERVICE. - - - - - - - - - @@ -144,89 +132,4 @@ Rail transport, Roads and Road transport - - - Classification of a Service. - - - - - - - - - - - - - - - Reference to a TYPE OF SERVICE. - - - - - - - - - Type for a TYPE OF SERVICE. - - - - - - - - - Classification of a PRODUCT CATEGORY. - - - - - - - - - - - - - - - - - - Reference to a TYPE OF PRODUCT CATEGORY. - - - - - - - - - Type for a TYPE OF PRODUCT CATEGORY. - - - - - - - - - - - - Elements for a TYPE OF PRODUCT CATEGORY. - - - - - An alternative code that uniquely identifies the PRODUCT CATEGORY. Specifically for use in AVMS systems that require an alias, if code is different from main identifier. For VDV compatibility. - - - - - diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd index 32304c569..407b99206 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd @@ -278,83 +278,6 @@ Rail transport, Roads and Road transport - - - Type for identifier of a TYPE OF SERVICE. - - - - - - Reference to a TYPE OF SERVICE. - - - - - Type for a reference to a TYPE OF SERVICE. - - - - - - Reference to a TYPE OF SERVICE. - - - - - - - - Type for a list of TYPEs OF SERVICE. - - - - - - - - - - - - - Type for identifier of a TYPE OF PRODUCT CATEGORY. - - - - - - Reference to a TYPE OF PRODUCT CATEGORY. Product of a JOURNEY. e.g. ICS, Thales etc -See ERA B.4 7037 Characteristic description code. - - - - - Type for a reference to a TYPE OF PRODUCT CATEGORY. - - - - - - Reference to a TYPE OF PRODUCT CATEGORY. - - - - - - - - Type for a list of TYPEs OF PRODUCT CATEGORY. - - - - - - - - - - Type for identifier of a TIMING ALGORITHM TYPE. From 6de12ab21d77ffc09698ec20db585ebe2e4fc60d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 6 May 2021 00:34:11 +0200 Subject: [PATCH 2/2] Remove extra whitespace --- .../part1_networkDescription/netex_line_version.xsd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index 770a85279..4bdd7cea9 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -131,16 +131,11 @@ Rail transport, Roads and Road transport DESTINATION DISPLAYs in frame. - TYPE OF SERVICEs in frame. - - - -