From 72b82c79be64a728b433bf47201d7a61bf8dbb31 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 25 Jun 2024 23:09:23 +0100 Subject: [PATCH 01/18] Update NeTEx.spp Create new Group of folders for stop assignment --- NeTEx.spp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/NeTEx.spp b/NeTEx.spp index 9639176a3..0e3a3588c 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -120,7 +120,7 @@ - + @@ -316,18 +316,12 @@ - - - - - - @@ -354,6 +348,14 @@ + + + + + + + + From 6cd63e75968e52f868de9b34423b37d172c67354 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 25 Jun 2024 23:23:49 +0100 Subject: [PATCH 02/18] Split out journey assignment files to separate subproject No functional change just reorg to match uml --- NeTEx.spp | 17 +++++++++-------- .../netex_stopAssignment_version.xsd | 15 ++++++++++----- xsd/netex_part_2/netex_all_objects_part2.xsd | 13 ++++++++++--- ...tex_all_objects_part2_journeyAssignments.xsd | 10 ++++++++++ .../netex_all_objects_part2_journeyTimes.xsd | 6 ------ 5 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyAssignments.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 0e3a3588c..2aafa0180 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -338,6 +338,15 @@ + + + + + + + + + @@ -348,14 +357,6 @@ - - - - - - - - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 34e35d8de..ee96a35f8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,15 +19,20 @@ 2011-02-05 - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. + + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. - 2023-12-12Add DECK ENTRANCE ASSIGNMENT + + 2023-12-12Add DECK ENTRANCE ASSIGNMENT - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments + + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments

NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

diff --git a/xsd/netex_part_2/netex_all_objects_part2.xsd b/xsd/netex_part_2/netex_all_objects_part2.xsd index 1ec429b25..a141ab374 100644 --- a/xsd/netex_part_2/netex_all_objects_part2.xsd +++ b/xsd/netex_part_2/netex_all_objects_part2.xsd @@ -5,6 +5,8 @@ + + @@ -19,8 +21,10 @@ 2010-09-04 -

NeTEx Xml is an XML representation of the Transmodel Public Transport Data model that can be used to exchange data objects between for databases and other services.

. -

This subschema aggregate all the NeTEx Data Objects.

+ +

NeTEx Xml is an XML representation of the Transmodel Public Transport Data model that can be used to exchange data objects between for databases and other services.

. +

This subschema aggregate all the NeTEx Data Objects.

+ text/xml http://www.w3.org/2001/XMLSchema @@ -40,7 +44,10 @@

Derived from the NeTEx specification and SIRI standards. -

  • NeTEx Data Object specification: ts004.003annexdapr07.xls
  • NeTEx UML specification: ts004-004a-annexd-sep08.pdf -
+
    +
  • NeTEx Data Object specification: ts004.003annexdapr07.xls
    • +
  • NeTEx UML specification: ts004-004a-annexd-sep08.pdf -
    • +

Version 1.0 diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyAssignments.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyAssignments.xsd new file mode 100644 index 000000000..c4b33dd0e --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyAssignments.xsd @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd index 4d4cbdbeb..0eb60205b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd @@ -7,10 +7,6 @@ - - - - @@ -33,7 +29,5 @@ - - From 4dc02e5d754f4b81d66cb36151f966b751cdea8f Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 25 Jun 2024 23:57:15 +0100 Subject: [PATCH 03/18] Rename TRAIN STOP ASSIGNMENT to PASSSENGER BOARDING POSITION STOP ASSIGNMENT Rename to folow Transmodel change --- .../deckPlans/DeckPlans-Example_bus.xml | 8 +- .../deckPlans/DeckPlans-Example_train.xml | 22 +-- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 148 +++++++++--------- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 8 +- .../standards/epip/epip_common_profile.xml | 2 +- xsd/NeTEx_publication.xsd | 36 ++++- xsd/NeTEx_publication_timetable.xsd | 20 +-- .../netex_stopAssignment_support.xsd | 43 ++++- .../netex_stopAssignment_version.xsd | 99 +++++++++--- 9 files changed, 249 insertions(+), 137 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index d74d361ed..d284f96c5 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1794,7 +1794,7 @@ Lower deck - + Board at front from position A true false @@ -1806,8 +1806,8 @@ Lower deck - - + + Exit at rear from position A false @@ -1820,7 +1820,7 @@ Lower deck - + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index dca27eab1..58beb5bdd 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -292,7 +292,7 @@ Small cars only The Train hasa default We assign the deck plans to a specific SERVICE JOURNEY , with different configuratiosn for each journey part -A PASSENGER STOP ASSIGNMENT with individual TRAIN STOP ASSIGNMENTs specify which carriages are aligned with which BOARDING POSITION +A PASSENGER STOP ASSIGNMENT with individual PASSENGER BOARDING POSITION ASSIGNMENTs specify which carriages are aligned with which BOARDING POSITION NAVIGATION PATH + DECK NAVIGATION PATH to reach a seat @@ -4933,7 +4933,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Front half of Carriage F01 Carriage F01 Seats 01-12 can use Boarding Position A true @@ -4959,8 +4959,8 @@ The train reverse in the station and departs, oriented backwards to the right - - + + Rear half of Carriage F01 Carriage F01 Seats 03-26 can use Boarding Position B true @@ -4988,8 +4988,8 @@ The train reverse in the station and departs, oriented backwards to the right - - + + Carriage F02 front Carriage F02 All seats must use forward door to Boarding Position C. Rear door shut true @@ -5021,8 +5021,8 @@ The train reverse in the station and departs, oriented backwards to the right lockedShut - - + + Short platform means F03 (buffet car) doors cannot be used false false @@ -5034,8 +5034,8 @@ The train reverse in the station and departs, oriented backwards to the right 4 false Move to front 2 carriages to access platfrom - - + + Short platform means F04 (sleeper wagon) doors cannot be used false false @@ -5047,7 +5047,7 @@ The train reverse in the station and departs, oriented backwards to the right 5 false Move to front 2 carriages to access platfrom - + diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index 52d801aa0..8d02f05fe 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -3855,7 +3855,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 1 to Boarding Area A (Coaches 1 to 6) @@ -3865,8 +3865,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 2 to Boarding Area A (Coaches 1 to 6) @@ -3875,8 +3875,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 3 to Boarding Area A (Coaches 1 to 6) @@ -3885,8 +3885,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 4 to Boarding Area A (Coaches 1 to 6) @@ -3895,8 +3895,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 5 to Boarding Area A (Coaches 1 to 6) @@ -3905,8 +3905,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 6 to Boarding Area A (Coaches 1 to 6) @@ -3915,7 +3915,7 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass buffetCar - + @@ -3925,7 +3925,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 7 to Boarding Area B (Coaches 6 to 12) @@ -3935,8 +3935,8 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass carriage - - + + Assign Coach 8 to Boarding Area B (Coaches 6 to 12) @@ -3945,8 +3945,8 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass carriage - - + + Assign Coach 9 to Boarding Area B (Coaches 6 to 12) @@ -3955,8 +3955,8 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass carriage - - + + Assign Coach 10 to Boarding Area B (Coaches 6 to 12) @@ -3965,8 +3965,8 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass carriage - - + + Assign Coach 11 to Boarding Area B (Coaches 6 to 12) @@ -3974,8 +3974,8 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass carriage - - + + Assign Coach 12 to Boarding Area B (Coaches 6 to 12) @@ -3984,7 +3984,7 @@ Q.4. Public holiday - Services do not run on a christams day - firstClass buffetCar - + @@ -3994,7 +3994,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 13 to Boarding Area C (Coaches 13 to 18) @@ -4004,8 +4004,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass buffetCar - - + + Assign Coach 14 to Boarding Area C (Coaches 13 to 18) @@ -4014,8 +4014,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 15 to Boarding Area C (Coaches 13 to 18) @@ -4024,8 +4024,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 16 to Boarding Area C (Coaches 13 to 18) @@ -4034,8 +4034,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 16 to Boarding Area C (Coaches 13 to 18) @@ -4044,8 +4044,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 17 to Boarding Area C (Coaches 13 to 18) @@ -4054,8 +4054,8 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass carriage - - + + Assign Coach 18 to Boarding Area C (Coaches 13 to 18) @@ -4064,7 +4064,7 @@ Q.4. Public holiday - Services do not run on a christams day - standardClass buffetCar - + @@ -4118,150 +4118,150 @@ Q.4. Public holiday - Services do not run on a christams day - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index a8f726017..381cc0e7b 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -791,14 +791,14 @@ - + - - + + - + diff --git a/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml index dfcfcc74e..286d1baa1 100644 --- a/examples/standards/epip/epip_common_profile.xml +++ b/examples/standards/epip/epip_common_profile.xml @@ -795,7 +795,7 @@ - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 0e6dd03cd..0de001c43 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -347,7 +347,7 @@ - + @@ -7584,7 +7584,32 @@ - + + + + + Every [PassengerBoardingPositionAssignment Id + Version + order] must be unique within document. + + + + + + + + + + + + + + + + + + + + + @@ -7595,7 +7620,7 @@ - + @@ -7607,7 +7632,10 @@ - + + + + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index 1f8d1934d..3af23e033 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -5082,26 +5082,26 @@ Provides a general purose wrapper for NeTEx data content. - - - + + + - Every [TrainStopAssignment Id + Version + order] must be unique within document. + Every [PassengerBoardingPositionAssignment Id + Version + order] must be unique within document. - + - - - + + + - - + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index 4d4423aef..eeb1f69e0 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -1,5 +1,5 @@ - + @@ -18,6 +18,9 @@ 2010-11-05 + + 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment +

NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

 @@ -30,7 +33,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2020
    @@ -108,27 +111,53 @@ Rail transport, Roads and Road transport - + - Identifier of TRAIN STOP ASSIGNMENT. + DEPRECATED - PASSENGER BOARDING POSITION ASSIGNMENT. - Reference to a TRAIN STOP ASSIGNMENT. + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. - Type for a reference to a TRAIN STOP ASSIGNMENT. + DEPRECATED - PASSENGER BOARDING POSITION ASSIGNMENT. - Identifier of a PASSENGER STOP ASSIGNMENT. + DEPRECATED - PASSENGER BOADRING STOP ASSIGNMENT. + + + + + + + + + Identifier of PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + + Reference to a PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + Type for a reference to a PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + + Identifier of a PASSENGER BOARDING POSITION ASSIGNMENT. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index ee96a35f8..6498120e8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -32,7 +32,10 @@ 2023-12-12Add DECK ENTRANCE ASSIGNMENT - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of passengerBoardingPositionAssignments + + + 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment

    NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

    @@ -100,7 +103,7 @@ Rail transport, Roads and Road transport     - + Assignment of a SCHEDULED STOP POINT to a STOP PLACE and QUAY, etc. @@ -179,10 +182,11 @@ Rail transport, Roads and Road transport - + - Assignment of a SCHEDULED STOP POINT to a STOP PLACE and QUAY, etc.. For associations to ZONE see FlexibleStopAssignment. Usually it is expected to have one single PASSENGER STOP ASSIGNMENT for each combination of STOP PLACE/QUAY/BOARDING POSITION assigned to a SCHEDULED STOP POINT. However, this can't be guaranteed as in some cases operational requirements need multiple combinations of multipe SCHEDULED STOP POINT to a combination in the physical world or even a single SCHEDULED STOP POINT potentially to be connected to multiple combinations in the real world. Also, for some operators the link between the timetable world (SCHEDULED STOP POINT) and the physical may not be provided. This should be avoided, as the link then needs to be done by matching which is not 100% accurate. + The default allocation of a SCHEDULED STOP POINT to a specific STOP PLACE, and also possibly a QUAY and BOARDING POSITION. + @@ -250,13 +254,13 @@ Rail transport, Roads and Road transport - + Train stop assignments elements to use for which SCHEDULED STOP POINT is to be assigned. +v2.0 - + @@ -266,14 +270,14 @@ Rail transport, Roads and Road transport - + - + Change to a PASSENGER STOP ASSIGNMENT. @@ -333,27 +337,34 @@ Rail transport, Roads and Road transport - - + + - Type for a list of references to a TRAIN STOP POINT ASSIGNMENT. + Type for a list of references to a PASSENGER BOARDING POSITION ASSIGNMENT + + + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. + + - - + - Assignment of a scheduled train stop point to a STOP PLACE and quay. etc. + The default allocation of a SCHEDULED STOP POINT to a specific STOP PLACE, and also possibly a QUAY and BOARDING POSITION. NB Rebmed from TRAIN STOP ASSIGNMENT in v2. + - + @@ -370,29 +381,29 @@ Rail transport, Roads and Road transport - + - + - + - Type for a TRAIN STOP POINT ASSIGNMENT. + Type for a PASSENGER BOARDING POSITION ASSIGNMENT - + - + - Elements for a TRAIN STOP POINT ASSIGNMENT. + Elements for a PASSENGER BOARDING POSITION ASSIGNMENT @@ -428,6 +439,50 @@ Rail transport, Roads and Road transport + + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + + + + + From 5047b65e94373dfd15493fbfc1013f69cbead6eb Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 26 Jun 2024 17:04:12 +0100 Subject: [PATCH 04/18] DeclPlanAssignment revisions Changes to stop assignment to support deck plans . TrainStopAssignment renamed to PassengerBoardingPossitionassigment VehicleJourneyStopASsignment & DynamicSTop Assignment moved to separate file in part 2 --- NeTEx.spp | 2 + .../deckPlans/DeckPlans-Example_bus.xml | 24 +- .../deckPlans/DeckPlans-Example_train.xml | 103 +++-- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 16 +- .../netex_deckPlan_support.xsd | 10 +- .../netex_seatingPlan_support.xsd | 25 +- .../netex_stopAssignment_support.xsd | 26 -- .../netex_stopAssignment_version.xsd | 149 +------ .../netex_deckEntranceAssignment_support.xsd | 50 ++- .../netex_deckEntranceAssignment_version.xsd | 82 +++- ...x_vehicleJourneyStopAssignment_support.xsd | 178 ++++++++ ...x_vehicleJourneyStopAssignment_version.xsd | 415 ++++++++++++++++++ .../netex_vehicleJourney_support.xsd | 99 +---- .../netex_vehicleJourney_version.xsd | 263 +---------- 14 files changed, 856 insertions(+), 586 deletions(-) create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 2aafa0180..67299c179 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -346,6 +346,8 @@ + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index d284f96c5..a24bfbb5d 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1793,21 +1793,17 @@ Lower deck - - + + Board at front from position A true false 1 Board at front - - - - - - - + + + Exit at rear from position A false @@ -1815,13 +1811,9 @@ Lower deck 1 exit at rear - - - - - - - + + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 58beb5bdd..db3b88d73 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -4932,10 +4932,9 @@ The train reverse in the station and departs, oriented backwards to the right false - - - Front half of Carriage F01 - Carriage F01 Seats 01-12 can use Boarding Position A + + + Entrance to F01 is at Boarding Position A via forward door on right hand side of train true true @@ -4947,20 +4946,15 @@ The train reverse in the station and departs, oriented backwards to the right true Board at front - - - Entrance to F01 is at Boarding Position A via forward door on right hand side of train - - - Seat 01 - - - Seat 12 - - - - - + + + Seat 01 + + + Seat 12 + + + Rear half of Carriage F01 Carriage F01 Seats 03-26 can use Boarding Position B true @@ -4974,22 +4968,17 @@ The train reverse in the station and departs, oriented backwards to the right true Exit by rear doors - - - Entrance to F01 seats 13-26 at Boarding Position B via rear door on right hand side of train - - shut - - - Seat 13 - - - Seat 36 - - - - - + + shut + + + Seat 13 + + + Seat 36 + + + Carriage F02 front Carriage F02 All seats must use forward door to Boarding Position C. Rear door shut true @@ -5003,25 +4992,31 @@ The train reverse in the station and departs, oriented backwards to the right true Exit through front carriages - - - Entrance to F03 at Boarding Position A via forward door on right hand side of train - - shut - - Seat 01 - - - Seat 36 - - - - No Entrance to F02 via rear door on right hand side of train - - lockedShut - - - + + shut + + Seat 01 + + + Seat 36 + + + + No Entrance to F02 via rear door on right hand side of train + false + false + + + + sleeperCarriage + + 3 + + false + Exit through front carriages + + lockedShut + Short platform means F03 (buffet car) doors cannot be used false @@ -5048,7 +5043,7 @@ The train reverse in the station and departs, oriented backwards to the right false Move to front 2 carriages to access platfrom - + diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index 8d02f05fe..80baee108 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -3854,7 +3854,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 1 to Boarding Area A (Coaches 1 to 6) @@ -3916,7 +3916,7 @@ Q.4. Public holiday - Services do not run on a christams day - buffetCar - + London St Pancras International Platform 5 Coaches 7 -12 @@ -3924,7 +3924,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 7 to Boarding Area B (Coaches 6 to 12) @@ -3985,7 +3985,7 @@ Q.4. Public holiday - Services do not run on a christams day - buffetCar - + London St Pancras International Platform 5 Coaches 13-18 @@ -3993,7 +3993,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Assign Coach 13 to Boarding Area C (Coaches 13 to 18) @@ -4065,7 +4065,7 @@ Q.4. Public holiday - Services do not run on a christams day - buffetCar - + Ebbsfleet International @@ -4117,7 +4117,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + @@ -4262,7 +4262,7 @@ Q.4. Public holiday - Services do not run on a christams day - - + Bourg-St-Maurice platform 1 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index b55a3e12a..666e55a28 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,11 +13,14 @@ 2023-01-30 - 2023-12-08Move SENSOR IN ENTRANCE to here + + 2023-12-08Move SENSOR IN ENTRANCE to here - 2024-01-11Revise enum values + + 2024-01-11Revise enum values - 2024-02-18Norway review comment - Add Window types. + + 2024-02-18Norway review comment - Add Window types.

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    @@ -476,6 +479,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index c7cb3afb7..127ad0398 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,14 +13,18 @@ 2023-02-02 - 2023-02-05 + + 2023-02-05 Name Space changes - 2023-12-08Move SENSOR IN SPOT declarations to here + + 2023-12-08Move SENSOR IN SPOT declarations to here - 2024-01-17Add bed to locatable spot type enumerations + + 2024-01-17Add bed to locatable spot type enumerations - 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration. + + 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration.

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    @@ -206,23 +210,32 @@     + A Range of LOCATABLE SPOTs. - + Start of range of LOCATABLE SPOTs. - + End of range of LOCATABLE SPOTs. + + + Type for a reference to a LOCATABLE SPOT. + + + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index eeb1f69e0..930e8e221 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -163,32 +163,6 @@ Rail transport, Roads and Road transport     - - - - Identifier of a DYNAMIC STOP ASSIGNMENT. - - - - - - Reference to a DYNAMIC STOP ASSIGNMENT. - - - - - Type for a reference to a DYNAMIC STOP ASSIGNMENT. - - - - - - Identifier of a PASSENGER STOP ASSIGNMENT. - - - - - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 6498120e8..0bdfd4b7a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -4,7 +4,6 @@ - @@ -264,80 +263,20 @@ Rail transport, Roads and Road transport     - + Train elements to which SCHEDULED STOP POINT is to be assigned. DEPRECATED -v2.0 - - - - - - - + + - Change to a PASSENGER STOP ASSIGNMENT. + Assignment of a SCHEDULED STOP POINT to a STOP PLACE and QUAY, etc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for DYNAMIC PASSENGER STOP ASSIGNMENT. - - - - - - - Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. - - - - - - - - - Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. - - - - - - - Type for a list of references to a PASSENGER BOARDING POSITION ASSIGNMENT @@ -347,12 +286,7 @@ Rail transport, Roads and Road transport - - - DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. - - - + @@ -432,14 +366,26 @@ Rail transport, Roads and Road transport Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. NB DECK ENTRANCE ASSIGNMENT can be used to make structured reference. - - - Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION. +V2.0 - - + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT + + + + + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. + + + + + + + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. @@ -483,7 +429,7 @@ Rail transport, Roads and Road transport - + View of an assignment of a SCHEDULED STOP POINT to a STOP PLACE and quay. etc. @@ -544,53 +490,4 @@ Rail transport, Roads and Road transport - - - Elements for a QUAYASSIGNMENT. - - - - - - - - - - - - Assignment to a specific QUAY within the STOP PLACE. - - - - - - - - - - - - - - QUAY to which SCHEDULED STOP POINT is to be assigned. - - - - - Name of QUAY or platform to which the SCHEDULED STOP POINT is assigned. - - - - - - - - Identifier of Object of which this is a view. - - - - - - - diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd index ed07641da..d000be6eb 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd @@ -1,7 +1,7 @@ - + @@ -13,9 +13,9 @@ 2023-02-12 - 2023-02-12 - Name Space changes - + + 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT +

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    This sub-schema describes the DECK ENTRANCE ASSIGNMENT types.

    @@ -77,7 +77,7 @@ Type for identifier of a DECK ENTRANCE ASSIGNMENT. - + @@ -89,7 +89,7 @@ Type for a reference to a DECK ENTRANCE ASSIGNMENT. - + Identifier of a DECK ENTRANCE ASSIGNMENT. @@ -98,5 +98,43 @@ + + + + Type for a list of TRAIN COMPONENT STOP ASSIGNMENTs. + + + + + + + + + + + + Type for identifier of a TRAIN COMPONENT STOP ASSIGNMENT. + + + + + + Reference to a TRAIN COMPONENT STOP ASSIGNMENT. +v2.0 + + + + + Type for a reference to a TRAIN COMPONENT STOP ASSIGNMENT. + + + + + + Identifier of a TRAIN COMPONENT STOP ASSIGNMENT. + + + + +     diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd index b5ec2fa17..f6604e3c2 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd @@ -4,7 +4,7 @@ - + @@ -17,9 +17,9 @@ 2023-01-30 - 2023-01-30 - Name Space changes - + + 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT +

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    This sub-schema describes the DECK ENTRANCE ALIGNMENT types.

    @@ -78,7 +78,7 @@ - + The association of a DECK ENTRANCE of a VEHICLE's DECK PLAN with a TRAIN and TRAIN COMPONENT and a specific STOP PLACE, QUAY and possibly BOARDING POSITION. NOTE: may indicate which side of VEHICLE door is. +v2.0 @@ -97,6 +97,12 @@ + + + + + + @@ -115,7 +121,7 @@ Type for a DECK ENTRANCE ASSIGNMENT.     - + @@ -128,7 +134,6 @@     - Whether assigment permits or forbids use of TRAIN COMPONENT and / or specified DECK ENTRANCE at specifed stop. @@ -142,5 +147,68 @@ + + + + Type for containment in frame of TRAIN COMPONENT STOP ASSIGNMENTs + + + + + + + + + + + + The association of a DECK ENTRANCE of a VEHICLE's DECK PLAN with a TRAIN and TRAIN COMPONENT and a specific STOP PLACE, QUAY and possibly BOARDING POSITION. NOTE: may indicate which side of VEHICLE door is. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + Identifier of TRAIN COMPONENT STOP ASSIGNMENT. + + + + + + + + + Type for a TRAIN COMPONENT STOP ASSIGNMENT. + + + + + + + + + + + + Elements for a TRAIN COMPONENT STOP ASSIGNMENT. + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd new file mode 100644 index 000000000..6de45a4ca --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd @@ -0,0 +1,178 @@ + + + + + + + main schema + e-service developers + V1.0 Christophe Duquesne + Nicholas Knowles + Europe + First drafted for version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-06-26 + + + 2024-06-26Split off from VejicleJOurney_support + + +

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    +

    This sub-schema describes the VEHICLE JOURNEY STOP ASSIGNMENT IDENTIFIER types.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_vehicleJourney_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_vehicleJourneyStpAssignment_support.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
      +
    • Derived from the Transmodel standards.
      • +
    + + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx VEHICLE JOURNEY identifier types. + Standard +     +     + NeTEx: VEHICLE JOURNEY tSTOP ASSIGNMENT ypes. +     + + + + + Identifier of VEHICLE TYPE STOP ASSIGNMENT. + + + + + + Reference to a VEHICLE TYPE STOP ASSIGNMENT. + + + + + Type for a reference to a VEHICLE TYPE STOP ASSIGNMENT. + + + + + + Identifier of referenced a VEHICLE TYPE STOP ASSIGNMENT. + + + + + + + + + Identifier of a VEHICLE JOURNEY STOP ASSIGNMENT. + + + + + + Reference to a VEHICLE JOURNEY STOP ASSIGNMENT. + + + + + Type for a reference to a VEHICLE JOURNEY STOP ASSIGNMENT. + + + + + + Identifier of a PASSENGER STOP ASSIGNMENT. + + + + + + + + + Type for identifier of a TRAIN COMPONENT NUMBER ASSIGNNMENT. + + + + + + Reference to a TRAIN COMPONENT NUMBER ASSIGNNMENT. + + + + + Type for a reference to a TRAIN COMPONENT NUMBER ASSIGNNMENT. + + + + + + Identifier of a TRAIN COMPONENT NUMBER ASSIGNNMENT. + + + + + + + + Type for a list of TRAIN COMPONENT NUMBER ASSIGNNMENTs. + + + + + + + + + + + + + Identifier of a DYNAMIC STOP ASSIGNMENT. + + + + + + Reference to a DYNAMIC STOP ASSIGNMENT. + + + + + Type for a reference to a DYNAMIC STOP ASSIGNMENT. + + + + + + Identifier of a PASSENGER STOP ASSIGNMENT. + + + + + + +     diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd new file mode 100644 index 000000000..18e4c6b57 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd @@ -0,0 +1,415 @@ + + + + + + + + + + + + main schema + e-service developers + V1.0 Christophe Duquesne + Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-06-26 + + + 2024-06-26Split off from Vehicle_journey_support. Make DYNAMIC SYOP ASSIGNMEMT a child of VEHICLE JOURNEY SUPPORT and add DATED VEJICLE JOURNEY Ref + + +

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    +

    This sub-schema describes the VEHICLE JOURNEY STOP ASSIGNMEMT types.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version.xsd + [ISO 639-2/B] ENG + Kizoom, 109-123 Clifton Street, London EC4A 4LD + + http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
      +
    • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
      • +
    + + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx VEHICLE JOURNEY types. + Standard +     +     + NeTEx: VEHICLE JOURNEY types. +     + + + + Type for containment in frame of VEHICLE JOURNEY STOP ASSIGNMENTs. + + + + + + + The allocation of a SCHEDULED STOP POINT (i.e. a SCHEDULED STOP POINT of a SERVICE PATTERN or JOURNEY PATTERN) to a specific STOP PLACE or QUAY, for either a Passenger JOURNEY or VEHICLE SERVICE. + + + + + + + + + + Type for containment of VEHICLE TYPE STOP ASSIGNNMENTs. + + + + + + + + The allocation of a stopping position of a VEHICLE TYPE for a particular VEHICLE JOURNEY. + + + + + + + + + The allocation of a stopping position of a VEHICLE TYPE for a particular VEHICLE JOURNEY. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for VEHICLE TYPE STOP ASSIGNMENT. + + + + + + + + + + + + Elements for VEHICLE TYPE STOP ASSIGNMENT Group. + + + + + Relative orientation of vehicle - Default is forwards. + + + + + + + + + + + Type for containment of VEHICLE JOURNEY STOP ASSIGNMENTs. + + + + + + + + + + + + + Change to a PASSENGER STOP ASSIGNMENT for a specific VEHICLE JOURNEY +v1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for VEHICLE JOURNEY STOP ASSIGNMENT. + + + + + + + Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. + + + + + + + + + Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. + + + + + + + + + + Type for containment of TRAIN COMPONENT NUMBER ASSIGNMENTs. + + + + + + + + + + + + + The allocation of an advertised designation for a vehicle or vehicle element for passengers. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for TRAIN COMPONENT NUMBER ASSIGNMENT. + + + + + + + + + + + + Elements for TRAIN COMPONENT NUMBER ASSIGNMENT Group. + + + + + Label to assign. + + + + + + + + + + Change to a PASSENGER STOP ASSIGNMENT. + + + + + + + + + + + + + + + + + + + + + + + + + + Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. + + + + + + + + + + + + + + + Type for DYNAMIC PASSENGER STOP ASSIGNMENT. + + + + + + + Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. + + + + + + + + + Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. + + + + + + + + + + Elements for a QUAY ASSIGNMENT. + + + + + + + + + + + + Assignment to a specific QUAY within the STOP PLACE. + + + + + + + + + + + + + + QUAY to which SCHEDULED STOP POINT is to be assigned. + + + + + Name of QUAY or platform to which the SCHEDULED STOP POINT is assigned. + + + + + + + + Identifier of Object of which this is a view. + + + + + + +     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 90f7ba6f1..ba756c4be 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd @@ -15,11 +15,14 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2019-03-25CR 51 CD Add VehiclJourneyStop Assignment + + 2019-03-25CR 51 CD Add VehiclJourneyStop Assignment - 2019-03-26NL-27 Add default TypeOfProductCategory and TypeOfService to Line. + + 2019-03-26NL-27 Add default TypeOfProductCategory and TypeOfService to Line. Move TypeOfProductCategory amnd TypeOfService from netex_vehicleJourney to Framework reusable components netex_travelRights so they are visible from part 1 @@ -216,70 +219,6 @@ Rail transport, Roads and Road transport - - - - Type for identifier of a TRAIN COMPONENT NUMBER ASSIGNNMENT. - - - - - - Reference to a TRAIN COMPONENT NUMBER ASSIGNNMENT. - - - - - Type for a reference to a TRAIN COMPONENT NUMBER ASSIGNNMENT. - - - - - - Identifier of a TRAIN COMPONENT NUMBER ASSIGNNMENT. - - - - - - - - Type for a list of TRAIN COMPONENT NUMBER ASSIGNNMENTs. - - - - - - - - - - - - - Identifier of VEHICLE TYPE STOP ASSIGNMENT. - - - - - - Reference to a VEHICLE TYPE STOP ASSIGNMENT. - - - - - Type for a reference to a VEHICLE TYPE STOP ASSIGNMENT. - - - - - - Identifier of referenced a VEHICLE TYPE STOP ASSIGNMENT. - - - - - @@ -306,31 +245,5 @@ Rail transport, Roads and Road transport - - - - Identifier of a VEHICLE JOURNEY STOP ASSIGNMENT. - - - - - - Reference to a VEHICLE JOURNEY STOP ASSIGNMENT. - - - - - Type for a reference to a VEHICLE JOURNEY STOP ASSIGNMENT. - - - - - - Identifier of a PASSENGER STOP ASSIGNMENT. - - - - - diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd index dfb48c92f..29389e30d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -1,10 +1,10 @@ - + - + @@ -25,25 +25,36 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset + + 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review CR51: make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. NJSK Review CR51: Allow inlining of vehicleJourneyStopAssignments within VehicleJourney. NJSK Also correct camel case on trainComponentLabelAssignents trainComponentLabelAssignents_RelStructure. - 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment + + 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Replace VehicleTypeRef with TransportTypeRef so as to be more general - 2024-02-27TM enhancement add PASSENGER TIMES at STOP + + 2024-02-27TM enhancement add PASSENGER TIMES at STOP + + + 2024-06-24Move VEHICOE JOURNEY STOP ASSIGNMENT, TRAIN COMPONENT LABEL ASSIGNMENT and VEHICLE JOURNEY STOP ASSIGNMENT to sepaarte file

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    @@ -100,22 +111,6 @@ Rail transport, Roads and Road transport - - - Type for containment in frame of VEHICLE JOURNEY STOP ASSIGNMENTs. - - - - - - - The allocation of a SCHEDULED STOP POINT (i.e. a SCHEDULED STOP POINT of a SERVICE PATTERN or JOURNEY PATTERN) to a specific STOP PLACE or QUAY, for either a Passenger JOURNEY or VEHICLE SERVICE. - - - - - - @@ -365,7 +360,6 @@ Rail transport, Roads and Road transport - @@ -424,147 +418,6 @@ Rail transport, Roads and Road transport - - - - Type for containment of TRAIN COMPONENT NUMBER ASSIGNMENTs. - - - - - - - - - - - - - The allocation of an advertised designation for a vehicle or vehicle element for passengers. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for TRAIN COMPONENT NUMBER ASSIGNMENT. - - - - - - - - - - - - Elements for TRAIN COMPONENT NUMBER ASSIGNMENT Group. - - - - - Label to assign. - - - - - - - - - - Type for containment of VEHICLE TYPE STOP ASSIGNNMENTs. - - - - - - - - The allocation of a stopping position of a VEHICLE TYPE for a particular VEHICLE JOURNEY. - - - - - - - - - The allocation of a stopping position of a VEHICLE TYPE for a particular VEHICLE JOURNEY. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for VEHICLE TYPE STOP ASSIGNMENT. - - - - - - - - - - - - Elements for VEHICLE TYPE STOP ASSIGNMENT Group. - - - - - Relative orientation of vehicle - Default is forwards. - - - - - - - @@ -597,77 +450,5 @@ Rail transport, Roads and Road transport - - - - Type for containment of VEHICLE JOURNEY STOP ASSIGNMENTs. - - - - - - - - - - - - - Change to a PASSENGER STOP ASSIGNMENT for a specific VEHICLE JOURNEY +v1.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for VEHICLE JOURNEY STOP ASSIGNMENT. - - - - - - - Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. - - - - - - - - - Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. - - - - - - +     From e95f6c7208964f752fc5485f9a023a52ee8b2ca3 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 26 Jun 2024 17:05:02 +0100 Subject: [PATCH 05/18] DeckPlan Asihnment Further update to example --- .../epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index 381cc0e7b..a2de4123e 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -790,7 +790,7 @@ - + @@ -799,7 +799,8 @@ - + + From 0e6c6ecb57f771e2643c588ee7f5b4254ed39524 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 26 Jun 2024 17:51:05 +0100 Subject: [PATCH 06/18] Update netex_responsibility_support.xsd So that examples validate --- .../netex_responsibility_support.xsd | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index 83b84576e..5a85e93ba 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -19,8 +19,10 @@ 2017-12-01 Add FareManagement Data Roles and SecurityManagement, Data Regfistrat secures etc - 2020-10-04NewModes: Add DataRoleType and StakholderRole enum values - 2024-03-01TM Contract - split into ResponsibilitySet_support + + 2020-10-04NewModes: Add DataRoleType and StakholderRole enum values + + 2024-03-01TM Contract - split into ResponsibilitySet_support

    NeTEx - Network Exchange. This subschema defines RESPONSIBILITY data administration base types.

    @@ -108,6 +110,23 @@ Rail transport, Roads and Road transport + + + + + + + + + + + + + + + + +     From 04de35dfb75c637781c51c2993bf158d6be09eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 27 Jun 2024 14:17:29 +0200 Subject: [PATCH 07/18] Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd Co-authored-by: Stefan de Konink --- .../netex_vehicleJourneyStopAssignment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd index 6de45a4ca..9ca2d77b3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd @@ -55,7 +55,7 @@ Rail transport, Roads and Road transport Standard - NeTEx: VEHICLE JOURNEY tSTOP ASSIGNMENT ypes. + NeTEx: VEHICLE JOURNEY STOP ASSIGNMENT types.     From 10dfc5de4ad2cb0b445cae850850e2abd6d37667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 27 Jun 2024 14:17:36 +0200 Subject: [PATCH 08/18] Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../netex_vehicleJourneyStopAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd index 18e4c6b57..3c0b0ebf0 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd @@ -231,7 +231,7 @@ Rail transport, Roads and Road transport - Type for containment of TRAIN COMPONENT NUMBER ASSIGNMENTs. + Type for containment of TRAIN COMPONENT NUMBER ASSIGNMENTs. From 10295cf6b148c663638121f78bae29b84fda0c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 27 Jun 2024 14:17:41 +0200 Subject: [PATCH 09/18] Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../netex_vehicleJourneyStopAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd index 3c0b0ebf0..d3e2a815b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd @@ -325,7 +325,7 @@ Rail transport, Roads and Road transport - Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. + Elements for a VEHICLE JOURNEY STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. From 77fb3bd3d22855e35c0db1a85ac66e237b0613a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 11:13:53 +0200 Subject: [PATCH 10/18] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index 930e8e221..ded931d47 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - DEPRECATED - PASSENGER BOARDING POSITION ASSIGNMENT. + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. From 169bfc301b7de45cadd1ce57129b429f5b107da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 11:13:59 +0200 Subject: [PATCH 11/18] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index ded931d47..3b865a8cd 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -125,7 +125,7 @@ Rail transport, Roads and Road transport     - DEPRECATED - PASSENGER BOARDING POSITION ASSIGNMENT. + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. From 96ee6d9669fc4925acfcb942f70ce2cdf5d6eace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:04:13 +0200 Subject: [PATCH 12/18] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 127ad0398..206059271 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -221,7 +221,7 @@ Start of range of LOCATABLE SPOTs.     - + End of range of LOCATABLE SPOTs. From 544fb8516fab79af3fa1a6a8e45417b433c1f8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:04:18 +0200 Subject: [PATCH 13/18] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 206059271..791863b6e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -216,7 +216,7 @@ A Range of LOCATABLE SPOTs. - + Start of range of LOCATABLE SPOTs. From 774543e4b852f09c2be04329d8f42757a25abd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:04:27 +0200 Subject: [PATCH 14/18] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 791863b6e..336c347cd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -228,7 +228,7 @@ - + Type for a reference to a LOCATABLE SPOT. From 3fa0d65369135febeed039355676c849f01e60d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:05:27 +0200 Subject: [PATCH 15/18] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index 3b865a8cd..10dd2ad22 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -131,7 +131,7 @@ Rail transport, Roads and Road transport - DEPRECATED - PASSENGER BOADRING STOP ASSIGNMENT. + DEPRECATED - Use PASSENGER BOARDING POSITION ASSIGNMENT. From ae0f2c9639bb28f7b7af2f0f0f11e8fe1187d141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:18:37 +0200 Subject: [PATCH 16/18] Update netex_seatingPlan_support.xsd --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 336c347cd..127ad0398 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -216,19 +216,19 @@ A Range of LOCATABLE SPOTs. - + Start of range of LOCATABLE SPOTs. - + End of range of LOCATABLE SPOTs. - + Type for a reference to a LOCATABLE SPOT. From 814485c2b0de25e913400063dd9015b7a813c340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 1 Jul 2024 17:26:00 +0200 Subject: [PATCH 17/18] fixing missing deckEntranceAssignments --- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 0bdfd4b7a..4e5f27e3b 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -4,6 +4,7 @@ + @@ -366,6 +367,11 @@ Rail transport, Roads and Road transport Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. NB DECK ENTRANCE ASSIGNMENT can be used to make structured reference. + + + DECK ENTRANCE assigned. +v2.0 + + From 836741d353da416cf045409163d2264c0f6915ae Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:28:19 +0000 Subject: [PATCH 18/18] Lint and update documentation tables --- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 1 - xsd/NeTEx_publication.xsd | 8 ++---- .../netex_responsibility_support.xsd | 13 ++++----- .../netex_deckPlan_support.xsd | 9 +++---- .../netex_seatingPlan_support.xsd | 12 +++------ .../netex_stopAssignment_support.xsd | 3 +-- .../netex_stopAssignment_version.xsd | 18 +++++-------- xsd/netex_part_2/netex_all_objects_part2.xsd | 11 +++----- .../netex_deckEntranceAssignment_support.xsd | 3 +-- .../netex_deckEntranceAssignment_version.xsd | 3 +-- ...x_vehicleJourneyStopAssignment_support.xsd | 3 +-- ...x_vehicleJourneyStopAssignment_version.xsd | 3 +-- .../netex_vehicleJourney_support.xsd | 9 +++---- .../netex_vehicleJourney_version.xsd | 27 +++++++------------ 14 files changed, 40 insertions(+), 83 deletions(-) diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index a2de4123e..7e6895c1c 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -800,7 +800,6 @@ - diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 0de001c43..877129e2e 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -7608,8 +7608,7 @@ - - + @@ -7632,10 +7631,7 @@ - - - - + diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index 5a85e93ba..2dff4cc39 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -19,10 +19,8 @@ 2017-12-01 Add FareManagement Data Roles and SecurityManagement, Data Regfistrat secures etc - - 2020-10-04NewModes: Add DataRoleType and StakholderRole enum values - - 2024-03-01TM Contract - split into ResponsibilitySet_support + 2020-10-04NewModes: Add DataRoleType and StakholderRole enum values + 2024-03-01TM Contract - split into ResponsibilitySet_support

    NeTEx - Network Exchange. This subschema defines RESPONSIBILITY data administration base types.

    @@ -110,8 +108,8 @@ Rail transport, Roads and Road transport - - + + @@ -125,8 +123,7 @@ Rail transport, Roads and Road transport - - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 666e55a28..0237da358 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,14 +13,11 @@ 2023-01-30 - - 2023-12-08Move SENSOR IN ENTRANCE to here + 2023-12-08Move SENSOR IN ENTRANCE to here - - 2024-01-11Revise enum values + 2024-01-11Revise enum values - - 2024-02-18Norway review comment - Add Window types. + 2024-02-18Norway review comment - Add Window types.

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 127ad0398..2191c3100 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,18 +13,14 @@ 2023-02-02 - - 2023-02-05 + 2023-02-05 Name Space changes - - 2023-12-08Move SENSOR IN SPOT declarations to here + 2023-12-08Move SENSOR IN SPOT declarations to here - - 2024-01-17Add bed to locatable spot type enumerations + 2024-01-17Add bed to locatable spot type enumerations - - 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration. + 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration.

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd index 10dd2ad22..2811abb94 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd @@ -18,8 +18,7 @@ 2010-11-05 - - 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment + 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment

    NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

    diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 4e5f27e3b..1226030f1 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,23 +19,17 @@ 2011-02-05 - - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. - - 2023-12-12Add DECK ENTRANCE ASSIGNMENT + 2023-12-12Add DECK ENTRANCE ASSIGNMENT - - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of passengerBoardingPositionAssignments + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of passengerBoardingPositionAssignments - - 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment + 2024-06-24Rename train stop assignment (deprectaed) to passenger boarding assignment

    NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

    diff --git a/xsd/netex_part_2/netex_all_objects_part2.xsd b/xsd/netex_part_2/netex_all_objects_part2.xsd index a141ab374..8e08f0958 100644 --- a/xsd/netex_part_2/netex_all_objects_part2.xsd +++ b/xsd/netex_part_2/netex_all_objects_part2.xsd @@ -21,10 +21,8 @@ 2010-09-04     - -

    NeTEx Xml is an XML representation of the Transmodel Public Transport Data model that can be used to exchange data objects between for databases and other services.

    . -

    This subschema aggregate all the NeTEx Data Objects.

    -     +

    NeTEx Xml is an XML representation of the Transmodel Public Transport Data model that can be used to exchange data objects between for databases and other services.

    . +

    This subschema aggregate all the NeTEx Data Objects.

    text/xml http://www.w3.org/2001/XMLSchema @@ -44,10 +42,7 @@

    Derived from the NeTEx specification and SIRI standards. -

      -
    • NeTEx Data Object specification: ts004.003annexdapr07.xls
      • -
    • NeTEx UML specification: ts004-004a-annexd-sep08.pdf -
      • -
    +
    • NeTEx Data Object specification: ts004.003annexdapr07.xls
    • NeTEx UML specification: ts004-004a-annexd-sep08.pdf -

    Version 1.0 diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd index d000be6eb..6d9debb0e 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd @@ -13,8 +13,7 @@ 2023-02-12 - - 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT + 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd index f6604e3c2..052654531 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd @@ -17,8 +17,7 @@ 2023-01-30 - - 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT + 2024-06-24Add TRAIN COMPONENT STOP ASSIGNMENT

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd index 9ca2d77b3..2ca359895 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_support.xsd @@ -13,8 +13,7 @@ 2024-06-26 - - 2024-06-26Split off from VejicleJOurney_support + 2024-06-26Split off from VejicleJOurney_support

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd index d3e2a815b..d20202ac0 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd @@ -18,8 +18,7 @@ 2024-06-26 - - 2024-06-26Split off from Vehicle_journey_support. Make DYNAMIC SYOP ASSIGNMEMT a child of VEHICLE JOURNEY SUPPORT and add DATED VEJICLE JOURNEY Ref + 2024-06-26Split off from Vehicle_journey_support. Make DYNAMIC SYOP ASSIGNMEMT a child of VEHICLE JOURNEY SUPPORT and add DATED VEJICLE JOURNEY Ref

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

    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 ba756c4be..046eb3e94 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd @@ -15,14 +15,11 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2019-03-25CR 51 CD Add VehiclJourneyStop Assignment + 2019-03-25CR 51 CD Add VehiclJourneyStop Assignment - - 2019-03-26NL-27 Add default TypeOfProductCategory and TypeOfService to Line. + 2019-03-26NL-27 Add default TypeOfProductCategory and TypeOfService to Line. Move TypeOfProductCategory amnd TypeOfService from netex_vehicleJourney to Framework reusable components netex_travelRights so they are visible from part 1 diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd index 29389e30d..823b5a069 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -25,36 +25,27 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset + 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset - - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review CR51: make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. NJSK Review CR51: Allow inlining of vehicleJourneyStopAssignments within VehicleJourney. NJSK Also correct camel case on trainComponentLabelAssignents trainComponentLabelAssignents_RelStructure. - - 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment + 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Replace VehicleTypeRef with TransportTypeRef so as to be more general - - 2024-02-27TM enhancement add PASSENGER TIMES at STOP + 2024-02-27TM enhancement add PASSENGER TIMES at STOP - - 2024-06-24Move VEHICOE JOURNEY STOP ASSIGNMENT, TRAIN COMPONENT LABEL ASSIGNMENT and VEHICLE JOURNEY STOP ASSIGNMENT to sepaarte file + 2024-06-24Move VEHICOE JOURNEY STOP ASSIGNMENT, TRAIN COMPONENT LABEL ASSIGNMENT and VEHICLE JOURNEY STOP ASSIGNMENT to sepaarte file

    NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.