Skip to content

Additional key / ref constraints #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TuThoThai merged 9 commits into from
Oct 30, 2025
Merged

Additional key / ref constraints #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd5fe58
Additional constraints in NeTEx_publication.xsd
trurlurl Oct 26, 2025
8e5aaa1
Update NeTEx_publication.xsd
trurlurl Oct 26, 2025
33ce5f7
Update NeTEx_publication.xsd
trurlurl Oct 26, 2025
84135bb
Correcting examples: missing fields
trurlurl Oct 27, 2025
c535dd8
Correcting examples: non-matching references
trurlurl Oct 27, 2025
0a345a3
Correcting examples: duplicate keys
trurlurl Oct 27, 2025
1dd4723
Two more glitches
trurlurl Oct 27, 2025
baa9114
Tentatively moving VehicleSharingParkingArea-equipmentPlaces under Eq…
trurlurl Oct 27, 2025
44a659c
Removing lonely "s"
trurlurl Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/functions/deckPlans/DeckPlans-Example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@
<Label>7D</Label>
<Orientation>forwards</Orientation>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="dd@deck_1@7C">
<ActualVehicleEquipment version="any" id="dd@deck_1@7D">
<SeatEquipmentRef version="any" ref="bench_seat"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
Expand Down
6 changes: 1 addition & 5 deletions examples/functions/deckPlans/DeckPlans-Example_bus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,6 @@ Lower deck
<Units>1</Units>
<WheelchairVehicleEquipmentRef version="any" ref="mb:WVE-ddb_wheelchair_space"/>
</ActualVehicleEquipment>
<ActualVehicleEquipment version="any" id="mb:AVE-ddb_deck_1@seating_area@3D">
<Units>1</Units>
<WheelchairVehicleEquipmentRef version="any" ref="mb:WVE-ddb_wheelchair_space"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
<SpotRowRef version="any" ref="mb:SR-ddb_deck_1@r03"/>
<SpotColumnRef version="any" ref="mb:SC-ddb_deck_1@c4"/>
Expand Down Expand Up @@ -791,7 +787,7 @@ Lower deck
<Label>7D</Label>
<Orientation>forwards</Orientation>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="mb:AVE-ddb_deck_1@seating_area@7C">
<ActualVehicleEquipment version="any" id="mb:AVE-ddb_deck_1@seating_area@7D">
<SeatEquipmentRef version="any" ref="mb:SEq-ddb_bench_seat"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/deckPlans/DeckPlans-Example_train.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ The train reverse in the station and departs, oriented backwards to the right
<Width>0.80</Width>
<Height>1.80</Height>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="rc:AVE-slw_deck_1@front_end_connecting@door">
<ActualVehicleEquipment version="any" id="rc:AVE-slw_deck_1@toilet@door">
<EntranceEquipmentRef version="any" ref="rc:EE-toilet_door"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
Expand Down Expand Up @@ -3561,7 +3561,7 @@ The train reverse in the station and departs, oriented backwards to the right
<Label>25</Label>
<Orientation>forwards</Orientation>
<actualVehicleEquipments>
<ActualVehicleEquipment version="any" id="rc:AVE-bfc_deck_1@seating_area@row_06_col_D@seat">
<ActualVehicleEquipment version="any" id="rc:AVE-bfc_deck_1@seating_area@row_07_col_A@seat">
<SeatEquipmentRef version="any" ref="rc:SEq-standard_chair"/>
</ActualVehicleEquipment>
</actualVehicleEquipments>
Expand Down
12 changes: 11 additions & 1 deletion examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,21 @@
<VehiclePoolingMeetingPlace version="any" id="alphaville_airport_set_down">
<Name>Alphaville pick up</Name>
<TopographicPlaceRef version="any" ref="belaire"> </TopographicPlaceRef>
<QuayRef version="any" ref="alphaville_gare@taxi_set_down"/>
<QuayRef version="any" ref="alphaville_aeroport@taxi_set_down"/>
</VehiclePoolingMeetingPlace>
<VehiclePoolingMeetingPlace version="any" id="alphaville_airport_pick_up">
<Name>Alphaville pick up</Name>
<TopographicPlaceRef version="any" ref="belaire"> </TopographicPlaceRef>
<QuayRef version="any" ref="alphaville_aeroport@taxi_pick_up"/>
</VehiclePoolingMeetingPlace>
<VehiclePoolingMeetingPlace version="any" id="alphaville_gare_set_down">
<Name>Alphaville gare pick up</Name>
<TopographicPlaceRef version="any" ref="alphaville"> </TopographicPlaceRef>
<QuayRef version="any" ref="alphaville_gare@taxi_set_down"/>
</VehiclePoolingMeetingPlace>
<VehiclePoolingMeetingPlace version="any" id="alphaville_gare_pick_up">
<Name>Alphaville gare pick up</Name>
<TopographicPlaceRef version="any" ref="alphaville"> </TopographicPlaceRef>
<QuayRef version="any" ref="alphaville_gare@taxi_pick_up"/>
</VehiclePoolingMeetingPlace>
</vehicleMeetingPlaces>
Expand Down
50 changes: 25 additions & 25 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,26 +378,26 @@
<VehicleSharingParkingArea version="any" id="bike_station_alpha_A1">
<equipmentPlaces>
<EquipmentPlace version="any" id="bike_station_alpha_A1@rack">
<placeEquipments>
Comment thread
skinkie marked this conversation as resolved.
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A1@rack_1">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<CycleStorageEquipment version="any" id="bike_station_alpha_A1@rack_2">
<NumberOfSpaces>10</NumberOfSpaces>
<CycleStorageType>docks</CycleStorageType>
</CycleStorageEquipment>
<TicketingEquipment version="any" id="bike_station_alpha">
<Name>Ticket Machine s at Bike Station Alpha</Name>
<TicketMachines>true</TicketMachines>
<NumberOfMachines>2</NumberOfMachines>
<TicketingFacilityList>ticketMachines</TicketingFacilityList>
<PaymentMethods>debitCard creditCard contactlessPaymentCard epayDevice epayAccount</PaymentMethods>
<TicketTypesAvailable>standard</TicketTypesAvailable>
</TicketingEquipment>
</placeEquipments>
</EquipmentPlace>
</equipmentPlaces>
<placeEquipments>
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A1@rack">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<CycleStorageEquipment version="any" id="bike_station_alpha_A1@rack">
<NumberOfSpaces>10</NumberOfSpaces>
<CycleStorageType>docks</CycleStorageType>
</CycleStorageEquipment>
<TicketingEquipment version="any" id="bike_station_alpha">
<Name>Ticket Machine s at Bike Station Alpha</Name>
<TicketMachines>true</TicketMachines>
<NumberOfMachines>2</NumberOfMachines>
<TicketingFacilityList>ticketMachines</TicketingFacilityList>
<PaymentMethods>debitCard creditCard contactlessPaymentCard epayDevice epayAccount</PaymentMethods>
<TicketTypesAvailable>standard</TicketTypesAvailable>
</TicketingEquipment>
</placeEquipments>
<TotalCapacity>10</TotalCapacity>
<bays>
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_alpha_A1@01">
Expand Down Expand Up @@ -495,11 +495,11 @@
</EquipmentPlace>
</equipmentPlaces>
<placeEquipments>
<CycleStorageEquipment version="any" id="bike_station_beta_B1@rack">
<CycleStorageEquipment version="any" id="bike_station_beta_B1@rack_2">
<NumberOfSpaces>10</NumberOfSpaces>
<CycleStorageType>docks</CycleStorageType>
</CycleStorageEquipment>
<TicketingEquipment version="any" id="bike_station_beta_B1@rack">
<TicketingEquipment version="any" id="bike_station_beta_B1@rack_ticketing">
<Name>Ticket Machine at Bike Station Beta</Name>
<TicketMachines>true</TicketMachines>
<NumberOfMachines>1</NumberOfMachines>
Expand All @@ -521,11 +521,11 @@
</MonitoredVehicleSharingParkingBay>
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_beta_B1@04">
<placeEquipments>
<VehicleReleaseEquipment version="any" id="bike_station_beta_B1@04">
<VehicleReleaseEquipment version="any" id="bike_station_beta_B1@04_release">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_beta_B1@04">
<RefuellingEquipment version="any" id="bike_station_beta_B1@04_charge">
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
Expand All @@ -535,11 +535,11 @@
</MonitoredVehicleSharingParkingBay>
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_beta_B1@05">
<placeEquipments>
<VehicleReleaseEquipment version="any" id="bike_station_beta_B1@05">
<VehicleReleaseEquipment version="any" id="bike_station_beta_B1@05_rack">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_beta_B1@05">
<RefuellingEquipment version="any" id="bike_station_beta_B1@05_charge">
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
Expand Down Expand Up @@ -791,7 +791,7 @@
</OnlineService>
</onlineServices>
<vehicleMeetingPlaceAssignments>
<VehicleSharingPlaceAssignment version="any" id="metrobik@bike_station_alpha_A1@rack-1">
<VehicleSharingPlaceAssignment version="any" id="metrobike@bike_station_alpha_A1@rack-1">
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<VehicleSharingParkingAreaRef version="any" ref="bike_station_alpha_A1"/>
</VehicleSharingPlaceAssignment>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/site/Netex_21_Sites_Parking_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ v1.1 revised ids and corrections
</spaces>
</ParkingProperties>
<entrances>
<ParkingEntranceRef version="any" ref="mypark:PP01@EP01"/>
<ParkingPassengerEntranceRef version="any" ref="mypark:PP01@EP01"/>
<ParkingEntranceForVehiclesRef version="any" ref="mypark:PP01@EV11@Entrance"/>
<ParkingEntranceForVehiclesRef version="any" ref="mypark:PP01@EV12@Exit"/>
<ParkingEntranceForVehiclesRef version="any" ref="mypark:PP01@EV01+02"/>
Expand Down Expand Up @@ -609,7 +609,7 @@ v1.1 revised ids and corrections
</spaces>
</ParkingProperties>
<entrances>
<ParkingEntranceRef version="any" ref="mypark:PP01@EP02 "/>
<ParkingPassengerEntranceRef version="any" ref="mypark:PP01@EP02"/>
<ParkingEntranceForVehiclesRef version="any" ref="mypark:PP01@EV02+03"/>
<ParkingEntranceForVehiclesRef version="any" ref="mypark:PP01@EV03+02"/>
</entrances>
Expand Down
2 changes: 1 addition & 1 deletion ...les/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4730,7 +4730,7 @@ Changes
<WaitingRoomEquipment version="any" id="tbd:4900ZZLUWIM3n4_Eq-Seats1">
<Seats>8</Seats>
</WaitingRoomEquipment>
<AssistanceService version="any" id="tbd:4900ZZLUWIM3n4_Eq-Seats1">
<AssistanceService version="any" id="tbd:4900ZZLUWIM3n4_Assist">
<AssistanceFacilityList>none</AssistanceFacilityList>
</AssistanceService>
</placeEquipments>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4961,7 +4961,7 @@ Changes
<WaitingRoomEquipment version="any" id="tbd:4900ZZLUWIM3n4_Eq-Seats1">
<Seats>8</Seats>
</WaitingRoomEquipment>
<AssistanceService version="any" id="tbd:4900ZZLUWIM3n4_Eq-Seats1">
<AssistanceService version="any" id="tbd:4900ZZLUWIM3n4_Assist">
<AssistanceFacilityList>none</AssistanceFacilityList>
</AssistanceService>
</placeEquipments>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4834,7 +4834,7 @@ Changes
<WaitingRoomEquipment version="any" id="nptg:4900ZZLUWIM3n4_Eq-Seats1">
<Seats>8</Seats>
</WaitingRoomEquipment>
<AssistanceService version="any" id="nptg:4900ZZLUWIM3n4_Eq-Seats1">
<AssistanceService version="any" id="nptg:4900ZZLUWIM3n4_Assist">
<AssistanceFacilityList>none</AssistanceFacilityList>
</AssistanceService>
</placeEquipments>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ The Calendar is shown coded as
</Departure>
</Call>
</calls>
<FlexibleServiceProperties version="1" id="hde:FlexibleServiceProperties:sj_24o@02">
<FlexibleServiceProperties version="1" id="hde:FlexibleServiceProperties:sj_24o@01">
<TypeOfFlexibleServiceRef ref="myfs" version="any"/>
<BookingMethods>online callOffice</BookingMethods>
<BookingAccess>public</BookingAccess>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/versioning/Netex_Uniqueness_01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ This is part 1 of a multistep example on versioning
<HeadingSign version="001" id="bar:foo2">
<PlaceName>SIGN</PlaceName>
</HeadingSign>
<PlaceLighting version="001" id="bar:foo2">
<PlaceLighting version="002" id="bar:foo2">
</PlaceLighting>
</placeEquipments>
</EquipmentPlace>
Expand Down
8 changes: 4 additions & 4 deletions examples/functions/versioning/Netex_VersioningExample_Step_04.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,16 @@ This is part 4 of a multistep example on versioning.
<GeneralFrame version="004" created="2010-05-21T10:30:51.0Z" changed="2010-05-21T10:30:51.0Z" modification="revise" responsibilitySetRef="mybus:RS_10" id="mybus:GeneralFrame:ntwkf001_Delta">
<Name>ntwkf001 experssed as a delta - only the removed stop is described - Baseline is version 3</Name>
<members modificationSet="changesOnly">
<GeneralFrameMember modification="delete" id="mybus:EntityInVersionInFrame:ntwkf001_05">
<GeneralFrameMember modification="delete" id="mybus:EntityInVersionInFrame:ntwkf001_05" version="002">
<ServiceLinkRef version="002" ref="mybu:SL_BtoA01"/>
</GeneralFrameMember>
<GeneralFrameMember modification="revise" id="mybus:EntityInVersionInFrame:ntwkf001_02">
<GeneralFrameMember modification="revise" id="mybus:EntityInVersionInFrame:ntwkf001_02" version="002">
<ScheduledStopPointRef version="001" ref="mybus:SSP0003C"/>
</GeneralFrameMember>
<GeneralFrameMember modification="new" id="mybus:EntityInVersionInFrame:ntwkf001_06">
<GeneralFrameMember modification="new" id="mybus:EntityInVersionInFrame:ntwkf001_06" version="002">
<ServiceLinkRef version="001" ref="mybu:SL_BtoC01"/>
</GeneralFrameMember>
<GeneralFrameMember modification="new" id="mybus:EntityInVersionInFrame:ntwkf001_07">
<GeneralFrameMember modification="new" id="mybus:EntityInVersionInFrame:ntwkf001_07" version="002">
<ServicePatternRef version="001" ref="mybus:SP_001"/>
</GeneralFrameMember>
</members>
Expand Down
14 changes: 7 additions & 7 deletions examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,25 @@ This version shows the use of thye general frame to hold references rather than
<DefaultResponsibilitySetRef ref="mybus:RS_10"/>
</FrameDefaults>
<members>
<GeneralFrameMember id="mybus:ntwkf001_01">
<GeneralFrameMember id="mybus:ntwkf001_01" version="001">
<ScheduledStopPointRef ref="mybus:SSP0001A"/>
</GeneralFrameMember>
<GeneralFrameMember id="mybus:ntwkf001_02">
<GeneralFrameMember id="mybus:ntwkf001_02" version="001">
<ScheduledStopPointRef ref="mybus:SSP0001B"/>
</GeneralFrameMember>
<GeneralFrameMember id="mybus:ntwkf001_05">
<GeneralFrameMember id="mybus:ntwkf001_05" version="001">
<ScheduledStopPointRef ref="mybus:SSP0001C"/>
</GeneralFrameMember>
<GeneralFrameMember id="mybus:ntwkf001_03">
<GeneralFrameMember id="mybus:ntwkf001_03" version="001">
<DayTypeRef ref="mybus:DT001_MF"/>
</GeneralFrameMember>
<GeneralFrameMember id="mybus:ntwkf001_04">
<GeneralFrameMember id="mybus:ntwkf001_04" version="001">
<ServiceLinkRef ref="mybu:SL_AtoB01"/>
</GeneralFrameMember>
<GeneralFrameMember modification="new " id="mybus:ntwkf001_06">
<GeneralFrameMember modification="new " id="mybus:ntwkf001_06" version="001">
<ServiceLinkRef ref="mybu:SL_BtoC01"/>
</GeneralFrameMember>
<GeneralFrameMember id="mybus:ntwkf001_07">
<GeneralFrameMember id="mybus:ntwkf001_07" version="001">
<ServicePatternRef ref="mybus:SP001"/>
</GeneralFrameMember>
</members>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ is relevant for supplying an Integrator with partial data from multiple sources.
<LowFloor>true</LowFloor>
<HasLiftOrRamp>true</HasLiftOrRamp>
</PassengerCarryingRequirementsView>
<FlexibleServiceProperties>
<FlexibleServiceProperties version="001" id="noptis:FlexibleServiceProperties:sp078">
<BookingAccess>public</BookingAccess>
<LatestBookingTime>10:00:00</LatestBookingTime>
<MinimumBookingPeriod>PT1H</MinimumBookingPeriod>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/norway/stops/PointOfInterest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ The example comprises
</EquipmentPlace>
</equipmentPlaces>
<placeEquipments>
<EntranceEquipment version="any" id="tbd:POI_23_A1-E1_Eq2">
<EntranceEquipment version="any" id="tbd:POI_23_A1-E1_Eq3">
<Name>gates</Name>
<DirectionOfUse>both</DirectionOfUse>
<NumberOfGates>10</NumberOfGates>
Expand Down
Loading