From a3eb4014655f98555ee2f60ae732999e411853b9 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:15:17 +0200 Subject: [PATCH 1/8] type changes --- .../netex_projection_version.xsd | 2 +- .../netex_deckPlan_version.xsd | 4 ++-- .../netex_seatingPlan_version.xsd | 2 +- .../netex_vehicleType_version.xsd | 8 ++++---- .../netex_ifopt_parking_version.xsd | 2 +- .../netex_vehicleAndCrewPoint_version.xsd | 18 +----------------- 6 files changed, 10 insertions(+), 26 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd index 6d4f39437..b27fe6300 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd @@ -419,7 +419,7 @@ Rail transport, Roads and Road transport Elements of a COMPLEX FEATURE PROJECTION. - + COMPLEX FEATURE which is being projected. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 9176a649e..ec0f3d409 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -379,9 +379,9 @@ Elements for a DECK SPACE. - + - Whether DECK SPACE is covered. Default is true. + Whether DECK SPACE is indoors, outdoors, or covered. Default is indoors. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index a3f30bea9..e5ef77c9c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -198,7 +198,7 @@ - Name of SPOT COLUMN. + Label of SPOT COLUMN. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 661017027..ee50c0ce6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -203,13 +203,13 @@ Rail transport, Roads and Road transport Whether vehicles of the type are self-propelled. - + List of types of power used +v1.2.2 - + The list of types of fuel used by a vehicle of the type. +1.2.2 @@ -830,9 +830,9 @@ Rail transport, Roads and Road transport Elements for a PASSENGER VEHICLE CAPACITY. - + - VEHicle categories for which capacity is specifyed. Default is allPAssengerVehicles i.e. capacity is for all VEHICLE CATEGORIES + Vehicle categories for which capacity is specified. Default is allPassengerVehicles i.e. capacity is for all VEHICLE CATEGORIES diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd index 26cc433d0..1e0710ed6 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd @@ -1084,7 +1084,7 @@ Rail transport, Roads and Road transport Height of PARKING BAY. - + Maximum Weight allowed in PARKING BAY. +v1.1 diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd index 7beb386d1..6d510f589 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd @@ -281,15 +281,7 @@ Rail transport, Roads and Road transport - - - Elements of a PARKING POINT. - - - - - - + Type for a list of GARAGEs. @@ -344,14 +336,6 @@ Rail transport, Roads and Road transport - - - Elements of a GARAGE POINT. - - - - - From c00195bf8f413616c14d189dc746967114695a60 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Tue, 8 Jul 2025 19:34:19 +0200 Subject: [PATCH 2/8] Update NeTEx VDV Example.xml --- examples/standards/vdv452/timetable/NeTEx VDV Example.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml index 200ab4ce7..44dbb1b10 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -205,8 +205,8 @@ Strab GT 8 K Überf1 - electric - battery + electric + battery 91 112 @@ -218,9 +218,9 @@ Solaris Gelenk-Elektro SoGeE 52 - electric + electric - battery + battery 46 From ddebe462b20bdd609a7bd1c16e09b83266f59922 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 9 Jul 2025 09:48:39 +0200 Subject: [PATCH 3/8] Correct all remaining PropulsionTypes --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- examples/functions/deckPlans/DeckPlans-Example_train.xml | 2 +- .../deckPlans/DeckPlans-Example_train_simple.xml | 2 +- examples/functions/fares/rail/Netex_era_distance_ro.xml | 2 +- .../functions/newModes/IXSI Service 1 - Static Data.xml | 2 +- examples/functions/newModes/NewModes-CarClubExample.xml | 2 +- .../functions/newModes/NewModes-CarPoolingExample.xml | 2 +- .../newModes/NewModes-ChauffeuredServiceExample.xml | 2 +- .../functions/newModes/NewModes-CycleSharingExample.xml | 4 ++-- examples/standards/gbfs/Netex_gbfs_exm1.xml | 8 ++++---- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 4acc8943b..d2e0f64a4 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -259,7 +259,7 @@ Double decker bus with staircase. Wheelchair and luggage spaces on lower deck. false true - human + human diesel bus diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index ea2294532..1432cf7d6 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -330,7 +330,7 @@ Lower deck Double decker bus with staircase. Wheelchair and luggage spaces on lower deck. false true - human + human diesel bus diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 02018193b..ad104ae28 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -652,7 +652,7 @@ The train reverse in the station and departs, oriented backwards to the right 4 carriage sleeper train with 2 Motorrail [Vehicles2] [Velicles1] [Sleeper3] [Buffet1] [Sleeper1] [Sleeper1] [Engine] true - electric + electric diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index f1171e743..43597932a 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -230,7 +230,7 @@ 4 carriage train [Seating car 3] [Seating car 3] [Seating car 2] [Seating car 1] [Engine] true - electric + electric diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml index d5048db21..6ae38d2a2 100644 --- a/examples/functions/fares/rail/Netex_era_distance_ro.xml +++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml @@ -417,7 +417,7 @@ c 3 carriage train [Wagon1] [Wagon2] [Wagon2] [Engine] true - electric + electric 204 diff --git a/examples/functions/newModes/IXSI Service 1 - Static Data.xml b/examples/functions/newModes/IXSI Service 1 - Static Data.xml index 65b327c58..85c8747a1 100644 --- a/examples/functions/newModes/IXSI Service 1 - Static Data.xml +++ b/examples/functions/newModes/IXSI Service 1 - Static Data.xml @@ -64,7 +64,7 @@ 3 - combustion + combustion diesel 845 selfDrive diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml index a4b33b2c4..df9325f02 100644 --- a/examples/functions/newModes/NewModes-CarClubExample.xml +++ b/examples/functions/newModes/NewModes-CarClubExample.xml @@ -188,7 +188,7 @@ Small car false true - electric + electric battery selfDrive diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index 6c9b12a6d..8ba2c57f1 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -927,7 +927,7 @@ This Shows sample Purchases true - combustion + combustion petrolUnleaded 400 full diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index d5b9bc969..7dee5f221 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -220,7 +220,7 @@ Strech limo true true - combustion electric + combustion electric petrol battery selfDrive diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index ccd472e20..d2493bb5b 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -211,7 +211,7 @@ Pedal cycle false false - human + human none selfDrive @@ -228,7 +228,7 @@ Electric cycle false true - electricAssist + electricAssist battery 15 selfDrive diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml index ae150a92d..7ffe015a8 100644 --- a/examples/standards/gbfs/Netex_gbfs_exm1.xml +++ b/examples/standards/gbfs/Netex_gbfs_exm1.xml @@ -158,7 +158,7 @@ GBFS file: vehicle_types.json: Example Basic Bike - human + human cycle @@ -167,7 +167,7 @@ GBFS file: vehicle_types.json: E-scooter - electric + electric 12345 @@ -181,7 +181,7 @@ GBFS file: vehicle_types.json: Cargo bike - electric + electric 12345 @@ -195,7 +195,7 @@ GBFS file: vehicle_types.json: Foor-door Sedan - combustion + combustion 523992 From 3fe6423f3a8645ff388e118c0368dd4d81aed6af Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 9 Jul 2025 09:58:50 +0200 Subject: [PATCH 4/8] Update all examples with FuelType --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- examples/functions/newModes/IXSI Service 1 - Static Data.xml | 2 +- examples/functions/newModes/NewModes-CarClubExample.xml | 2 +- examples/functions/newModes/NewModes-CarPoolingExample.xml | 2 +- .../functions/newModes/NewModes-ChauffeuredServiceExample.xml | 2 +- examples/functions/newModes/NewModes-CycleSharingExample.xml | 4 ++-- .../timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index d2e0f64a4..cb6eaf939 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -260,7 +260,7 @@ false true human - diesel + diesel bus 60 diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 1432cf7d6..8d830c9fd 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -331,7 +331,7 @@ Lower deck false true human - diesel + diesel bus 60 diff --git a/examples/functions/newModes/IXSI Service 1 - Static Data.xml b/examples/functions/newModes/IXSI Service 1 - Static Data.xml index 85c8747a1..4e5b0db75 100644 --- a/examples/functions/newModes/IXSI Service 1 - Static Data.xml +++ b/examples/functions/newModes/IXSI Service 1 - Static Data.xml @@ -65,7 +65,7 @@ 3 combustion - diesel + diesel 845 selfDrive 4 diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml index df9325f02..387e94e18 100644 --- a/examples/functions/newModes/NewModes-CarClubExample.xml +++ b/examples/functions/newModes/NewModes-CarClubExample.xml @@ -189,7 +189,7 @@ false true electric - battery + battery selfDrive 4 diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index 8ba2c57f1..600bd58d6 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -928,7 +928,7 @@ This Shows sample Purchases true combustion - petrolUnleaded + petrolUnleaded 400 full mediumCar diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 7dee5f221..88faad935 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -221,7 +221,7 @@ true true combustion electric - petrol battery + petrol battery selfDrive 7 diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index d2493bb5b..522e3fe3d 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -212,7 +212,7 @@ false false human - none + none selfDrive 1 @@ -229,7 +229,7 @@ false true electricAssist - battery + battery 15 selfDrive diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index ccccc337c..81cbe3723 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -11419,7 +11419,7 @@ Q.4. Public holiday - Services do not run on a christams day - London Paris 18 Coach Train true - electricity + electricity From 6a497f0d993a69853b5ecd952e4c0dadce55e865 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Jul 2025 08:03:29 +0000 Subject: [PATCH 5/8] Lint and update documentation tables --- .../netex_vehicleAndCrewPoint_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd index 6d510f589..583cb4f7a 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd @@ -281,7 +281,7 @@ Rail transport, Roads and Road transport - + Type for a list of GARAGEs. From 691d1a889a583521e014c8fb252f2adb4d2597c5 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 9 Jul 2025 10:07:22 +0200 Subject: [PATCH 6/8] Comment typo's --- .../netex_reusableComponents/netex_environment_support.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 0560549da..0ad39709d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -451,12 +451,12 @@ Rail transport, Roads and Road transport - Value to be used, if covered is used as a "boolean". Equals covered. Depreciated.+v2.0 + Value to be used, if covered is used as a "boolean". Equals covered. Deprecated. -v2.0 - Value to be used, if covered is used as a "boolean". Equals outdoors. Depreciated. +v2.0 + Value to be used, if covered is used as a "boolean". Equals outdoors. Deprecated. -v2.0 From 1f3ae74d86667d9bcf769a0ae9c8091604df6d75 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 9 Jul 2025 10:25:01 +0200 Subject: [PATCH 7/8] Correctly deprecated the changes in 2.0 --- .../netex_vehicleType_version.xsd | 18 ++++++++++++++---- 1 file changed, 14 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 ee50c0ce6..4a6200c4d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -205,18 +205,28 @@ Rail transport, Roads and Road transport - List of types of power used +v1.2.2 + List of types of power used +v2.0 + + + + + Type of power used. DEPRECATED -v2.0 + + + + + The list of types of fuel used by a vehicle of the type. +v2.0 - + - The list of types of fuel used by a vehicle of the type. +1.2.2 + The type of fuel used by a vehicle of the type. DEPRECATED -v2.0 - The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType. + The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType. -v2.0 From 4b4c3faa43caa424414fed6e8e7f2e9f873f214c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 10 Jul 2025 11:52:21 +0200 Subject: [PATCH 8/8] Also make Refuelling Equipment use FuelTypes --- .../functions/newModes/NewModes-CycleSharingExample.xml | 8 ++++---- .../netex_nm_equipmentEnergy_version.xsd | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index 522e3fe3d..30f0123e1 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -431,7 +431,7 @@ dock - electricity + electricity pedalCycle @@ -449,7 +449,7 @@ dock - electricity + electricity pedalCycle @@ -526,7 +526,7 @@ dock - electricity + electricity pedalCycle @@ -540,7 +540,7 @@ dock - electricity + electricity pedalCycle diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd index 94c051fc3..616e06ee1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd @@ -205,9 +205,14 @@ points cannot exceed this value. Elements for REFUELLING EQUIPMENT. + + + The list of types of fuel used by a vehicle of the type. + + - The type of fuel used by a vehicle of the type. + The type of fuel used by a vehicle of the type. DEPRECATED -v2.0