From 7f76c93a4b50228db9acca3d9ec714e6bbef7ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 12 Dec 2023 17:50:17 +0100 Subject: [PATCH 01/18] Added CustomerServiceContactDetails --- examples/functions/newModes/NewModes-CarClubExample.xml | 3 +++ .../netex_reusableComponents/netex_vehicleType_version.xsd | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml index a4b00e6e9..c93999006 100644 --- a/examples/functions/newModes/NewModes-CarClubExample.xml +++ b/examples/functions/newModes/NewModes-CarClubExample.xml @@ -385,6 +385,9 @@ immobilisingLock + + +41 1 800 80 80 + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 9fbd7a9b4..4f6a97309 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1061,6 +1061,11 @@ Rail transport, Roads and Road transport ACTUAL EQUIPMENT found in VEHICLE. + + + Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly. + + From 7b69a319b32aeeca8420672d1dc698f2484406ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 12 Dec 2023 18:11:04 +0100 Subject: [PATCH 02/18] added VehicleRef to ServiceJourney and I think a Type and a Vehicle might be possible. Added example from @codeape2 --- .../vehicle/Netex_simpleVehicle_01.xml | 112 ++++++++++++++++++ .../netex_vehicleJourney_version.xsd | 22 ++-- 2 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 examples/functions/vehicle/Netex_simpleVehicle_01.xml diff --git a/examples/functions/vehicle/Netex_simpleVehicle_01.xml b/examples/functions/vehicle/Netex_simpleVehicle_01.xml new file mode 100644 index 000000000..933d67328 --- /dev/null +++ b/examples/functions/vehicle/Netex_simpleVehicle_01.xml @@ -0,0 +1,112 @@ + + + 2010-12-17T09:30:47.0Z + SYS001 + + + 2010-12-17T09:30:47.0Z + SYS002 + + + + + 2010-11-01T00:00:00Z + + + REQUEST + + + + P1M + Example of simple vehicle schedule frame with tblocks + + + + + + Sept to March + 2010-11-01T00:00:00Z + 2011-03-31T00:00:00Z + + + + + + + mybus + http://www.mybuses.eu/stuff + My buses + + + xj + http://www.borninabahn.de + OtherStop data data + + + kx + http://www.ksx.com + + + + + + + + + + + + + + MS Havila Capella + 9865570 + + + + + MS Havila Castor + 9865582 + + + + + MS Havila Polaris + 9873759 + + + + + MS Havila Pollux + 9873761 + + + + + + + + + Model + Hybrid cruise vessel + true + + 640 + + true + true + 124 + 22 + + + + + + + + + + + + + + \ No newline at end of file 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..b61275f7d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -24,22 +24,29 @@ 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 @@ -259,6 +266,7 @@ Rail transport, Roads and Road transport + From ce54bd58072382cf941c3a8b773597b00a72a312 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:12:39 +0000 Subject: [PATCH 03/18] Lint and update documentation tables --- .../vehicle/Netex_simpleVehicle_01.xml | 2 +- .../netex_vehicleJourney_version.xsd | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/examples/functions/vehicle/Netex_simpleVehicle_01.xml b/examples/functions/vehicle/Netex_simpleVehicle_01.xml index 933d67328..4f327f569 100644 --- a/examples/functions/vehicle/Netex_simpleVehicle_01.xml +++ b/examples/functions/vehicle/Netex_simpleVehicle_01.xml @@ -109,4 +109,4 @@ - \ No newline at end of file + 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 b61275f7d..e7e70c55a 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -24,29 +24,22 @@ 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 From 95d15d65bb256aa5c40daf52a892a3bde4bf5d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 19 Apr 2024 09:37:44 +0200 Subject: [PATCH 04/18] clarification when to use VehicleRef --- .../part2_journeyTimes/netex_vehicleJourney_version.xsd | 6 +++++- 1 file changed, 5 insertions(+), 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 e7e70c55a..77f1dd909 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -259,7 +259,11 @@ Rail transport, Roads and Road transport - + + + VehicleTypeRef is the normally used field, as in many cases only the VEHICLE TYPE is known in advance. VehicleRef is then the exception and used only when the concrete VEHICLE is known in advance. Then also only one vehicle is possible. + + From 98afad456b1ff9987f4573e24bc0e348b24d0ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 19 Apr 2024 09:46:19 +0200 Subject: [PATCH 05/18] Update netex_vehicleType_version.xsd --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 75d1aa19b..3c1205187 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1097,7 +1097,7 @@ Rail transport, Roads and Road transport Range when fully fuelled or charged. +v2.0 - + Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly. From f231007892ed54c9beae509175d1a566e6f2b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 19 Apr 2024 09:54:12 +0200 Subject: [PATCH 06/18] fixing ambiguity and double VehicleCodeGroup --- .../netex_vehicleType_version.xsd | 2 +- .../netex_vehicle_version.xsd | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 3c1205187..25924e206 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1117,7 +1117,7 @@ Rail transport, Roads and Road transport - Energy required for a full charge. +v2.0 + DEPRECATED - use privateCodes diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index f7852d59a..a0f9d6afb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -179,7 +179,6 @@ Rail transport, Roads and Road transport - ACTUAL EQUIPMENT found in VEHICLE. @@ -229,23 +228,6 @@ Rail transport, Roads and Road transport - - - Alternative Code Elements for VEHICLE. - - - - - Operational Number of VEHICLE. - - - - - DEPRECATED - use privateCodes - - - - From 28539cdeb6747143399c7d4d71870a9ce0320baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 19:08:03 +0200 Subject: [PATCH 07/18] typos, fixing import --- .../netex_vehicleType_version.xsd | 8 ++++---- .../part2_journeyTimes/netex_vehicleJourney_version.xsd | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 25924e206..6d32aac2e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1107,23 +1107,23 @@ Rail transport, Roads and Road transport - Alternative Code Elements for VEHICLE. + Alternative code elements for VEHICLE. - Operational Number of VEHICLE. + Operational number of VEHICLE. - DEPRECATED - use privateCodes + Private code of the vehicle. - Equipment profiles assoicated with model +v1.2.2 + Equipment profiles assoicated with model. +v1.2.2 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 0a2517373..ece730b31 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -4,6 +4,7 @@ + From 93a596a70adaf36dd95aac95f8993b6973aa341a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 19:21:10 +0200 Subject: [PATCH 08/18] typos and equipmentProfiles added to VehicleModel was there during EPIAP. --- .../netex_vehicleType_version.xsd | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 6d32aac2e..c0468c629 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -501,7 +501,7 @@ Rail transport, Roads and Road transport - Identifier of VEHICLE EQUIPMENT PROFILE. + Identifier of ACCEPTED DRIVER PERMIT. @@ -1098,6 +1098,13 @@ Rail transport, Roads and Road transport + + + + Equipment profiles assoicated with model. +v1.2.2 + + + Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly. From af51d62479a838372bcf455036d3a4e593d377b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 10 May 2024 19:28:40 +0200 Subject: [PATCH 09/18] also VehicleModelProfileRef to VehicleModel --- .../netex_vehicleType_version.xsd | 1 + .../part2_journeyTimes/tmp0000.xsd | 679 ++++++++++++++++++ 2 files changed, 680 insertions(+) create mode 100644 xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index c0468c629..f6473f43d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1104,6 +1104,7 @@ Rail transport, Roads and Road transport Equipment profiles assoicated with model. +v1.2.2 + diff --git a/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd b/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd new file mode 100644 index 000000000..ece730b31 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd @@ -0,0 +1,679 @@ + + + + + + + + + + + + + + + + + + + + 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-05Name Space changes + + 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. + + 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 + + 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.

+
+ + 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 TRAIN NUMBERs. + + + + + + + + + + + + + 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. + + + + + + + + + + Dummy VEHICLE JOURNEY supertype. + + + + + The planned movement of a public transport vehicle on a DAY TYPE from the start point to the end point of a JOURNEY PATTERN on a specified ROUTE. + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for VEHICLE JOURNEY. + + + + + + + + + + + + Elements for VEHICLE JOURNEY. + + + + + + + + + Elements for VEHICLE JOURNEY. + + + + + + Elements for associating journey with other ENTITIEs. + + + + + + + + Elements for parts of a VEHICLE JOURNEY. + + + + + Other TIME DEMAND TYPEs used in JOURNEY. + + + + + JOURNEY PARTs of a JOURNEY - for a multi part JOURNEY only. + + + + + Labelling of carriages for Train associated with JOURNEY. + + + + + Normal VEHICLE STOP ASSIGNMENTs for VEHICLE JOURNEY, +v1.1 + + + + + + + Time Elements for VEHICLE JOURNEY. + + + + + WAIT TIMEs for VEHICLE JOURNEY at different TIMING POINTs. + + + + + Run times for VEHICLE JOURNEY over different TIMING LINKs. + + + + + LAYOVER times for VEHICLE JOURNEY. + + + + + PASSING TIMEs for VEHICLE JOURNEY. + + + + + Times for passenger to be at stop if earlier than departure time. +v2.0 + + + + + + + Elements for associations of VEHICLE JOURNEY with other entities. + + + + + DAY TYPEs for Journey. + + + + + + Reference to a JOURNEY PATTERN. + + + + + Reference to a TIME DEMAND TYPE used at start of JOURNEY. + + + + + + + + VehicleTypeRef is the normally used field, as in many cases only the VEHICLE TYPE is known in advance. VehicleRef is then the exception and used only when the concrete VEHICLE is known in advance. Then also only one vehicle is possible. + + + + + + Reference to a BLOCK. + + + + + + Public code for JOURNEY. + + + + + + + Elements for Service time. + + + + + Time of departure. + + + + + Day offset if day of departure time of VEHICLE JOURNEY differs from the current OPERATING DAY. + + + + + Frequency of Journey. + + + + + Total length of Journey. Can be computed from individual times. Add to Departure time to obtain JOURNEY arrival time. + + + + + + + + A repeating VEHICLE JOURNEY for which a frequency has been specified, either as a HEADWAY JOURNEY GROUP (e.g. every 20 minutes) or a RHYTHMICAL JOURNEY GROUP (e.g. at 15, 27 and 40 minutes past the hour). It may thus represent multiple journeys. + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for TEMPLATE VEHICLE JOURNEY. + + + + + + + + + + + + Elements for TEMPLATE VEHICLE JOURNEY. + + + + + Type of TEMPLATE VEHICLE JOURNEY. + + + + + frequency groups defining Template journey. Can only be of one type. + + + + + + + + + Specification of codes assigned to particular VEHICLE JOURNEYs when operated by TRAINs of COMPOUND TRAINs according to a functional purpose (passenger information, operation follow-up, etc). + + + + + + + + + + + + + + + + + + + + + + + Type for TRAIN NUMBER. + + + + + + + + + + + + Elements for TRAIN NUMBER Group. + + + + + Description of TRAIN NUMBER. + + + + + TRAIN NUMBER to use when advertising Train -If different from Id. + + + + + TRAIN NUMBER to use for production -If different from Id. + + + + + + + + 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. + + + + + + + + + + + Classification of a TIMING ALGORITHM. + + + + + + + + + + + + + + + + + + + + + + + Type for a TIMING ALGORITHM TYPE. + + + + + + + + + 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 e190c35ab8d8e7859401e20822c20ae399b37541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 22 May 2024 16:53:53 +0200 Subject: [PATCH 10/18] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index f6473f43d..d56a78de3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1131,7 +1131,7 @@ Rail transport, Roads and Road transport - Equipment profiles assoicated with model. +v1.2.2 + Equipment profiles associated with model. +v1.2.2 From c327e7a676506f3a7ab6a53bee454204832c423c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 23 May 2024 09:26:54 +0200 Subject: [PATCH 11/18] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: Christophe Duquesne --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index d56a78de3..d31b53f1c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1098,7 +1098,6 @@ Rail transport, Roads and Road transport
- Equipment profiles assoicated with model. +v1.2.2 From 8afc953d90687ba1282634a820024587e400d32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 23 May 2024 09:27:01 +0200 Subject: [PATCH 12/18] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: Christophe Duquesne --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index d31b53f1c..330a1dfd8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1104,7 +1104,7 @@ Rail transport, Roads and Road transport - + Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly. From 4ab1889118135b38608f9a1e05e7eb806425d9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 5 Jun 2024 14:18:37 +0200 Subject: [PATCH 13/18] changed equipmentProfiles I don't really like breaking example (unless they were obviously wrong) The VehicleCodeGroup is only used once (in VehicleGroup): so I would remove the equipmentProfiles and VehicleModelProfileRef from it and move them to this line 182 (in fact just remove them from VehicleCodeGroup and add equipmentProfiles before VehicleModelProfileRef of line 182 ... removed tmp0000. checked examples --- .../netex_vehicleType_version.xsd | 8 - .../netex_vehicle_version.xsd | 8 +- .../part2_journeyTimes/tmp0000.xsd | 679 ------------------ 3 files changed, 7 insertions(+), 688 deletions(-) delete mode 100644 xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 330a1dfd8..f39128c70 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1127,14 +1127,6 @@ Rail transport, Roads and Road transport Private code of the vehicle. - - - - Equipment profiles associated with model. +v1.2.2 - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index a0f9d6afb..882fc7a4e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -179,6 +179,12 @@ Rail transport, Roads and Road transport + + + Equipment profiles associated with model. +v1.2.2 + + + ACTUAL EQUIPMENT found in VEHICLE. @@ -509,4 +515,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd b/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd deleted file mode 100644 index ece730b31..000000000 --- a/xsd/netex_part_2/part2_journeyTimes/tmp0000.xsd +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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-05Name Space changes - - 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. - - 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 - - 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.

-
- - 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 TRAIN NUMBERs. - - - - - - - - - - - - - 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. - - - - - - - - - - Dummy VEHICLE JOURNEY supertype. - - - - - The planned movement of a public transport vehicle on a DAY TYPE from the start point to the end point of a JOURNEY PATTERN on a specified ROUTE. - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for VEHICLE JOURNEY. - - - - - - - - - - - - Elements for VEHICLE JOURNEY. - - - - - - - - - Elements for VEHICLE JOURNEY. - - - - - - Elements for associating journey with other ENTITIEs. - - - - - - - - Elements for parts of a VEHICLE JOURNEY. - - - - - Other TIME DEMAND TYPEs used in JOURNEY. - - - - - JOURNEY PARTs of a JOURNEY - for a multi part JOURNEY only. - - - - - Labelling of carriages for Train associated with JOURNEY. - - - - - Normal VEHICLE STOP ASSIGNMENTs for VEHICLE JOURNEY, +v1.1 - - - - - - - Time Elements for VEHICLE JOURNEY. - - - - - WAIT TIMEs for VEHICLE JOURNEY at different TIMING POINTs. - - - - - Run times for VEHICLE JOURNEY over different TIMING LINKs. - - - - - LAYOVER times for VEHICLE JOURNEY. - - - - - PASSING TIMEs for VEHICLE JOURNEY. - - - - - Times for passenger to be at stop if earlier than departure time. +v2.0 - - - - - - - Elements for associations of VEHICLE JOURNEY with other entities. - - - - - DAY TYPEs for Journey. - - - - - - Reference to a JOURNEY PATTERN. - - - - - Reference to a TIME DEMAND TYPE used at start of JOURNEY. - - - - - - - - VehicleTypeRef is the normally used field, as in many cases only the VEHICLE TYPE is known in advance. VehicleRef is then the exception and used only when the concrete VEHICLE is known in advance. Then also only one vehicle is possible. - - - - - - Reference to a BLOCK. - - - - - - Public code for JOURNEY. - - - - - - - Elements for Service time. - - - - - Time of departure. - - - - - Day offset if day of departure time of VEHICLE JOURNEY differs from the current OPERATING DAY. - - - - - Frequency of Journey. - - - - - Total length of Journey. Can be computed from individual times. Add to Departure time to obtain JOURNEY arrival time. - - - - - - - - A repeating VEHICLE JOURNEY for which a frequency has been specified, either as a HEADWAY JOURNEY GROUP (e.g. every 20 minutes) or a RHYTHMICAL JOURNEY GROUP (e.g. at 15, 27 and 40 minutes past the hour). It may thus represent multiple journeys. - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for TEMPLATE VEHICLE JOURNEY. - - - - - - - - - - - - Elements for TEMPLATE VEHICLE JOURNEY. - - - - - Type of TEMPLATE VEHICLE JOURNEY. - - - - - frequency groups defining Template journey. Can only be of one type. - - - - - - - - - Specification of codes assigned to particular VEHICLE JOURNEYs when operated by TRAINs of COMPOUND TRAINs according to a functional purpose (passenger information, operation follow-up, etc). - - - - - - - - - - - - - - - - - - - - - - - Type for TRAIN NUMBER. - - - - - - - - - - - - Elements for TRAIN NUMBER Group. - - - - - Description of TRAIN NUMBER. - - - - - TRAIN NUMBER to use when advertising Train -If different from Id. - - - - - TRAIN NUMBER to use for production -If different from Id. - - - - - - - - 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. - - - - - - - - - - - Classification of a TIMING ALGORITHM. - - - - - - - - - - - - - - - - - - - - - - - Type for a TIMING ALGORITHM TYPE. - - - - - - - - - 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 7a7e9715f36d15d12cae2e1d515e876e83648794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 5 Jun 2024 14:43:25 +0200 Subject: [PATCH 14/18] modeled the Contacts correct and corrected that contacts must allow multiple Contact --- .../functions/newModes/NewModes-CarClubExample.xml | 11 +++++++---- .../netex_organisation_version.xsd | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml index 5cf38a28d..5df29b827 100644 --- a/examples/functions/newModes/NewModes-CarClubExample.xml +++ b/examples/functions/newModes/NewModes-CarClubExample.xml @@ -123,6 +123,11 @@ information + + + +41 1 800 80 80 + + @@ -374,6 +379,7 @@ + @@ -385,9 +391,6 @@ immobilisingLock - - +41 1 800 80 80 - @@ -1252,4 +1255,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 944ea64ec..3a2b41389 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -1016,7 +1016,7 @@ Rail transport, Roads and Road transport - + From ae9367571d162af5feec4a0aa8700a8cd71ea1ab Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:45:29 +0000 Subject: [PATCH 15/18] Lint and update documentation tables --- .../functions/newModes/NewModes-CarClubExample.xml | 2 +- .../netex_vehicleType_version.xsd | 13 ++++++------- .../netex_vehicle_version.xsd | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml index 5df29b827..d12114f4d 100644 --- a/examples/functions/newModes/NewModes-CarClubExample.xml +++ b/examples/functions/newModes/NewModes-CarClubExample.xml @@ -1255,4 +1255,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index f39128c70..87019b9a7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1098,13 +1098,12 @@ Rail transport, Roads and Road transport
- - - Equipment profiles assoicated with model. +v1.2.2 - - - - + + + Equipment profiles assoicated with model. +v1.2.2 + + + Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index 882fc7a4e..d84b24a67 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -515,4 +515,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 2f2d93219df5243dc9c87ab1d43ed9036114e6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 5 Jun 2024 17:32:06 +0200 Subject: [PATCH 16/18] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 87019b9a7..2b794c52e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1098,6 +1098,9 @@ Rail transport, Roads and Road transport + + Energy required for a full charge. +v2.0 + Equipment profiles assoicated with model. +v1.2.2 From 1d7a9a0a84dfa878f26563f8b493dbc34e97a0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 5 Jun 2024 17:37:20 +0200 Subject: [PATCH 17/18] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 2b794c52e..47019c600 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1097,10 +1097,11 @@ Rail transport, Roads and Road transport Range when fully fuelled or charged. +v2.0 - + Energy required for a full charge. +v2.0 + Equipment profiles assoicated with model. +v1.2.2 From 168b6fdf551e95572d9c9facca02dff86d6b2e30 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:39:25 +0000 Subject: [PATCH 18/18] Lint and update documentation tables --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 47019c600..8a6878002 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1098,10 +1098,10 @@ Rail transport, Roads and Road transport - + Energy required for a full charge. +v2.0 - + Equipment profiles assoicated with model. +v1.2.2