From dd5fe58bad19a794b8110680038fe8e91e8b37a4 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Sun, 26 Oct 2025 16:38:46 +0100 Subject: [PATCH 1/9] Additional constraints in NeTEx_publication.xsd --- xsd/NeTEx_publication.xsd | 693 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 693 insertions(+) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 6d3fb4286..74200c2a3 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -12354,6 +12354,699 @@ + + + + + Every [AccessZone Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [ClassInFrame Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [Equipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [Facility Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [FacilitySet Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [FlexibleLinkProperties Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [FlexiblePointProperties Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [FlexibleServiceProperties Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [GeneralFrameMember Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [GenericNavigationPath Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [GenericPathJunction Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [NetworkRestriction Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [ParkingEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PlaceLightingEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PointOfInterestVehicleEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PriceableObject Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [LuggageLockerEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [OtherOrganisation Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SensorEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SignEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SiteComponent Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SiteElement Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SiteEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SiteNavigationPath Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SpotEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [StopAssignment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfMobilityService Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfModeOfOperation Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [VehicleEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [VehicleEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [VehiclePoolingMeetingPlace Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [WaitingEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [WheelchairVehicle Id + Version] must be unique within document. + + + + + + + + + + + + + + + + From 8e5aaa1cc7a1a062cda41baf598da126bed75624 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Sun, 26 Oct 2025 17:22:54 +0100 Subject: [PATCH 2/9] Update NeTEx_publication.xsd Remove previously added ClassInFrame constraints --- xsd/NeTEx_publication.xsd | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 74200c2a3..27b478e88 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -12375,27 +12375,6 @@ - - - - - Every [ClassInFrame Id + Version] must be unique within document. - - - - - - - - - - - - - - - - From 33ce5f7ca2f91b5d492c745f0c1e329941b852b1 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Sun, 26 Oct 2025 21:14:53 +0100 Subject: [PATCH 3/9] Update NeTEx_publication.xsd Equipment complete family --- xsd/NeTEx_publication.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 27b478e88..401bf3c1d 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -12392,7 +12392,7 @@ - + From 84135bb2b321530aaec136956091e7b1af382f07 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:32:49 +0100 Subject: [PATCH 4/9] Correcting examples: missing fields --- .../versioning/Netex_VersioningExample_Step_04.xml | 8 ++++---- .../Netex_VersioningExample_Step_05_ByRef.xml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml index 5c230c4fa..5fb6a77f9 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml @@ -168,16 +168,16 @@ This is part 4 of a multistep example on versioning. ntwkf001 experssed as a delta - only the removed stop is described - Baseline is version 3 - + - + - + - + diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml index b580dc905..d6e8365c2 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml @@ -65,25 +65,25 @@ This version shows the use of thye general frame to hold references rather than - + - + - + - + - + - + - + From c535dd818a7ce449ea7cfb710071be6ed5c279dd Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:22:37 +0100 Subject: [PATCH 5/9] Correcting examples: non-matching references --- .../newModes/NewModes-ChauffeuredServiceExample.xml | 12 +++++++++++- ...eTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 88faad935..098e6e71b 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -588,11 +588,21 @@ Alphaville pick up - + Alphaville pick up + + + + Alphaville gare pick up + + + + + Alphaville gare pick up + diff --git a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml index c9fca3ead..912ac00ba 100644 --- a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml +++ b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml @@ -340,7 +340,7 @@ is relevant for supplying an Integrator with partial data from multiple sources. true true - + public 10:00:00 PT1H From 0a345a3be086af8b2233fec6a20d85338b4d5f71 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 17:14:04 +0100 Subject: [PATCH 6/9] Correcting examples: duplicate keys --- .../deckPlans/DeckPlans-Example_bus.xml | 6 +----- .../deckPlans/DeckPlans-Example_train.xml | 4 ++-- .../newModes/NewModes-CycleSharingExample.xml | 20 +++++++++---------- .../site/Netex_21_Sites_Parking_2.xml | 4 ++-- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- ...topPlace_uk_ComplexStation_Wimbledon_1.xml | 2 +- .../Netex_10_StopPlace_withParking_1.xml | 2 +- ...07.2_Bus_FlexibleTimetable_WithPattern.xml | 2 +- .../versioning/Netex_Uniqueness_01.xml | 2 +- .../norway/stops/PointOfInterest.xml | 2 +- 10 files changed, 21 insertions(+), 25 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index a9e938f1b..661cca902 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -603,10 +603,6 @@ Lower deck 1 - - 1 - - @@ -791,7 +787,7 @@ Lower deck forwards - + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 43ad6f425..89f28cda9 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1176,7 +1176,7 @@ The train reverse in the station and departs, oriented backwards to the right 0.80 1.80 - + @@ -3561,7 +3561,7 @@ The train reverse in the station and departs, oriented backwards to the right forwards - + diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index 30f0123e1..1e8500c63 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -381,14 +381,14 @@ - + true dock - + 10 docks - + s Ticket Machine s at Bike Station Alpha true @@ -495,11 +495,11 @@ - + 10 docks - + Ticket Machine at Bike Station Beta true 1 @@ -521,11 +521,11 @@ - + true dock - + electricity @@ -535,11 +535,11 @@ - + true dock - + electricity @@ -791,7 +791,7 @@ - + diff --git a/examples/functions/site/Netex_21_Sites_Parking_2.xml b/examples/functions/site/Netex_21_Sites_Parking_2.xml index 73f41f1cd..8b9f71f73 100644 --- a/examples/functions/site/Netex_21_Sites_Parking_2.xml +++ b/examples/functions/site/Netex_21_Sites_Parking_2.xml @@ -542,7 +542,7 @@ v1.1 revised ids and corrections - + @@ -609,7 +609,7 @@ v1.1 revised ids and corrections - + diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index b16dc9597..d5cd9203d 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -4730,7 +4730,7 @@ Changes 8 - + none diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml index 0f845a544..2bdd94de5 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml @@ -4961,7 +4961,7 @@ Changes 8 - + none diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index c306718ff..216e91a39 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -4834,7 +4834,7 @@ Changes 8 - + none diff --git a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml index 0a46b7c29..40ad9b0c0 100644 --- a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml +++ b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml @@ -705,7 +705,7 @@ The Calendar is shown coded as - + online callOffice public diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml index 298e2071c..3d6f3d5ba 100644 --- a/examples/functions/versioning/Netex_Uniqueness_01.xml +++ b/examples/functions/versioning/Netex_Uniqueness_01.xml @@ -244,7 +244,7 @@ This is part 1 of a multistep example on versioning SIGN - + diff --git a/examples/standards/norway/stops/PointOfInterest.xml b/examples/standards/norway/stops/PointOfInterest.xml index 1ce234033..8b70cda60 100644 --- a/examples/standards/norway/stops/PointOfInterest.xml +++ b/examples/standards/norway/stops/PointOfInterest.xml @@ -243,7 +243,7 @@ The example comprises - + gates both 10 From 1dd4723ea0996ebd2521a7c38b25ada51e17432a Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 17:37:46 +0100 Subject: [PATCH 7/9] Two more glitches --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- examples/functions/site/Netex_21_Sites_Parking_2.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 09b81c72a..87cd3ce09 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -677,7 +677,7 @@ forwards - + diff --git a/examples/functions/site/Netex_21_Sites_Parking_2.xml b/examples/functions/site/Netex_21_Sites_Parking_2.xml index 8b9f71f73..23062f0e7 100644 --- a/examples/functions/site/Netex_21_Sites_Parking_2.xml +++ b/examples/functions/site/Netex_21_Sites_Parking_2.xml @@ -609,7 +609,7 @@ v1.1 revised ids and corrections - + From baa91149acc94912ebb72a99135d3c965ef99f9b Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 17:42:50 +0100 Subject: [PATCH 8/9] Tentatively moving VehicleSharingParkingArea-equipmentPlaces under EquipmentPlace at one place --- .../newModes/NewModes-CycleSharingExample.xml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index 1e8500c63..79cbaa7c1 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -378,26 +378,26 @@ + + + true + dock + + + 10 + docks + s + + Ticket Machine s at Bike Station Alpha + true + 2 + ticketMachines + debitCard creditCard contactlessPaymentCard epayDevice epayAccount + standard + + - - - true - dock - - - 10 - docks - s - - Ticket Machine s at Bike Station Alpha - true - 2 - ticketMachines - debitCard creditCard contactlessPaymentCard epayDevice epayAccount - standard - - 10 From 44a659c32a82b84d48fcf3d0f4795586a1cbeab4 Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Mon, 27 Oct 2025 21:33:57 +0100 Subject: [PATCH 9/9] Removing lonely "s" --- examples/functions/newModes/NewModes-CycleSharingExample.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index 79cbaa7c1..29e5e7e58 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -386,7 +386,7 @@ 10 docks - s + Ticket Machine s at Bike Station Alpha true