From 69ade1b4444a368c20b7c10c456cd192af4a7973 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Mar 2024 01:24:40 +0100 Subject: [PATCH 1/7] Implements #672 Includes fixes for broken examples --- .../newModes/NewModes-CarPoolingExample.xml | 4 +- .../NewModes-ChauffeuredServiceExample.xml | 4 +- ...Netex_02.1_Bus_CircularRoute_Timetable.xml | 48 ++-- .../Netex_simpleVehicleSchedule_01.xml | 32 +-- ...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 | 154 ++++++++++++ .../netex_passengerAtStopTimes_support.xsd | 219 ++++++++++++++++++ .../netex_passingTimes_support.xsd | 14 +- .../netex_passingTimes_version.xsd | 8 +- .../netex_vehicleJourney_version.xsd | 12 +- 15 files changed, 567 insertions(+), 71 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 751ea0f79..24639e0fb 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -1003,11 +1003,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 f83112df8..a85702b02 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -1136,11 +1136,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 1bd0acd2c..7dccfaa45 100644 --- a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml +++ b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml @@ -899,11 +899,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 11:00:00.0Z - + 11:10:00.0Z PT5M @@ -1074,11 +1074,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 12:50:00.0Z - + 12:55:00.0Z @@ -1103,11 +1103,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 13:00:00.0Z - + 13:05:00.0Z @@ -1324,11 +1324,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:25:00.0Z - + 16:30:00.0Z @@ -1353,11 +1353,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:50:00.0Z - + 16:55:00.0Z @@ -1528,11 +1528,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:35:00.0Z - + 16:45:00.0Z @@ -1557,11 +1557,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:25:00.0Z - + 16:30:00.0Z @@ -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 c8d6beac9..d345b9dc3 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 a09d95056..77ce4eeb8 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -6688,6 +6688,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 b0871ebe4..9d8ef4f75 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 @@ -12,8 +12,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..e9ea2f93b --- /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, s.
    • +
+ + 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..4f26e1515 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd @@ -0,0 +1,154 @@ + + + + + + + + + + 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 tPASSEMGER 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 specifoed 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..22b924b79 --- /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..e1f4729b7 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd @@ -65,8 +65,8 @@ Rail transport, Roads and Road transport 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..637032b17 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
    @@ -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 + + @@ -557,7 +565,7 @@ Rail transport, Roads and Road transport - + Classification of a TIMING ALGORITHM. From 8442c70c54a40f0018f992a289fead4f73980fd4 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 00:27:30 +0000 Subject: [PATCH 2/7] Lint and update documentation tables --- .../epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index d345b9dc3..385bdab34 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -2419,16 +2419,16 @@ - + 08:00:00 - + 08:15:00 08:15:00 - + 08:30:00 From e503b97d8f3920cc15e70a7563e602cc7ed8f950 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Mar 2024 01:32:48 +0100 Subject: [PATCH 3/7] Typo squating. --- .../netex_passengerAtStopTime_version.xsd | 14 ++++++-------- .../netex_passengerAtStopTimes_support.xsd | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd index 4f26e1515..f7f0695d7 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd @@ -54,7 +54,7 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG9. - NeTEx PASSENGER AT STOP TIME types. + NeTEx PASSENGER AT STOP TIME types. Standard @@ -87,8 +87,7 @@ Rail transport, Roads and Road transport - Time at which a passenger should be at a stop to commence or finish a process. +v2.0 - + Time at which a passenger should be at a stop to commence or finish a process. +v2.0 @@ -118,23 +117,22 @@ Rail transport, Roads and Road transport - Description of tPASSEMGER at STOP time. + Description of PASSENGER AT STOP TIME. - Earliest time that passenger should be at stop for specified process, e.g. baggage check in, customs etc. - + 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. + 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 specifoed process. + Latest time that passenger should be at stop for specified 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 index 22b924b79..524c31ee8 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd @@ -54,7 +54,7 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG9. - NeTEx PASSING TIME identifier types. + NeTEx PASSING TIME identifier types. Standard From e0fefa5bcedcbcfc17ec97cef66ea4ef0afa7eca Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Mar 2024 08:54:35 +0100 Subject: [PATCH 4/7] More typo's and optical changes --- .../netex_passengerAtStopTime_support.xsd | 2 +- .../netex_passengerAtStopTime_version.xsd | 4 ++-- .../netex_passengerAtStopTimes_support.xsd | 2 +- .../netex_passingTimes_version.xsd | 6 +++--- .../netex_vehicleJourney_version.xsd | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd index e9ea2f93b..9852d2e7c 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_support.xsd @@ -36,7 +36,7 @@
      -
    • Derived from the Transmodel, s.
      • +
    • Derived from the Transmodel standard.
    Version 1.0 diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd index f7f0695d7..3edf346aa 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTime_version.xsd @@ -87,7 +87,7 @@ Rail transport, Roads and Road transport     - Time at which a passenger should be at a stop to commence or finish a process. +v2.0 + Time at which a passenger should be at a stop to commence or finish a process. +v2.0 @@ -143,7 +143,7 @@ Rail transport, Roads and Road transport - Nature of process + 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 index 524c31ee8..6b253f7de 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passengerAtStopTimes_support.xsd @@ -35,7 +35,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2014
      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 e1f4729b7..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,11 +59,11 @@ 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. 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 637032b17..2a39daebd 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -206,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 @@ -238,7 +238,7 @@ Rail transport, Roads and Road transport - Times for passenger to be at stop if earlier than departure time +v2.0 + Times for passenger to be at stop if earlier than departure time. +v2.0 @@ -338,7 +338,7 @@ Rail transport, Roads and Road transport - Type for TEMP_LATE VEHICLE JOURNEY. + Type for TEMPLATE VEHICLE JOURNEY. @@ -468,7 +468,7 @@ Rail transport, Roads and Road transport - Type for TRAIN COMPONENT NUMBER ASSIGNNMENT. + Type for TRAIN COMPONENT NUMBER ASSIGNMENT. @@ -480,7 +480,7 @@ Rail transport, Roads and Road transport - Elements for TRAIN COMPONENT NUMBER ASSIGNNMENT Group. + Elements for TRAIN COMPONENT NUMBER ASSIGNMENT Group. @@ -495,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. @@ -540,7 +540,7 @@ Rail transport, Roads and Road transport - Type for VEHICLE TYPE STOP ASSIGNNMENT. + Type for VEHICLE TYPE STOP ASSIGNMENT. @@ -552,7 +552,7 @@ Rail transport, Roads and Road transport - Elements for VEHICLE TYPE STOP ASSIGNNMENT Group. + Elements for VEHICLE TYPE STOP ASSIGNMENT Group. @@ -647,7 +647,7 @@ Rail transport, Roads and Road transport - Type for VEHICLE JOURNER STOP ASSIGNMENT. + Type for VEHICLE JOURNEY STOP ASSIGNMENT. From f370e66496a963a421b82f3e2afe7edf9434b969 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Mar 2024 08:58:04 +0100 Subject: [PATCH 5/7] Remove extra spaces --- xsd/NeTEx_publication.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 77ce4eeb8..adf6d57f2 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -6694,18 +6694,18 @@ Correct COnstraints for PointOnRoute Every [TimetabledPassingTime Id + Version] must be unique within document. - + - + - + From 63f57f8cd627a60dfc1d0fd37bea67375ec033ec Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 14 Mar 2024 11:56:57 +0100 Subject: [PATCH 6/7] Remove double spaces --- .../part2_journeyTimes/netex_vehicleJourney_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2a39daebd..dfb48c92f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -552,7 +552,7 @@ Rail transport, Roads and Road transport - Elements for VEHICLE TYPE STOP ASSIGNMENT Group. + Elements for VEHICLE TYPE STOP ASSIGNMENT Group. From 4a209d8194b0d4abd873682e0eb593ac93af280c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 10 Apr 2024 18:47:54 +0200 Subject: [PATCH 7/7] Update Netex_simpleVehicleSchedule_01.xml --- .../vehicleSchedule/Netex_simpleVehicleSchedule_01.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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