From babaef810e17210ded0a0be908da6ef3a5221a5d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 18 Apr 2024 00:38:04 +0200 Subject: [PATCH] Implements PASSENGER AT STOP TIME and TimetabledTime constraints (#678) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Implements #672 Includes fixes for broken examples * Lint and update documentation tables * Typo squating. * More typo's and optical changes * Remove extra spaces * Remove double spaces * Update Netex_simpleVehicleSchedule_01.xml --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthias Günter --- .../newModes/NewModes-CarPoolingExample.xml | 4 +- .../NewModes-ChauffeuredServiceExample.xml | 4 +- ...Netex_02.1_Bus_CircularRoute_Timetable.xml | 48 ++-- .../Netex_simpleVehicleSchedule_01.xml | 4 +- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 12 +- examples/standards/norway/network/Line61A.xml | 14 +- xsd/NeTEx_publication.xsd | 21 ++ .../netex_all_objects_part2_journeyTimes.xsd | 4 +- .../part2_journeyTimes/netex_call_version.xsd | 6 + .../netex_passengerAtStopTime_support.xsd | 86 +++++++ .../netex_passengerAtStopTime_version.xsd | 152 ++++++++++++ .../netex_passengerAtStopTimes_support.xsd | 219 ++++++++++++++++++ .../netex_passingTimes_support.xsd | 14 +- .../netex_passingTimes_version.xsd | 14 +- .../netex_vehicleJourney_version.xsd | 28 ++- 15 files changed, 562 insertions(+), 68 deletions(-) create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index 5c9af2218..ae7f390b9 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -1005,11 +1005,11 @@ This Shows sample Purchases 07:00:00 - + 07:00:00 - + 09:15:00 diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 919e38c1e..1f0c88015 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -1138,11 +1138,11 @@ This Shows sample Purchases 10:15:00 - + 10:15:00 - + 11:10:00 diff --git a/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml b/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml index f1d294fbd..5d837f305 100644 --- a/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml +++ b/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml @@ -788,27 +788,27 @@ Two GROUP of SERVICEs groups two sets of journeys. C 1 | 15:15 | 16:30 | C to B: 15mn B 1 | 15:30 | 16:45 | B to A 15mn A 2 | 15:45 | 17:00 | --> - + 14:30:00.0Z - + 14:40:00.0Z - + 15:00:00.0Z - + 15:15:00.0Z - + 15:30:00.0Z - + 15:45:00.0Z @@ -923,27 +923,27 @@ Two GROUP of SERVICEs groups two sets of journeys. C 1 | 15:15 | 16:30 | C to B: 15mn B 1 | 15:30 | 16:45 | B to A 15mn A 2 | 15:45 | 17:00 | --> - + 15:45:00.0Z - + 16:00:00.0Z - + 16:15:00.0Z - + 16:30:00.0Z - + 16:45:00.0Z - + 17:00:00.0Z @@ -1058,27 +1058,27 @@ Two GROUP of SERVICEs groups two sets of journeys. B 1 | 15:30 | 16:45 | A to E 15mn E 2 | 15:45 | 17:00 | --> - + 14:30:00.0Z - + 14:45:00.0Z - + 15:00:00.0Z - + 15:15:00.0Z - + 15:30:00.0Z - + 15:45:00.0Z @@ -1194,27 +1194,27 @@ Two GROUP of SERVICEs groups two sets of journeys. B 1 | 15:30 | 16:45 | A to E 15mn E 2 | 15:45 | 17:00 | --> - + 15:45:00.0Z - + 16:00:00.0Z - + 16:15:00.0Z - + 16:30:00.0Z - + 16:45:00.0Z - + 17:00:00.0Z diff --git a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml index a83adce7d..a1d4ab607 100644 --- a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml +++ b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml @@ -1683,11 +1683,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 21:15:00.0Z - + 21:25:00.0Z diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index a1c9d24c8..7bf75bdfc 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -2389,16 +2389,16 @@ - + 08:00:00 - + 08:15:00 08:15:00 - + 08:30:00 @@ -2419,16 +2419,16 @@ - + 08:00:00 - + 08:15:00 08:15:00 - + 08:30:00 diff --git a/examples/standards/norway/network/Line61A.xml b/examples/standards/norway/network/Line61A.xml index 5369e0b35..ce560a782 100644 --- a/examples/standards/norway/network/Line61A.xml +++ b/examples/standards/norway/network/Line61A.xml @@ -363,37 +363,37 @@ - + 00:15:00 - + 00:17:00 - + 00:21:00 - + 00:24:00 - + 00:27:00 - + 00:28:00 - + 00:31:00 diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 0ecca27b6..0cd2ec0f5 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -7726,6 +7726,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [TimetabledPassingTime Id + Version] must be unique within document. + + + + + + + + + + + + + + + + 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 3569e5d90..4d4cbdbeb 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 @@ -16,8 +16,10 @@ - + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd index 8d4b18063..9f902ac7a 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd @@ -3,6 +3,7 @@ + @@ -284,6 +285,11 @@ Rail transport, Roads and Road transport NOTICEs of a CALL that apply only to the Arrival or departure. + + + Times by which passenger should be at stop for specific processes such as baggage checking, passport control and security - may be earlier than the departure time for departures, or later than arrival time for arrivals. +v2.0 + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd new file mode 100644 index 000000000..9852d2e7c --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd @@ -0,0 +1,86 @@ + + + + + + + + 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-02-27 TM 6.2 enhancement to allow + + + 2024-02-27 + + +

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

+

This sub-schema describes the PASSENGER AT STOP TIMEtypes.

+ + + 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_ppassengerAtStopTime_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd + + Unclassified + CEN, Crown Copyright 2023-2024 + + +
    +
  • Derived from the Transmodel standard.
    • +
+ + 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 PASSENGER AT STOP TIME identifier types. + Standard + + + NeTEx: PASSENGER AT STOP TIME identifier types. + + + + + Type for identifier of a PASSENGER AT STOP TIME. + + + + + + Reference to a PASSENGER AT STOP TIME. +v2.0 + + + + + Type for a reference to a PASSENGER AT STOP TIME. + + + + + + Identifier of referenced entity. + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd new file mode 100644 index 000000000..3edf346aa --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd @@ -0,0 +1,152 @@ + + + + + + + + + + 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-02-28 + + + 2024-02-28 + + +

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

+

This sub-schema describes the PASSENGER AT STOP TIME 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_passengerTimeAtStop_version.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
    +
  • Derived from the Transmodel standard.
    • +
+ + 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 PASSENGER AT STOP TIME types. + Standard + + + NeTEx: PASSENGER AT STOP TIMES types. + + + + + Type for a list of PASSENGER AT STOP TIME. + + + + + + + + + + + + Type for PASSENGER AT STOP TIME. + + + + + + + + + + + + Time at which a passenger should be at a stop to commence or finish a process. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + + PASSENGER AT STOP TIME elements. + + + + + Description of PASSENGER AT STOP TIME. + + + + + Earliest time that passenger should be at stop for specified process, e.g. baggage check in, customs etc. + + + + + Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day. + + + + + Latest time that passenger should be at stop for specified process. + + + + + Number of days after the starting time of the journey. + + + + + + Nature of process. + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd new file mode 100644 index 000000000..6b253f7de --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd @@ -0,0 +1,219 @@ + + + + + + + + + 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 + + 2010-09-04 + + + 2011-02-05 + + + +

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

+

This sub-schema describes the PASSING TIME 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_passingTimes_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd + + Unclassified + CEN, Crown Copyright 2009-2014 + + +
    +
  • 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 PASSING TIME identifier types. + Standard + + + NeTEx: PASSING TIMES identifier types. + + + + + Type for identifier of a PASSING TIME. + + + + + + Reference to a PASSING TIME. + + + + + Type for a reference to a PASSING TIME. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a TARGET PASSING TIME. + + + + + + Reference to a TARGET PASSING TIME. + + + + + Type for a reference to a TARGET PASSING TIME. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of an OBSERVED PASSING TIME. + + + + + + Reference to an OBSERVED PASSING TIME. + + + + + Type for a reference to an OBSERVED PASSING TIME. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of an ESTIMATED PASSING TIME. + + + + + + Reference to an ESTIMATED PASSING TIME. + + + + + Type for a reference to an ESTIMATED PASSING TIME. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a TIMETABLED PASSING TIME. + + + + + + Reference to a TIMETABLED PASSING TIME. + + + + + Type for a reference to a TIMETABLED PASSING TIME. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a PASSENGER AT STOP TIME. + + + + + + Reference to a PASSENGER AT STOP TIME. +v2.0 + + + + + Type for a reference to a PASSENGER AT STOP TIME. + + + + + + Identifier of referenced entity. + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd index 2d815f4f3..ce4e7c20b 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd @@ -60,19 +60,19 @@ Rail transport, Roads and Road transport NeTEx: PASSING TIMES identifier types. - + Type for identifier of a PASSING TIME. - + Reference to a PASSING TIME. - + Type for a reference to a PASSING TIME. @@ -86,7 +86,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a TARGET PASSING TIME. @@ -112,7 +112,7 @@ Rail transport, Roads and Road transport - + Type for identifier of an OBSERVED PASSING TIME. @@ -138,7 +138,7 @@ Rail transport, Roads and Road transport - + Type for identifier of an ESTIMATED PASSING TIME. @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a TIMETABLED PASSING TIME. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd index 0cc16f7e8..1c459f811 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd @@ -40,7 +40,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2017 + CEN, Crown Copyright 2009-2017
    @@ -59,14 +59,14 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG9. - NeTEx PASSING TIME types. + NeTEx PASSING TIME types. Standard - NeTEx: PASSING TIMES types. + NeTEx: PASSING TIMES types. - - + + PASSING TIME. @@ -97,7 +97,7 @@ Rail transport, Roads and Road transport - + Type for a list of TIMETABLED PASSING TIME. @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - TIEMTABLED PASSING TIME elements. + TIMETABLED PASSING TIME elements. 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 3b9e2672d..dfb48c92f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -9,6 +9,7 @@ + @@ -42,6 +43,8 @@ 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 +

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

    This sub-schema describes the VEHICLE JOURNEY types.

    @@ -58,7 +61,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2024
      @@ -203,7 +206,7 @@ Rail transport, Roads and Road transport - Niormal VEHICLE STOP ASSIGNMENTs for VEHICLE JOURNEY, +v1.1 + Normal VEHICLE STOP ASSIGNMENTs for VEHICLE JOURNEY, +v1.1 @@ -233,6 +236,11 @@ Rail transport, Roads and Road transport PASSING TIMEs for VEHICLE JOURNEY. + + + Times for passenger to be at stop if earlier than departure time. +v2.0 + + @@ -330,7 +338,7 @@ Rail transport, Roads and Road transport - Type for TEMP_LATE VEHICLE JOURNEY. + Type for TEMPLATE VEHICLE JOURNEY. @@ -460,7 +468,7 @@ Rail transport, Roads and Road transport - Type for TRAIN COMPONENT NUMBER ASSIGNNMENT. + Type for TRAIN COMPONENT NUMBER ASSIGNMENT. @@ -472,7 +480,7 @@ Rail transport, Roads and Road transport - Elements for TRAIN COMPONENT NUMBER ASSIGNNMENT Group. + Elements for TRAIN COMPONENT NUMBER ASSIGNMENT Group. @@ -487,7 +495,7 @@ Rail transport, Roads and Road transport - Type for containment of VEHICLE TYPE STOP ASSIGNNMENTs. + Type for containment of VEHICLE TYPE STOP ASSIGNNMENTs. @@ -532,7 +540,7 @@ Rail transport, Roads and Road transport - Type for VEHICLE TYPE STOP ASSIGNNMENT. + Type for VEHICLE TYPE STOP ASSIGNMENT. @@ -544,7 +552,7 @@ Rail transport, Roads and Road transport - Elements for VEHICLE TYPE STOP ASSIGNNMENT Group. + Elements for VEHICLE TYPE STOP ASSIGNMENT Group. @@ -557,7 +565,7 @@ Rail transport, Roads and Road transport - + Classification of a TIMING ALGORITHM. @@ -639,7 +647,7 @@ Rail transport, Roads and Road transport - Type for VEHICLE JOURNER STOP ASSIGNMENT. + Type for VEHICLE JOURNEY STOP ASSIGNMENT.