From 645503d0a30f87b4b1dba400c14103d14a4a3d1c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 21:47:16 +0200 Subject: [PATCH 01/17] Update netex_nm_vehicleMeetingPointAssignment_support.xsd (#506) Co-authored-by: ue71603 --- .../part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd index 9e8052300..47918c6a2 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd @@ -136,7 +136,7 @@ Rail transport, Roads and Road transport - Allowed values for Meeting Usage. +v1.2.2 + Allowed values for meeting usage of VEHICLE MEETING POINTs. +v1.2.2 From 9ffc9a82d8866b721bc5d17647d75f5f60b37d30 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 22:46:32 +0200 Subject: [PATCH 02/17] Fix improve mode (#507) * First draft of the clean up of MODE * Better explanations in VEHICLE MODE * AccessMode now works TRANSFERs and OTHER LEG (for OJP) * Some depreciations * added a mode to Connection * Update netex_mode_support.xsd Deprecated not Depreciated ;-) * Update netex_submode_version.xsd Deprecated not Depreciated ;-) * Apply suggestions from code review * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: ue71603 Co-authored-by: Christophe Duquesne Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_place_version.xsd | 6 + .../netex_mode_support.xsd | 112 ++++++++++++++---- .../netex_submode_version.xsd | 12 +- 3 files changed, 105 insertions(+), 25 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 9987b6efa..e814d0b59 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -2,6 +2,7 @@ + @@ -158,6 +159,11 @@ Rail transport, Roads and Road transport Whether timings and validity applies to both directions (true) or just to the from-to direction of the TRANSFER. + + + If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd index 53a39f1d8..472cc728b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd @@ -68,19 +68,23 @@ Rail transport, Roads and Road transport - Access MODE for SITEs. + Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if in OTHER LEG of the TRIP a monomodal non-public transport is used. - Allowed values for Access MODEs for SITEs. + Allowed values for Access MODEs for SITEs, VEHICLE MEETING POINTS and TRANSFER and for monomodal non-public transport OTHER LEG in TRIP. - + + + Taxi can now be modeled as VEHICLE MODE as well. + + @@ -210,36 +214,98 @@ Rail transport, Roads and Road transport - Allowed values for MODES of Transport : TPEG pti_table 01. + Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used. - - + + + If all modes are meant. + + + + + Use only when no other entry applies. + + - + + + Special type of bus with two overhead wires using spring-loaded trolley poles. + + - + + + Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different. + + - - - - - - - - + + + Deprecated. Use Mode rail with RailSubmode longDistance. + + + + + Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). + + + + + Within an urban area. For underground and railway. + + + + + All air related Mode. No special distinction is done. + + + + + Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode. + + + + + Can be only two cabines or multiple. + + + + + cable railway on steep slope using two counterbalanced carriages. + + + + + A collection for all Mode involving snow and ice. + + - - + + + Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route. + + + + + General Mode for elevators and for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that. + + - See pti12_x. + For all alternative modes where a vehicle is driven by the user. See pti12_x. + + + + + To be avoided. + + + + + Use only when no other entry applies. - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd index e63f4f081..776a8f7f2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd @@ -261,8 +261,16 @@ Local train adapted for running in mountain railway lines. - - + + + Deprecated. Use metro + + + + + Replaces the Mode urbanRail. + + From 91c38159f22ca016f1b91e49e7c20455227bd3df Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 28 Sep 2023 11:01:37 +0200 Subject: [PATCH 03/17] Fix passenger information equipment list (#510) * The connection exists in the documentation, but was not done in the xsd NeTEx part 1, figure 628 * Fixed according to Christophe's proposal * Apply suggestions from code review * Update xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd * Lint and update documentation tables --------- Co-authored-by: ue71603 Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .../netex_facility_version.xsd | 11 +++++++++-- .../netex_passengerInformationEquipment_version.xsd | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index fcce32eb5..551cae7e5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport - + List of PASSENGER INFORMATION Equipments. @@ -1099,6 +1099,13 @@ Rail transport, Roads and Road transport + + + + List of values for PASSENGER INFORMATION EQUIPMENT. + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd index f8dce69d0..dbca82563 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd @@ -240,10 +240,15 @@ LOGICAL DISPLAY corresponds to a SIRI STOP MONITORING point. + + + List of PASSENGER INFORMATION Equipments. + + - List of predefined Passenger Info EQUIPMENT f. + List of predefined Passenger Info EQUIPMENT. From fff853e819f0a5133697e6f0e88fcca5a0d60d67 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 28 Sep 2023 15:44:42 +0200 Subject: [PATCH 04/17] Fix typo's (#511) --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 49ad9f364..2b994544c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd @@ -758,22 +758,22 @@ Rail transport, Roads and Road transport - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations - Dummy Type to get round SG limitatiins + Dummy Type to get round SG limitations From 6ae5cc41f1fde63f4ae5f8809d6693eccbf0e8e1 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Oct 2023 12:25:15 +0200 Subject: [PATCH 05/17] Introduce VAT (#516) * Introduce VAT number --- .../netex_genericFramework/netex_organisation_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index 1ffdb74eb..11baf46dc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -212,6 +212,11 @@ Rail transport, Roads and Road transport Company registration number including Country prefix. + + + Company registered tax number including Country prefix. + + An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. From 7a1af73cf6060c813c0be272fd77a2eaabf821d7 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 4 Oct 2023 15:31:36 +0200 Subject: [PATCH 06/17] Removing duplicate enumeration (thanks to David) (#509) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Removing duplicate enumeration (thanks to David) btw something is wrong with xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_support.xsd in next * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd Co-authored-by: Matthias Günter --------- Co-authored-by: ue71603 Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .../netex_reusableComponents/netex_facility_support.xsd | 1 - .../netex_nm_equipmentEnergy_support.xsd | 9 +++++++-- xsd/netex_framework/netex_utility/netex_units.xsd | 5 ----- .../part1_ifopt/netex_ifopt_vehicleStopping_support.xsd | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index f1cb87545..e6c910cb9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -484,7 +484,6 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index 372d6958f..56225bcf1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -214,8 +214,13 @@ Rail transport, Roads and Road transport - - + + + depreciated. Will be panthograph. + + + + diff --git a/xsd/netex_framework/netex_utility/netex_units.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd index d058cabe6..c65e9a14f 100644 --- a/xsd/netex_framework/netex_utility/netex_units.xsd +++ b/xsd/netex_framework/netex_utility/netex_units.xsd @@ -81,11 +81,6 @@ Weight = Kilos Speed = Metres per second. - - - TYPO - DEPRECATED. - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd index f510fde3f..3ee3e7969 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd @@ -168,7 +168,6 @@ Rail transport, Roads and Road transport - From aaff0a6e28b3bbc0949b349b776409d0ed3c3eed Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Mon, 30 Jan 2023 23:47:09 +0000 Subject: [PATCH 07/17] enhancement-TMTC-add ACCEPTED DRIVER PERMITs Add ACCEPTED DRIVER PERMITS to VEHICEL TYpe --- .../netex_vehicleType_support.xsd | 120 ++++++++++++--- .../netex_vehicleType_version.xsd | 140 ++++++++++++++++-- 2 files changed, 221 insertions(+), 39 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index e1bc0abc2..4440738e2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -10,31 +10,51 @@ 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 + 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 - - 2012-04-15Revise Passenger Capacity - - 2019-04-09Add list of vehicle type refs for PARKING and general use - - 2020-08-11Issue #110 Add missing fuel types - electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - - 2020-10-04NewModes: Add list of VEHICLEs. - Add TransportType, SimpleVehicleType - Add fuel types none, other, - ADd Power Tpe enumeration - Add Vehicle PRofile - - 2021-04-19NewModes: GBFS compatibility Add car to vehicle Types - - 2021-07-07NewModes: Add extra fuel types from APDS - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - + + 2011-02-05 + Name Space changes + + + 2012-04-15 + Revise Passenger Capacity + + + 2019-04-09 + Add list of vehicle type refs for PARKING and general use + + + 2020-08-11 + Issue #110 Add missing fuel types + electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol + + + 2020-10-04 + NewModes: Add list of VEHICLEs. + Add TransportType, SimpleVehicleType + Add fuel types none, other, + ADd Power Tpe enumeration + Add Vehicle PRofile + + + 2021-04-19 + NewModes: GBFS compatibility Add car to vehicle Types + + + 2021-07-07 + NewModes: Add extra fuel types from APDS + + + 2021-07-08 + NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + v + + 2023-01-30 + TM CR: EnhancementL Add Accepted Driver Permit l +

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

This sub-schema describes the VEHICLE TYPE identifier Types.

@@ -449,7 +469,7 @@ Rail transport, Roads and Road transport - Allowed values for type of power +v1/2/2 + Allowed values for type of power +v1/2/2 @@ -483,7 +503,7 @@ Rail transport, Roads and Road transport - Allowed values for Personal Vehicle Categories _v1.2.2 + Allowed values for Personal Vehicle Categories _v1.2.2 @@ -557,5 +577,57 @@ Rail transport, Roads and Road transport + + + + Type for identifier of an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + Type for a reference to an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + + + + + Type for identifier of a TYPE OF DRIVER PERMIT. + + + + + + Reference to a TYPE OF DRIVER PERMIT. + + + + + Type for a reference to a TYPE OF DRIVER PERMIT. + + + + + + Reference to a TYPE OF DRIVER PERMIT. + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 62fe9f55d..0fb075d5c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -38,6 +38,10 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2023-01-30 + TM CR: EnhancementL Add Accepted Driver Permit l +

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

This sub-schema describes the VEHICLE TYPE types.

@@ -64,13 +68,15 @@ 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 - + 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 TYPE types. @@ -100,8 +106,7 @@ Rail transport, Roads and Road transport - A classification of any type of VEHICLE according to its properties. - + A classification of any type of VEHICLE according to its properties. @@ -201,7 +206,7 @@ Rail transport, Roads and Road transport - The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2 + The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2 @@ -457,12 +462,81 @@ Rail transport, Roads and Road transport - Whether vehicle can be carried easily, e.g. scooter, skateboard, collapsible bicycle. - + Whether vehicle can be carried easily, e.g. scooter, skateboard, collapsible bicycle. + + + + + Facilities of VEHICLE TYPE. + + + + Type for a list of ACCEPTED DRIVER PERMITs. + + + + + + + + + + + + Accepted TYPE OF DRIVER PERMIT for a given SIMPLE VEHICLE TYPE. +V2.0 + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROILE. + + + + + + + + + Type for an ACCEPTED DRIVER PERMIT. + + + + + + Elements for an ACCEPTED DRIVER PERMIT. + + + + + + + + Elements for a ACCEPTED DRIVER PERMIT. + + + + + Name of ACCEPTED DRIVER PERMIT. + + + + + @@ -634,7 +708,7 @@ Rail transport, Roads and Road transport - The total capacity of vehicles of the type. For a requirement this is the minimum needed. + The total capacity of vehicles of the type. For a requirement this is the minimum needed. @@ -644,7 +718,7 @@ Rail transport, Roads and Road transport - The standing capacity of vehicles of the type. For a requirement this is the minimum needed. + The standing capacity of vehicles of the type. For a requirement this is the minimum needed. @@ -973,7 +1047,7 @@ Rail transport, Roads and Road transport - Dae of registration or commissioning - may be used to determin age oif vehice + Date of registration or commissioning - may be used to determine age of vehice. @@ -1170,5 +1244,41 @@ Rail transport, Roads and Road transport + + + + A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licenceA type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence).", +V2.0 + + + + + + + + + + + + + + + + + + Identifier of PURPOSE OF EQUIMENT PROFILE. + + + + + + + + + Type for a TYPE OF DRIVER PERMIT. + + + + + From 7c8804b5f11836ae4c32778db9ffe3557985f9a2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 00:26:02 +0100 Subject: [PATCH 08/17] lint --- .../netex_vehicleType_support.xsd | 79 +++---------------- .../netex_vehicleType_version.xsd | 3 +- 2 files changed, 13 insertions(+), 69 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 4440738e2..dad52abf6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -4,95 +4,40 @@ - - 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 + main schemae-service developersV1.0 Christophe DuquesneNicholas KnowlesEuropeFirst drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk2010-09-042011-02-05 Name Space changes - - - 2012-04-15 + 2012-04-15 Revise Passenger Capacity - - - 2019-04-09 + 2019-04-09 Add list of vehicle type refs for PARKING and general use - - - 2020-08-11 + 2020-08-11 Issue #110 Add missing fuel types electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - - - 2020-10-04 + 2020-10-04 NewModes: Add list of VEHICLEs. Add TransportType, SimpleVehicleType Add fuel types none, other, ADd Power Tpe enumeration Add Vehicle PRofile - - - 2021-04-19 + 2021-04-19 NewModes: GBFS compatibility Add car to vehicle Types - - - 2021-07-07 + 2021-07-07 NewModes: Add extra fuel types from APDS - - - 2021-07-08 + 2021-07-08 NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel v - - 2023-01-30 + 2023-01-30 TM CR: EnhancementL Add Accepted Driver Permit l - - -

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

-

This sub-schema describes the VEHICLE TYPE 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_framework/netex_reusableComponents}netex_vehicleType_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 +

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

This sub-schema describes the VEHICLE TYPE identifier Types.

text/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_vehicleType_support.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsdUnclassified CEN, Crown Copyright 2009-2020 - - -
    -
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
    • -
- - Version 1.0 - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, +
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0Arts, 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 TYPE types. - Standard - +CEN TC278 WG3 SG9.NeTEx VEHICLE TYPE types.Standard diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 0fb075d5c..9b189cce6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -38,8 +38,7 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30 + 2023-01-30 TM CR: EnhancementL Add Accepted Driver Permit l From 335050cb8e4bb081e5ac6e34abba264ff9733f1e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 00:35:14 +0100 Subject: [PATCH 09/17] revert non-changes --- .../netex_vehicleType_support.xsd | 91 +++++++++++++------ .../netex_vehicleType_version.xsd | 23 +++-- 2 files changed, 75 insertions(+), 39 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index dad52abf6..476212fdd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -4,40 +4,77 @@ - main schemae-service developersV1.0 Christophe DuquesneNicholas KnowlesEuropeFirst drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk2010-09-042011-02-05 - Name Space changes - 2012-04-15 - Revise Passenger Capacity - 2019-04-09 - Add list of vehicle type refs for PARKING and general use - 2020-08-11 - Issue #110 Add missing fuel types - electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - 2020-10-04 - NewModes: Add list of VEHICLEs. - Add TransportType, SimpleVehicleType - Add fuel types none, other, - ADd Power Tpe enumeration - Add Vehicle PRofile - 2021-04-19 - NewModes: GBFS compatibility Add car to vehicle Types - 2021-07-07 - NewModes: Add extra fuel types from APDS - 2021-07-08 - NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - v - 2023-01-30 - TM CR: EnhancementL Add Accepted Driver Permit l -

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

This sub-schema describes the VEHICLE TYPE identifier Types.

text/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_vehicleType_support.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsdUnclassified + + 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 + + 2012-04-15Revise Passenger Capacity + + 2019-04-09Add list of vehicle type refs for PARKING and general use + + 2020-08-11Issue #110 Add missing fuel types + electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol + + 2020-10-04NewModes: Add list of VEHICLEs. + Add TransportType, SimpleVehicleType + Add fuel types none, other, + ADd Power Tpe enumeration + Add Vehicle PRofile + + 2021-04-19NewModes: GBFS compatibility Add car to vehicle Types + + 2021-07-07NewModes: Add extra fuel types from APDS + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2023-01-30TM CR: EnhancementL Add Accepted Driver Permit l + + +

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

+

This sub-schema describes the VEHICLE TYPE 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_framework/netex_reusableComponents}netex_vehicleType_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-2020 -
  • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
Version 1.0Arts, recreation and travel, Tourism, Travel (tourism), Transport, + + +
    +
  • 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 TYPE types.Standard + + CEN TC278 WG3 SG9. + + NeTEx VEHICLE TYPE types. + Standard + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 9b189cce6..16e41c409 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -38,9 +38,8 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30 - TM CR: EnhancementL Add Accepted Driver Permit l - + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit +

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

This sub-schema describes the VEHICLE TYPE types.

@@ -67,15 +66,15 @@ 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 - +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 TYPE types. From 85bd9dccbaff4d5bdda125fb5c82324fa0cc7135 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 00:36:36 +0100 Subject: [PATCH 10/17] revert non-changes --- .../netex_reusableComponents/netex_vehicleType_version.xsd | 6 ++---- 1 file changed, 2 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 16e41c409..3c80a1725 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -68,11 +68,9 @@ 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, +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, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, Rail transport, Roads and Road transport CEN TC278 WG3 SG9. From b3d811ae901859d9b36649a1c97f241aed3f52e6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 6 Nov 2023 11:39:53 +0100 Subject: [PATCH 11/17] 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 3c80a1725..d4762c640 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -458,7 +458,7 @@ Rail transport, Roads and Road transport - Whether vehicle can be carried easily, e.g. scooter, skateboard, collapsible bicycle. + Whether vehicle can be carried easily, e.g. scooter, skateboard, foldable bicycle. From c63e6d6c119a2a3a78012edeaa59150f9468f509 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 6 Nov 2023 11:42:37 +0100 Subject: [PATCH 12/17] Apply suggestions from code review --- .../netex_reusableComponents/netex_vehicleType_support.xsd | 2 +- .../netex_reusableComponents/netex_vehicleType_version.xsd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 476212fdd..b2b66ead9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -35,7 +35,7 @@ 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: EnhancementL Add Accepted Driver Permit l + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit

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

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index d4762c640..eb639d3ae 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -499,7 +499,7 @@ Rail transport, Roads and Road transport - Identifier of VEHICLE EQUIPMENT PROILE. + Identifier of VEHICLE EQUIPMENT PROFILE. @@ -1243,7 +1243,7 @@ Rail transport, Roads and Road transport - A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licenceA type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence).", +V2.0 + A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence). +V2.0 From 2436aa34bdfa4614e7f9ffa8b696f62a1b09955e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 6 Nov 2023 11:43:11 +0100 Subject: [PATCH 13/17] Update xsd/netex_framework/netex_reusableComponents/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 eb639d3ae..84a896e79 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1243,7 +1243,7 @@ Rail transport, Roads and Road transport - A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence). +V2.0 + A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence ). +V2.0 From 376a4a010bb183de640992752dab24249f30cdfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 6 Nov 2023 13:02:53 +0100 Subject: [PATCH 14/17] 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 84a896e79..17a9e93fa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -461,7 +461,7 @@ Rail transport, Roads and Road transport Whether vehicle can be carried easily, e.g. scooter, skateboard, foldable bicycle. - + Facilities of VEHICLE TYPE. From 969fe5388aa2e0a821e4d39b112679ec9942027a Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 6 Nov 2023 13:14:20 +0100 Subject: [PATCH 15/17] Update xsd/netex_framework/netex_reusableComponents/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 17a9e93fa..e8f47545b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1043,7 +1043,7 @@ Rail transport, Roads and Road transport - Date of registration or commissioning - may be used to determine age of vehice. + Date of registration or commissioning - may be used to determine the age of a vehice. From 426d19510e41abbcad5b00614b82357e522ab10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 6 Nov 2023 13:18:04 +0100 Subject: [PATCH 16/17] Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: Stefan de Konink --- .../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 e8f47545b..9f5ded4c6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -463,7 +463,7 @@ Rail transport, Roads and Road transport - Facilities of VEHICLE TYPE. + Required permit to operate the vehicle. From e87e4d2ac070f38a513ee62e9ece5e5e81dcc3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 21 Nov 2023 10:58:00 +0100 Subject: [PATCH 17/17] 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 9f5ded4c6..e7499a046 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1261,7 +1261,7 @@ Rail transport, Roads and Road transport - Identifier of PURPOSE OF EQUIMENT PROFILE. + Identifier of the TYPE OF DRIVER PERMIT.