From dcde0b08a5bfff639d9a667d68562e0a9a7801e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 16 Dec 2023 19:53:32 +0100 Subject: [PATCH 001/144] recreated commit 532c9b --- NeTEx.spp | 126 +- .../functions/deckPlans/DeckPlans-Example.xml | 1752 +++++++++++++++++ xsd/NeTEx_publication.xsd | 673 ++++++- .../netex_resourceFrame_version.xsd | 13 +- .../netex_all_objects_reusableComponents.xsd | 14 +- .../netex_deckPlan_support.xsd | 577 ++++++ .../netex_deckPlan_version.xsd | 1362 +++++++++++++ ...etex_equipmentVehiclePassenger_support.xsd | 30 +- ...etex_equipmentVehiclePassenger_version.xsd | 28 +- ...ex_nm_chargingEquipmentProfile_version.xsd | 4 +- .../netex_seatingPlan_support.xsd | 328 +++ .../netex_seatingPlan_version.xsd | 642 ++++++ .../netex_sensorEquipment_support.xsd | 200 ++ .../netex_sensorEquipment_version.xsd | 376 ++++ .../netex_spotEquipment_support.xsd | 164 ++ .../netex_spotEquipment_version.xsd | 359 ++++ .../netex_vehicleType_support.xsd | 55 +- .../netex_vehicleType_version.xsd | 112 +- .../netex_stopAssignment_version.xsd | 18 +- .../netex_timetableFrame_version.xsd | 9 +- .../netex_all_objects_part2_journeyTimes.xsd | 8 +- .../netex_deckEntranceAlignment_support.xsd | 103 + .../netex_deckEntranceAlignment_version.xsd | 136 ++ .../netex_deckPlanAssignment_support.xsd | 103 + .../netex_deckPlanAssignment_version.xsd | 139 ++ 25 files changed, 7216 insertions(+), 115 deletions(-) create mode 100644 examples/functions/deckPlans/DeckPlans-Example.xml create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 1c4f8643d..31e48a9a3 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -78,55 +78,77 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,6 +203,7 @@ + @@ -272,6 +295,10 @@ + + + + @@ -744,6 +771,9 @@ + + + diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml new file mode 100644 index 000000000..3b6d4874b --- /dev/null +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -0,0 +1,1752 @@ + + + + 2020-12-17T09:30:47.0Z + SYS001 + + + 2020-12-17T09:30:46.0Z + SYS002 + Request for Erebus 1 tariff + + + + + 2020-01-01T00:00:00Z + + + + + + + + + + + P1M + Example of DeckPlans + + + + + 2023-01-01T00:00:00 + 2023-12-31T12:00:00 + + Deck Plan Example + This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + + + + + + + + + + EUR + + + + + erebus Operator specific common resources + + + mb + http://www.erebus.eu/ + erebus data + + + + + feedback@erebus.eu + + + + + + Operator data + + + creates + Planning + erebus + + + + + + + + Bike equipment + + + Battery + + + Charger + + + + + + + + MBK + erebus + erebus + erebus SA + operator +
+ Alpha1 + Metropolis + RH10 9UA + Metroland +
+ bus + + + + + + Bench seat + 0.48 + 0.50 + 0.50 + false + + + Pulldown seat> + 0.48 + 0.40 + 0.40 + true + + + Bench seat + 0.48 + 0.50 + 0.45 + false + + + External Door sensor + cable + + + Internal sensor on bottom step + cable + + + Seat sensor + cable + + + true + 1 + 2.00 + 1.80 + 2.00 + true + + + 0 + + + true + cashAndCard contactlessPaymentCard travelCard + + + 1.00 + true + + + true + true + true + + + 12 + 0.10 + oneSide + 1.00 + true + true + 1 + + + + + freeWifi + purchase + noCycles + + + + + Double Decker Bus + Double decker bus with staircase. Wheelchair and luggage spaces on lower deck. + false + true + human + diesel + bus + + 60 + 20 + 2 + 1 + + false + 0.15 + 10 + 4 + 2000 + + + + + + + + + + + + + + + Lower Deck + + + + + + + 1 + + + + Driver seat + false + 1 + + + + Lower Deck seating area + true + standardClass + + true + + + true + false + true + + + + true + false + + + + 1.00 + 1.90 + + + 1 + + + + 1 + + + + Front Door + external + left + true + + + + + + + + + 0.95 + 1.90 + + + 1 + + + + + + + + + + Rear Door + external + left + true + + + + + + + + + 0.80 + 1.90 + + + + + + Entrance to stairs + internal + + + + + + + + + + entry + + + exit + + + 43 + + + seat + 22 + + + standingSpace + 20 + + + wheelchairSpace + 1 + + + pushchairSpace + 2 + + + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + 1 + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + false + false + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + false + + + + + + + leftwards + + + + + + + + + + + + + + + 1 + + + + Stop button at top of stairs + + + + Stairwell to upper deck + false + + + + 1.00 + 1.90 + Bottom of stairwell + internal + true + + + + 1.00 + 1.90 + Top of Stairwell + internal + true + + + + + + + + + + + + + + + entryAndExit + + + entryAndExit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Upper Deck + + + + + Upper Deck seating area + + false + + + false + false + true + + + + true + false + + + 0.80 + 2.00 + ENtrance to top of stairs + internal + + + + + seat + 37 + + + standingSpace + 12 + + + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + false + false + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Basic Elements for map of bus + http:erebus.eu/plans/double_decker_floor_plan + + + Bottom Deck + + + + Forward Entrance + + + + Rear Entrance + + + + Stairs + + + + Top Deck + + + + + + + + Deck Plan Assignment Example + This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry . + + + To a particalr stopt + + + + + + + true + false + 1 + + Board at front + + + + + + + + false + true + 1 + + exit at rear + + + + + + + + + + + + + Deck Plan Example + This is an example showing how one might assign a deck plan to a journey. + + + + 10:10:00 + + + + + + + + In to centre + + + + 10:10:00 + 10:30:00 + + + Across centre - doors open + + + + 10:31:00 + 10:50:00 + + + + + + + + Assign double decker bus to Journey - doors shut + + + + + + + Assign double decker bus to Journey - doors open + + + + + + + + + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY + + + + + + + + + + \ No newline at end of file diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 9ba89219c..c54c53db9 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -1,5 +1,5 @@ - + @@ -3496,7 +3496,637 @@ Correct COnstraints for PointOnRoute + + + + + + Every [TypeOfDriverPermit Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SpotRow Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SpotColumn Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerSpot Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + Every [LuggageSpot Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerVehicleSpot Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfLocatableSpot Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckPlan Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [Deck Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerSpace Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [OtherDeckSpace Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [OtherDeckEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckVehicleEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckEntranceUsage Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckEntranceCouple Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckLevel Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckCapacity Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfDeckSpace Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfDeckEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckPlanAssignment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckEntranceAssignment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SeatEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [BedEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [LuggageBayEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [EntranceSensor Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SpotSensor Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SensorInEntrance Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [SensorInSpot Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [AcceptedDriverPermit Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -3539,6 +4169,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [VehicleEquipmentProfileMember Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -6392,24 +7043,24 @@ Correct COnstraints for PointOnRoute - - - + + + - Every [VehicleTypeStopAssignment Id + Version] must be unique within document. + Every [VehicleJourneyStopAssignment Id + Version] must be unique within document. - + - - - + + + - - + + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index 4bbd74799..1f8fee4b2 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ 2011-02-05 - 2017-03-28CR031 Add Zones to RESOURCE FRAME + 2017-03-28CR031 Add Zones to RESOURCE FRAME 2017-06-28CR048 Add Security Lists to RESOURCE FRAME @@ -25,6 +25,8 @@ 2020-10-20New Modes Add Facility sets to RESOURCE FRAME. + 2023-02-02Add DECK PLAN CHANGES. +

NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.

 @@ -65,7 +67,7 @@ Rail transport, Roads and Road transport - A coherent set of reference values for TYPE OF VALUEs , ORGANISATIONs, VEHICLE TYPEs etc that have a common validity, as specified by a set of frame VALIDITY CONDITIONs. Used to define common resources that will be referenced by other types of FRAME. + A coherent set of reference values for TYPE OF VALUEs, ORGANISATIONs, VEHICLE TYPEs etc that have a common validity, as specified by a set of frame VALIDITY CONDITIONs. Used to define common resources that will be referenced by other types of FRAME. @@ -112,7 +114,8 @@ Rail transport, Roads and Road transport - + + @@ -148,7 +151,7 @@ Rail transport, Roads and Road transport - General Elements of a RESOURCE FRAME. + General Elements of a RESOURCE FRAME. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index 6fed2db4c..90f8d6c6e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -1,5 +1,5 @@ - + @@ -20,7 +20,11 @@ - + + + + + @@ -54,5 +58,9 @@ - + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd new file mode 100644 index 000000000..780baa602 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -0,0 +1,577 @@ + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-01-30 + + + 2023-02-01 + Name Space changes + + +

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

+

This sub-schema describes the DECK PLAN 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_deckPlan_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 2023-2023 + + +
    +
  • Derived from the Transmodel 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 DECK PLAN types. + Standard + + + DECK PLAN identifier types + + + + + Type for a list of DECK PLANs. + + + + + + + + + + + + Type for identifier of a DECK PLAN. + + + + + + Reference to a DECK PLAN. +v2.0 + + + + + Type for a reference to a DECK PLAN. + + + + + + Identifier of a DECK PLAN. + + + + + + + + + Type for a list of DECKs. + + + + + + + + + + + + Type for identifier of a DECK. + + + + + + Reference to a DECK. +v2.0 + + + + + Type for a reference to a DECK. + + + + + + Identifier of a DECK. + + + + + + + + + Type for identifier of a DECK COMPONENT. + + + + + + Reference to a DECK COMPONENT. +v2.0 + + + + + Type for a reference to a DECK COMPONENT. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a DECK SPACE. + + + + + + Reference to a DECK SPACE. +v2.0 + + + + + Type for a reference to a DECK SPACE. + + + + + + Identifier of a DECK SPACE. + + + + + + + + + Type for identifier of a PASSENGER SPACE. + + + + + + Reference to a PASSENGER SPACE. +v2.0 + + + + + Type for a reference to a PASSENGER SPACE. + + + + + + Identifier of a PASSENGER SPACE. + + + + + + + + Allowed values for type of epassenger space. + + + + + + + + + + + + + + + Type for identifier of a OTHER DECK SPACE. + + + + + + Reference to a OTHER DECK SPACE. +v2.0 + + + + + Type for a reference to a OTHER DECK SPACE. + + + + + + Identifier of a OTHER DECK SPACE. + + + + + + + + + Type for identifier of a DECK ENTRANCE. + + + + + + Reference to a DECK ENTRANCE. +v2.0 + + + + + Type for a reference to a DECK ENTRANCE. + + + + + + Identifier of a DECK ENTRANCE. + + + + + + + + Allowed values for type of DECK ENTRANCE. + + + + + + + + + Allowed values for Relation to vehicle of ENtrance. + + + + + + + + + + + + + Type for identifier of a PASSENGER ENTRANCE. + + + + + + Reference to a PASSENGER ENTRANCE. +v2.0 + + + + + Type for a reference to a PASSENGER ENTRANCE. + + + + + + Identifier of a PASSENGER ENTRANCE. + + + + + + + + + Type for identifier of a DECK VEHICLE ENTRANCE. + + + + + + Reference to a DECK VEHICLE ENTRANCE. +v2.0 + + + + + Type for a reference to a DECK VEHICLE ENTRANCE. + + + + + + Identifier of a DECK VEHICLE ENTRANCE. + + + + + + + + + Type for identifier of a OTHER DECK ENTRANCE. + + + + + + Reference to a OTHER DECK ENTRANCE. +v2.0 + + + + + Type for a reference to a OTHER DECK ENTRANCE. + + + + + + Identifier of a OTHER DECK ENTRANCE. + + + + + + + + + Type for identifier of a DECK ENTRANCE USAGE. + + + + + + Reference to a DECK ENTRANCE USAGE. +v2.0 + + + + + Type for a reference to a DECK ENTRANCE USAGE. + + + + + + Identifier of a DECK ENTRANCE USAGE. + + + + + + + + Allowed values for type of entrance Usage.. + + + + + + + + + + + + Type for identifier of a DECK ENTRANCE COUPLE. + + + + + + Reference to a DECK ENTRANCE COUPLE. +v2.0 + + + + + Type for a reference to a DECK ENTRANCE COUPLE. + + + + + + Identifier of a DECK ENTRANCE COUPLE. + + + + + + + + + Type for identifier of a DECK WINDOW. + + + + + + Reference to a DECK WINDOW. +v2.0 + + + + + Type for a reference to a DECK WINDOW. + + + + + + Identifier of a DECK WINDOW. + + + + + + + + + Type for identifier of a DECK LEVEL. + + + + + + Reference to a DECK LEVEL. +v2.0 + + + + + Type for a reference to a DECK LEVEL. + + + + + + Identifier of a DECK LEVEL. + + + + + + + + + Type for identifier of a DECK SPACE CAPACITY. + + + + + + Reference to a DECK SPACE CAPACITY. +v2.0 + + + + + Type for a reference to a DECK SPACE CAPACITY. + + + + + + Identifier of a DECK SPACE CAPACITY + + + + + + + + + Type for identifier of a TYPE OF DECK SPACE PROFILE. + + + + + + Reference to a TYPE OF DECK SPACE PROFILE. +v2.0 + + + + + Type for a reference to a TYPE OF DECK SPACE PROFILE. + + + + + + Reference to a TYPE OF DECK SPACE PROFILE. + + + + + + + + + Type for identifier of a TYPE OF DECK ENTRANCE. + + + + + + Reference to a TYPE OF DECK ENTRANCE. +v2.0 + + + + + Type for a reference to a TYPE OF DECK ENTRANCE. + + + + + + Reference to a TYPE OF DECK ENTRANCE. + + + + + + + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd new file mode 100644 index 000000000..592c7d4b1 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -0,0 +1,1362 @@ + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-01-30 + + + 2023-01-30 + Name Space changes + + +

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

+

This sub-schema describes the DECK PLAN 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_deckPlan_version.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 2022-2023 + + +
    +
  • Derived from the Transmodel, 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 DECK PLAN types. + Standard + + + DECK PLAN data types + + + + + Elements for a DECK PLAN in Frame. + + + + + DECK OKANs in FRAME. + + + + + + + Type for containment in frame of DECK PLANs + + + + + + + + + + + + + A plan for the layout of seating and other areas of use of an entire VEHICLE (train, coach, vessel etc.) or individual TRAIN ELEMENT for all or part of a journey. +v2.0 + + + + + + + + + + + + + + + + + + + + Identifier of DECK PLAN. + + + + + + + + + Type for a DECK PLAN. + + + + + + + + + + + + Elements for a DECK PLAN. + + + + + Name of DECK PLAN. + + + + + Description of DECK PLAN. + + + + + DECK LEVELs in DECK PLAN. + + + + + DECKs in DECK PLAN. + + + + + + + + Type for a list ofDECKs. + + + + + + + + + + + + An area within a VEHICLE (i.e. bus, boat, coach, car, plan, etc.) or TRAIN ELEMENT made up of one or more DECK SPACEs. A subdivision of a DECK PLAN +. +V2.0 + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROILE. + + + + + + + + + Type for a DECK. + + + + + + Elements for an DECK. + + + + + + + + Elements for a DECK. + + + + + Name of DECK. + + + + + Name of DECK. + + + + + + DECK SPACEs in DECK PLAN. + + + + + Rows on DECK. + + + + + COLUMNs on DECK. + + + + + + + + An abstract element providing common features for spatially located elements within the DECK PLAN.+v2.0 + + + + + Type for a DECK COMPONENT. + + + + + + + Elements for a DECK COMPONENT. + + + + + + + + + Elements for a DECK COMPONENT. + + + + + Name of DECK COMPONENT. + + + + + Description of DECK COMPONENT. + + + + + Whether DECK COMPONENT is for public use. Default is true. + + + + + + + Edit care class for which capacity is specifyed. Default is any, i.e. capacity is for all classes. + + + + + + + + + Type for a list of DECK SPACEs. + + + + + + + + + + + + + Dummy type to work around SG limitations + + + + + An area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT delimiting a particular use such as seating, WC, bar, gangway, etc. May be specialised, e.g. as PASSENGER SPACE ; may contain other spaces. Different types of space may overlap. +v2.0. + + + + + + + + + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + Identifier of DECK SPACE. + + + + + + + + + Type for a DECK SPACE. + + + + + + + + + + + + Elements for a DECK SPACE. + + + + + Whether DECK SPACE is covered. Default is true. + + + + + Whether DECK SPACE is air conditioned. + + + + + Whether smoking is allowed in DECK SPACE. Defaukts is false. + + + + + + Deck space containing this deck space + + + + + + The total capacity of people for the DECK SPACE. + + + + + Capacities of DECK SPACE. + + + + + + + Elements for a DECK SPACE. + + + + + DECK ENTRANCEs to DECK SPACE. + + + + + DECK ENTRANCE COUPLEs for DECK SPACE. + + + + + DECK ENTRANCE USAGEs for DECK SPACE. + + + + + DECK WINDOWs on DECK SPACE. + + + + + + + + Type for a list of PASSENGER SPACEs. + + + + + + + + + + + + + +v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + + + + Identifier of PASSENGER SPACE. + + + + + + + + + Type for a PASSENGER SPACE. + + + + + + + + + + + + Elements for a PASSENGER SPACE. + + + + + Whether standing is allowed in DECK SPACE. + + + + + PASSENGER SPOTs, i.e. seats in PASSENGER SPACE. + + + + + LUGGAGE SPOTS in PASSENGER SPACE. + + + + + PASSENGER VEHICLE SPOTs in PASSENGER SPACE. + + + + + + + + Type for a list of OTHER DECK SPACEs. + + + + + + + + + + + + + +v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + + + + Identifier of OTHER DECK SPACE. + + + + + + + + + Type for a OTHER DECK SPACE. + + + + + + + + + + + + Elements for a OTHER DECK SPACE. + + + + + + + Dummy type to work around SG limitations + + + + + Type for a list of DECK ENTRANCEs. + + + + + + + + + + + + + An entrance to or within a DECK. +v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + Identifier of DECK ENTRANCE. + + + + + + + + + Type for a DECK ENTRANCE. + + + + + + + + + + + + Elements for a DECK ENTRANCE. + + + + + Type of DECK ENTRANCE. + + + + + Side of ENTRANCE relative to forward orientation of VEHICLE. to . + + + + + Distance of forward edge of door from front of Vehicle.. + + + + + Whether the door is automatic. + + + + + + ENTRANCE SENSORS in the DECK ENTRANCE. + + + + + + + + A normal entrance for passengers to or within a DECK. ++v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + + + + Identifier of PASSENGER ENTRANCE. + + + + + + + + + Type for a PASSENGER ENTRANCE. + + + + + + + + + + + + Elements for a PASSENGER ENTRANCE. + + + + + + + A normal entrance for passengers to or within a DECK. ++v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + + + + Identifier of DECK VEHICLE ENTRANCE. + + + + + + + + + Type for a DECK VEHICLE ENTRANCE. + + + + + + + + + + + + Elements for a DECK VEHICLE ENTRANCE. + + + + + + + An entrance to or within a DECK for use for other purposes than normal passenger access. E.g. crew, emergency exit, etc. ++v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + + + + Identifier of OTHER DECK ENTRANCE. + + + + + + + + + Type for a OTHER DECK ENTRANCE. + + + + + + + + + + + + Elements for a OTHER DECK ENTRANCE. + + + + + + + Type for a list of DECK ENTRANCE USAGEs. + + + + + + + + + + + + Permitted usage of a specific PASSENGER ENTRANCE to access a particular DECK SPACE. ++v2.0 + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROILE. + + + + + + + + + Type for a DECK ENTRANCE USAGE. + + + + + + + + + + Elements for a DECK ENTRANCE USAGE. + + + + + Name of DECK ENTRANCE USAGE. + + + + + Description of DECK ENTRANCE USAGE. + + + + + Nature of usage: entry, ecit etc. See allowed values. + + + + + + + + + Type for a list of DECK ENTRANCE COUPLEs. + + + + + + + + + + + + Explicit linking of a pair of DECK ENTRANCEs, e.g. between train carriages. ++v2.0 + + + + + + + + + + + + + + + + + Identifier of DECK ENTRANCE COUPLE. + + + + + + + + + Type for a DECK ENTRANCE COUPLE. + + + + + + + + + + Elements for a DECK ENTRANCE COUPLE.. + + + + + Name of DECK ENTRANCE COUPLE. + + + + + DECK ENTRANCE from which couple links.. + + + + + DECK ENTRANCE to which couple links.. + + + + + + + + Type for a list of DECK WINDOWs. + + + + + + + + + + + + + A window onto a DECK SPACE. ++v2.0 + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + Identifier of DECK WINDOW. + + + + + + + + + Type for a DECK WINDOW. + + + + + + + + + + + + Elements for a DECK WINDOW. + + + + + Sequence of window from the front of the DECK. + + + + + SDistance of Window from front of DECK + + + + + Whether window has blind. + + + + + Whether window can be opened. + + + + + + + + Type for a list of DECK LEVELs. + + + + + + + + + + + + An identified level (1, 2 ,3 ) within the DECK PLAN of a VEHICLE (boat, airplane, etc). +v2.0 +. ++v2.0 + + + + + + + + + + + + + + + + + + Identifier of DECK LEVEL. + + + + + + + + + Type for a DECK LEVEL. + + + + + + + + + + + + Elements for a DECK LEVEL. + + + + + Label of DECK LEVEL. + + + + + Name of DECK. + + + + + Description of DECK. + + + + + Whether DECK is for public use. + + + + + + + + Type for a list of DECK SPACE CAPACITies. + + + + + + + + + + + + Capacity of a DECK SPACE for passengers or LOCATABLE SPOTs.+v2.0 + + + + + + + + + + + + + + + + + + Identifier of DECK SPACE CAPACITY. + + + + + + + + + Type for a DECK SPACE CAPACITY + + + + + + + + + + + + Elements for a DECK SPACE CAPACITY. + + + + + Type of Locatable spot for which this is the capacity + + + + + + The total capacity for passengers or vehciles of the type. + + + + + + + + Classification for DECK SPACE, e.g. as WC, Restaurant, luggage area, etc. ++v2.0 + + + + + + + + + + + + + + + + + + Identifier of TYPE OF DECK SPACE. + + + + + + + + + Type for a TYPE OF DECK SPACE. + + + + + + + + + Classification for DECK ENTRANCE. +v2.0 + + + + + + + + + + + + + + + + + + Identifier of PURPOSE OF EQUIMENT PROFILE. + + + + + + + + + Type for a TYPE OF DECK ENTRANCE. + + + + + + + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 6fd864d3e..0790be8c6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ 2007-06-12 -

NeTEx - Network Exchange. This subschema defines VEHICLE EQUIPMENT types for Place access.

+

NeTEx - Network Exchange. This subschema defines VEHICLE EQUIPMENT types for Place access.

 text/xml @@ -26,7 +26,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2023
    @@ -114,9 +114,29 @@ Rail transport, Roads and Road transport Reference to a WHEELCHAIR VEHICLE EQUIPMENT. + DEPRECATED + + DEPRECATED + + + + + + Identifier of a POINT. + + + + + + + + Reference to a WHEELCHAIR VEHICLE EQUIPMENT. + + + Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT. @@ -133,7 +153,7 @@ Rail transport, Roads and Road transport - Allowed values for assisted boarding locations. + Allowed values for assisted boarding locations. @@ -143,7 +163,7 @@ Rail transport, Roads and Road transport - Allowed values for assistance needed. + Allowed values for assistance needed. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 0e8d7e5c8..62c3cd160 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -1,5 +1,5 @@ - + @@ -16,14 +16,16 @@ 2011-12-16 - 2021-01-29BUG Issue #143: Correct data type on GapToPlatform + + 2021-01-29BUG Issue #143: Correct data type on GapToPlatform

    NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT

    text/xml - http://www.w3.org/2 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. + http://www.w3.org/2 + 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. 001/XMLSchema XML schema, W3C Recommendation 2001 @@ -85,12 +87,24 @@ Rail transport, Roads and Road transport     - + + + List of VACTUAL EHICLE EQUIPMENT. + + + + + + + + + + An item of EQUIPMENT of a particular type actually available in an individual VEHICLE. - + Abstract Type for an ACTUAL VEHICLE EQUIPMENT. @@ -193,7 +207,7 @@ Rail transport, Roads and Road transport - VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs. + VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs. @@ -267,7 +281,7 @@ Rail transport, Roads and Road transport - Whether special position on platform is needed for boarding. + Whether special position on platform is needed for boarding. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd index 9ff17117d..797883d3a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd @@ -147,8 +147,8 @@ Rail transport, Roads and Road transport - Normal period need to set up charging. - + Normal period need to set up charging. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd new file mode 100644 index 000000000..5ca754a16 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -0,0 +1,328 @@ + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-02 + + + 2023-02-05 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK PLAN 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_seatingPlan_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 2022-2023 + + +
      +
    • Derived from the Transmodel 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 SEATING PLAN types. + Standard +     +     + SEATING PLAN identifier types +     + + + + Type for a list of SPOT ROWs. + + + + + + + + + + + + Type for identifier of a SPOT ROW. + + + + + + Reference to a SPOT ROW. +v2.0 + + + + + Type for a reference to a SPOT ROW. + + + + + + Identifier of a SPOT ROW. + + + + + + + + + Type for a list of SPOT COLUMNs. + + + + + + + + + + + + Type for identifier of a SPOT COLUMN. + + + + + + Reference to a SPOT COLUMN. +v2.0 + + + + + Type for a reference to a SPOT COLUMN. + + + + + + Identifier of a SPOT COLUMN. + + + + + + + + + Type for identifier of a nEQUIPABLE SPACE. + + + + + + Reference to an EQUIPABLE SPACE. +v2.0 + + + + + Type for a reference to an EQUIPABLE SPACE. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a LOCATABLE SPOT. + + + + + + Reference to a LOCATABLE SPOT. +v2.0 + + + + + Type for a reference to a LOCATABLE SPOT. + + + + + + Identifier of referenced entity. + + + + + + + + + Type for identifier of a PASSENGER SPOT. + + + + + + Reference to a PASSENGER SPOT. +v2.0 + + + + + Type for a reference to a PASSENGER SPOT. + + + + + + Identifier of a PASSENGER SPOT. + + + + + + + + + Type for identifier of a PASSENGER VEHICLE SPOT. + + + + + + Reference to a PASSENGER VEHICLE SPOT. +v2.0 + + + + + Type for a reference to a PASSENGER VEHICLE SPOT. + + + + + + Identifier of a PASSENGER VEHICLE SPOT. + + + + + + + + + Type for identifier of a LUGGAGE SPOT. + + + + + + Reference to a LUGGAGE SPOT. +v2.0 + + + + + Type for a reference to a LUGGAGE SPOT. + + + + + + Identifier of a LUGGAGE SPOT. + + + + + + + + + Type for identifier of a TYPE OF LOCATABLE SPOT. + + + + + + Reference to a TYPE OF LOCATABLE SPOT. +v2.0 + + + + + Type for a reference to a TYPE OF LOCATABLE SPOT. + + + + + + Reference to a TYPE OF LOCATABLE SPOT. + + + + + + + + Allowed values for type of epassenger space. + + + + + + + + + + + + + + + Allowed values for Sepot Orientation. + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd new file mode 100644 index 000000000..8d9e88caf --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -0,0 +1,642 @@ + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-01-30 + + + 2023-01-30 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK PLAN 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_seatingPlan_version.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 2022-2023 + + +
      +
    • Derived from the Transmodel, 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 DECK PLAN types. + Standard +     +     + SEATING PLAN data types +     + + + + Type for a list of SPOT ROWs. + + + + + + + + + + + + A Row of LOCATABLE SPOTs, e.g. seats, within a PASSENGER SPACE. +v2.0 + + + + + + + + + + + + + + + + + + Identifier of SPOT ROW. + + + + + + + + + Type for a SPOT ROW. + + + + + + + + + + + + Elements for a SPOT ROW. + + + + + Name of SPOT ROW. + + + + + Whether number of ROW starts at front. Default is true. + + + + + + + + Type for a list of SPOT COLUMNs. + + + + + + + + + + + + A File of LOCATABLE SPOTs within a PASSENGER SPACE, For example Column A, B, C, D. +v2.0 + + + + + + + + + + + + + + + + + + + Identifier of SPOT COLUMN. + + + + + + + + + Type for a SPOT COLUMN. + + + + + + + + + + + + Elements for a SPOT COLUMN. + + + + + Name of SPOT COLUMN.. + + + + + Whether number of Colmns starts from left of vehicle, facing forward, or right. Default is true. + + + + + + + + A place where ACTUAL VEHICLE EQUIPMENT may be located. +v2.0 + + + + + Type for a EQUIPABLE SPACE. + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + + + Elements for an EQUIPABLE SPACE. + + + + + Description of EQUIPABLE SPACE. + + + + + Orientation of EQUIPABLE SPACE . Default is forwards. + + + + + + + ACTUAL VEHICLE EQUIPMENT for element. + + + + + + + Elements for an EQUIPABLE SPACE dimensions. + + + + + Width of EQUIPABLE SPACE. + + + + + Length of EQUIPABLE SPACE. + + + + + Height of EQUIPABLE SPACE. + + + + + + + + An identifiable individual area within a given PASSENGER SPACE, which may potentially be allocated to a single passenger or +v2.0 + + + + + Type for a LOCATABLE SPOT. + + + + + + + Elements for a LOCATABLE SPOT. + + + + + + + + + Elements for a LOCATABLE SPOT. + + + + + + + SPOT SENSORs in the LOCATABLE SPOT. + + + + + + + Elements for a LOCATABLE SPOT dimensions. + + + + + Width of LOCATABLE SPOT. + + + + + Length of LOCATABLE SPOT. + + + + + Height of LOCATABLE SPOT. + + + + + + + Elements for a LOCATABLE SPOT Row and Columns. + + + + + + + + + + Type for a list of PASSENGER SPOTs. + + + + + + + + + + + + + Type for a PASSENGER SPOT. + + + + + + + + + + + + Elements for a PASSENGER SPOT. + + + + + Whether PASSENGER SPOT is by Aisle. + + + + + Whether PASSENGER SPOT is by Window + + + + + Whether PASSENGER SPOT faces table. + + + + + Whether PASSENGER SPOT has armrest + + + + + Leg space available.t + + + + + Whether PASSENGER SPOT has a tray + + + + + Whether PASSENGER SPOT has a powr socket + + + + + + + + A specified seat or other space for a passenger within a given DECK SPACE. +v2.0 + +v2.0. + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a LOCATABLE SPOT. + + + + + + + + + + Identifier of PASSENGER SPOT. + + + + + + + + + Type for a list of PASSENGER VEHICLE SPOTs. + + + + + + + + + + + + + A specified onboard space to carry a vehicle (car, motorcycle, cycle, etc) within a given DECK SPACE. +v2.0. + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a LOCATABLE SPOT. + + + + + + + + + + Identifier of PASSENGER VEHICLE SPOT. + + + + + + + + + Type for a PASSENGER VEHICLE SPOT. + + + + + + + + + + + + Elements for a PASSENGER VEHICLE SPOT. + + + + + + + + + Type for a list of LUGGAGE SPOTs. + + + + + + + + + + + + + A specified space to stow a passenger's luggage onboard.+v2.0. + + + + + + + + + + + + + + + Elements for a EQUIPABLE SPACE. + + + + + + + Elements for a LOCATABLE SPOT. + + + + + + + + + + Identifier of LUGGAGE SPOT. + + + + + + + + + Type for a LUGGAGE SPOT. + + + + + + + + + + + + Elements for a LUGGAGE SPOT. + + + + + Height of LUGGAGE SPOT ifrom floor. + + + + + + + + Classification for LOCATABLE SPOT. +v2.0. ++v2.0 + + + + + + + + + + + + + + + + + + Identifier of TYPE OF LOCATABLE SPOT. + + + + + + + + + Type for a TYPE OF LOCATABLE SPOT. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd new file mode 100644 index 000000000..c08616030 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -0,0 +1,200 @@ + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-08 + + + 2023-02-08 + Split out from Charging Equipoment + + +

    NeTEx - Network Exchange. This subschema defines SENSOR EQUIPMENT types.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_sensorEquipment_support.xsd + [ISO 639-2/B] ENG + CEN TC278 WG3 SG9 + + Unclassified + CEN, Crown Copyright 2009-2023 + + +
      +
    • Added fro NExTex new modes.
      • +
    + + 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 Network Exchange - SENSOR EQUIPMENT identifier types. + Standard +     +     + SENSOR EQUIPMENT identifier types for NeTEx. +     + + + + Type for identifier of SENSOR EQUIPMENT. + + + + + + Identifier of a SENSOR EQUIPMENT. +V2.0 + + + + + Type for a reference to a SENSOR EQUIPMENT. + + + + + + Identifier of a SENSOR EQUIPMENT. + + + + + + + + Allowed values for Sensor Commications + + + + + + + + + + + Type for identifier of SPOT SENSOR. + + + + + + Identifier of a SPOT SENSOR. +v2.0 + + + + + Type for a reference to a SPOT SENSOR. + + + + + + Identifier of a SPOT SENSOR. + + + + + + + + + Type for identifier of ENTRANCE SENSOR. + + + + + + Identifier of an ENTRANCE SENSOR. +v2.0 + + + + + Type for a reference to an ENTRANCE SENSOR. + + + + + + Identifier of a ENTRANCE SENSOR. + + + + + + + + + Type for identifier of SENSOR IN SPOT. + + + + + + Identifier of a SENSOR IN SPOT. +V2.0 + + + + + Type for a reference to a SENSOR IN SPOT. + + + + + + Identifier of a SENSOR IN SPOT. + + + + + + + + + Type for identifier of SENSOR IN ENTRANCE. + + + + + + Identifier of a SENSOR IN ENTRANCE. +V2.0 + + + + + Type for a reference to a SENSOR IN ENTRANCE. + + + + + + Identifier of a SENSOR IN ENTRANCE. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd new file mode 100644 index 000000000..7f133fec6 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -0,0 +1,376 @@ + + + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-06 + + + 2023-02-06 + Definition of CycleStorage number of spaces corrected. Doc change only. + + +

    NeTEx - Network Exchange. This subschema defines SENSOR EQUIPMENT base types.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_sensorEquipment_version.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + Unclassified + CEN, Crown Copyright 2009-2023 + + +
      +
    • Derived from the TransModel 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 Network Exchange - SENSOR Types of Equipment. + Standard +     +     + SENSOR EQUIPMENT types for NeTEx. +     + + + + Dummy type for +V2.0 + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + An EQUIPMENT used to monitor use of a space or entrance. + +V2.0 + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a SENSOR EQUIPMENT. + + + + + + + + + + + + Elements for SENSOR EQUIPMENT. + + + + + How sensor communicates with onboard hub. + + + + + + + + An EQUIPMENT used to monitor use of a LOCATABLE SPOT such as a passenger seat +. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a SPOT SENSOR. + + + + + + + + + + + + Elements for SPOT SENSOR. + + + + + + + AN EQUIPMENT used to monitor or count passengers using a PASSENGER ENTRANCE. + +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a ENTRANCE SENSOR. + + + + + + + + + + + + Elements for ENTRANCE SENSOR. + + + + + + + Type for a list of SENSORs in SPOT. + + + + + + + + + + + + Use of a specific SPOT SENSOR to monitor a specific LOCATABLE SPOT. ++v2.0 + + + + + + + + + + + + + + + + + + Identifier of SENSOR IN SPOT. + + + + + + + + + Type for a SENSOR IN SPOT + + + + + + + + + + + + Elements for a SENSOR IN SPOT. + + + + + + + + + + Type for a list of SENSORs in ENTRANCE. + + + + + + + + + + + + Use of a specific ENTRANCE SENSOR to monitor a specific DECK ENTRANCE. ++ v2.0 + + + + + + + + + + + + + + + + + + Identifier of SENSOR IN ENTRANCE. + + + + + + + + + Type for a SENSOR IN ENTRANCE + + + + + + + + + + + + Elements for a SENSOR IN ENTRANCE. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd new file mode 100644 index 000000000..65f169b28 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -0,0 +1,164 @@ + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-06 + + + 2023-02-0 + Split out from Charging Equipoment + + +

    NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT types

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_spotEquipment_support.xsd + [ISO 639-2/B] ENG + CEN TC278 WG3 SG9 + + Unclassified + CEN, Crown Copyright 2009-2023 + + +
      +
    • Added fro NExTex new modes.
      • +
    + + 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 Network Exchange - SPOT EQUIPMENT identifier types. + Standard +     +     + SPOT EQUIPMENT identifier types for NeTEx. +     + + + + Type for identifier of SPOT EQUIPMENT. + + + + + + Identifier of a SPOT EQUIPMENT. +V2.0 + + + + + Type for a reference to a SPOT EQUIPMENT. + + + + + + Identifier of a SPOT EQUIPMENT. + + + + + + + + + Type for identifier of SEAT EQUIPMENT. + + + + + + Identifier of a SEAT EQUIPMENT. +v2.0 + + + + + Type for a reference to a SEAT EQUIPMENT. + + + + + + Identifier of a SEAT EQUIPMENT. + + + + + + + + + Type for identifier of BED EQUIPMENT. + + + + + + Identifier of a BED EQUIPMENT. +v2.0 + + + + + Type for a reference to a BED EQUIPMENT. + + + + + + Identifier of a BED EQUIPMENT. + + + + + + + + + Type for identifier of LUGGAGE BAY EQUIPMENT. + + + + + + Identifier of a LUGGAGE BAY EQUIPMENT. +v2.0 + + + + + Type for a reference to a LUGGAGE BAY EQUIPMENT. + + + + + + Identifier of a LUGGAGE BAY EQUIPMENT. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd new file mode 100644 index 000000000..a94ea554a --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -0,0 +1,359 @@ + + + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-06 + + + 2023-02-06 + Definition of CycleStorage number of spaces corrected. Doc change only. + + +

    NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT base types.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_spotEquipment_version.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + + Unclassified + CEN, Crown Copyright 2009-2023 + + +
      +
    • Derived from the TransModel 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 Network Exchange - SPOT Types of Equipment. + Standard +     +     + SPOT EQUIPMENT types for NeTEx. +     + + + + An abstract EQUIPMENT in a LOCATABLE SPOT providing a onboard seat, bed or other amenity. +V2.0 + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + An abstract EQUIPMENT in a LOCATABLE SPOT providing a onboard seat, bed or other amenity. +V2.0 + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a SPOT EQUIPMENT. + + + + + + + + + + + + Elements for SPOT EQUIPMENT. + + + + + Width of seat bottom. + + + + + Height from bloor + + + + + Whether spot has power supply socket. + + + + + Whether Spot has UsbPowerSockets. + + + + + + + + A specialisation of SPOT EQUIPMENT describing the detailed properties of a seat. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a SEAT EQUIPMENT. + + + + + + + + + + + + Elements for SEAT EQUIPMENT. + + + + + Height of Seat back from seat bottom. + + + + + Depgth of Seat from front to back. + + + + + Whether seat folds up. default is false + + + + + Whether seat reclines. Deafult sis false. + + + + + + + + A specialisation of SPOT EQUIPMENT describing the detailed properties of a bed. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a BED EQUIPMENT. + + + + + + + + + + + + Elements for BED EQUIPMENT. + + + + + Length of bedt back from seat bottom. + + + + + Whether bed can be stowed away when not in use. + + + + + + + + A specialisation of SPOT EQUIPMENT describing the detailed properties of a luggage bay. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a LUGGAGE BAY EQUIPMENT. + + + + + + + + + + + + Elements for LUGGAGE BAY EQUIPMENT. + + + + + Whether bay is lockable. + + + + + Whether bay is has a door. + + + + +     \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index b39972ef9..da606483a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -1,5 +1,5 @@ - + @@ -14,28 +14,37 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2012-04-15Revise Passenger Capacity + + 2012-04-15Revise Passenger Capacity - 2019-04-09Add list of vehicle type refs for PARKING and general use + + 2019-04-09Add list of vehicle type refs for PARKING and general use - 2020-08-11Issue #110 Add missing fuel types + + 2020-08-11Issue #110 Add missing fuel types electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - 2020-10-04NewModes: Add list of VEHICLEs. + + 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-04-19NewModes: GBFS compatibility Add car to vehicle Types - 2021-07-07NewModes: Add extra fuel types from APDS + + 2021-07-07NewModes: Add extra fuel types from APDS - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit

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

    @@ -571,6 +580,32 @@ Rail transport, Roads and Road transport + + + + Type for identifier of a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + Reference to a VEHICLE EQUIPMENT PROFILE MEMBER + + + + + Type for a reference to a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + Identifier of referenced VEHICLE EQUIPMENT PROFILE MEMBER + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index a243e12d0..57d85a426 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1,5 +1,5 @@ - + @@ -20,16 +20,21 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-03-27CR0001 - Vehicle Dimensions added. + + 2017-03-27CR0001 - Vehicle Dimensions added. - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -37,9 +42,11 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit

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

    @@ -637,6 +644,7 @@ Rail transport, Roads and Road transport + Type for a list of PASSENGER CAPACITY REQUIREMENTs. @@ -1211,6 +1219,83 @@ Rail transport, Roads and Road transport     + + + Members of Vehicle Profile. +v2.0 + + + + + + + + Type for a list of VEHICLE EQUIPMENT PROFILE MEMBERs. + + + + + + + + + + + + A element within a VEHICLE EQUIPMENT PROFILE specifying the number of units of a given TYPE OF EQUIPMENT. + + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + + + + Type for a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + + + + + Elements for a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Name of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Description of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Number of units of EQUIPMENT. + + + @@ -1234,7 +1319,7 @@ Rail transport, Roads and Road transport - Identifier of PURPOSE OF EQUIMENT PROFILE. + Identifier of PURPOSE OF EQUIPMENT PROFILE. @@ -1243,7 +1328,7 @@ Rail transport, Roads and Road transport - Type for a PURPOSE OF EQUIPMENT. + Type for a PURPOSE OF EQUIPMENT PROFILE. @@ -1252,7 +1337,8 @@ Rail transport, Roads and Road transport - 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_licenceA type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence).", +V2.0 + @@ -1268,9 +1354,9 @@ Rail transport, Roads and Road transport - + - Identifier of the TYPE OF DRIVER PERMIT. + Identifier of TYPE OF DRIVER PERMIT. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 77fe9293b..7794a4c3e 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -1,10 +1,11 @@ - + - + + @@ -131,7 +132,7 @@ Rail transport, Roads and Road transport - Reference or inline declaration of SCHEDULED STOP POINT which is being assigned + Reference or inline declaration of SCHEDULED STOP POINT which is being assigned. @@ -189,7 +190,7 @@ Rail transport, Roads and Road transport - STOP PLACE to which SCHEDULED STOP POINT is to be assigned. + STOP PLACE to which SCHEDULED STOP POINT is to be assigned. @@ -203,7 +204,7 @@ Rail transport, Roads and Road transport - BOARDING POSITION to which SCHEDULED STOP POINT is to be assigned. + BOARDING POSITION to which SCHEDULED STOP POINT is to be assigned. @@ -360,7 +361,12 @@ Rail transport, Roads and Road transport - A specific ENTRANCE to the VEHICLE. E.g. Front, rear. + Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. + + + + + Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 4aabad0c7..5e5838751 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -14,13 +14,16 @@ 2010-09-04 - 2017-05-09 Add Header + + 2017-05-09 Add Header - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - 2020-10-08New Modes: Widen VehicleType to TransportType + + 2020-10-08New Modes: Widen VehicleType to TransportType

    NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

    diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd index b0871ebe4..cb6c8d15f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd @@ -1,12 +1,16 @@ - + - + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd new file mode 100644 index 000000000..441cf088b --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd @@ -0,0 +1,103 @@ + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-12 + + + 2023-02-12 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK ENTRANCE ALIGNMENT 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_deckEntranceAlignment_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 2023-2023 + + +
      +
    • Derived from the Transmodel 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 DECK ENTRANCE ALIGNMENT types. + Standard +     +     + DECK ENTRANCE ALIGNMENT identifier types +     + + + + Type for a list of DECK ENTRANCE ASSIGNMENTs. + + + + + + + + + + + + Type for identifier of a DECK ENTRANCE ASSIGNMENT. + + + + + + Reference to a DECK ENTRANCE ASSIGNMENT. +v2.0 + + + + + Type for a reference to a DECK ENTRANCE ASSIGNMENT. + + + + + + Identifier of a DECK ENTRANCE ASSIGNMENT. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd new file mode 100644 index 000000000..9089b9fd4 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -0,0 +1,136 @@ + + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-01-30 + + + 2023-01-30 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK ENTRANCE ALIGNMENT 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_deckEntranceAlignment_version.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 2022-2023 + + +
      +
    • Derived from the Transmodel, 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 DECKENTRANCE ALIGNMENT types. + Standard +     +     + DECK ENTRANCE ALIGNMENT data types +     + + + + + Type for containment in frame of DECK ENTRANCE ASSIGNMENTs + + + + + + + + + + + + The association of a DECK ENTRANCE of a VEHICLE's DECK PLAN  with a TRAIN and TRAIN COMPONENT and a specific STOP PLACE,  QUAY and possibly BOARDING POSITION.    NOTE: may indicate which side of VEHICLE door is. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of DECK ENTRANCE ASSIGNMENT. + + + + + + + + + Type for a DECK ENTRANCE ASSIGNMENT. + + + + + + + + + + + + Elements for a DECK ENTRANCE ASSIGNMENT. + + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd new file mode 100644 index 000000000..82ebf5f21 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -0,0 +1,103 @@ + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-02-12 + + + 2023-02-312 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK PLAN ASSIGNMENT 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_deckPlanAssignment_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 2023-2023 + + +
      +
    • Derived from the Transmodel 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 DECK PLAN ASSIGNMENT types. + Standard +     +     + DECK PLAN ASSIGNMENT identifier types +     + + + + Type for a list of DECK PLAN ASSIGNMENTs. + + + + + + + + + + + + Type for identifier of a DECK PLAN ASSIGNMENT. + + + + + + Reference to a DECK PLAN ASSIGNMENT. +v2.0 + + + + + Type for a reference to a DECK PLAN ASSIGNMENT. + + + + + + Identifier of a DECK PLAN ASSIGNMENT. + + + + + + +     \ No newline at end of file diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd new file mode 100644 index 000000000..a262cd7d9 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -0,0 +1,139 @@ + + + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2023-01-30 + + + 2023-01-30 + Name Space changes + + +

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

    +

    This sub-schema describes the DECK PLAN ASSIGNMENT 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_deckPlanAssignment_version.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 2022-2023 + + +
      +
    • Derived from the Transmodel, 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 DECK PLAN ASSIGNMENT types. + Standard +     +     + DECK PLAN ASSIGNMENT data types +     + + + + + Type for containment in frame of DECK PLAN ASSIGNMENTs + + + + + + + + + + + + DECK PLAN ASSIGNMENT: The allocation of a DECK PLAN to all or part of a specific VEHICLE JOURNEY and /or VEHICLE  TYPE and/or TRAIN ELEMENT. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Identifier of DECK PLAN ASSIGNMENT. + + + + + + + + + Type for a DECK PLAN ASSIGNMENT. + + + + + + + + + + + + Elements for a DECK PLAN ASSIGNMENT. + + + + + + + + + +     \ No newline at end of file From 05620e0aaacbee6f55c231b35c2b1fa2755e9f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 16 Dec 2023 19:57:12 +0100 Subject: [PATCH 002/144] recreated commit 29ee965 --- .../netex_timetableFrame_version.xsd | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 5e5838751..cb9cbc3ae 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -1,9 +1,10 @@ - + + @@ -109,7 +110,7 @@ Rail transport, Roads and Road transport - Default properties of elements in TIMETABLE FRAME. Use these values on child elements if not specified on individual elements. + Default properties of elements in TIMETABLE FRAME. Use these values on child elements if not specified on individual elements. @@ -122,7 +123,7 @@ Rail transport, Roads and Road transport - Default properties of elements in TIMETABLE FRAME. Use these values if not specified on individual elements. + Default properties of elements in TIMETABLE FRAME. Use these values if not specified on individual elements. @@ -179,7 +180,7 @@ Rail transport, Roads and Road transport - FREQUENCY GROUPs In frame. Can be used to template VEHICLE JOURNEYs. + FREQUENCY GROUPs In frame. Can be used to template VEHICLE JOURNEYs. @@ -194,17 +195,22 @@ Rail transport, Roads and Road transport - JOURNEY COUPLINGs in frame. + JOURNEY COUPLINGs in frame. - JOURNEY COUPLINGs in frame. + COUPLED JOURNEYs in frame. - SERVICE FACILITies in frame. + SERVICE FACILITies in frame. + + + + + DECK PLAN ASSIGNMENTs in frame. From 8648bcf4db914274d0b8f8d282e4998ef1978b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 16 Dec 2023 20:10:53 +0100 Subject: [PATCH 003/144] rebuild commit 0eddb08 --- NeTEx.spp | 9 +- .../netex_deckPlan_support.xsd | 28 +++- .../netex_deckPlan_version.xsd | 76 +++++++++- .../netex_seatingPlan_support.xsd | 28 +++- .../netex_seatingPlan_version.xsd | 78 +++++++++-- .../netex_sensorEquipment_support.xsd | 54 +------- .../netex_sensorEquipment_version.xsd | 131 +----------------- .../netex_deckPlanAssignment_version.xsd | 3 +- 8 files changed, 202 insertions(+), 205 deletions(-) diff --git a/NeTEx.spp b/NeTEx.spp index 31e48a9a3..2b134afef 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -147,7 +147,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -1018,5 +1018,6 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 780baa602..4e83897ac 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -573,5 +573,31 @@     + + + + Type for identifier of SENSOR IN ENTRANCE. + + + + + + Identifier of a SENSOR IN ENTRANCE. +V2.0 + + + + + Type for a reference to a SENSOR IN ENTRANCE. + + + + + + Identifier of a SENSOR IN ENTRANCE. + + + + + - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 592c7d4b1..d5ec0e4f4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -315,7 +315,7 @@     - An area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT delimiting a particular use such as seating, WC, bar, gangway, etc. May be specialised, e.g. as PASSENGER SPACE ; may contain other spaces. Different types of space may overlap. +v2.0. + An area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT delimiting a particular use such as seating, WC, bar, gangway, etc. May be specialised, e.g. as PASSENGER SPACE ; may contain other spaces. Different types of space may overlap. +v2.0. @@ -441,7 +441,8 @@ - +v2.0 + A specialisation of DECK SPACE defining an area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT for use by passengers. _2.0 ++v2.0 @@ -538,7 +539,7 @@ - +v2.0 + A specialisation of DECK SPACE defining an area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT for restricted use, such as a crew area. +v2.0 @@ -770,8 +771,7 @@ - A normal entrance for passengers to or within a DECK. -+v2.0 + An entrance for passenger vehicles to or within a DECK. +v2.0 @@ -1039,6 +1039,68 @@ + + + + Type for a list of SENSORs in ENTRANCE. + + + + + + + + + + + + Use of a specific ENTRANCE SENSOR to monitor a specific DECK ENTRANCE. ++ v2.0 + + + + + + + + + + + + + + + + + + Identifier of SENSOR IN ENTRANCE. + + + + + + + + + Type for a SENSOR IN ENTRANCE + + + + + + + + + + + + Elements for a SENSOR IN ENTRANCE. + + + + + + @@ -1149,7 +1211,7 @@ - An identified level (1, 2 ,3 ) within the DECK PLAN of a VEHICLE (boat, airplane, etc). +v2.0 + An identified level (1, 2 , 3, etc. ) within the DECK PLAN of a VEHICLE (boat, train, airplane, etc). +v2.0 . +v2.0 @@ -1230,7 +1292,7 @@ - Capacity of a DECK SPACE for passengers or LOCATABLE SPOTs.+v2.0 + The capacity of a DECK SPACE for passengers and other payload in terms of TYPES OF LOCATABLE SPOTs. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 5ca754a16..3c0043062 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -324,5 +324,31 @@ + + + + Type for identifier of SENSOR IN SPOT. + + + + + + Identifier of a SENSOR IN SPOT. +V2.0 + + + + + Type for a reference to a SENSOR IN SPOT. + + + + + + Identifier of a SENSOR IN SPOT. + + + + + - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 8d9e88caf..60bacb8e2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -1,6 +1,7 @@ + @@ -78,7 +79,7 @@ - A Row of LOCATABLE SPOTs, e.g. seats, within a PASSENGER SPACE. +v2.0 + A designated row of LOCATABLE SPOTs, e.g. seats, within a PASSENGER SPACE. v2.0 @@ -147,7 +148,7 @@ - A File of LOCATABLE SPOTs within a PASSENGER SPACE, For example Column A, B, C, D. +v2.0 + A designated File of LOCATABLE SPOTs within a PASSENGER SPACE, For example Column A, B, C, D. +v2.0 @@ -205,7 +206,7 @@ - A place where ACTUAL VEHICLE EQUIPMENT may be located. +v2.0 + A place aboard a vehicle where ACTUAL VEHICLE EQUIPMENT may be located. +v2.0 @@ -273,7 +274,7 @@ - An identifiable individual area within a given PASSENGER SPACE, which may potentially be allocated to a single passenger or +v2.0 + An identifiable individual area within a given PASSENGER SPACE, which may potentially be allocated to a single passenger or +v2.0 @@ -408,8 +409,7 @@ - A specified seat or other space for a passenger within a given DECK SPACE. +v2.0 - +v2.0. + A designated seat or other space for a passenger within a given DECK SPACE. +v2.0. @@ -463,7 +463,7 @@ - A specified onboard space to carry a vehicle (car, motorcycle, cycle, etc) within a given DECK SPACE. +v2.0. + A designated space to stow a passenger's luggage onboard.+v2.0. @@ -638,5 +638,67 @@ + + + + Type for a list of SENSORs in SPOT. + + + + + + + + + + + + Use of a specific SPOT SENSOR to monitor a specific LOCATABLE SPOT. ++v2.0 + + + + + + + + + + + + + + + + + + Identifier of SENSOR IN SPOT. + + + + + + + + + Type for a SENSOR IN SPOT + + + + + + + + + + + + Elements for a SENSOR IN SPOT. + + + + + + - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd index c08616030..b9cb99e98 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -144,57 +144,5 @@ - - - - Type for identifier of SENSOR IN SPOT. - - - - - - Identifier of a SENSOR IN SPOT. +V2.0 - - - - - Type for a reference to a SENSOR IN SPOT. - - - - - - Identifier of a SENSOR IN SPOT. - - - - - - - - - Type for identifier of SENSOR IN ENTRANCE. - - - - - - Identifier of a SENSOR IN ENTRANCE. +V2.0 - - - - - Type for a reference to a SENSOR IN ENTRANCE. - - - - - - Identifier of a SENSOR IN ENTRANCE. - - - - - - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd index 7f133fec6..d95b24fc8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -1,6 +1,5 @@ - @@ -89,9 +88,7 @@ - An EQUIPMENT used to monitor use of a space or entrance. - +V2.0 - + An EQUIPMENT used to measure values relevant for some monitoring function, for example to monitor use of a space or entrance. +V2.0 @@ -249,128 +246,4 @@ - - - - Type for a list of SENSORs in SPOT. - - - - - - - - - - - - Use of a specific SPOT SENSOR to monitor a specific LOCATABLE SPOT. -+v2.0 - - - - - - - - - - - - - - - - - - Identifier of SENSOR IN SPOT. - - - - - - - - - Type for a SENSOR IN SPOT - - - - - - - - - - - - Elements for a SENSOR IN SPOT. - - - - - - - - - - Type for a list of SENSORs in ENTRANCE. - - - - - - - - - - - - Use of a specific ENTRANCE SENSOR to monitor a specific DECK ENTRANCE. -+ v2.0 - - - - - - - - - - - - - - - - - - Identifier of SENSOR IN ENTRANCE. - - - - - - - - - Type for a SENSOR IN ENTRANCE - - - - - - - - - - - - Elements for a SENSOR IN ENTRANCE. - - - - - - - \ No newline at end of file + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index a262cd7d9..5a12428a1 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -81,8 +81,7 @@ - DECK PLAN ASSIGNMENT: The allocation of a DECK PLAN to all or part of a specific VEHICLE JOURNEY and /or VEHICLE  TYPE and/or TRAIN ELEMENT. +v2.0 - + The allocation of a DECK PLAN to all or part of a specific VEHICLE JOURNEY and /or VEHICLE TYPE and/or TRAIN ELEMENT. +v2.0 From 2568a55b6630958635787445780f5efa6fea5169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 16 Dec 2023 20:25:47 +0100 Subject: [PATCH 004/144] incluse #574. but had to comments things out --- .../netex_accessRightParameter_version.xsd | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index bf557ffe2..294f2f463 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -1,9 +1,11 @@ - + + + @@ -22,6 +24,7 @@ + @@ -121,7 +124,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2023
      @@ -325,7 +328,7 @@ Rail transport, Roads and Road transport - + One to many Relationship for temporal validity parameters. @@ -343,15 +346,17 @@ Rail transport, Roads and Road transport Temporal validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. + - + + One to many Relationship for scoping validity parameters. @@ -376,7 +381,7 @@ Rail transport, Roads and Road transport Network validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. - + Route validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. @@ -451,7 +456,9 @@ Rail transport, Roads and Road transport SITE validity parametersfor ACCESS RIGHT PARAMETER ASSIGNMENT. + + @@ -479,7 +486,7 @@ Rail transport, Roads and Road transport - + ROUTE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. @@ -561,15 +568,29 @@ Rail transport, Roads and Road transport - Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. + Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PAssengerSeatRef is DEPRECATED + + + + + + Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PAssengerSeatRef is DEPRECATED + + + + + + + + CLASS OF USE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. @@ -610,6 +631,7 @@ Rail transport, Roads and Road transport + @@ -623,6 +645,7 @@ Rail transport, Roads and Road transport + @@ -633,6 +656,7 @@ Rail transport, Roads and Road transport + From beefced16c2825b28908753104d6df51284fed07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 16 Dec 2023 20:59:19 +0100 Subject: [PATCH 005/144] implements commit fa43f0f --- .../site/Netex_11_Sites_OlympicPark_1.xml | 86 ++- .../netex_zone_support.xsd | 48 +- .../netex_zone_version.xsd | 160 +++-- .../part1_frames/netex_siteFrame_version.xsd | 21 +- .../part1_ifopt/netex_ifopt_site_support.xsd | 122 +++- .../part1_ifopt/netex_ifopt_site_version.xsd | 231 +++++++- xsd/netex_part_1/part1_ifopt/tmp0000.xsd | 553 ++++++++++++++++++ .../netex_accessRightParameter_version.xsd | 9 +- 8 files changed, 1104 insertions(+), 126 deletions(-) create mode 100644 xsd/netex_part_1/part1_ifopt/tmp0000.xsd diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml index af2d7d05a..b7c615b4f 100644 --- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml +++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml @@ -149,7 +149,7 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram A COMPOSITE FRAME is used to group the other frames as a single version -(C) CEN Copyright 2010 +(C) CEN Copyright 2010, 2023 --> 2001-12-17T09:30:47.0Z @@ -491,6 +491,28 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram ENG + + + Sites in Olympic Park + + + + + + + + + + + + + + + + + + + @@ -4224,6 +4246,52 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram wellLit 80000 + + + Level 1 + true + + + Level 2 + true + + + Level 3 + true + + + + + East Access Block + + + 1 + + + + 2 + + + + 3 + + + + + + West Access Block + + + 1 + + + + 2 + + + + + Hockey Centre @@ -4734,6 +4802,22 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram + + + + + + + + + + + Zone3 + + + Zone4 + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 327247dcd..d5a6e4db4 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -1,5 +1,5 @@ - + @@ -29,7 +29,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2023
        @@ -54,7 +54,7 @@ Rail transport, Roads and Road transport ZONE identifier types for NeTEx. - + Type for identifier of a ZONE. @@ -75,8 +75,6 @@ Rail transport, Roads and Road transport - - @@ -85,7 +83,7 @@ Rail transport, Roads and Road transport - + Dummy type Reference to a TARIFF ZONE. @@ -165,5 +163,43 @@ Rail transport, Roads and Road transport + + + + Reference to a GROUP OF TARIFF ZONEs. + + + + + Type for a GROUP OF TARIFF ZONEs. + + + + + + Identifier of a GROUP OF TARIFF ZONEs. + + + + + + + + Type for identifier of a GROUP OF TARIFF ZONEs. + + + + + + Type for a list of GROUP OF TARIFF ZONEs. + + + + + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index c0cd2ad06..7157316af 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -1,5 +1,5 @@ - + @@ -21,13 +21,17 @@ 2017-03-28 Add Zones to RESOURCE FRAME - 2017-11-08Add TARIFF ZONE Presentation Group + + 2017-11-08Add TARIFF ZONE Presentation Group - 2018-03-09Correct Type on GENERAL ZONE element + + 2018-03-09Correct Type on GENERAL ZONE element - 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy + + 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy - 2021-01-25Add GroupOfTariffZones + + 2021-01-25Add GroupOfTariffZones

        NeTEx - Network Exchange. This subschema defines ZONE types.

        @@ -41,7 +45,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2023
          @@ -92,7 +96,7 @@ Rail transport, Roads and Road transport - + A two-dimensional PLACE within the service area of a public transport operator (administrative zone, TARIFF ZONE, ACCESS ZONE, etc.). @@ -144,7 +148,7 @@ Rail transport, Roads and Road transport - + A GENERAL ZONE used to define a zonal fare structure in a zone-counting or zone-matrix system. @@ -182,19 +186,26 @@ Rail transport, Roads and Road transport - - + + - Dummy TARIFF ZONE to workaround xML spy Substitution Group limitations + Type for list of GROUP OF TARIFF ZONES. - - + + + + + + + + + - A ZONE used to define a zonal fare structure in a zone-counting or zone-matrix system. + A grouping of TariffZones which will be commonly referenced for a specific purpose. +v2.0 - + @@ -206,66 +217,56 @@ Rail transport, Roads and Road transport - - - - - - - + - - - Reference to a TYPE OF TARIFF ZONE. - - + - + - Type for a TARIFF ZONE. + Type for GROUP OF TARIFF ZONES. - + - + - + - Presentation Elements of a ZONE+v1.1 + Elements for GROUP OF TARIFF ZONES. - - - Presentation values to use when rendering ZONE such as a colour. - - - + - Presentation values to use in printed material for ZONE such as a colour. +v1.1 + Public code for GROUP OF TARIFF ZONES. - + - Public identifier code of TARIFF ZONE. + TARIFF ZONEs in a GROUP OF TARIFF ZONES - - + + - A grouping of TARIFF ZONEs which will be commonly referenced for a specific purpose. + Dummy TARIFF ZONE to workaround xML spy Substitution Group limitations + + + + + A ZONE used to define a zonal fare structure in a zone-counting or zone-matrix system. - + @@ -277,64 +278,59 @@ Rail transport, Roads and Road transport - + + + + + + + - + + + Reference to a TYPE OF TARIFF ZONE. + + - + - Type for GROUP OF TARIFF ZONEs. + Type for a TARIFF ZONE. - + - + - + - Elements for GROUP OF TARIFF ZONEs. + Presentation Elements of a ZONE+v1.1 - + - TARIFF ZONEs in GROUP OF TARIFF ZONEs. + Presentation values to use when rendering ZONE such as a colour. + + + + + Presentation values to use in printed material for ZONE such as a colour. +v1.1 + + + + + Public identifier code of TARIFF ZONE. - - - Reference to a GROUP OF TARIFF ZONEs. - - - - - Type for a GROUP OF TARIFF ZONEs. - - - - - - Identifier of a GROUP OF TARIFF ZONEs. - - - - - - - - Type for identifier of a GROUP OF TARIFF ZONEs. - - - - + Classification of a ZONe. diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index 19915fb12..72bf7e464 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -1,5 +1,5 @@ - + @@ -42,7 +42,7 @@ http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd Unclassified - CEN, Crown Copyright 2009-2017 + CEN, Crown Copyright 2009-2023
            @@ -153,6 +153,11 @@ Rail transport, Roads and Road transport SITE related elements in frame. + + + GROUPS of SITESs in frame. +v.0 + + GROUPS of STOP PLACEs in frame. @@ -209,17 +214,17 @@ Rail transport, Roads and Road transport - Service related elements in frame. + TARIFF ZONE related elements in frame. - + - TARIFF ZONEs in frame. + GROUPS OF TARIFF ZONEs in frame. +v2.0 - - + + - GROUPs of TARIFF ZONEs in frame. + TARIFF ZONEs in frame. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 045fe65ac..eacb8814d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -1,5 +1,5 @@ - + @@ -13,11 +13,14 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure + + 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure - 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration + + 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration

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

            @@ -58,10 +61,37 @@ Rail transport, Roads and Road transport Standard - NeTEX: SITE idenifier types. + NeTEX: SITE identifier types.             - + + + + Reference to a GROUP OF SITEs. + + + + + Type for a GROUP OF SITEs. + + + + + + Identifier of a GROUP OF SITEs. + + + + + + + Type for identifier of a GROUP OF SITEs. + + + + + + Identifier for a SITE ELEMENT. @@ -123,7 +153,7 @@ Rail transport, Roads and Road transport - + Identifier for a SERVICE SITE. @@ -149,7 +179,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a SITE COMPONENT. @@ -175,7 +205,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a LEVEL. @@ -201,7 +231,71 @@ Rail transport, Roads and Road transport - + + + + Identifier for a SITE STRUCTURE. + + + + + + Reference to a SITE STRUCTURE. + + + + + Type for identifier of a SITE STRUCTURE. + + + + + + Identifier of a SITE STRUCTURE. + + + + + + + + Type for a collection of one or more SITE STRUCTUREs. + + + + + + + + + + + + + Type for identifier of a LEVEL IN STRUCTURE. + + + + + + Reference to LEVEL of a LEVEL IN STRUCTURE. + + + + + Type for a reference to a LEVEL IN STRUCTURE. + + + + + + Identifier of a LEVEL IN STRUCTURE. + + + + + + Type for identifier of ENTRANCE. @@ -221,7 +315,7 @@ Rail transport, Roads and Road transport - Identifier of a PLACE. + Identifier of an ENTRANCE. @@ -239,7 +333,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a VEHICLE ENTRANCE. @@ -259,13 +353,13 @@ Rail transport, Roads and Road transport - Identifier of a PLACE. + Identifier of a VEHICLE ENTRANCE. - + Identifier for an ACCESS ZONE. 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 e02409e03..678983f58 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 @@ -1,5 +1,5 @@ - + @@ -8,6 +8,7 @@ + @@ -23,9 +24,11 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2020-10-10New Modes : Add PRESENTATGION To Site ELement + + 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

            @@ -43,7 +46,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2023
              @@ -68,6 +71,7 @@ Rail transport, Roads and Road transport NeTEx: SITE types. + A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. @@ -188,7 +192,7 @@ Rail transport, Roads and Road transport - + A type of PLACE, such as a STOP PLACE, POINT OF INTEREST or ADDRESS, to which passengers may wish to travel. @@ -254,7 +258,12 @@ Rail transport, Roads and Road transport - Entrances to and within SITE. + ENTRANCEs to and within SITE. + + + + + SITE STRUCTUREs within SITE. +v2.0 @@ -282,7 +291,7 @@ Rail transport, Roads and Road transport - + An element of a SITE describing part of its structure. SITE COMPONENTs share common properties for accessibility and other features. @@ -434,7 +443,7 @@ Rail transport, Roads and Road transport - + Type for a list of VEHICLE ENTRANCEs. @@ -517,7 +526,7 @@ Rail transport, Roads and Road transport - + Type for a list of LEVELs. @@ -618,7 +627,207 @@ Rail transport, Roads and Road transport - + + + + Type for list of GROUP OF SITES. + + + + + + + + + + + + A grouping of SITEs which will be commonly referenced for a specific purpose. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Type for GROUP OF SITES. + + + + + + + + + + + + Elements for GROUP OF SITES. + + + + + + Alternative names. + + + + + Public code for GROUP OF SITES. + + + + + SITEs in a GROUP OF SITEs + + + + + + + Elements for GROUP OF SITES. + + + + + Centre Coordinates of ZONE. + + + + + + Projections of SITE onto another layer. + + + + + + + + Type for list of SITE STRUCTURES. + + + + + + + + + + + + A building or a separate part thereof within a SITE. +v2.0 + + + + + + Type for a SITE STRUCTURE. + + + + + + + + + + + + Elements of a SITE STRUCTURE. + + + + + Name of GROUP OF ENTITies. + + + + + Further Description of a GROUP OF ENTITies. + + + + + + LEVELs found within SITe. + + + + + + + + Type for a list of ENTRANCEs. + + + + + + + + + + + + A LEVEL that is accessible in a SITE STRUCTURE with its relative lateral order in that SITE STRUCTURE counted from the bottom and upwards. +V2.0 + + + + + + Type for LEVEL IN STRUCTURE. + + + + + + + + + Order of LEVEL IN STRUCTURE within SITE STRUCTURE. + + + + + + + + Elements of a LEVEL IN STRUCTURE. + + + + + Label associated with LEVEL within SITE STRUCTURE. + + + + + Name of Level in SITE STRUCTURE + + + + + + Type for a list of ACCESS ZONEs. @@ -697,7 +906,7 @@ Rail transport, Roads and Road transport - + A sub-type of SITE which is of specific interest for the operator (e.g. where a joint service or a joint fee is proposed). diff --git a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd new file mode 100644 index 000000000..1186b8819 --- /dev/null +++ b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd @@ -0,0 +1,553 @@ + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] + Europe + Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema + + 2006-08-10 + + + 2006-09-21 + + + 2007-03-22 + + + 2019-03-25FR49 CD #65 Accessibility changes + CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip + NK Review: Reorder so as to place like elements toigether, add sub Groups to organize + + + 2019-03-28FR49 CD #65 Accessibility changes + NJSK Doc rewviewe + Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ + Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent + Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___ + + + NeTEx Network Exchange - PATH types. +

              +

              +               + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version.xsd + [ISO 639-2/B] ENG + CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR + + http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd + + Unclassified + CEN, Crown Copyright 2009-2019 + + +
                +
              • Evolved from NaPTAN, SIRI and other schemas.
                • +
              + + 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 Network Exchange (IFOPT subset) - STOP PLACE Schema Place . + Standard +               +               + IFOPT STOP PLACE Model. +               + + + + Common elements of a PATH. + + + + + + + Maximum number of passengers who can traverse PATH LINK per minute. + + + + + + + Common Navigation elements of a PATH. + + + + + Direction heading to show for PATH LINK when travelling in its FROM / TO sense. + + + + + Direction heading to show for PATH LINK when travelling in its TO / FROM sense. + + + + + Number of steps to take PATH LINK. + + + + + Minimum Height of PATH LINK. +v1.1 + + + + + Minimum Width of PATH LINK. +v1.1 + + + + + Allowed direction of use: one way or two way. Default is two way. + + + + + Whether PATH LINK is up down or level in from to direction. + + + + + Maximum gradient in degrees (in the direction of the PATH LINK way). +v1.1 + + + + + Coded value of the maximum gradient.+v1.1 + + + + + Maximum Tilt angle in degrees between -20 and 20 (in the direction of the PATH LINK way). +v1.1 + + + + + Coded value of the maximum tilt. See allowed va;ues. +v1.1 + + + + + + + Common Description elements of a PATH. + + + + + Type of physical feature of PATH LINK. + + + + + Type of passage feature of PATH LINK. + + + + + Type of flooring of the walking surface. +v1.1 + + + + + Type of border on the right side (in the direction of the PATH LINK). + + + + + Type of border on the left side (in the direction of the PATH LINK). +v1.1 + + + + + Nature of the tactile warning strips (in the direction of the PATH LINK). +v1.1 + + + + + Indicates whether there are guiding strips. +v1.1 + + + + + + + + A link between any two PLACEs (That is STOP PLACEs, ACCESS SPACEs or QUAYs, BOARDING POSITIONs, POINTs OF INTEREST etc or PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out of vehicle passengers within or between a PLACE. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a PATH LINK. + + + + + + + + + + + + Elements of a PATH LINK. + + + + + Origin end of PATH LINK. + + + + + Destination end of PATH LINK. + + + + + Description of PATH LINK. + + + + + + + + + + Duration properties of a LINK. + + + + + Timings for the transfer. + + + + + + + Type for a PATH LINK ENd. + + + + + Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. + + + + + Reference to a LEVEL on which SITE COMPONENT is found. + + + + + Reference to an ENTRANCE of a PLACE. + + + + + + + Elements of a PATH SITE ELEMENT. + + + + + + + + + Allowed MODEs to use in component. + + + + + + + + + Type for a list of SITE PATH LINKs. + + + + + + + + PATH LINK for a SITE. + + + + + + + + + A PATH LINK between two nodes that are SITE components, i.e. within a STOP PLACE or POINT OF INTEREST. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a SITE PATH LINK. + + + + + + + + + + + + + Elements of a SITE PATH LINK. + + + + + Additional public label for the SITE PATH LINK + + + + + + + + + Type for a list of PATH JUNCTIONs. + + + + + + + + PATH JUNCTION for a SITE. + + + + + + + + + A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a PATH LINK VIEW. + + + + + + + + + + + + Elements of a PATH JUNCTION. + + + + + Parent ZONE that contains this PATH JUNCTION. + + + + + Elements of a SITE ELEMENTs. + + + + + Additional Label of PATH JUNCTION. + + + + + PATH JUNCTION is within the referenced SITE COMPONENT. + + + + + + + + A VIEW of a PATH LINK used to select items for presentation. + + + + + + + + + Whether link should be hidden in the PATH LINK VIEW. + + + + + Whether destination of PATH LINK should be hidden. + + + + + Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. + + + + + Whether exit at end of PATH LINK should be shown as separate step in view. + + + + + Whether Heading element should be shown as separate step in view e.g. turn left right. + + + + + + + Identifier of Object of which this is a view. + + + + + + + + + Type for a PATH LINK VIEW. + + + + + + + Whether link should be hidden in the PATH LINK VIEW. + + + + + Whether destination of PATH LINK should be hidden. + + + + + Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. + + + + + Whether exit at end of PATH LINK should be shown as separate step in view. + + + + + Whether Heading element should be shown as separate step in view e.g. turn left right. + + + + + + + +               diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 294f2f463..632a27484 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -1,5 +1,6 @@ + @@ -8,8 +9,8 @@ + - @@ -18,6 +19,7 @@ + @@ -37,7 +39,6 @@ - @@ -147,7 +148,7 @@ Rail transport, Roads and Road transport Standard - NeTEx ACCESS RIGHT ASSIGNMENT types. + NeTEx ACCESS RIGHT ASSIGNMENT types. @@ -456,7 +457,7 @@ Rail transport, Roads and Road transport SITE validity parametersfor ACCESS RIGHT PARAMETER ASSIGNMENT.               - + From 26573ff7bf00f10b90d9a54807ed58fa6f22a034 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:01:15 +0000 Subject: [PATCH 006/144] Lint and update documentation tables --- .../functions/deckPlans/DeckPlans-Example.xml | 7 +++-- .../site/Netex_11_Sites_OlympicPark_1.xml | 6 ++--- xsd/NeTEx_publication.xsd | 8 +++--- .../netex_resourceFrame_version.xsd | 4 +-- .../netex_zone_support.xsd | 2 +- .../netex_zone_version.xsd | 12 +++------ .../netex_all_objects_reusableComponents.xsd | 10 +++---- .../netex_deckPlan_support.xsd | 5 ++-- .../netex_deckPlan_version.xsd | 7 +++-- ...etex_equipmentVehiclePassenger_support.xsd | 4 +-- ...etex_equipmentVehiclePassenger_version.xsd | 8 +++--- ...ex_nm_chargingEquipmentProfile_version.xsd | 1 - .../netex_seatingPlan_support.xsd | 5 ++-- .../netex_seatingPlan_version.xsd | 5 ++-- .../netex_sensorEquipment_support.xsd | 3 +-- .../netex_sensorEquipment_version.xsd | 3 +-- .../netex_spotEquipment_support.xsd | 5 ++-- .../netex_spotEquipment_version.xsd | 5 ++-- .../netex_vehicleType_support.xsd | 27 +++++++------------ .../netex_vehicleType_version.xsd | 25 +++++++---------- .../part1_frames/netex_siteFrame_version.xsd | 4 +-- .../part1_ifopt/netex_ifopt_site_support.xsd | 13 ++++----- .../part1_ifopt/netex_ifopt_site_version.xsd | 10 +++---- xsd/netex_part_1/part1_ifopt/tmp0000.xsd | 6 ++--- .../netex_stopAssignment_version.xsd | 3 +-- .../netex_timetableFrame_version.xsd | 11 +++----- .../netex_all_objects_part2_journeyTimes.xsd | 6 ++--- .../netex_deckEntranceAlignment_support.xsd | 5 ++-- .../netex_deckEntranceAlignment_version.xsd | 5 ++-- .../netex_deckPlanAssignment_support.xsd | 5 ++-- .../netex_deckPlanAssignment_version.xsd | 5 ++-- .../netex_accessRightParameter_version.xsd | 16 +++++------ 32 files changed, 97 insertions(+), 144 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 3b6d4874b..f46481c05 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1,5 +1,5 @@ - + @@ -4291,7 +4291,7 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram - + Hockey Centre @@ -4817,7 +4817,7 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram Zone4 - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index c54c53db9..4b39cdbd5 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -3496,7 +3496,7 @@ Correct COnstraints for PointOnRoute - + @@ -4062,7 +4062,7 @@ Correct COnstraints for PointOnRoute - + @@ -4126,7 +4126,7 @@ Correct COnstraints for PointOnRoute - + @@ -4189,7 +4189,7 @@ Correct COnstraints for PointOnRoute - + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index 1f8fee4b2..eeadd035d 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -114,8 +114,8 @@ Rail transport, Roads and Road transport - - + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index d5a6e4db4..88b100364 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -200,6 +200,6 @@ Rail transport, Roads and Road transport -               +               diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 7157316af..bf04a0241 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -21,17 +21,13 @@ 2017-03-28 Add Zones to RESOURCE FRAME - - 2017-11-08Add TARIFF ZONE Presentation Group + 2017-11-08Add TARIFF ZONE Presentation Group - - 2018-03-09Correct Type on GENERAL ZONE element + 2018-03-09Correct Type on GENERAL ZONE element - - 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy + 2019-02-25UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy - - 2021-01-25Add GroupOfTariffZones + 2021-01-25Add GroupOfTariffZones

              NeTEx - Network Exchange. This subschema defines ZONE types.

              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index 90f8d6c6e..8c480fb37 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -1,5 +1,5 @@ - + @@ -20,11 +20,11 @@ - + - + @@ -58,9 +58,9 @@ - + - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 4e83897ac..04a659d98 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,8 +13,7 @@ 2023-01-30 - - 2023-02-01 + 2023-02-01 Name Space changes @@ -598,6 +597,6 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index d5ec0e4f4..b00a4fbac 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -14,8 +14,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes @@ -1100,7 +1099,7 @@ - + @@ -1421,4 +1420,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 0790be8c6..12cde440d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport Reference to a WHEELCHAIR VEHICLE EQUIPMENT. - DEPRECATED + DEPRECATED @@ -136,7 +136,7 @@ Rail transport, Roads and Road transport Reference to a WHEELCHAIR VEHICLE EQUIPMENT. - + Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 62c3cd160..78a6172cf 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -16,16 +16,14 @@ 2011-12-16 - - 2021-01-29BUG Issue #143: Correct data type on GapToPlatform + 2021-01-29BUG Issue #143: Correct data type on GapToPlatform

              NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT

              text/xml - http://www.w3.org/2 - 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. + http://www.w3.org/2 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. 001/XMLSchema XML schema, W3C Recommendation 2001 @@ -98,7 +96,7 @@ Rail transport, Roads and Road transport -               +               An item of EQUIPMENT of a particular type actually available in an individual VEHICLE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd index 797883d3a..fdaacaf73 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd @@ -148,7 +148,6 @@ Rail transport, Roads and Road transport Normal period need to set up charging. - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 3c0043062..4430e4efd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,8 +13,7 @@ 2023-02-02 - - 2023-02-05 + 2023-02-05 Name Space changes @@ -349,6 +348,6 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 60bacb8e2..f1efba988 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -16,8 +16,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes @@ -699,6 +698,6 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd index b9cb99e98..9877029a6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -12,8 +12,7 @@ 2023-02-08 - - 2023-02-08 + 2023-02-08 Split out from Charging Equipoment diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd index d95b24fc8..bc28525a1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -13,8 +13,7 @@ 2023-02-06 - - 2023-02-06 + 2023-02-06 Definition of CycleStorage number of spaces corrected. Doc change only. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd index 65f169b28..d296eaeaa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -12,8 +12,7 @@ 2023-02-06 - - 2023-02-0 + 2023-02-0 Split out from Charging Equipoment @@ -161,4 +160,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index a94ea554a..bfa9f7faf 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -14,8 +14,7 @@ 2023-02-06 - - 2023-02-06 + 2023-02-06 Definition of CycleStorage number of spaces corrected. Doc change only. @@ -356,4 +355,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index da606483a..c070cb473 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -14,37 +14,28 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2012-04-15Revise Passenger Capacity + 2012-04-15Revise Passenger Capacity - - 2019-04-09Add list of vehicle type refs for PARKING and general use + 2019-04-09Add list of vehicle type refs for PARKING and general use - - 2020-08-11Issue #110 Add missing fuel types + 2020-08-11Issue #110 Add missing fuel types electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - - 2020-10-04NewModes: Add list of VEHICLEs. + 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-04-19NewModes: GBFS compatibility Add car to vehicle Types - - 2021-07-07NewModes: Add extra fuel types from APDS + 2021-07-07NewModes: Add extra fuel types from APDS - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 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 57d85a426..e50c24e6f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -20,21 +20,16 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-27CR0001 - Vehicle Dimensions added. + 2017-03-27CR0001 - Vehicle Dimensions added. - - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -42,11 +37,9 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit

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

              @@ -644,7 +637,7 @@ Rail transport, Roads and Road transport - + Type for a list of PASSENGER CAPACITY REQUIREMENTs. @@ -1295,7 +1288,7 @@ Rail transport, Roads and Road transport Number of units of EQUIPMENT.               - + diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index 72bf7e464..46e5d878f 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -157,7 +157,7 @@ Rail transport, Roads and Road transport GROUPS of SITESs in frame. +v.0 - + GROUPS of STOP PLACEs in frame. @@ -221,7 +221,7 @@ Rail transport, Roads and Road transport GROUPS OF TARIFF ZONEs in frame. +v2.0 - +               TARIFF ZONEs in frame. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index eacb8814d..22987f35e 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -13,14 +13,11 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure + 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure - - 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration + 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration

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

              @@ -89,9 +86,9 @@ Rail transport, Roads and Road transport               - + - + Identifier for a SITE ELEMENT. 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 678983f58..00931b446 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 @@ -8,7 +8,7 @@ - + @@ -24,11 +24,9 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2020-10-10New Modes : Add PRESENTATGION To Site ELement + 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

              @@ -71,7 +69,7 @@ Rail transport, Roads and Road transport NeTEx: SITE types.               - + A physical PLACE to which passengers may go. May have ACCESSIBILITY ASSESMENT and other properties to describe it. diff --git a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd index 1186b8819..862a4f4b3 100644 --- a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd +++ b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd @@ -22,13 +22,11 @@ 2007-03-22 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip NK Review: Reorder so as to place like elements toigether, add sub Groups to organize - - 2019-03-28FR49 CD #65 Accessibility changes + 2019-03-28FR49 CD #65 Accessibility changes NJSK Doc rewviewe Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 7794a4c3e..04f354733 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -4,8 +4,7 @@ - - + diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index cb9cbc3ae..f8827a4cf 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -4,7 +4,7 @@ - + @@ -15,16 +15,13 @@ 2010-09-04 - - 2017-05-09 Add Header + 2017-05-09 Add Header - - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - - 2020-10-08New Modes: Widen VehicleType to TransportType + 2020-10-08New Modes: Widen VehicleType to TransportType

              NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

              diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd index cb6c8d15f..7d444c31c 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd @@ -1,16 +1,16 @@ - + - + - + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd index 441cf088b..7ec2b0d29 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd @@ -13,8 +13,7 @@ 2023-02-12 - - 2023-02-12 + 2023-02-12 Name Space changes @@ -100,4 +99,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd index 9089b9fd4..ad264d39e 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -16,8 +16,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes @@ -133,4 +132,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd index 82ebf5f21..b7cc4e4d7 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -13,8 +13,7 @@ 2023-02-12 - - 2023-02-312 + 2023-02-312 Name Space changes @@ -100,4 +99,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index 5a12428a1..45f8b8251 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -17,8 +17,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes @@ -135,4 +134,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 632a27484..3781a51ae 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -6,7 +6,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -357,7 +357,7 @@ Rail transport, Roads and Road transport - + One to many Relationship for scoping validity parameters. @@ -459,7 +459,7 @@ Rail transport, Roads and Road transport - + @@ -591,7 +591,7 @@ Rail transport, Roads and Road transport - + CLASS OF USE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. @@ -632,7 +632,7 @@ Rail transport, Roads and Road transport - + @@ -646,7 +646,7 @@ Rail transport, Roads and Road transport - + @@ -657,7 +657,7 @@ Rail transport, Roads and Road transport - + From 60089963f2966efd740f790464414119fa3b7418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 22 Dec 2023 20:31:21 +0100 Subject: [PATCH 007/144] redo of #625 --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 00931b446..aa2c3cb0b 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 @@ -609,7 +609,7 @@ Rail transport, Roads and Road transport - Order of LEVELs. The level numbers are not absolute, but only give a relative order within the SITE. 0 should be the ground floor, even when it is often difficult to determine which one that is in a complex structure. Complex buildings can be modelled with multiple SITEs and referenced by SiteRef. + Primary relative order of LEVELs for SITE. -1, 0 +1 +2, etc, 0 should be the ground floor. Negative numbers can be used to indicate levels below ground level. Note that in a complex site alternative setes of level indicators may exist. E.g. Level 1 in one building part may be ground level in another; in this case SITE STRUCTUREs and LEVELs IN STRUCTURE can be used to represent the alternative numbering sets. From 6430952a46bf7efd93e9ab6bc2220c0e8f8b1660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:40:57 +0100 Subject: [PATCH 008/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 4430e4efd..3753b0a68 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -309,7 +309,7 @@               - Allowed values for Sepot Orientation. + Allowed values for Spot Orientation. From da2ecd35e4e327a7b4f4e3c7be326ad259196b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:09 +0100 Subject: [PATCH 009/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 3753b0a68..987991d51 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -294,7 +294,7 @@ - Allowed values for type of epassenger space. + Allowed values for type of passenger space. From ffce6c33e1f4370b3b59257a0edd70560524ca5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:22 +0100 Subject: [PATCH 010/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index f1efba988..de0f45a26 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -400,7 +400,7 @@               - Whether PASSENGER SPOT has a powr socket + Whether PASSENGER SPOT has a power socket. From 641c627945091361115b5670095203e0e2d3e6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:30 +0100 Subject: [PATCH 011/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index de0f45a26..416b55f4d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -462,7 +462,7 @@ - A designated space to stow a passenger's luggage onboard.+v2.0. + A designated space to stow a passenger's luggage onboard.+v2.0. From d7edd25faa39c49bb894261ff63bed32a5c49f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:39 +0100 Subject: [PATCH 012/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 416b55f4d..f95f2c769 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -537,7 +537,7 @@ - A specified space to stow a passenger's luggage onboard.+v2.0. + A specified space to stow a passenger's luggage onboard.+v2.0. From 9f058ce5878f6f5d2e469f1b05a8a6f8aa74871d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:47 +0100 Subject: [PATCH 013/144] Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_seatingPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index f95f2c769..f894bde44 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -595,7 +595,7 @@ - Height of LUGGAGE SPOT ifrom floor. + Height of LUGGAGE SPOT from floor. From 6b1ec9e5c962857cb5c2374e838e79876963d2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 29 Dec 2023 17:41:55 +0100 Subject: [PATCH 014/144] Update xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_spotEquipment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index bfa9f7faf..8c8d02704 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -224,7 +224,7 @@ - Whether seat reclines. Deafult sis false. + Whether seat reclines. Default is false. From c416510f6b8dd2db083fca8339bf3400a4c11366 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 17 Jan 2024 10:55:01 +0000 Subject: [PATCH 015/144] Enhancee Seeting plan 615 Add child beds Add extra enum values to bed ty[e --- .../netex_spotEquipment_support.xsd | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd index d296eaeaa..c3e38e1fc 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -12,9 +12,12 @@ 2023-02-06 - 2023-02-0 - Split out from Charging Equipoment - + + 2023-02-01Split out from Charging Equipoment + + + 2024-01-24Add btype of bed +

              NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT types

               @@ -28,7 +31,7 @@ CEN TC278 WG3 SG9 Unclassified - CEN, Crown Copyright 2009-2023 + CEN, Crown Copyright 2009-2024
                @@ -133,6 +136,21 @@ + + + Allowed values for TYPE OF BED. +v2.0 + + + + + + + + + + + + From bd36ba448c78064853c00b43973567342fed53c5 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 17 Jan 2024 11:07:19 +0000 Subject: [PATCH 016/144] Update netex_spotEquipment_version.xsd --- .../netex_spotEquipment_version.xsd | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index 8c8d02704..7a5041869 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -14,7 +14,8 @@ 2023-02-06 - 2023-02-06 + + 2023-02-06 Definition of CycleStorage number of spaces corrected. Doc change only. @@ -139,6 +140,11 @@ Width of seat bottom. + + + Length of bedt back from seat bottom. + + Height from bloor @@ -280,7 +286,7 @@ Elements for BED EQUIPMENT. - + Length of bedt back from seat bottom. @@ -290,6 +296,11 @@ Whether bed can be stowed away when not in use. + + + Length of bedt back from seat bottom. + + From 2aa3dcaca8288fe742a0869ef7460fd3a2802c2c Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Sat, 20 Jan 2024 23:37:04 +0000 Subject: [PATCH 017/144] Deck Plan examples and fixes Add bus and train examples for deck plans. Fix various equipment issues. Revise DEckPlanassignment --- NeTEx.spp | 3 +- .../deckPlans/DeckPlans-Example_bus.xml | 1886 ++++++++++ .../deckPlans/DeckPlans-Example_train.xml | 3345 +++++++++++++++++ xsd/NeTEx_publication.xsd | 270 +- .../netex_deckPlan_support.xsd | 87 +- .../netex_deckPlan_version.xsd | 121 +- ...etex_equipmentVehiclePassenger_version.xsd | 8 +- .../netex_facility_support.xsd | 75 +- .../netex_facility_version.xsd | 59 +- .../netex_seatingPlan_version.xsd | 24 +- .../netex_serviceRestrictions_support.xsd | 31 +- .../netex_spotEquipment_support.xsd | 33 +- .../netex_spotEquipment_version.xsd | 54 +- .../netex_trainElement_version.xsd | 30 +- .../netex_vehicleType_support.xsd | 166 +- .../netex_vehicleType_version.xsd | 92 +- .../netex_ifopt_equipmentAccess_support.xsd | 67 +- .../netex_ifopt_equipmentAccess_version.xsd | 33 +- ...netex_ifopt_equipmentPassenger_support.xsd | 97 +- ...netex_ifopt_equipmentPassenger_version.xsd | 114 +- .../netex_deckPlanAssignment_version.xsd | 30 +- 21 files changed, 6403 insertions(+), 222 deletions(-) create mode 100644 examples/functions/deckPlans/DeckPlans-Example_bus.xml create mode 100644 examples/functions/deckPlans/DeckPlans-Example_train.xml diff --git a/NeTEx.spp b/NeTEx.spp index 2b134afef..7f424e5d4 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -772,7 +772,8 @@ - + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml new file mode 100644 index 000000000..2694ec582 --- /dev/null +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -0,0 +1,1886 @@ + + + + 2020-12-17T09:30:47.0Z + SYS001 + + + 2020-12-17T09:30:46.0Z + SYS002 + Request for Erebus 1 tariff + + + + + 2020-01-01T00:00:00Z + + + + + + + + + + + P1M + Example of DeckPlans + + + + + 2023-01-01T00:00:00 + 2023-12-31T12:00:00 + + Deck Plan Example + This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + + + + mb + http://www.erebus.eu/ + erebus data + + + + + + + + + + + + erebus Operator specific common resources + + + + + + + feedback@erebus.eu + + + + + + Operator data + + + creates + Operation + erebus + + + + + Operator timetable data + + + creates + Planning + erebus + + + + + + + + MBK + erebus + erebus + erebus SA + operator +
                + Alpha1 + Metropolis + RH10 9UA + Metroland +
                + bus +                 +                 + + + + + Bench seat + Bench Seat contiguous with neighbour + 0.48 + 0.50 + 0.50 + false + + + Pulldown seat + 0.48 + 0.40 + 0.40 + true + + + Single seat + 0.48 + 0.50 + 0.45 + false + + + Seat sensor + cable + + + true + 1 + 2.00 + 1.80 + 2.00 + true + + + + 0.90 + 1.00 + 0.45 + 0 + + + 0.90 + 1.00 + 0.80 + 1.0 + + + + 1.20 + true + PT90S + + + true + foldingPair + true + true + false + + + External Door sensor + cable + + + + Spiral starcase from deck1 to deck2 + 2.0 + both + 6 + false + 8.00 + 12 + 0.10 + true + oneSide + 1.00 + + false + + + false + + true + true + 1 + + + Internal sensor on step + cable + + + + true + cashAndCard contactlessPaymentCard travelCard + + + paperStamp + true + true + Insert ticket into machine to obtain validation stamp + + + + + freeWifi + purchase + steps + freeSeating standing + seating pushchair wheelchair + noCycles baggageStorage pushchairsAllowed + noReservationsPossible + + + + + Double Decker Bus + Double decker bus with staircase. Wheelchair and luggage spaces on lower deck. + false + true + human + diesel + bus + + 60 + 20 + 2 + 1 + + false + 0.15 + 10 + 4 + 2000 + + + + + Double decker bus + + + Doors open Configuration + + + Doors shut Configuration + + + + + + + + + + + + + Lower Deck + + + + + Driver seat + + + 1 + + + + 1 + + + + false + 1 + + + Lower Deck seating area + + true + standardClass + + true + + + true + false + true + + + + true + false + + + + Front Door + 1.00 + 1.90 + + + 1 + + + + true + leftSide + 1 + 0.20 + external + true + true + true + + + + + + + + + Rear Door + 0.95 + 1.90 + + + 1 + + + + + + + true + leftSide + 2 + 0.20 + external + true + true + true + + + + + + + + + Downstairs Entrance to stairs + 0.80 + 1.90 + + + + + + internal + internal + false + + + + + + + + + + entry + + + + + + With rear door set open so passengers can alight when stopped in town + exit + open + + + + + + With rear door set shut + exit + shut + true + + + 43 + + + seat + 22 + + + standingSpace + 20 + + + wheelchairSpace + 1 + + + pushchairSpace + 2 + + + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + 1 + + + + 1 + + + + + + true + true + + + + + leftwards + + + + + + + + true + true + + + + rightwards + + + 1 + + + + + + true + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + true + + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + false + false + + + + forwards + + + + + + + + false + true + + + + forwards + + + + + + + + true + false + + + + forwards + + + + + + + + false + false + + + + + + + leftwards + + + + + + + + + + + Stairwell to upper deck + + + + 1 + + + + Stop button at top of stairs + + + + false + + + + Bottom of stairwell + 1.00 + 1.90 + internal + true + + + + Top of Stairwell + 1.00 + 1.90 + internal + true + + + + + + + + + + + + + + + entryAndExit + + + entryAndExit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Upper Deck + + + + Upper Deck seating area + + false + + + false + false + true + + + + true + false + + + Entrance to top of stairs + 0.80 + 2.00 + internal + + + + + seat + 37 + + + standingSpace + 12 + + + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + true + + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + false + false + + + + forwards + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + true + false + + + + forwards + + + + + + + + + + + + + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Basic Elements for map of bus + http:erebus.eu/plans/double_decker_floor_plan + + + Bottom Deck + + + + + Forward Entrance + + + + Rear Entrance + + + + Stairs + + + + + Top Deck + + + + + +                 + + Deck Plan Assignment Example + This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry . + + + To a particalar stopt + + + + + + + Board at front from position A + true + false + 1 + + Board at front + + + + + + + + Exit at rear from position A + + false + true + 1 + + exit at rear + + + + + + + + + + + + + Deck Plan Example + This is an example showing how one might assign a deck plan to a journey. + + + + 10:10:00 + + + + + + + + + In to centre + + + + 10:10:00 + 10:30:00 + + + Across centre - doors open + + + + 10:31:00 + 10:50:00 + + + Out of to centre doors open + + + + 10:50:00 + 11:20:00 + + + + + + + + Assign double decker bus to Journey - doors shut + + + + + + + Assign double decker bus to Journey - doors open + + + + + + + Assign double decker bus to Journey - doors shut + + + + + + + + + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY + + + + + +                 +                 +                 +                 diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml new file mode 100644 index 000000000..aa38f2820 --- /dev/null +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -0,0 +1,3345 @@ + + + + + + + 2020-12-17T09:30:47.0Z + SYS001 + + + 2020-12-17T09:30:46.0Z + SYS002 + + P1M + Example of DeckPlans + + + + + 2023-01-01T00:00:00 + 2023-12-31T12:00:00 + + Deck Plan Example + This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + + + + rc + http://www.fakerail.eu/ + Fake rail data + + + + + + + + + + Rail examples Sleeper wagon + + + + MRC + Motor Rail CO + Moto + Motovacation SA + operator +
                + Prince Rupert Street + Strelsau + z354 + Ruritania +
                + bus +                 +                 + + + + + Passenger Train door + true + hingedSingle + true + true + false + + + Sliding door to compartment + true + slidingSingle + false + true + true + + + Hinged door to compartment + true + hingedSingle + false + true + true + + + Passenger Train dor on car transporter + false + hingedSingle + false + false + + + External Door sensor + cable + + + true + slidingPair + true + true + true + + + External Door sensor + cable + + + + Bottom seat in couchette + 0.48 + 0.50 + 0.50 + false + + + Bottom seat in couchette + 0.48 + 0.50 + 0.50 + false + + + Bottom bed in couchette + 0.48 + true + true + bottomBunk + false + 1.0 + 0.50 + + + Middle bed in couchette + 2.0 + true + middleBunk + true + 1.0 + 0.50 + + + Top bed in couchette + 3.0 + true + topBunk + true + 1.2 + 0.50 + + + Standard carriage seate + 0.48 + 0.50 + 0.50 + false + + + Bold down chaire + 0.48 + 0.50 + 0.50 + true + + + true + 1 + 2.00 + 1.80 + 2.00 + true + + + + luggage area + 4.00 + 1.25 + 0.40 + 1.90 + luggageBay + 0.40 + false + + + luggage area + 2.00 + 0.20 + 1.50 + cycleRack + false + + + + toilet washbasin + 1 + true + + + + + + + General facilities + buffet + firstClass standardClass + suitableForWheelchairs + mobilePhoneFreeZone mobilePhoneUseZone noSmoking + freeWifi powerSupplySockets + nextStopIndicator passengerInformationDisplay realTimeConnections stopAnnouncements + toilet wheelchairAccessToilet wheelchairAccessToilet + couchette seating sleeper + C2 C6 T2 + baggageStorage baggageVan cyclesAllowedWithReservation luggageRacks + + + First class facilities + breakfastInCar + airConditioning heating + firstClass + blinds tintedWindows + powerSupplySockets publicWifi freeWifi + reservation + sleeper + + + firstClass + sleeper + 1 + lower + noSmoking mobilePhoneFreeZone + freeWifi + + + firstClass + doubleSleeper + C2 + 2 + freeWifi + + + + + firstClass + earlyBoardingPossibleBeforeDeparture + PT1H + + + firstClass + overnightStayOnboardAllowed + PT9H + + + + + Second class facilities + buffet + airConditioning heating + economyClass + blinds tintedWindows + powerSupplySockets publicWifi + reservation + couchette + + + secondClass + couchette + C6 + 6 + all + freeWifi + + + + + + General facilities + recharging + + + + + Rail Sleeper coach + Sleeper coach with 1st and second class compartments and WC at end + true + false + human + rail + + + + + + 60 + 20 + + + + + + 60 + 20 + + + false + 0.15 + 10 + 4 + 2000 + + + Rail Sleeper coach + Sleeper coach with 1st and second class compartments and WC at end + true + false + human + rail + + + allPassengerVehicles + + + false + 0.15 + 10 + 4 + 2000 + + + + 40447 Alpha - Charley Sleepor with Motorrail + [Vehicles2] [Velicles1] [Sleeper3] [Sleeper2] [Sleeper1] [Buffet1] [Engine] + true + electric + + + + 186 + + 126 + + 60 + + + + 32 + + + + + + + + + + Engine + + Engine + engine + + + + + + Buffet car A + carriage + economyClass + + + + + + + Sleeper Waggon B + sleeperCarriage + firstClass economyClass + + + + + + + Sleeper Waggon C + sleeperCarriage + firstClass economyClass + + + + + + + Sleeper Waggon D + sleeperCarriage + firstClass economyClass + + + + + + + Vehicle Wagon 1 + carTransporter + standardClass + + + + + + + Vehicle Wagon 2 + carTransporter + standardClass + + + + + + + + + Rail sleeper wagon + + + Day Configuration + + + + + + + Cairl sleeper wagon Passenger deck + + + + Corridor + + false + + + + + Front Door + 1.00 + 1.90 + + + 1 + + + + 1 + + + + + + + true + leftSide + 1 + 0.20 + external + true + true + true + + + + + + + + + Front Right External Door + 1.00 + 1.90 + + + 1 + + + + 1 + + + + true + rightSide + 1 + 0.20 + external + true + true + true + + + + + + + + + Rear External Door + 0.95 + 1.90 + + + 1 + + + + + + + + + + true + leftSide + 2 + 0.20 + external + true + true + true + + + + + + + + + Rear Right External Door + 0.95 + 1.90 + + + 1 + + + + + + + true + rightSide + 2 + 0.20 + external + true + true + true + + + + + + + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + true + frontEnd + communicating + false + true + true + + + + + + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + + + + true + backEnd + communicating + false + true + true + + + + + + + + + Compartment 1 door + 0.80 + 1.80 + + + + + + internal + true + false + + + + Compartment 1 door + 0.80 + 1.80 + + + + + + internal + true + false + + + Compartment 2 door + internal + true + false + + + Compartment 3 door + internal + true + false + + + Compartment 4 door + internal + true + false + + + Compartment 5 door + internal + true + false + + + Compartment 6 door + internal + true + false + + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + + + 1 + 4 + true + true + + + 2 + 14 + true + true + + + + 20 + + + standingSpace + 20 + + + true + + + + WC + + + 1 + + + + true + true + false + + + + CToilet door connecting to corridor + 0.80 + 1.80 + + + + + + true + true + false + + + + + Connected to corridor + + + + + + + entryAndExit + shut + + + + 1 + + + + + Compartment 1: Seats 01-02 + First class compartment with two beds + + true + standardClass + + true + + + true + false + true + + + + true + false + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + Connected to corridor + + + + + + + entryAndExit + shut + + + + + + leftwards + + 1.50 + true + true + + + 8 + + + + + + seat + 8 + + + + + + bed + 6 + + + standingSpace + 0 + + + false + + + + + backwards + 0.60 + 0.50 + 2.0 + + + + + + + + + + + + + + true + true + true + true + + + + forwards + + + + + + + + + + + + + + true + true + true + true + + + + + + + Compartment 2: Seats 02-03 + Rirst class with two beds + + true + standardClass + + true + + + true + false + true + + + + true + false + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + Connected to corridor + + + + + + + entryAndExit + shut + + + + 8 + + + + + + seat + 8 + + + + + + bed + 6 + + + standingSpace + 0 + + + false + + + + + backwards + 0.60 + 0.50 + 2.0 + + + + + + + + + + + + + + true + true + true + true + + + + forwards + + + + + + + + + + + + + + true + true + true + true + + + + + + + + Compartment 3 : Seats 05-12 + 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths + + true + standardClass + true + false + + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + entryAndExit + shut + + + + 8 + + + + + + 8 people as daytime compartment + seat + 8 + + + + + + 6 people as nightime couchette + bed + 6 + + + false + + + + + backwards + + + + + + + + + + + + + + + + + false + true + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + backwards + + + + + + + + + + + true + false + true + + + + + forwards + + + + + + + + + + + + + + + + + false + true + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + forwards + + + + + + + + + + + true + false + true + + + + + + Compartment 4 : Seats 12-20 + 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths + + true + standardClass + true + false + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + entryAndExit + shut + + + + 8 + + + + + + 8 people as daytime compartment + seat + 8 + + + + + + 6 people as nightime couchette + bed + 6 + + + false + + + + + backwards + + + + + + + + + + + + + + + + + false + true + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + backwards + + + + + + + + + + + true + false + true + + + + + forwards + + + + + + + + + + + + + + + + + false + true + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + forwards + + + + + + + + + + + true + false + true + + + + + + Compartment 5 : Seats 21-28 + 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths + + true + standardClass + true + false + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + entryAndExit + shut + + + + 8 + + + + + + 8 people as daytime compartment + seat + 8 + + + + + + 6 people as nightime couchette + bed + 6 + + + false + + + + + backwards + + + + + + + + + + + + + + + + + false + true + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + backwards + + + + + + + + + + + true + false + true + + + + + forwards + + + + + + + + + + + + + + + + + false + true + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + forwards + + + + + + + + + + + true + false + true + + + + + + compartment 6 : Seats 21-28 + 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths + + true + standardClass + true + false + + + + Compartment 1 door connecting to corridor + 0.80 + 1.80 + + + + + + true + firstClass + true + false + + + + + entryAndExit + shut + + + + 8 + + + + + + 8 people as daytime compartment + seat + 8 + + + + + + 6 people as nightime couchette + bed + 6 + + + false + + + + + backwards + + + + + + + + + + + + + + + + + false + true + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + backwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + backwards + + + + + + + + + + + true + false + true + + + + + forwards + + + + + + + + + + + + + + + + + false + true + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + forwards + + + + + + + + + + + + + + + + + false + true + + + + Seat only available in daytime + forwards + + + + + + + + + + + true + false + true + + + + + + WC + true + true + false + 1 + + + + angledRight + 0.5 + 2.5 + 2.0 + + + 1 + + + + + + + angledRight + 0.5 + 2.5 + 2.0 + + + 1 + + + + + + + angledRight + 0.5 + 2.5 + 2.0 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Rail sleeper wagon + + + Day Configuration + + + + + + + + Lower vehicle deck + true + + + + Lower vehicle deck + true + + + + + Car transporter Waggon - lower deck + + + + + Car area + + false + + + + + Passenger access left Door + 1.00 + 1.90 + + + 1 + + + + true + leftSide + 0.20 + external + true + true + false + + + + >Passenger access Right External Door + 1.00 + 1.90 + + + 1 + + + + true + rightSide + 1 + 0.20 + external + true + true + false + + + + Front End entrance + 4.00 + 5.00 + true + frontEnd + communicating + false + + + Back End entrance + 4.00 + 5.00 + true + backEnd + communicating + false + + + + + entryAndExit + shut + false + + + + entryAndExit + shut + false + + + + 4 + + + vehicleSpace + 4 + + + vehicleSpace + 2 + + + true + + + + + + + 5.0 + 9.0 + 3.40 + motorcycle microCar miniCar smallCar largeCar + + + + + + + 5.0 + 9.0 + 3.40 + motorcycle microCar miniCar smallCar largeCar + + + + + + + 5.0 + 21.0 + 3.40 + largeCar camperCar minibus carWithTrailer + + + + + + + + 5.0 + 9.0 + 3.40 + motorcycle microCar miniCar smallCar largeCar + + + + + + + 5.0 + 9.0 + 3.40 + motorcycle microCar miniCar smallCar largeCar + + + + + + + 5.0 + 21.0 + 3.40 + largeCar camperCar minibus carWithTrailer + + + + + + + Car transporter Waggon - upper deck + + + + + Car area + + false + + + + Front End entrance + 4.00 + 5.00 + true + frontEnd + communicating + false + + + Back End entrance + 4.00 + 5.00 + true + backEnd + communicating + false + + + 4 + + + vehicleSpace + 4 + + + true + + + + 5.0 + 9.0 + 3.0 + motorcycle microCar miniCar smallCar largeCar + + + + 5.0 + 9.0 + 3.0 + motorcycle microCar miniCar smallCar largeCar + + + + 5.0 + 9.0 + 3.0 + motorcycle microCar miniCar smallCar largeCar + + + + 5.0 + 9.0 + 3.0 + motorcycle microCar miniCar smallCar largeCar + + + + + + + + + + Rail sleeper wagon + + + Buffet car Passenger deck + + + + seating + + false + + + + + Front Door + 1.00 + 1.90 + + + 1 + + + + 1 + + + + + + + true + leftSide + 1 + 0.20 + external + true + true + true + + + + + + + + + Front Right External Door + 1.00 + 1.90 + + + 1 + + + + 1 + + + + true + rightSide + 1 + 0.20 + external + true + true + true + + + + + + + + + Rear External Door + 0.95 + 1.90 + + + 1 + + + + + + + + + + true + leftSide + 2 + 0.20 + external + true + true + true + + + + + + + + + Rear Right External Door + 0.95 + 1.90 + + + 1 + + + + + + + true + rightSide + 2 + 0.20 + external + true + true + true + + + + + + + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + true + frontEnd + communicating + false + true + true + + + + + + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + + + + true + backEnd + communicating + false + true + true + + + + + + + + + Compartment 1 door + 0.80 + 1.80 + + + + + + internal + true + false + + + + Compartment 1 door + 0.80 + 1.80 + + + + + + internal + true + true + + + Compartment 2 door + internal + true + false + + + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + entryAndExit + lockedShut + + + + + + 1 + 4 + true + true + + + 2 + 14 + true + true + + + + 20 + + + standingSpace + 20 + + + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + false + true + true + true + + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + + + + + + + + + + true + false + true + true + + + + + + WC + + + 1 + + + + true + true + false + 1 + + + + Luggage + true + true + false + + + Galley + false + true + false + + + buffet + false + true + false + + + Snack area + true + true + false + 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Basic Elements for map of wagon + http:railco.eu/plans/wagon_floor_plan + + + Bottom Deck + + + + Forward Entrance left + + + + Rear Entrance + + + + Toilet + + + + + +                 + + + Deck Plan - Train and Journey assignment Example + This is an example showing how one might assign a deck plan to a journey. Note that Train elements can specify a default deck plan + + + + 10:10:00 + + + + + + + + + In to centre + + + + 10:10:00 + 10:30:00 + + + Across centre - doors open + + + + 10:31:00 + 10:50:00 + + + + + + + + General service specific facilities + boardingAssistance conductor wheelchairAssistance + buffet + purchase + reservation + couchette seating sleeper + C2 C6 T2 + baggageStorage baggageVan cyclesAllowedWithReservation luggageRacks + + + + + + Day Coach leg of journey + + + + + + + + + + Night leg of journey + + + + + + + + + + + + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY + + + + + + + Rail Deck Plan Assignment Example + This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . + + + Assignment for train To a particular stop + + + + + + true + false + 1 + + Board at front + + + + + + + + false + true + 1 + + exit at rear + + + + + + + + + + +                 +                 +                 +                 diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 4b39cdbd5..874aa8753 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,26 +16,40 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2021-09-02NewModes: Add BatteyEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug + + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT + FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON - 2021-09-01NewModes: AddPOOL OF VEHICLEs + + 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + + 2021-09-01NewModes: AddPOOL OF VEHICLEs - 2021-09-01NewModes: Add PoolOfVehicles + + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + + 2021-09-01NewModes: Add PoolOfVehicles - 2021-07-09Revise name sto allign with TM + + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + + + 2021-07-09Revise name sto allign with TM VehicleRentalOperation --> VehicleRental, VehicleSharingOperation --> VehicleSharing, VehiclePoolingOperation --> VehiclePooling - 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment + + 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment - 2020-11-16NewModes: Drop AlternativeTransportOperator + + 2020-11-16NewModes: Drop AlternativeTransportOperator - 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. + + 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. - 2020-10-14NewModes Add Constraints (NM) + + 2020-10-14NewModes Add Constraints (NM) Add MobilityServiceFrame, MobilityJourneyFrame. TypeOfProof, TaxiRank, TaxiStand. TypeOfParking ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling. @@ -59,50 +73,66 @@ FIX: Add OpenTransportMode, Submode, VehicleChargingEquipment, CycleStorageEquipment, HailAndRideArea FIX: Remove PlaceRef and EquipmentRef and bogus restrictions on uniqueness across places and equipment. - 2020-08-20Corrections + + 2020-08-20Corrections Add UicOperatingPeriod key and ref constraints - 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent + + 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent - 2020-04-17Corrections + + 2020-04-17Corrections Add ParentFareZoneRef constraint - 2020-04-02Corrections + + 2020-04-02Corrections Add constraint for RowRef and ColumnRef - 2019-05-15Corrections + + 2019-05-15Corrections Add TypeOfLine constraint - 2019-05-02 + + 2019-05-02 Corrections Add missing constraint selectors for DefaultResponsibilitySetRef and DefaultDataSourceRef Add missing constraints ref DefaultCodespaceRef - 2019-04-24Corrections + + 2019-04-24Corrections Add missing constraints ref for JourneyPart/MainPartRef to JourneyPartCouple - 2019-04-24Corrections + + 2019-04-24Corrections (1)Add constraints ref for ParkingEntranceForVehicles and ParkingPasengerEntrance (2) Drop general EntranceRef constraint - 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment + + 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment - 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef + + 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef - 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. + + 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. - 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, + + 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, Also drop some spurious selectors. - 2019-03-10Fix: Add constraint for SupplementToFareProductRef . + + 2019-03-10Fix: Add constraint for SupplementToFareProductRef . - 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element + + 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element - 2019-02-18 + + 2019-02-18 (a) Relax uniqueness constraint on FareTable and PriceGroup now unique within type, - 2019-01-15 + + 2019-01-15 (a) Fix keyref constraint on TimingLinkInJourneyPattern_AnyVersionedKey, (Drop DropFarePointInPattern. TimingTimingLinkInJournePattern, STopTimingLinkInJourneyPattern) (b) Fix keyref constraint on ServiceLinkInJourneyPattern_AnyVersionedKey (Drop points) (c) Fix keyref constraint on FarePointInPattern_AnyVersionedKey - Add Points @@ -119,45 +149,61 @@ (n) Fix Add Constraints on SectionInSequence (o) Revise key names to emphasise when key is ordered - 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE + + 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE - 2018-01-07 Remove trailing blanks on names - 2017-08-10Align with TM6 + + 2018-01-07 Remove trailing blanks on names + + 2017-08-10Align with TM6 Rename Passenger Contract to FareContract. Rename Passenger Contract Event to FareContractEntry. Rename Type of Passenger Contract to TypeOfFareContract. Adjust References in Dependent packages. - 2017-08-10 + + 2017-08-10 Rename FareContractEvent to FareContractEntry Add constraints for CustomerPurchasePackage, CustomerPurchasePackageElement, CustomerPurchaseParameterAssignment Add constraints for CustomerAccount, CustomerAccountStatus, TypeOf CustomerAccount, Add constraints for CustomerEligibility, UserProfileEligibility, CommercialProfileEligibility, ResidentialQualifactionEligibility - 2017-06-29 + + 2017-06-29 CR048 add constraints WHITE LIST Fix: Add Constraint on CUSTOMER CR00310 add constraints on JOURNEY PART POSITION - 2017-05-09 + + 2017-05-09 Correct COnstraints for PointOnRoute Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er Add Missing Constraints For GroupOfServicesMember , JourneyAccounting DelegatedResponsibilitySet Reinstate Constraints for CAll Fix constraints that were missing namespace on subpart - 2017-03-27 + + 2017-03-27 Various 1.1 changes see CRS. CR0038 revise constraints on ResponsibilityRole - 2011-01-17V0.94 Revised + + 2011-01-17V0.94 Revised - 2010-09-04Created from Siri.xsd + + 2010-09-04Created from Siri.xsd -

                netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                . -

                The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). -

                • For each data object type it describes an XML representation which can be used to exchange netex data.
                • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                -

                + +

                netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                . +

                The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                +

                This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). +

                  +
                • For each data object type it describes an XML representation which can be used to exchange netex data.
                  • +
                • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                  • +
                • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                  • +
                +

                +                 text/xml http://www.w3.org/2001/XMLSchema @@ -2523,6 +2569,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [PassengerBeaconEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -3497,6 +3564,111 @@ Correct COnstraints for PointOnRoute + + + + + Every [PassengerCarryingRequirement Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [FacilityRequirement Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [VehicleManoeuvringRequirement Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerCapacity Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [PassengerVehicleCapacity Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -4001,24 +4173,24 @@ Correct COnstraints for PointOnRoute - - - + + + - Every [LuggageBayEquipment Id + Version] must be unique within document. + Every [LuggageSpotEquipment Id + Version] must be unique within document. - + - - - + + + - - + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 04a659d98..402644267 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,8 +13,8 @@ 2023-01-30 - 2023-02-01 - Name Space changes + + 2024-01-11Revise enum values

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

                @@ -33,7 +33,7 @@ Unclassified - CEN, Crown Copyright 2023-2023 + CEN, Crown Copyright 2023-2024
                  @@ -216,16 +216,30 @@ - Allowed values for type of epassenger space. + Allowed values for TYPE OF PASSENGER SPACE. - - + + + + + + + + + + Allowed values for TYPE OF OTHER OTHER SPACE. + + + + + + @@ -285,20 +299,55 @@ Allowed values for type of DECK ENTRANCE. - + + + Door gives external access to VEHICLE. + + + - Allowed values for Relation to vehicle of ENtrance. + Allowed values for Relation to vehicle of Entrance. - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -407,7 +456,7 @@ - Allowed values for type of entrance Usage.. + Allowed values for type of DECK ENTRANCE Usage.. @@ -416,6 +465,16 @@ + + + Allowed values for type of DECK ENTRANCE setting.. + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index b00a4fbac..9b52eedda 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -1,6 +1,7 @@ + @@ -14,7 +15,8 @@ 2023-01-30 - 2023-01-30 + + 2023-01-30 Name Space changes @@ -143,6 +145,11 @@ Description of DECK PLAN. + + + VALIDTY CONDITIONs used to configure DECK PLAN + + DECK LEVELs in DECK PLAN. @@ -268,16 +275,6 @@ Elements for a DECK COMPONENT. - - - Name of DECK COMPONENT. - - - - - Description of DECK COMPONENT. - - Whether DECK COMPONENT is for public use. Default is true. @@ -326,6 +323,13 @@ + + + + Elements for a EQUIPABLE SPACE. + + + @@ -641,7 +645,7 @@ - Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + Elements for a DECK COMPONENT. @@ -675,14 +679,27 @@ Elements for a DECK ENTRANCE. - + + - Type of DECK ENTRANCE. + Classification elements for a DECK ENTRANCE. + + + + + ENTRANCE SENSORS in the DECK ENTRANCE. - + + + + + Positional ements for a DECK ENTRANCE. + + + - Side of ENTRANCE relative to forward orientation of VEHICLE. to . + Side of ENTRANCE relative to forward orientation of VEHICLE. @@ -690,15 +707,42 @@ Distance of forward edge of door from front of Vehicle.. - + - Whether the door is automatic. + Positional sequence of door from front (orr left side end) of VEHICLE. 1 - forward, + + + + + Height of ENtrance from ground. + + + + + + + EClassification lements for a DECK ENTRANCE. + + + + + Type of DECK ENTRANCE. - + - ENTRANCE SENSORS in the DECK ENTRANCE. + Whether the door is an emergency Exit. + + + + + Whether the door is automatic. + + + + + Whether the door is automatic. @@ -828,7 +872,18 @@ Elements for a DECK VEHICLE ENTRANCE. - + + + + TYPES OF VEHICLE that may use VEHICLE ENTRANCE. + + + + + Vehicle categories that may use VEHICLE ENTRANCE. + + + @@ -958,9 +1013,19 @@ Description of DECK ENTRANCE USAGE. - + - Nature of usage: entry, ecit etc. See allowed values. + Nature of usage: entry, exit etc. See allowed values. Default is entryAndExit. + + + + + Door setting: whether keot open, shut or locked. See allowed values. Default is shut. + + + + + Whether door is normally locked for safety when in motiion. @@ -1183,6 +1248,11 @@ SDistance of Window from front of DECK + + + Height ofindow from floor of of DECK + + Whether window has blind. @@ -1333,6 +1403,11 @@ Elements for a DECK SPACE CAPACITY. + + + Name of capacitty + + Type of Locatable spot for which this is the capacity diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 78a6172cf..9d68b24da 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -16,14 +16,16 @@ 2011-12-16 - 2021-01-29BUG Issue #143: Correct data type on GapToPlatform + + 2021-01-29BUG Issue #143: Correct data type on GapToPlatform

                  NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT

                  text/xml - http://www.w3.org/2 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. + http://www.w3.org/2 + 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. 001/XMLSchema XML schema, W3C Recommendation 2001 @@ -31,7 +33,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                    diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 21ebf10d3..ccb9e71ff 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -1,5 +1,5 @@ - + @@ -13,28 +13,44 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2013-01-07No Pull request correct spelling of coffeeShop, nofoodavailable enum value + + 2013-01-07No Pull request correct spelling of coffeeShop, nofoodavailable enum value - 2017-05-25Add buggy and umbrella to accessibility tools + + 2017-05-25Add buggy and umbrella to accessibility tools - 2017-11-10Update Nuisance list to match UML + + 2017-11-10Update Nuisance list to match UML - 2019-03-25Fix #43 by Skinkie from 2019.01.07 Fix typo on _tactilePlatformEdges. + + 2019-03-25Fix #43 by Skinkie from 2019.01.07 Fix typo on _tactilePlatformEdges. - 2019-03-25NL32 CD #61 Add new values to (Site) AccessFacility enum; wheelchairLift, automaticRamp and slidingStep. + + 2019-03-25NL32 CD #61 Add new values to (Site) AccessFacility enum; wheelchairLift, automaticRamp and slidingStep. NJSK Review: Keep Site and Service aspects separate; add separate VehicleAccessFacility enum with values unknown, wheelchairLift, manualRamp, automaticRamp, steps, slidingStep, narrowEntrance, lowFloorAccess, validator. - 2019-04-14Fix Add new values ti PassengerInfromation LienStatus and realTimeDIsruption + + 2019-04-14Fix Add new values ti PassengerInfromation LienStatus and realTimeDIsruption - 2020-10-16New modes 0- add ski racks to Luggagefacility enum values + + 2020-10-16New modes 0- add ski racks to Luggagefacility enum values Fix Add missing animalsAllowed values to NuisanceFacility Add unspecifed to Gender list - 2021-04-15New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other. + + 2021-04-15New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other. + + + 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility + + + 2024-01-01Add ClimateControl and LightingControl faciliies - 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility + + 2024-01-01DECK PLANs Add values to Berth facility

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

                    @@ -52,7 +68,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                      @@ -309,9 +325,11 @@ Rail transport, Roads and Road transport Allowed values for Berth Facility: - + + + @@ -358,6 +376,21 @@ Rail transport, Roads and Road transport + + + Allowed values for Climate Control Facility. + + + + + + + + + + + + Allowed values for Family Accommodation. @@ -395,6 +428,22 @@ Rail transport, Roads and Road transport + + + + Allowed values for Lighting Control Facility. + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index 551cae7e5..a475fe36a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -1,5 +1,5 @@ - + @@ -16,18 +16,27 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2019-03-25FR-5 CD change #53 Add AccessFacilityList to SiteFacilitySet. + + 2019-03-25FR-5 CD change #53 Add AccessFacilityList to SiteFacilitySet. - 2019-03-25NL32 CD change #61 Add new attribute VehicleAccessFacilityList to ServiceFacilitySet. + + 2019-03-25NL32 CD change #61 Add new attribute VehicleAccessFacilityList to ServiceFacilitySet. NJSK Review: Do not add SiteAccess facilitrie to vehicle, but rather add a new VehicleAccessFacilityList - 2019-04-05Fix add FacilitySet as substitiution group for SiteFacilitySet and ServcieFacilitySet + + 2019-04-05Fix add FacilitySet as substitiution group for SiteFacilitySet and ServcieFacilitySet - 2019-04-14FIX ACCOMMODATION and onBOARD STAY add missing elements name, parent and use GROUP. FIX TYPO on BoardingPermissione + + 2019-04-14FIX ACCOMMODATION and onBOARD STAY add missing elements name, parent and use GROUP. FIX TYPO on BoardingPermissione - 2020-10-20Add facility sets on Frame. + + 2020-10-20Add facility sets on Frame. + + + 2024-01-01Add ClimateControl and LightingControl faciliies

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

                      @@ -184,6 +193,7 @@ Rail transport, Roads and Road transport + @@ -191,6 +201,7 @@ Rail transport, Roads and Road transport + @@ -906,6 +917,23 @@ Rail transport, Roads and Road transport                       + + + + Classification of climate control FACILITY. + + + + + List of CLIMATE CONTROL FACILITies. + + + + + List of values for CLIMATE CONTROL FACILITY + + + @@ -980,6 +1008,23 @@ Rail transport, Roads and Road transport + + + + Classification of lighting control FACILITY. + + + + + List of lighting control FACILITies. + + + + + List of values for lighting control FACILITY. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index f894bde44..aa99cc457 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -16,7 +16,8 @@ 2023-01-30 - 2023-01-30 + + 2023-01-30 Name Space changes @@ -230,6 +231,16 @@ + + Lavel of EQUIPABLE SPACE. e.g. seat number. + + + + + Name of DECK COMPONENT. + + + Description of EQUIPABLE SPACE. @@ -518,7 +529,16 @@ Elements for a PASSENGER VEHICLE SPOT. - + + + Vehicle categories that may use PASSENGER VEHICLE SPOT. + + + + + Types of Transport that may use PASSENGER VEHICLE SPOT. + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd index 0da6bfe7e..bf079c3ad 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -1,5 +1,5 @@ - + @@ -11,28 +11,38 @@ 2010-09-04 - 2014-07-15Add PurchaseMoment enum + + 2014-07-15Add PurchaseMoment enum - 2019-03-02 Add open PaymentMethod as first class object so that user defined methods can be added. Add epayDevice and epayAccount and mileagePoints to enum + + 2019-03-02 Add open PaymentMethod as first class object so that user defined methods can be added. Add epayDevice and epayAccount and mileagePoints to enum Add documentation on payment method enumerations. - 2019-03-11Fix rename PaymentMethod to TypeOfPaymentMethod to avoid name clash with enum + + 2019-03-11Fix rename PaymentMethod to TypeOfPaymentMethod to avoid name clash with enum UK-40 Add subscriptionOnly , also onCheckIn , inAdvanceOnly, beforeBoardingOnly , onBoardingOnly to PurchasentMoment enum. UK-40 a Add bankTransfer and directDebit to payment methods. values EURA-84 add cashExactChangeOnly to values for PaymentMethods - 2019-03-12EURA-84 add cashExactChangeOnly to values for PaymentMethods + + 2019-03-12EURA-84 add cashExactChangeOnly to values for PaymentMethods - 2019-03-27NL-27 Add default TypeOfProductCategory and TypeOfService to Line + + 2019-03-27NL-27 Add default TypeOfProductCategory and TypeOfService to Line Move TypeOfProductCategory amnd TypeOfService from netex_vehicleJourney to Framework reusable components netex_travelRights so they are visible from part 1 Rename netex_travel_rights to netext_serviceRestrictions so as to align with TM6, Fx SuvsriptionOnly and checkin values on PurchaseMoment - 2020-10-07NewModes Booking arrangements add further attributes + + 2020-10-07NewModes Booking arrangements add further attributes MaximumBookingPeriod, MinimBookingDuration, MaximumBookingDuration, DepositRequired, Add ServiceBookimngArrangements. - 2020-06-21FIX: Issue #75 FareClassEnumeration Remove space from end of secondClass enum value + + 2020-06-21FIX: Issue #75 FareClassEnumeration Remove space from end of secondClass enum value + + + 2024-01-17DECKPLANS dd washbasin to sanitary facilities

                      NeTEx - Network Exchange. This subschema defines NetEX:TRAVEL RIGHTS identifier types.

                      @@ -46,11 +56,11 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2024
                        -
                      • Derived from the SIRI standards.
                        • +
                      • Derived from the Transmodel standards.
                      Version 1.0 @@ -681,6 +691,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd index c3e38e1fc..db70a55ed 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -145,37 +145,52 @@ + - - + + - Type for identifier of LUGGAGE BAY EQUIPMENT. + Type for identifier of LUGGAGE SPOT EQUIPMENT. - + - Identifier of a LUGGAGE BAY EQUIPMENT. +v2.0 + Identifier of a LUGGAGE SPOT EQUIPMENT. +v2.0 - + - Type for a reference to a LUGGAGE BAY EQUIPMENT. + Type for a reference to a LUGGAGE SPOT EQUIPMENT. - + - Identifier of a LUGGAGE BAY EQUIPMENT. + Identifier of a LUGGAGE SPOT EQUIPMENT. + + + Allowed values for TYPE OF LUGGAGE SPOT +v2.0 + + + + + + + + + + +                       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index 7a5041869..d33088465 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -137,12 +137,17 @@ - Width of seat bottom. + Width of SPOT EQUIPMENT - Length of bedt back from seat bottom. + Length deont to back of SPOT EQUIPMENT. + + + + + Height of SPOT EQUIPMENT. @@ -150,12 +155,12 @@ Height from bloor - + Whether spot has power supply socket. - + Whether Spot has UsbPowerSockets. @@ -301,16 +306,21 @@ Length of bedt back from seat bottom. + + + UsableLength of bed back from seat bottom. + + - - + + - A specialisation of SPOT EQUIPMENT describing the detailed properties of a luggage bay. +v2.0 + A specialisation of SPOT EQUIPMENT describing the detailed properties of a LUGGAGE SPOT. +v2.0 - + @@ -325,10 +335,10 @@ - + - + Identifier of ENTITY. @@ -337,31 +347,41 @@ - + - Type for a LUGGAGE BAY EQUIPMENT. + Type for a LUGGAGE SPOT EQUIPMENT. - + - + - Elements for LUGGAGE BAY EQUIPMENT. + Elements for LUGGAGE SPOT EQUIPMENT. + + + TYPE OF LUGGAGE SPOTn + + + + + Height avilable for LUGGAGE + + - Whether bay is lockable. + Whether LUGGAGE SPOT is lockable. - Whether bay is has a door. + Whether LUGGAGE SPOT is has a door. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index f40bb3cf2..c0953c3c5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -1,7 +1,8 @@ - + + @@ -37,20 +38,30 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-04-271.1 CR0039 Add Width to TRAIN ELEMENT + + 2017-04-271.1 CR0039 Add Width to TRAIN ELEMENT - 2019-02-21Make ValidityCondition etc visible on TrainElement + + 2019-02-21Make ValidityCondition etc visible on TrainElement - 2019-03-27Fix add missing TrainSize attribute to TrainElement + + 2019-03-27Fix add missing TrainSize attribute to TrainElement - 2019-04-18Fix add missing orientation to TrainComponent - 2021-09-018NewModes: revise to allow chargingEquipmentProfile + + 2019-04-18Fix add missing orientation to TrainComponent + + + 2021-09-01NewModes: revise to allow chargingEquipmentProfile + + + 2024-01-17DECK PLANS add a defualt DECK PLAN

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

                      -

                      This sub-schema describes the TRAIN ELEMENT types

                      +

                      This sub-schema describes the TRAIN ELEMENT types

                       text/xml @@ -64,7 +75,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                        @@ -383,6 +394,7 @@ Rail transport, Roads and Road transport Actual EQUIPMENT on element. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index c070cb473..1aa14d116 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -14,28 +14,40 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2012-04-15Revise Passenger Capacity + + 2012-04-15Revise Passenger Capacity - 2019-04-09Add list of vehicle type refs for PARKING and general use + + 2019-04-09Add list of vehicle type refs for PARKING and general use - 2020-08-11Issue #110 Add missing fuel types + + 2020-08-11Issue #110 Add missing fuel types electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - 2020-10-04NewModes: Add list of VEHICLEs. + + 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-04-19NewModes: GBFS compatibility Add car to vehicle Types - 2021-07-07NewModes: Add extra fuel types from APDS + + 2021-07-07NewModes: Add extra fuel types from APDS - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + + 2024-01-17TM CR: Enhancement Add PASSENGER VEHICLE CAPACITY

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

                        @@ -53,7 +65,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2024
                          @@ -269,6 +281,32 @@ Rail transport, Roads and Road transport + + + + Type for identifier of a PASSENGER VEHICLE CAPACITY. + + + + + + Reference to a PASSENGER VEHICLE CAPACITY. + + + + + Type for a reference to a PASSENGER VEHICLE CAPACITY. + + + + + + Identifier of a VEHICLE. + + + + + @@ -495,30 +533,120 @@ Rail transport, Roads and Road transport - + + + - Allowed values for Personal Vehicle Categories _v1.2.2 + Allowed values for list of Portable Wheeled VEHICLE types.+V2.0 - + + + + + Allowed values for Portable VEHICLE types. +V2.0 + + + - - + + + + + + + + Allowed values for list of Personal Wheeled VEhICLE types.+V2.0 + + + + + + Allowed values for Personal VEHICLE types.+V2.0 + + - + + + + - + + + + + + + + - - + + + + + + + + Allowed values for list of Wheeled commercial VEHICLE types.+V2.0 + + + + + + Allowed values for Wheeled commercial VEHICLE types. + + + + + + + + + + + + + + + + + + + + + + + Allowed values for list of All road Wheeled VEHICLE types.+V2.0 + + + + + + All road vehicle types. + + + + + + + Allowed values for list of All road Wheeled VEHICLE types.+V2.0 + + + + + + All road vehicle types. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index e50c24e6f..e2f6499a9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -20,16 +20,21 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-03-27CR0001 - Vehicle Dimensions added. + + 2017-03-27CR0001 - Vehicle Dimensions added. - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -37,9 +42,11 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit

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

                          @@ -640,20 +647,22 @@ Rail transport, Roads and Road transport - Type for a list of PASSENGER CAPACITY REQUIREMENTs. + Type for a list of PASSENGER and PASSENGER VEHICLE CAPACITies. + - Capacity for a VEHICLE TYPE and Class. + Total number of passengers that can be carried by a VEHICLE of this type. + @@ -680,7 +689,7 @@ Rail transport, Roads and Road transport - Capacity for a VEHICLE TYPE and Class. + Type for a PASSENGER CAPACITY. @@ -692,12 +701,12 @@ Rail transport, Roads and Road transport - Elements for a PASSENGER CAPACITY REQUIREMENT. relevant for passenger systems. + Elements for a PASSENGER CAPACITY. - Edit care class for which capacity is specifyed. Default is any, i.e. capacity is for all classes. + Fare class for which capacity is specifyed. Default is any, i.e. capacity is for all FARE CLASSes. @@ -705,7 +714,7 @@ Rail transport, Roads and Road transport - Elements for a PASSENGER CAPACITY REQUIREMENT. relevant for passenger systems. + Capacity type Elements for a PASSENGER CAPACITY REQUIREMENT. Relevant for passenger systems. @@ -740,6 +749,63 @@ Rail transport, Roads and Road transport + + + + Total number of passenger vehicles s that can be carried by a VEHICLE of this type. + + + + + + + + + + + + + + + + + + Identifier of PASSENGER VEHICLE CAPACITY. + + + + + + + + + Type for a PASSENGER VEHICLE CAPACITY. + + + + + + + + + + + + Elements for a PASSENGER VEHICLE CAPACITY. + + + + + VEHicle categories for which capacity is specifyed. Default is allPAssengerVehicles i.e. capacity is for all VEHICLE CATEGORIES + + + + + The total capacity of passenger VEHICLES of the type. F + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 2774e4b09..b79742a09 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -1,5 +1,5 @@ - + @@ -15,7 +15,8 @@ 2007-06-12 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown CD add LightingMethodEnumeration with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector Add value_alwaysOn_ to LightingMethodEnumeration. Rename to LightinOnMethod. @@ -24,7 +25,11 @@ CD add BorderTypeEnumeration with values _wall, grass, dirt, barrier, road, cyclingLane, step, rail, plants, trees, mud, solidEdge, water, gravel, noPhysicalBorder, otherPhysicalBorder, unknown, other,_ NJSK Review: Move TactileWarningStripEnumeration, here from netex_path_support , use lower camel case for values. - 2021-07-14Fix catch up - Make Access Equipment Abstarct + + 2021-07-14Fix catch up - Make Access Equipment Abstarct + + + 2024-01-17DECK PLAN and EPIA add DoorType

                          NeTEx - Network Exchange. This subschema defines ACCESS EQUIPMENT types for Place access.

                          @@ -38,7 +43,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                            @@ -115,6 +120,60 @@ Rail transport, Roads and Road transport + + + Allowed values for DOOR TYPE +2.0 + + + + + Single door hinged at one side. + + + + + Pair of doors, hinged at either side of ENTRANCE. + + + + + Single door, sliding to one side. + + + + + Pair of sliding doors, sliding apart to each side. + + + + + Single door, folding to one side. + + + + + Pair of folding doors, folding to each side. + + + + + Door hinged at bottom to drop down as boarding ramp. + + + + + Revolving Door. + + + + + Other type of door + + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 0f05acb5d..3e6566f0a 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1,5 +1,5 @@ - + @@ -21,9 +21,11 @@ 2011-12-16 - 2017-05-25 Integrate NPR documentation correction to lift passable + + 2017-05-25 Integrate NPR documentation correction to lift passable - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add new attribute NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown CD add new attributeLightingMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector @@ -42,15 +44,21 @@ NJSK Review: NB AudioOrVideoIntercom overlap with EntranceAttention CD Add new attributes to QueuingEquipment: DisabledPriority QueuingSeatedPossible. - 2019-05-27Fix add missing DropKerbOutside value to Entrance Eqeuipment + + 2019-05-27Fix add missing DropKerbOutside value to Entrance Eqeuipment Rename Slope to Gradient to be conistent Move WIthoutRaiser to be specifc to Staircase. - 2019-05-27Doc tidy up + + 2019-05-27Doc tidy up Rename Accoustic(six) to AUdio Correct comments - 2021-07-14Fix catch up - Make Access Equipment Abstarct + + 2021-07-14Fix catch up - Make Access Equipment Abstarct + + + 2024-01-16EPIAP Add EntranceControlHeight to ENTRANCE

                            NeTEx - Network Exchange. This subschema defines EQUIPMENT base types.

                            @@ -64,7 +72,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                              @@ -1128,6 +1136,12 @@ Rail transport, Roads and Road transport Whether door is revolving. Only applies if door is specified. + + + Type of door; hinged, sliding, etc. v2.0 + + + Whether there is a physical barrier across the doorway. @@ -1187,6 +1201,11 @@ Rail transport, Roads and Road transport Whether doors are automatic. + + + Indicates door control element height. This could be e.g. a door handle or a door button. + + Whether door is made of glass. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index 7bc9c3336..c6e5935e0 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -1,5 +1,5 @@ - + @@ -12,11 +12,15 @@ 2007-06-12 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add AcousticAnnouncementsTriggerEnumeration with values _onDemand, automatic_. CD add AnnouncementsTriggeringMethodEnumeration with values _presenceDetector, app, internetPage, specificDevice, pushButton_. NK Review rename Acoustic to Audio. rename app value to mobileApp, add cyclicReadingValue + + 2024.01.15EPIA Merge in Beacon Point enhancement +

                              NeTEx - Network Exchange. This subschema defines PASSENGER EQUIPMENT types for Place access.

                               @@ -29,7 +33,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2024
                                @@ -133,6 +137,93 @@ Rail transport, Roads and Road transport + + + Type for identifier of a BEACON EQUIPMENT. + + + + + + Reference of an BEACON EQUIPMENT. +2.0 + + + + + Type for a reference to an BEACON EQUIPMENT. + + + + + + Identifier of a BEACON EQUIPMENT. + + + + + + + + Allowed values for Beacon Type + + + + + bluetooth low energy + + + + + ultra wide band + + + + + In some cases the beacon is a wifi hot spot. + + + + + + + Allowed values for communication direction of beacon. + + + + + Normal unidirectional beacon. Usually a backend is then mandatory. + + + + + The beacon is able to do bidirectional transmissions. + + + + + + + Allowed values for beacon protocols + + + + + Apple beacon protocol + + + + + Android beacons + + + + + Usage of VDV 431 + + + + + Type for identifier of a RUBBISH DISPOSAL. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index eb933ace0..285cd70e5 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -1,5 +1,5 @@ - + @@ -21,21 +21,29 @@ 2011-12-16 - 2017-05-25NPR make Gender optional + + 2017-05-25NPR make Gender optional - 2019-03-25Fix #38 Skinkie. Fix typo on KeyScheme. NB this will break existing XML. + + 2019-03-25Fix #38 Skinkie. Fix typo on KeyScheme. NB this will break existing XML. - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add new attribute to ___PassengerSafetyEquipment___; ___AcousticAnnouncementsTrigger___ with values _onDemand, automatic_. CD add new attribute to ___PassengerSafetyEquipment___; ___AnnouncementsTriggeringMethod___ with values _presenceDetector, app, internetPage, specificDevice, pushButton_. CD add new attributes to ___SanitaryEquipment___; ___CallButtonAvailable___ , ___SupportBarHeigth____. , ___LockedAccess___. NJSK Review: Correct typo on SupportBarHeigth, reorder elements - 2019-03-29FR49 CD #65 Accessibility changes + + 2019-03-29FR49 CD #65 Accessibility changes NSKK Review: Add missing ___ChangeAvailable___ attribute NJSK Review : revises name to be AudioANnouncementsType, AudioTriggerMethod - 2019-04-06Fix Add back missing attribute to SanitaryEquipment: NumberofToilets + + 2019-04-06Fix Add back missing attribute to SanitaryEquipment: NumberofToilets + + + 2021-01-17EPIA merge in BEACON POINT.

                                NeTEx - Network Exchange. This subschema defines EQUIPMENT base types.

                                @@ -49,7 +57,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2024
                                  @@ -87,7 +95,7 @@ Rail transport, Roads and Road transport - Specialisation of PASSENGER EQUIPMENT for pasenger safety. + Specialisation of PASSENGER EQUIPMENT for passenger safety. @@ -102,7 +110,7 @@ Rail transport, Roads and Road transport - + A SANITARY FACILITY , e.g. WC, Shower, baby change. @@ -123,7 +131,7 @@ Rail transport, Roads and Road transport - Whether the EQUIPMENT is fixed at a place or min a vehicle. + Whether the EQUIPMENT is fixed at a place or in a vehicle. @@ -236,7 +244,7 @@ Rail transport, Roads and Road transport - + Specialisation of PASSENGER EQUIPMENT for passenger safety features, e.g. panic button, SOS phone. @@ -257,7 +265,7 @@ Rail transport, Roads and Road transport - Whether the EQUIPMENT is fixed at a place or min a vehicle. + Whether the EQUIPMENT is fixed at a place or in a vehicle. @@ -339,7 +347,7 @@ Rail transport, Roads and Road transport - + Specialisation of PASSENGER EQUIPMENT for HELP POINT. @@ -360,7 +368,7 @@ Rail transport, Roads and Road transport - Whether the EQUIPMENT is fixed at a place or min a vehicle. + Whether the EQUIPMENT is fixed at a place or in a vehicle. @@ -423,7 +431,81 @@ Rail transport, Roads and Road transport - + + + + Specialisation of PASSENGER EQUIPMENT for Beacons. For SSID or UUID always use PublicCode. Be aware that when using VEHICLE TYPE or VEHICLE PROFILE only the type of the beacon can be described. The information aboutn the relevent real beacon often can only be provided when the actual VEHICLE is known. +v2.0 + + + + + + + + + + + + + + + + + + Whether the EQUIPMENT is fixed at a place or in a vehicle. + + + + + + + + + + + + + + + Type for a BEACON EQUIPMENT. + + + + + + + + + + + + Elements for a BEACON EQUIPMENT type. Beacons are under development so the Enumerations may change fast. + + + + + + The type of the beacon + + + + + If the Beacon is unidirectional or bidirectional + + + + + The relevant Beacon Protocol used. + + + + + The to reach the back end system for the usage of the beacon. + + + + + Equipment for Passengers relating to a Rubbish disposal. @@ -444,7 +526,7 @@ Rail transport, Roads and Road transport - Whether the EQUIPMENT is fixed at a place or min a vehicle. + Whether the EQUIPMENT is fixed at a place or in a vehicle. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index 45f8b8251..b4c546c57 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -1,6 +1,7 @@ + @@ -17,9 +18,9 @@ 2023-01-30 - 2023-01-30 - Name Space changes - + + 2024-01-17Revise to add TRAIN ELEMENT +

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

                                  This sub-schema describes the DECK PLAN ASSIGNMENT types.

                                  @@ -128,7 +129,30 @@                                   + + + + + Validity coniditions in effect for JOURNEY or JOURNEY PART. + + + + + + + Assign to TRAIN elements for a DECK PLAN ASSIGNMENT. + + + + + + + + + Assign to SERVICE JOURNEY elements for a DECK PLAN ASSIGNMENT. + + From 5fe5f3664bd2d012c4381136f08c086ee6d53dcb Mon Sep 17 00:00:00 2001 From: trurlurl <82838870+trurlurl@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:19:33 +0100 Subject: [PATCH 018/144] LiftCallEquipment added --- xsd/NeTEx_publication.xsd | 21 +++++ xsd/NeTEx_publication_timetable.xsd | 25 +++++- .../netex_ifopt_equipmentAccess_support.xsd | 28 +++++- .../netex_ifopt_equipmentAccess_version.xsd | 90 ++++++++++++++++++- 4 files changed, 159 insertions(+), 5 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 874aa8753..9cd73c658 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -2201,6 +2201,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [LiftCallEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index b404e398b..455a74bd1 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1683,7 +1683,7 @@ Provides a general purose wrapper for NeTEx data content. - + @@ -1778,7 +1778,7 @@ Provides a general purose wrapper for NeTEx data content. - + @@ -1824,6 +1824,27 @@ Provides a general purose wrapper for NeTEx data content. + + + + + Every [LiftCallEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index b79742a09..2d67d02b3 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -246,7 +246,33 @@ Rail transport, Roads and Road transport - Identifier of a TICKETING EQUIPMENT. + Identifier of a LIFT EQUIPMENT. + + + + + + + + + Type for identifier of a LIFT call EQUIPMENT. + + + + + + Identifier of an LIFT call EQUIPMENT. + + + + + Type for a reference to an LIFT call EQUIPMENT. + + + + + + Identifier of a LIFT call EQUIPMENT. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 8d55e5131..59557433c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -107,6 +107,7 @@ Rail transport, Roads and Road transport + @@ -124,6 +125,7 @@ Rail transport, Roads and Road transport + @@ -950,9 +952,93 @@ Rail transport, Roads and Road transport Indicates buttons height (in centimeter)                                   - + + + + + + Specialisation of PLACE ACCESS EQUIPMENT for calling LIFTs (provides specific characteristics that may differ from floor to floor like button height, door, etc.). + + + + + + + + + + + + + + + + + + Elements for an ACCESS EQUIPMENT. + + + + + + + Elements for calling a LIFT that are specific to a floor /. + + + + + + + + + + + + + + + + + + + + + Elements for LIFT call EQUIPMENT type. + + + + + Height of call button from ground. + + + + + Whether buttons are raised. + + + + + Whether buttons have braille. + + + + + Indicates a tactile marker on floor under the buttons (or aligned with) +v1.1 . + + + + + Whether LIFT has AudioAnnouncements. + + + + + Indicates existence of a magnetic induction loop. +v1.1 + + + - Indicates a tactile marker on floor under the buttons (or aligned with). + The direction from which to approach the door(s). From 598007530f643e46df27f4a805fdfc36ce530c69 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Mon, 5 Feb 2024 17:23:02 +0000 Subject: [PATCH 019/144] Updated deckplan examples Add deck plane xamples and update deck path --- NeTEx.spp | 3 +- .../deckPlans/DeckPlans-Example_train.xml | 168 ++++++++ .../netex_deckPlan_support.xsd | 14 +- .../netex_seatingPlan_support.xsd | 12 +- .../netex_vehicleType_support.xsd | 2 +- .../part1_ifopt/netex_deckPath_support.xsd | 202 +++++++++ .../part1_ifopt/netex_deckPath_version.xsd | 405 ++++++++++++++++++ .../part1_ifopt/netex_ifopt_all_objects.xsd | 4 +- .../netex_ifopt_checkConstraint_support.xsd | 19 +- .../part1_ifopt/netex_ifopt_path_version.xsd | 12 +- 10 files changed, 816 insertions(+), 25 deletions(-) create mode 100644 xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd create mode 100644 xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 7f424e5d4..c6a695476 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -230,6 +230,8 @@ + + @@ -1019,6 +1021,5 @@ - diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index aa38f2820..2d43e800f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -265,6 +265,7 @@ C) CEN 2023 + Rail examples Sleeper wagon @@ -3223,6 +3224,173 @@ C) CEN 2023 + + Deck Plan - Train and Journey assignment Example + Example paths + + + xx + http://www.natrail.rt/ + Fake stop data + + + + + Erewhon hbf + + + Street Level + ST + 0 + + + Platform Level + PL + 1 + + + + + + + + External Entrance to Ticket Hall + + + true + + + true + true + + + + + openDoor + true + true + true + 3.0 + 2.0 + + + Ticket Hall Entrance to Platforms 1 and 2 - top of staires + + + opening + false + true + true + 3.0 + 3.0 + + + Platforms 1 and 2 -from bottom of staires + + + opening + false + true + true + 3.0 + 3.0 + + + + + + + -1 + + + + 0 + + + + + + + + Quay 3 + + true + + + unknown + false + + + + + railPlatform + + + covered + + positionOnRailPlatform + + + covered + + positionOnRailPlatform + + + covered + + positionOnRailPlatform + + + + + + + + + + + + + 10 + + + Ticket Hall Entrance to Platforms 1 and 2 - top of staires"> + + + + + + Ticket Hall Entrance to Platforms 1 and 2 - top of staires"/> + + 10 + + + + + + + + + + + From Station main entrance to QUAY 2 Boarding point 1 + + + + + + + + + example navigation path + + + + + + + + Deck Plan - Train and Journey assignment Example diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 402644267..9055cc398 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -433,9 +433,9 @@ Type for identifier of a DECK ENTRANCE USAGE. - + - + Reference to a DECK ENTRANCE USAGE. +v2.0 @@ -445,7 +445,7 @@ Type for a reference to a DECK ENTRANCE USAGE. - + Identifier of a DECK ENTRANCE USAGE. @@ -472,7 +472,7 @@ - + @@ -480,9 +480,9 @@ Type for identifier of a DECK ENTRANCE COUPLE. - + - + Reference to a DECK ENTRANCE COUPLE. +v2.0 @@ -492,7 +492,7 @@ Type for a reference to a DECK ENTRANCE COUPLE. - + Identifier of a DECK ENTRANCE COUPLE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 987991d51..3f1aefa29 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,9 +13,9 @@ 2023-02-02 - 2023-02-05 - Name Space changes - + + 2024-01-17Add bed to locatable spot type enumerations +

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

                                  This sub-schema describes the DECK PLAN types.

                                  @@ -31,9 +31,8 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2022-2023 + Unclassified + CEN, Crown Copyright 2022-2024
                                    @@ -298,6 +297,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 1aa14d116..788198b4c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -1,7 +1,7 @@ - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd new file mode 100644 index 000000000..1e1d5ce8f --- /dev/null +++ b/xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd @@ -0,0 +1,202 @@ + + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-01-18 + + + 2024-01-18 + + +

                                    NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                    +                                     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + Unclassified + CEN, Crown Copyright 2009-2024 + + +
                                      +
                                    • Derived from the TRANSMODEL 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 Network Exchange - DECK PATH identifier types. + Standard +                                     +                                     + DECK PATH LINK identifier types for NeTEx. +                                     + + + + Type for a list of references to a DECK PATH LINK. + + + + + + + + + + + + + Type for identifier of a DECK PATH LINK. + + + + + + Reference to a DECK PATH LINK. + + + + + Type for a reference to a DECK PATH LINK. + + + + + + Identifier of a DECK PATH LINK. + + + + + + + + + Reference to a DECK PATH LINK BY VALUE. + + + + + Type for a reference to a DECK PATH LINK BY VALUE. + + + + + + Identifier of a POINT. at which LINK starts. + + + + + Identifier of a POINT. at which LINK ends. + + + + + Class of POINT referenced by LINK. + + + + + + + + + Type for identifier of a DECK PATH JUNCTION. + + + + + + Reference to a DECK PATH JUNCTION. + + + + + Type for a reference to a DECK PATH JUNCTION. + + + + + + Identifier of a PATH JUNCTION. + + + + + + + + + Type for a list of references to a DECK NAVIGATION PATH. + + + + + + + + + + + + Type for identifier of a DECK NAVIGATION PATH. + + + + + + Reference to a DECK NAVIGATION PATH. + + + + + Type for reference to a DECK NAVIGATION PATH. + + + + + + Identifier of a DECK NAVIGATION PATH. + + + + + + + + Allowed values for Deck Navigation type. + + + + + + + + + + +                                     diff --git a/xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd new file mode 100644 index 000000000..e61ec5786 --- /dev/null +++ b/xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd @@ -0,0 +1,405 @@ + + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] + Europe + Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema + + 2024-01-17 + + + 2024-01-17 + + + NeTEx Network Exchange - DECK PATH LINK types. +

                                    +

                                    +                                     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_deckPathLink_version.xsd + [ISO 639-2/B] ENG + CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR + + http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
                                      +
                                    • Evolved from Transmodel standard.
                                      • +
                                    + + 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 Network Exchange DECK PATH LINK Types . + Standard +                                     +                                     + DECK PATH LINK Model. +                                     + + + + Type for a list of DECK PATH JUNCTIONs. + + + + + + + DECK PATH JUNCTION for a SITE. + + + + + + + + + + Type for a list of DECK PATH LINKs. + + + + + + + + PATH LINK for a DECK + + + + + + + + + A link within a DECK PLAN that represents a step in a possible route for pedestrians, wheelchair users or other out-of-vehicle passengers. + + + + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a DECK PATH LINK. + + + + + + + + + + + + + Elements of a DECK PATH LINK. + + + + + Additional public label for the DECK PATH LINK + + + + + Start point of DECK PATH LINK. + + + + + Start point of DECK PATH LINK. + + + + + + + DECK COMPONENT elements of a DECK PATH LINK. + + + + + + + + + Impediments to navigation from processes or barriers. For example security, check in etc. + + + + + + + + + Beginning or end of a DECK PATH LINK, referencing a DECK COMPONENT or LOCATABLE SPOT. May be linked to a specific DECK LEVEL. + + + + + + + + + + Valid endpoint on a DECK, either a DECK ENTRANCE, LOCATABLE SPOT + + + + + + + + + + + + + + + + Type for a list of DECK PATH JUNCTIONs. + + + + + + + + DECK PATH JUNCTION for a SITE. + + + + + + + + + A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a DECK PATH JUNCTION + + + + + + + + + + + + Elements of a DECK PATH JUNCTION. + + + + + Elements of a SITE ELEMENTs. + + + + + Additional Label of DECK PATH JUNCTION. + + + + + + + + Elements of a DECK PATH LINK. + + + + + + + + + + + Type for a list of DECK NAVIGATION PATHs. + + + + + + + + DECK NAVIGATION PATH for a SITE. + + + + + + + + + A designated path between two places on. May include an ordered sequence of DECK PATH LINKs. + + + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for DECK NAVIGATION PATH. + + + + + + + + + + + + Elements of a DECK NAVIGATION PATH. + + + + + Ordered collection of References to STOP PLACE spaces Use for a branch path. + + + + + + + Elements of a DECK NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the DECK NAVIGATION PATH forbids wheelchair. + + + + + Origin end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs are not given. + + + + + Destination end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs not given. + + + + + + MODEs of access which may used at associated place, e.g. foot access, bicycle access. + + + + + Summaries of access features encountered in path. + + + + + Total time needed to navigate path (May be derived from links). + + + + + +                                     diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd index 32401e280..5e193b290 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd @@ -9,7 +9,7 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po This file provides a single declaration of all the ifopt data elements for use in such an import. --> - + @@ -35,4 +35,6 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd index d79d0af66..4ab7a6ce9 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd @@ -1,5 +1,5 @@ - + @@ -14,7 +14,11 @@ 2011-02-05 - 2017-10-25 Add TYPE OF CONGESTION. + + 2017-10-25 Add TYPE OF CONGESTION. + + + 2024-01-17DECK PLANS: add ladder to AvvesFeatureType enumeration.

                                    NeTEx - Network Exchange. This subschema defines common Check types.

                                    @@ -28,7 +32,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2024
                                      @@ -171,7 +175,13 @@ Rail transport, Roads and Road transport - + + + + + DEPRECATED + + @@ -222,6 +232,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index 862a4f4b3..f17e2c082 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -22,11 +22,13 @@ 2007-03-22 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip NK Review: Reorder so as to place like elements toigether, add sub Groups to organize - 2019-03-28FR49 CD #65 Accessibility changes + + 2019-03-28FR49 CD #65 Accessibility changes NJSK Doc rewviewe Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent @@ -72,7 +74,7 @@ Rail transport, Roads and Road transport Standard - IFOPT STOP PLACE Model. + IFOPT PATH LINK Model. @@ -271,7 +273,7 @@ Rail transport, Roads and Road transport - Type for a PATH LINK ENd. + Type for a PATH LINK END. @@ -428,7 +430,7 @@ Rail transport, Roads and Road transport - Type for a PATH LINK VIEW. + Type for a PATH JUNCTION/ From 370d1de60efaad34bc0fad0f4c5ecbf4f484041a Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 7 Feb 2024 03:18:19 +0000 Subject: [PATCH 020/144] Enhancement-Add Deck Paths and DEckplan Examples (1) Refactor Path Links and Navigation Paths as a generic PATH LINK stub in core . Place common enums as Reusable environment_support package. (2) Revise IFOPT pt1 SItePathLinks to extend generic PathLink (3) Also Add DECK PATH and DECK NAVIGATION PATHs to extend generic Path Link. Add new constraints to pub file. (4) Add Bus DEck Plan example (5) Add extensive train DECK PLAN example with train make up and boarding poistion akigmnet and Deck Navigation path example. ALso had to fix upo some existing example to pass validation PassengerCapacity --- NeTEx.spp | 18 +- .../deckPlans/DeckPlans-Example_bus.xml | 12 +- .../deckPlans/DeckPlans-Example_train.xml | 364 ++++++++++---- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 2 +- .../site/Netex_01_Sites_SimpleStadium_1.xml | 4 +- .../Netex_10_Sites_OlympicPark_2_basic.xml | 36 +- ...FER_910GWIMBLDN-accessibility_20140601.xml | 64 +-- .../Netex_10_StopPlace_withParking_1.xml | 64 +-- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 36 +- .../Netex_era_uic_simplepark(Disneyland).xml | 8 +- ...odel-PathLinkWithProjection-DEPRECATED.xml | 4 +- .../norway/stops/PointOfInterest.xml | 4 +- .../norway/vehicles/submodel-VehicleType.xml | 8 +- .../vdv452/timetable/NeTEx VDV Example.xml | 118 ++--- xsd/NeTEx_publication.xsd | 52 +- .../netex_all_objects_generic.xsd | 4 +- .../netex_path_support.xsd | 291 ++++++++++++ .../netex_path_version.xsd | 398 ++++++++++++++++ .../netex_place_support.xsd | 7 +- .../netex_all_objects_reusableComponents.xsd | 3 +- .../netex_deckPath_support.xsd | 31 +- .../netex_deckPath_version.xsd | 216 ++++++--- .../netex_deckPlan_support.xsd | 12 +- .../netex_deckPlan_version.xsd | 2 + .../netex_environment_support.xsd | 448 ++++++++++++++++++ .../netex_environment_version.xsd | 158 ++++++ .../netex_seatingPlan_support.xsd | 12 +- .../netex_vehicleType_support.xsd | 1 + .../part1_ifopt/netex_ifopt_all_objects.xsd | 2 - .../netex_ifopt_checkConstraint_support.xsd | 44 +- .../netex_ifopt_checkConstraint_version.xsd | 14 +- .../netex_ifopt_equipmentAccess_support.xsd | 53 +-- .../netex_ifopt_equipmentAccess_version.xsd | 3 +- .../netex_ifopt_navigationPath_version.xsd | 265 ++--------- .../part1_ifopt/netex_ifopt_path_support.xsd | 314 +++--------- .../part1_ifopt/netex_ifopt_path_version.xsd | 357 ++++---------- .../part1_ifopt/netex_ifopt_site_support.xsd | 88 +--- .../part1_ifopt/netex_ifopt_site_version.xsd | 37 +- .../netex_ifopt_stopPlace_support.xsd | 17 +- .../netex_routeInstruction_version.xsd | 17 +- 40 files changed, 2285 insertions(+), 1303 deletions(-) create mode 100644 xsd/netex_framework/netex_genericFramework/netex_path_support.xsd create mode 100644 xsd/netex_framework/netex_genericFramework/netex_path_version.xsd rename xsd/{netex_part_1/part1_ifopt => netex_framework/netex_reusableComponents}/netex_deckPath_support.xsd (86%) rename xsd/{netex_part_1/part1_ifopt => netex_framework/netex_reusableComponents}/netex_deckPath_version.xsd (65%) create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index c6a695476..156df8df3 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -60,6 +60,8 @@ + + @@ -109,6 +111,8 @@ + + @@ -137,6 +141,8 @@ + + @@ -230,8 +236,6 @@ - - @@ -668,6 +672,7 @@ + @@ -775,7 +780,6 @@ - @@ -791,6 +795,14 @@ + + + + + + + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 2694ec582..6bf80b055 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1770,17 +1770,17 @@ Lower deck To a particalar stopt - - - - + + + + Board at front from position A true false 1 - + Board at front @@ -1794,7 +1794,7 @@ Lower deck false true 1 - + exit at rear diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 2d43e800f..51431fdda 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -4,10 +4,11 @@ We describe DECK PLANS for three different wagon types : a sleeper car, nd car transport wagon and a a buffet car a -We describe a TRAIN Ccomprising a buffet car, three sleeper wagons and two car transport wagons, pulled by an engine. - DECK PLAN [Vehicles2] [VeHicles1] [Sleeper3] [Sleeper2] [Sleeper1] [Buffet1] [Engine] +We describe a TRAIN Comprising a buffet car, three sleeper wagons and two car transport wagons, pulled by an engine. + DECK PLAN [Vehicles2] [VeHicles1] [Sleeper3] [Buffet1] [Sleeper2] [Sleeper1] [Engine] TRAIN COMPONENT #7 #6 #5 #4 #3 #2 #1 - TRAIN ELEMENT + TRAIN ELEMENT + Label V02 V02 F04 F03 F02 F01 We assign the deck plans to a specifc SERVICE JOURNEY @@ -15,7 +16,7 @@ We assign the deck plans to a specifc SERVICE JOURNEY --> + 2020-12-17T09:30:47.0Z SYS001 @@ -586,60 +612,66 @@ C) CEN 2023 Engine engine - - - - - Buffet car A - carriage - economyClass - - + forwards - + - Sleeper Waggon B + Sleeper Waggon F01 sleeperCarriage firstClass economyClass + forwards + + + + + Buffet car F02 + carriage + economyClass + + + forwards - + - Sleeper Waggon C + Sleeper Waggon F03 sleeperCarriage firstClass economyClass + forwards - + - Sleeper Waggon D + Sleeper Waggon F04 sleeperCarriage firstClass economyClass - + - Vehicle Wagon 1 + Vehicle Wagon V01 carTransporter - standardClass + any + backwards - + - Vehicle Wagon 2 + Vehicle Wagon V02 carTransporter - standardClass + any + backwards @@ -2226,6 +2258,106 @@ C) CEN 2023 + + + + + mid point at front fo carriage + + 3 2 + + all + + + + + mid point at front fo carriage + + 3 2 + + all + + + + + + + + + + + + + + + + + + + + + + + + + link to Compartment 1 + + + + + + + + + + + link to Compartment 1 + + + + + + + + + + + link to Compartment3 + + + + + + + + + + + + + Static Navigation path to get from right rear door to C3 + + + + + + + wellLit + true + + + + left + Turn right into coridoor + + + + forward + Go down corridor third compart ment on right + + + + @@ -3213,13 +3345,22 @@ C) CEN 2023 - Rear Entrance + Rear Entrance left + + Forward Entrance right + + + + Rear Entrance right + + Toilet + @@ -3235,28 +3376,28 @@ C) CEN 2023 - + Erewhon hbf - + Street Level ST 0 - + Platform Level PL 1 - + - + External Entrance to Ticket Hall - - + + true @@ -3265,7 +3406,7 @@ C) CEN 2023 - + openDoor true true @@ -3273,10 +3414,10 @@ C) CEN 2023 3.0 2.0 - - Ticket Hall Entrance to Platforms 1 and 2 - top of staires - - + + Ticket Hall Entrance to Platforms 1 and 2 - top of stairs + + opening false true @@ -3284,10 +3425,10 @@ C) CEN 2023 3.0 3.0 - - Platforms 1 and 2 -from bottom of staires - - + + Platforms 1 and 2 -from bottom of stairs + + opening false true @@ -3297,45 +3438,45 @@ C) CEN 2023 - + - + -1 - + - + 0 - + - + Quay 3 - + true - + unknown false - + railPlatform - + covered positionOnRailPlatform - + covered positionOnRailPlatform - + covered positionOnRailPlatform @@ -3344,52 +3485,85 @@ C) CEN 2023 - + + Ticket Hall Entrance to middle - + + + - + + - 10 + 1 - - Ticket Hall Entrance to Platforms 1 and 2 - top of staires"> + + Ticket Hall middle to Platforms 1 and 2 - top of stairs - + + - - Ticket Hall Entrance to Platforms 1 and 2 - top of staires"/> + + + + + 0 + + + top of stairs Entrance to Platforms 1 and 2 - bottom of stairs + + + + + + + + + 10 + + Bottom of of stairs Entrance to Platforms 2 - boarding position c + + + + + + + + + + 0 + - - - - + From Station main entrance to QUAY 2 Boarding point 1 - - + + - - - - - example navigation path - - - + + + + + + + + + + + @@ -3471,22 +3645,22 @@ C) CEN 2023 Rail Deck Plan Assignment Example - This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . + This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on the platform . Assignment for train To a particular stop - - - + + + true false - 1 - + 10 + Board at front - + @@ -3494,15 +3668,27 @@ C) CEN 2023 false true - 1 - + 9 + exit at rear - + + + false + true + 1 + + exit at front + + + + + + diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml index 10c9d4304..eed536e62 100644 --- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml +++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml @@ -465,7 +465,7 @@ v1.1 revised ids Big red bus - + 50 20 2 diff --git a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml index 14441f3ed..99be308d9 100644 --- a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml +++ b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml @@ -906,7 +906,7 @@ The example comprises - + Entrance A true forward @@ -1062,7 +1062,7 @@ The example comprises - + Entrance A true forward diff --git a/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml b/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml index 877933c79..f0a6f4b01 100644 --- a/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml +++ b/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml @@ -2163,63 +2163,63 @@ that defines a number of - + Entrance to aquatics vicinity false forward level - + quatics vicinity to bridge 4 false forward level - + from bridge 4 to Stadium vicinity false right level - + Stadium vicinity to Stadium vicinity false forward level - + Stadium vicinity to handball area vicinity ea false forward level - + Handball vicinity to haHockey arvicinity ea true forward level - + hockey vicinity to bridge 2 false right level - + bridge2 to velo vicinity false forward level - + to BMX true forward @@ -2414,63 +2414,63 @@ that defines a number of - + to BMX false forward level - + bridge2 to velo vicinity true forward level - + hockey vicinity to bridge 2 true forward level - + Handball vicinity to haHockey arvicinity ea true left level - + Stadium vicinity to handball arvicinity ea false forward level - + Stadium vicinity to Stadium vicinity false forward level - + from bridge 4 to Stadium vicinity false left level - + quatics vicinity to bridge 4 false forward level - + Entrance to aquatics vicinity false forward 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 49968be26..998588691 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 @@ -2858,7 +2858,7 @@ Changes - + Branch from main entrance to DL stairs 1-4 -180 @@ -2866,8 +2866,8 @@ Changes indoors - - + + Branch from main entrance to Rail stairs to 5 and 6 -180 @@ -2875,8 +2875,8 @@ Changes indoors - - + + Branch from path junction 2 to Rail stairs to 7 and 8 -180 @@ -2884,8 +2884,8 @@ Changes indoors - - + + Branch from path junction 3 to Rail stairs to 9 and 10 -180 @@ -2893,8 +2893,8 @@ Changes indoors - - + + Branch from lift area internal entrance 5 to Lift 1 and Lift 2 -180 @@ -2902,8 +2902,8 @@ Changes indoors - - + + Branch from lift area internal entrance 6 to Lift 3 and Lift 4 -180 @@ -2911,8 +2911,8 @@ Changes indoors - - + + Branch in front foreCourt Near entrance -180 @@ -2920,8 +2920,8 @@ Changes outdoors - - + + Branch in front foreCourt near street -180 @@ -2929,7 +2929,7 @@ Changes outdoors - + @@ -5266,7 +5266,7 @@ Changes - + Landing on Stairs 1 on way to DL -180 @@ -5274,7 +5274,7 @@ Changes indoors - + @@ -6068,7 +6068,7 @@ Changes - + Branch in way to Stop D and Stop P -180 @@ -6076,8 +6076,8 @@ Changes outdoors - - + + Branch on way from main entrance to Stop P -180 @@ -6085,8 +6085,8 @@ Changes outdoors - - + + Branch on way from Stop P to Stop L -180 @@ -6094,8 +6094,8 @@ Changes outdoors - - + + Branch on way from Stop D and Stop L to centre Court -180 @@ -6103,8 +6103,8 @@ Changes outdoors - - + + Branch on way to Stop L from Centre Court -180 @@ -6112,7 +6112,7 @@ Changes outdoors - + @@ -6559,7 +6559,7 @@ Changes - + first Branch on way from main entrance to Alexandra Road 1 -180 @@ -6567,8 +6567,8 @@ Changes outdoors - - + + second Branch on way to Alexandra Road 1 -180 @@ -6576,7 +6576,7 @@ Changes outdoors - + diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index 993463271..800e9f562 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -2962,7 +2962,7 @@ Changes - + Branch from main entrance to DL stairs 1-4 -180 @@ -2970,8 +2970,8 @@ Changes indoors - - + + Branch from main entrance to Rail stairs to 5 and 6 -180 @@ -2979,8 +2979,8 @@ Changes indoors - - + + Branch from path junction 2 to Rail stairs to 7 and 8 -180 @@ -2988,8 +2988,8 @@ Changes indoors - - + + Branch from path junction 3 to Rail stairs to 9 and 10 -180 @@ -2997,8 +2997,8 @@ Changes indoors - - + + Branch from lift area internal entrance 5 to Lift 1 and Lift 2 -180 @@ -3006,8 +3006,8 @@ Changes indoors - - + + Branch from lift area internal entrance 6 to Lift 3 and Lift 4 -180 @@ -3015,8 +3015,8 @@ Changes indoors - - + + Branch in front foreCourt Near entrance -180 @@ -3024,8 +3024,8 @@ Changes outdoors - - + + Branch in front foreCourt near street -180 @@ -3033,7 +3033,7 @@ Changes outdoors - + @@ -5352,7 +5352,7 @@ Changes - + Landing on Stairs 1 on way to DL -180 @@ -5360,7 +5360,7 @@ Changes indoors - + @@ -6164,7 +6164,7 @@ Changes - + Branch in way to Stop D and Stop P -180 @@ -6172,8 +6172,8 @@ Changes outdoors - - + + Branch on way from main entrance to Stop P -180 @@ -6181,8 +6181,8 @@ Changes outdoors - - + + Branch on way from Stop P to Stop L -180 @@ -6190,8 +6190,8 @@ Changes outdoors - - + + Branch on way from Stop D and Stop L to centre Court -180 @@ -6199,8 +6199,8 @@ Changes outdoors - - + + Branch on way to Stop L from Centre Court -180 @@ -6208,7 +6208,7 @@ Changes outdoors - + @@ -6685,7 +6685,7 @@ Changes - + first Branch on way from main entrance to Alexandra Road 1 -180 @@ -6693,8 +6693,8 @@ Changes outdoors - - + + second Branch on way to Alexandra Road 1 -180 @@ -6702,7 +6702,7 @@ Changes outdoors - + diff --git a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml index da86a43d7..fc53452a4 100644 --- a/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml +++ b/examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml @@ -11432,7 +11432,7 @@ Q.4. Public holiday - Services do not run on a christams day - Standard classs carriage carriage standardClass - + standardClass 58 @@ -11465,7 +11465,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11498,7 +11498,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11531,7 +11531,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11567,7 +11567,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11603,7 +11603,7 @@ Q.4. Public holiday - Services do not run on a christams day - buffetCar standardClass - + standardClass 0 20 @@ -11622,7 +11622,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 39 @@ -11655,7 +11655,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 39 @@ -11692,7 +11692,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 25 2 @@ -11744,7 +11744,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 25 @@ -11792,7 +11792,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 39 @@ -11828,7 +11828,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage firstClass - + firstClass 39 @@ -11861,7 +11861,7 @@ Q.4. Public holiday - Services do not run on a christams day - buffetCar standardClass - + standardClass 0 10 @@ -11880,7 +11880,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11916,7 +11916,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11952,7 +11952,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -11985,7 +11985,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 58 @@ -12018,7 +12018,7 @@ Q.4. Public holiday - Services do not run on a christams day - carriage standardClass - + standardClass 48 diff --git a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml index d8ad04b55..29cc0263c 100644 --- a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml +++ b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml @@ -133,7 +133,7 @@ A COMPOSITE FRAME IS used for grouping the other frames. - + EURODISNEY to MARNE LA VALLEE CHESSY SNCF 500 @@ -142,8 +142,8 @@ A COMPOSITE FRAME IS used for grouping the other frames. - - + + EURODISNEY to MARNE LA VALLEE CHESSY 500 @@ -152,7 +152,7 @@ A COMPOSITE FRAME IS used for grouping the other frames. - + diff --git a/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml b/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml index 8894d879e..06646f56a 100644 --- a/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml +++ b/examples/standards/norway/other_resources/submodel-PathLinkWithProjection-DEPRECATED.xml @@ -2,7 +2,7 @@ - + pGNVZIcJ4ldFD 2017586184.321 @@ -22,4 +22,4 @@ PathLink inherits from Link - + diff --git a/examples/standards/norway/stops/PointOfInterest.xml b/examples/standards/norway/stops/PointOfInterest.xml index 8727c998e..12f247575 100644 --- a/examples/standards/norway/stops/PointOfInterest.xml +++ b/examples/standards/norway/stops/PointOfInterest.xml @@ -894,7 +894,7 @@ The example comprises - + Entrance A true forward @@ -1050,7 +1050,7 @@ The example comprises - + Entrance A true forward diff --git a/examples/standards/norway/vehicles/submodel-VehicleType.xml b/examples/standards/norway/vehicles/submodel-VehicleType.xml index ced2471c7..04a408851 100644 --- a/examples/standards/norway/vehicles/submodel-VehicleType.xml +++ b/examples/standards/norway/vehicles/submodel-VehicleType.xml @@ -1,12 +1,12 @@ example - V + V + Euro 6 true diesel - Euro 6 - + firstClass 100 80 @@ -15,7 +15,7 @@ 2 2 - + standardClass 300 250 diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml index 8ed9d69ba..1dbc830ca 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -116,7 +116,7 @@ 11m_Schumacher 11-SU 40 - + 42 42 0 @@ -127,7 +127,7 @@ 11m_Dressmann 11-DR 45 - + 34 42 0 @@ -138,7 +138,7 @@ Strab GT 8 K Überf1 3 - + 91 112 0 @@ -149,7 +149,7 @@ Strab GT 8 Z Überf2 4 - + 84 121 0 @@ -160,7 +160,7 @@ GT8 N GT8 N 5 - + 84 115 0 @@ -171,7 +171,7 @@ GT8 K GT8 K 6 - + 91 112 0 @@ -182,7 +182,7 @@ GT 4/ Oldtimer Old 7 - + 31 31 0 @@ -193,7 +193,7 @@ Setra Überlandbus VAG uel-va 18 - + 49 27 0 @@ -204,7 +204,7 @@ Taxi_Taxizentrale TA-TZ 65 - + 4 0 0 @@ -215,7 +215,7 @@ 8Sitzer_Hercher 8S-HE 60 - + 8 0 0 @@ -226,7 +226,7 @@ 11m_GFR 11-GF 55 - + 34 42 0 @@ -237,7 +237,7 @@ 11 m_SBG 11-SBG 70 - + 42 42 0 @@ -248,7 +248,7 @@ GT8 Z Schülerkurse GT8Z 92 - + 84 121 0 @@ -259,7 +259,7 @@ GT8 N Schülerkurse GT8N 93 - + 84 115 0 @@ -270,7 +270,7 @@ Gelenk_Schülerkurse Gelenk 99 - + 46 49 0 @@ -281,7 +281,7 @@ 11m_Schülerkurse 11_M 98 - + 34 74 0 @@ -292,7 +292,7 @@ 11m_Rast 11-RA 35 - + 42 42 0 @@ -303,7 +303,7 @@ GT8 A GT8 A 8 - + 91 112 0 @@ -314,7 +314,7 @@ 11m_VAG_Citaro citaro 27 - + 34 64 0 @@ -325,7 +325,7 @@ 11m Winterhalter 11-WIN 80 - + 38 42 0 @@ -336,7 +336,7 @@ Schienenschleifer schlei 9 - + 1 1 0 @@ -347,7 +347,7 @@ Combino Combin 1 - + 79 166 0 @@ -358,7 +358,7 @@ GT8 Z GT8 Z 2 - + 84 121 0 @@ -369,7 +369,7 @@ Sprinter_VAG-Freiburg 10-VA 10 - + 14 7 0 @@ -380,7 +380,7 @@ Schienen-Reiniger reinig 12 - + 1 1 0 @@ -391,7 +391,7 @@ Partywagen Party 13 - + 20 20 0 @@ -402,7 +402,7 @@ 11m_Schwarz 11-SW 50 - + 45 54 0 @@ -413,7 +413,7 @@ Sputnik sputni 14 - + 20 20 0 @@ -424,7 +424,7 @@ Diesel-Lok dielok 19 - + 1 1 0 @@ -435,7 +435,7 @@ 11m_Binninger 11-BI 31 - + 49 42 0 @@ -446,7 +446,7 @@ Taxi Groß Taxis 17 - + 12 0 0 @@ -457,7 +457,7 @@ Breisgau-S-Bahn ZUG 20 - + 0 0 0 @@ -468,7 +468,7 @@ Breisgau-S-Bahn ZUG1 21 - + 0 0 0 @@ -479,7 +479,7 @@ Breisgau-S-Bahn ZUG2 22 - + 0 0 0 @@ -490,7 +490,7 @@ Breisgau-S-Bahn ZUG3 23 - + 0 0 0 @@ -501,7 +501,7 @@ Breisgau-S-Bahn ZUG4 24 - + 0 0 0 @@ -512,7 +512,7 @@ Breisgau-S-Bahn ZUG5 25 - + 0 0 0 @@ -523,7 +523,7 @@ Gelenk_Schwarz 18-SW 51 - + 61 93 0 @@ -534,7 +534,7 @@ 11m-Hohwihler 11-HO 30 - + 34 32 0 @@ -545,7 +545,7 @@ Gelenk_Schumacher 15schu 41 - + 46 53 0 @@ -556,7 +556,7 @@ Gelenk_Rast 18-RA 36 - + 55 85 0 @@ -567,7 +567,7 @@ Gelenk_Dresmann 18-DR 46 - + 46 53 0 @@ -578,7 +578,7 @@ Gelenk_GFR 18-GF 56 - + 46 53 0 @@ -589,7 +589,7 @@ Taxi_GFR TA-GF 57 - + 4 0 0 @@ -600,7 +600,7 @@ Taxi_Hercher TA-HE 61 - + 4 0 0 @@ -611,7 +611,7 @@ 8Sitzer_Taxizentrale 8S-TZ 66 - + 8 0 0 @@ -622,7 +622,7 @@ Gelenk_SBG 18-SBG 71 - + 55 85 0 @@ -633,7 +633,7 @@ Gelenk_Winterhalter 18-WIN 81 - + 46 53 0 @@ -644,7 +644,7 @@ GT8K_Schülerkurse GT8K 91 - + 91 112 0 @@ -655,7 +655,7 @@ Combino_Schülerkurse Comb 94 - + 79 171 0 @@ -666,7 +666,7 @@ Test-Einrichtung test 29 - + 1 1 0 @@ -677,7 +677,7 @@ Gelenk_VAG-Freiburg 15-VA 15 - + 46 53 0 @@ -688,7 +688,7 @@ 11m_VAG-Freiburg 11-VA 11 - + 34 32 0 @@ -699,7 +699,7 @@ Taxi Klein Klein 16 - + 4 0 0 @@ -710,7 +710,7 @@ Bus_Läufer 11-LÄ 26 - + 46 22 0 @@ -721,7 +721,7 @@ Pseudo-Zählfahrzeug Zähl_F 32 - + 34 32 0 @@ -732,7 +732,7 @@ Sprinter-Winterhalter Sp-WIN 82 - + 14 7 0 @@ -743,7 +743,7 @@ Sprinter_Sutter Sp-SUT 67 - + 26 10 1 @@ -754,7 +754,7 @@ Turmwagen Turm 48 - + 4 0 0 diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 9cd73c658..a9faf95ce 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -4299,6 +4299,48 @@ Correct COnstraints for PointOnRoute + + + + + Every [DeckPathLink Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckPathJunction Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -5747,12 +5789,12 @@ Correct COnstraints for PointOnRoute - + - + @@ -5762,18 +5804,18 @@ Correct COnstraints for PointOnRoute Every [PathJunction Id + Version] must be unique within document. - + - + - + diff --git a/xsd/netex_framework/netex_all_objects_generic.xsd b/xsd/netex_framework/netex_all_objects_generic.xsd index 76367f73f..407509054 100644 --- a/xsd/netex_framework/netex_all_objects_generic.xsd +++ b/xsd/netex_framework/netex_all_objects_generic.xsd @@ -30,7 +30,7 @@ - + @@ -39,6 +39,8 @@ + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd new file mode 100644 index 000000000..e42163193 --- /dev/null +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -0,0 +1,291 @@ + + + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-01-05Factored out of Ifopt path + + + 2024-01-05 + + +

                                      NeTEx - Network Exchange. This subschema defines PATH types.

                                      +                                       + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + Unclassified + CEN, Crown Copyright 2009-2019 + + +
                                        +
                                      • Derived from the TRANSMODEL 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 Network Exchange - PATH identifier types. + Standard +                                       +                                       + PATH identifier types for Generic Fixed Objects in Public Transport. +                                       + + + + Type for a list of references to a PATH LINK. + + + + + + + + + + + + + Type for identifier of a PATH LINK. + + + + + + Reference to a PATH LINK. + + + + + Type for a reference to a PATH LINK. + + + + + + Identifier of a PATH LINK. + + + + + + + + + Reference to a PATH LINK BY VALUE. + + + + + Type for a reference to a PATH LINK BY VALUE. + + + + + + Identifier of a POINT. at which LINK starts. + + + + + Identifier of a POINT. at which LINK ends. + + + + + Class of POINT referenced by LINK. + + + + + + + + + Type for identifier of a PATH JUNCTION. + + + + + + Reference to a PATH JUNCTION. + + + + + Type for a reference to a PATH JUNCTION. + + + + + + Identifier of a PATH JUNCTION. + + + + + + + + + + + Type for a list of references to a NAVIGATION PATH. + + + + + + + + + + + + Type for identifier of a NAVIGATION PATH. + + + + + + Reference to a NAVIGATION PATH. + + + + + Type for reference to a NAVIGATION PATH. + + + + + + Identifier of a NAVIGATION PATH. + + + + + + + + + Type for identifier of an ACCESS SUMMARY. + + + + + + + Type for identifier of place step in a NAVIGATION PATH. + + + + + + Reference to a PLACE IN SEQUENCE. If given by context does not need to be stated. + + + + + Type for reference to a PLACE IN SEQUENCE. + + + + + + Identifier of a PLACE IN SEQUENCE. + + + + + + + + + Type for identifier of link step in a PATH LINK IN SEQUENCE. + + + + + + Reference to a PATH LINK IN SEQUENCE. If given by context does not need to be stated. + + + + + Type for Reference to a PATH LINK IN SEQUENCE. + + + + + + Identifier of a PATH LINK IN SEQUENCE. + + + + + + + + + Type for identifier of a PATH LINK VIEW.; + + + + + + + Allowed values for flow direction. + + + + + + + + + Allowed values for path transition. + + + + + + + + + + + + Allowed values for path heading. + + + + + + + + +                                       diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd new file mode 100644 index 000000000..2b8111c42 --- /dev/null +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -0,0 +1,398 @@ + + + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] + Europe + Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema + + 2024-02-05Factored out from ifopt_path_link + + + 2024-02-05 + + + NeTEx Network Exchange - Generic PATH types. + + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version.xsd + [ISO 639-2/B] ENG + CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR + + http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
                                        +
                                      • Evolved from NaPTAN, SIRI and other schemas.
                                        • +
                                      + + 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 Network Exchange (IFOPT subset) - STOP PLACE Schema Place . + Standard +                                       +                                       + IFOPT PATH LINK Model. +                                       + + + + A link between any two PLACEs (That is STOP PLACEs, ACCESS SPACEs or QUAYs, BOARDING POSITIONs, POINTs OF INTEREST etc or PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out of vehicle passengers within or between a PLACE. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a PATH LINK. + + + + + + + + + + + + Elements of a PATH LINK. + + + + + + Duration properties of a LINK. + + + + + Timings for the transfer. + + + + + + + Type for a PATH LINK END. + + + + + Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. + + + + + + + Elements of a PATH SITE ELEMENT. + + + + + + + + + + + + Type for a list of PATH JUNCTIONs. + + + + + + + + PATH JUNCTION for a SITE. + + + + + + + + + A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a PATH JUNCTION. + + + + + + + + + + + + Elements of a PATH JUNCTION. + + + + + Parent ZONE that contains this PATH JUNCTION. + + + + + + + + A VIEW of a PATH LINK used to select items for presentation. + + + + + + + + + Whether link should be hidden in the PATH LINK VIEW. + + + + + Whether destination of PATH LINK should be hidden. + + + + + Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. + + + + + Whether exit at end of PATH LINK should be shown as separate step in view. + + + + + Whether Heading element should be shown as separate step in view e.g. turn left right. + + + + + + + Identifier of Object of which this is a view. + + + + + + + + + Type for a PATH LINK VIEW. + + + + + + + Whether link should be hidden in the PATH LINK VIEW. + + + + + Whether destination of PATH LINK should be hidden. + + + + + Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. + + + + + Whether exit at end of PATH LINK should be shown as separate step in view. + + + + + Whether Heading element should be shown as separate step in view e.g. turn left right. + + + + + + + + + + A collection of one or more PATH LINKs in SEQUENCE. + + + + + + + + + + + + A step in a Navigation PATH. + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a PATH LINK IN SEQUENCE. + + + + + + + + + + + + Elements of a PATH LINK IN SEQUENCE. + + + + + + Description of reference. + + + + + Whether link is navigated in to / from, i.e. reverse direction . Default is false, i.e. from to. + + + + + Whether step is left right or forward. + + + + + Whether step is up down or level in direction of use. + + + + + Instruction for following path + + + + + Label On step. + + + + + Instructions on how step view should be presented. + + + + + + + + + + +                                       diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd index aefc0ffae..66968aea2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd @@ -14,9 +14,11 @@ 2010-09-04 - 2011-02-05 Name Space changes + + 2011-02-05 Name Space changes - 2019-02-07Mark PlaceRef_ as Abstract + + 2019-02-07Mark PlaceRef_ as Abstract Add dummGroupOfPlaceRefs so that all place tpesrefs can be included @@ -58,6 +60,7 @@ Rail transport, Roads and Road transport Standard + Identifer types for PLACE diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index 8c480fb37..f1179af0e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -45,7 +45,8 @@ - + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd similarity index 86% rename from xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd rename to xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 1e1d5ce8f..8fcfe35ca 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -1,7 +1,6 @@ - - + @@ -14,7 +13,7 @@ 2024-01-18 - 2024-01-18 + 2024-01-18Move from Part1 Ifoft and bas on generic

                                      NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                      @@ -148,6 +147,32 @@ Rail transport, Roads and Road transport                                       + + + + Type for identifier of place step in a NAVIGATION PATH. + + + + + + Reference to a DECK PLACE IN SEQUENCE. If given by context does not need to be stated. + + + + + Type for reference to a DECK PLACE IN SEQUENCE. + + + + + + Identifier of a DECK PLACE IN SEQUENCE. + + + + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd similarity index 65% rename from xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd rename to xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index e61ec5786..c6524cde6 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -2,9 +2,14 @@ - - - + + + + + + + + @@ -60,25 +65,31 @@ Rail transport, Roads and Road transport Standard - DECK PATH LINK Model. + DECK PATH LINK and NAVIGATION PATH Model. - - + + - Type for a list of DECK PATH JUNCTIONs. + Deck Path elemenst fro DECK - - - - - - DECK PATH JUNCTION for a SITE. - - - - - - + + + + PATH JUNCTIONs for DECK + + + + + PATH LINKs for DECK + + + + + NAVIGATION PATHs for DECK + + + + @@ -99,7 +110,7 @@ Rail transport, Roads and Road transport - A link within a DECK PLAN that represents a step in a possible route for pedestrians, wheelchair users or other out-of-vehicle passengers. + A link within a DECK PLAN that represents a step in a possible route for pedestrians, wheelchair users or other out-of-vehicle passengers. +V2.0 @@ -187,12 +198,13 @@ Rail transport, Roads and Road transport - Beginning or end of a DECK PATH LINK, referencing a DECK COMPONENT or LOCATABLE SPOT. May be linked to a specific DECK LEVEL. + Beginning or end of a DECK PATH LINK, referencing a DECK COMPONENT or LOCATABLE SPOT. May be linked to a specific DECK LEVEL. +V2.0 + @@ -216,21 +228,20 @@ Rail transport, Roads and Road transport Type for a list of DECK PATH JUNCTIONs. - - - - + + + - DECK PATH JUNCTION for a SITE. + DECK PATH JUNCTION for a DECK. - +                                       - A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + A designated point, inside a DECK SPACE , at which two or more DECK PATH LINKs may connect or branch. +V2.0 @@ -271,7 +282,7 @@ Rail transport, Roads and Road transport Elements of a DECK PATH JUNCTION. - + Elements of a SITE ELEMENTs. @@ -294,27 +305,108 @@ Rail transport, Roads and Road transport + + + + A collection of one or more PLACEs in SEQUENCE. + + + + + + + Deck place traversed by a DECK NAVIGATION PATH in sequence. May be a DECK PLACE, PATH JUNCTION or POINT. + + + + + + + + + Point traversed by a NAVIGATION PATH in sequence. May be a PLACE PATH JUNCTION or EQUIPABLE SPACE. + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a DECK PLACE IN SEQUENCE. + + + + + + + + + + + + Elements of DECK PLACE IN SEQUENCE. + + + + + + Branching level of place. + + + + + Onward links from this point. + + + + + + + + + - + Type for a list of DECK NAVIGATION PATHs. - - - - + + + DECK NAVIGATION PATH for a SITE. - + - A designated path between two places on. May include an ordered sequence of DECK PATH LINKs. + A designated path between two places within a DECK PLAN. May include an ordered sequence of DECK PATH LINKs. +v2.0 @@ -330,9 +422,7 @@ Rail transport, Roads and Road transport - - - + @@ -349,7 +439,7 @@ Rail transport, Roads and Road transport Type for DECK NAVIGATION PATH. - + @@ -361,11 +451,28 @@ Rail transport, Roads and Road transport Elements of a DECK NAVIGATION PATH. - + + + + + Classification of Overall Accessibility of NAVIGATION PATH. + + + + + Classification of DECK NAVIGATION.. + + + Ordered collection of References to STOP PLACE spaces Use for a branch path. + + + Ordered collection of References to PATH LINKs. + + @@ -373,30 +480,33 @@ Rail transport, Roads and Road transport Elements of a DECK NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the DECK NAVIGATION PATH forbids wheelchair. - + Origin end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs are not given. - + Destination end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs not given. - - - - MODEs of access which may used at associated place, e.g. foot access, bicycle access. - - - + + + + + + Detailed properties of a DECK ELEMENT, (These are simialr to properties of a SIT ELEMENT + + + + - Summaries of access features encountered in path. + Presentation defaults for SITE ELEMENT. +V1.2.2 - + - Total time needed to navigate path (May be derived from links). + Facilities available at SITe. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 9055cc398..528a9af75 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -79,7 +79,7 @@ - + Reference to a DECK PLAN. +v2.0 @@ -143,7 +143,7 @@ - + Reference to a DECK COMPONENT. +v2.0 @@ -195,7 +195,7 @@ - + Reference to a PASSENGER SPACE. +v2.0 @@ -357,7 +357,7 @@ - + Reference to a PASSENGER ENTRANCE. +v2.0 @@ -383,7 +383,7 @@ - + Reference to a DECK VEHICLE ENTRANCE. +v2.0 @@ -409,7 +409,7 @@ - + Reference to a OTHER DECK ENTRANCE. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 9b52eedda..210eeb0d4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -3,6 +3,7 @@ + @@ -246,6 +247,7 @@ COLUMNs on DECK. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd new file mode 100644 index 000000000..1a23d9d29 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -0,0 +1,448 @@ + + + + + + + + + main schema + e-service developers + Europe + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc + + + 2024-02-05 + + +

                                      NeTEx - Network Exchange. This subschema defines common access enumeration types.

                                      +                                       + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_environent_support.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + Unclassified + CEN, Crown Copyright 2009-2019 + + +
                                        +
                                      • Derived from the TRANSMODEL 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 Network Exchange - PATH identifier types. + Standard +                                       +                                       + Environment enumerations for Generic PATH and PLACE and SITE models +                                       + + + + + + Common elements of a PATH. + + + + + + + Maximum number of passengers who can traverse PATH LINK per minute. + + + + + + + Common Navigation elements of a PATH. + + + + + Direction heading to show for PATH LINK when travelling in its FROM / TO sense. + + + + + Direction heading to show for PATH LINK when travelling in its TO / FROM sense. + + + + + Number of steps to take PATH LINK. + + + + + Minimum Height of PATH LINK. +v1.1 + + + + + Minimum Width of PATH LINK. +v1.1 + + + + + Allowed direction of use: one way or two way. Default is two way. + + + + + Whether PATH LINK is up down or level in from to direction. + + + + + Maximum gradient in degrees (in the direction of the PATH LINK way). +v1.1 + + + + + Coded value of the maximum gradient.+v1.1 + + + + + Maximum Tilt angle in degrees between -20 and 20 (in the direction of the PATH LINK way). +v1.1 + + + + + Coded value of the maximum tilt. See allowed va;ues. +v1.1 + + + + + + + Common Description elements of a PATH. + + + + + Type of physical feature of PATH LINK. + + + + + Type of passage feature of PATH LINK. + + + + + Type of flooring of the walking surface. +v1.1 + + + + + Type of border on the right side (in the direction of the PATH LINK). + + + + + Type of border on the left side (in the direction of the PATH LINK). +v1.1 + + + + + Nature of the tactile warning strips (in the direction of the PATH LINK). +v1.1 + + + + + Indicates whether there are guiding strips. +v1.1 + + + + + + + + Environmental properties of a SITE ELEMENT o DECK ELEMENTr + + + + + Whether the component is available for public use or is restricted. + + + + + Whether the component is Indoors or outdoors. Default is Indoors. + + + + + Whether the component is within a gated area or freely accessible without a pass or ticket. + + + + + Whether the component is lit or not. Default is well Lit. + + + + + Whether all areas of the component are wheelchair accessible. + + + + + Total number of people that component can contain. + + + + + + + + Allowed values for Navigation type. + + + + + + + + + + + + + + + + + + + + Allowed values for Gradient steepness. + + + + + + + + + + + + + Allowed values for tilt. +v1.1 + + + + + + + + + + + + + Allowed values for flooring. + + + + + + + + + + + + + + + + + + + + + + + + + + Allowed values for border types + + + + + + + + + + + + + + + + + + + + + + + + + + Allowed values for TactileWarningStrip + + + + + + + + + + + + + Allowed values for an access feature. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Allowed values for a list of access features. + + + + + + + Allowed value for Lighting. + + + + + + + + + + + + Allowed values for public use. + + + + + + + + + + + + Allowed values for covered. + + + + + + + + + + + + Allowed values for gated. + + + + + + + + + + Allowed values for ACCESS SPACE TYPEs. + + + + + + + + + + + + + + + + + + + + + + + Allowed values for Passage Types. + + + + + + + + + + + +                                       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd new file mode 100644 index 000000000..474387c3f --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -0,0 +1,158 @@ + + + + + + + + + + + + + main schema + e-service developers + V1.0 Nicholas Knowles + Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] + Europe + Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema + + 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK + + + 2024-01-06 + + + NeTEx Network Exchange - Shared PATH types. + + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_environment_version.xsd + [ISO 639-2/B] ENG + CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR + + http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd + + Unclassified + CEN, Crown Copyright 2009-2024 + + +
                                        +
                                      • Evolved from NaPTAN, SIRI and other schemas.
                                        • +
                                      + + 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 Network Exchange (IFOPT subset) - NAVIGATION PATH types. + Standard +                                       +                                       + Shared PATH features Model. +                                       + + + + A collection of one or more ACCESS SUMMARies. + + + + + + + + + + + + Summary of a feature used in NAVIGATION PATH. + + + + + + + + + + + + + + + + + + + + Type for ACCESS SUMMARY. + + + + + + + + + + + + Elements of a NAVIGATION PATH. + + + + + Type of access feature, e.g. lift, stairs, + + + + + Count of feature, e.g. number of lifts, stairs. + + + + + Nature of access feature transition e.g. up or down. + + + + + + + + Elements of a NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. + + + + + + MODEs of access which may used at associated place, e.g. foot access, bicycle access. + + + + + Summaries of access features encountered in path. + + + + + Total time needed to navigate path (May be derived from links). + + + + + +                                       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 3f1aefa29..dd91dfe1a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -142,7 +142,7 @@ - + Reference to an EQUIPABLE SPACE. +v2.0 @@ -168,7 +168,7 @@ - + Reference to a LOCATABLE SPOT. +v2.0 @@ -194,7 +194,7 @@ - + Reference to a PASSENGER SPOT. +v2.0 @@ -220,7 +220,7 @@ - + Reference to a PASSENGER VEHICLE SPOT. +v2.0 @@ -246,7 +246,7 @@ - + Reference to a LUGGAGE SPOT. +v2.0 @@ -330,7 +330,7 @@ - + Identifier of a SENSOR IN SPOT. +V2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 788198b4c..8e792099a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -575,6 +575,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd index 5e193b290..2a5809bb9 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd @@ -35,6 +35,4 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd index 4ab7a6ce9..88cd60c7c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd @@ -18,7 +18,10 @@ 2017-10-25 Add TYPE OF CONGESTION.                                       - 2024-01-17DECK PLANS: add ladder to AvvesFeatureType enumeration. + 2024-01-17DECK PLANS: add ladder to AccesFeatureType enumeration. + + + 2024-02-17DECK PLANS: REmodularise Move AccsesFeatureType enumeration to acceeess_Support

                                      NeTEx - Network Exchange. This subschema defines common Check types.

                                      @@ -220,44 +223,7 @@ Rail transport, Roads and Road transport - - - Allowed values for an access feature. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Allowed values for a list of access features. - - - - + Allowed values for a congestion. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd index b4a8f4198..f59cff3ef 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd @@ -1,6 +1,7 @@ - + + @@ -22,9 +23,14 @@ 2011-12-16 - 2017-05-25CR0035 Add Type of COngestion open value. + + 2017-05-25CR0035 Add Type of COngestion open value. + + + 2019-04-09 FIX Make data type of throughut counts NumberOfPassengers. - 2019-04-09 FIX Make data type of throughut counts NumberOfPassengers. + + 2024-02-01 Remodularise - add include to access_support

                                      NeTEx - Network Exchange. This subschema defines common Check types.

                                      @@ -38,7 +44,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2024
                                        diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 2d67d02b3..2395cf220 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -31,6 +31,9 @@ 2024-01-17DECK PLAN and EPIA add DoorType + + 2024-02-05Path refactoring: Move TactileWarningStripEnumeration to path_support. Also cdrop unusued LightingMethod - shoudl be LightingOnMethod +

                                        NeTEx - Network Exchange. This subschema defines ACCESS EQUIPMENT types for Place access.

                                         @@ -409,18 +412,6 @@ Rail transport, Roads and Road transport - - - Allowed values for TactileWarningStrip - - - - - - - - - @@ -456,18 +447,6 @@ Rail transport, Roads and Road transport - - - Allowed value for Lighting. - - - - - - - - - Allowed values for lighting method. @@ -519,18 +498,6 @@ Rail transport, Roads and Road transport - - - Allowed values for Gradient steepness. - - - - - - - - - Allowed values for entrance attention device. @@ -568,18 +535,4 @@ Rail transport, Roads and Road transport - - - Allowed values for lighting method - - - - - - - - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 59557433c..77ec6df41 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -1,6 +1,7 @@ + @@ -27,7 +28,7 @@ 2019-03-25FR49 CD #65 Accessibility changes CD add new attribute NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown - CD add new attributeLightingMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other + CD add new attributeLightingOOnMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector CD Add new attribute to AccessEquipmene; SafeForGuideDog. CD Add new attribute to StairEquipment; WithoutRiser. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 6883f9530..6dcf5e303 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -1,14 +1,12 @@ - + - - - + @@ -28,18 +26,14 @@ 2007-03-22 - 2017-11-08 Move Dsecription prom Path in Seqyence to supertpe lin k in Sequence + + 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence + + + 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc NeTEx Network Exchange - NAVIGATION PATH types. -

                                        -

                                          -
                                        • STOP PLACE Model
                                          • -
                                        • POINT OF INTEREST Model
                                          • -
                                        • Topographic Model
                                          • -
                                        • Administrative Model
                                          • -
                                        -

                                        text/xml @@ -53,7 +47,7 @@ http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2024
                                          @@ -123,13 +117,14 @@ Rail transport, Roads and Road transport - - + + + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. - + @@ -139,19 +134,24 @@ Rail transport, Roads and Road transport - - + + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. - + + + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. + + + - Group of Access related elements. + Group of ACCESS and PATH related elements related elements. for a site @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport PATH LINKs for SITE. - + PATH JUNCTIONs within the SITE and or between the SITE elsewhere. @@ -176,7 +176,7 @@ Rail transport, Roads and Road transport - + Type for a list of NAVIGATION PATHs. @@ -212,8 +212,6 @@ Rail transport, Roads and Road transport - - @@ -229,8 +227,6 @@ Rail transport, Roads and Road transport - - @@ -241,170 +237,62 @@ Rail transport, Roads and Road transport Elements of a NAVIGATION PATH. - - - Classification of Overall Accessibility of NAVIGATION PATH. - - - - - Classification of Navigation. - - - - - Ordered collection of References to STOP PLACE spaces Use for a branch path. - - - - - Ordered collection of References to PATH LINKs. - - - - - Access Links that NAVIGATION PATH serves. - - + + + - + Elements of a NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. - + Origin end of NAVIGATION PATH. Only needed if detailed PATH LINKs are not given. - + Destination end of NAVIGATION PATH. Only needed if detailed PATH LINKs not given. - - - - MODEs of access which may used at associated place, e.g. foot access, bicycle access. - - - - - Summaries of access features encountered in path. - - - - - Total time needed to navigate path (May be derived from links). - - + - - - - A collection of one or more PATH LINKs in SEQUENCE. - - - - - - - - - - - - A step in a Navigation PATH. - - - - - - - - - - - - - - - - - - - - - Identifier of ENTITY. - - - - - - - - - Type for a step in NAVIGATION PATH. - - - - - - - - - - + - Elements of a step in a NAVIGATION PATH. + Elements of a NAVIGATION PATH. - - - - Description of reference. - - - - - Whether link is navigated in to / from, i.e. reverse direction . Default is false, i.e. from to. - - - + - Whether step is left right or forward. + Classification of Overall Accessibility of NAVIGATION PATH. - + - Whether step is up down or level in direction of use. + Classification of Navigation. - + - Instruction for following path + Ordered collection of References to STOP PLACE spaces Use for a branch path. - + - Label On step. + Ordered collection of References to PATH LINKs. - + - Instructions on how step view should be presented. + Access Links that NAVIGATION PATH serves. - - - - - - + A collection of one or more PLACEs in SEQUENCE. @@ -487,71 +375,4 @@ Rail transport, Roads and Road transport - - - A collection of one or more ACCESS SUMMARies. - - - - - - - - - - - - Summary of a feature used in NAVIGATION PATH. - - - - - - - - - - - - - - - - - - - - Type for ACCESS SUMMARY. - - - - - - - - - - - - Elements of a NAVIGATION PATH. - - - - - Type of access feature, e.g. lift, stairs, - - - - - Count of feature, e.g. number of lifts, stairs. - - - - - Nature of access feature transition e.g. up or down. - - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 522179008..f04ef46c0 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -1,8 +1,7 @@ - - - - + + + @@ -17,10 +16,14 @@ 2011-12-16 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add CodedTiltEnumeration with values _strongLeftTilt, mediumLeftTilt, nearlyFlat, mediumRightTilt, strongRightTilt, unknown_. Revise name of ___CodedTilt___ to ___TiltType___ to be consistent + + 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH +

                                          NeTEx - Network Exchange. This subschema defines PATH types.

                                           @@ -33,7 +36,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2024
                                            @@ -58,10 +61,10 @@ Rail transport, Roads and Road transport PATH identifier types for IFOPT Fixed Objects in Public Transport. - - + + - Type for a list of references to a PATH LINK. + Type for a list of references to a SITE PATH LINK. @@ -72,310 +75,133 @@ Rail transport, Roads and Road transport - + - Type for identifier of a PATH LINK. + Type for identifier of a SITE PATH LINK. - + - + - Reference to a PATH LINK. + Reference to a SITE PATH LINK. - + - Type for a reference to a PATH LINK. + Type for a reference to a SITE PATH LINK. - - + + - Identifier of a PATH LINK. + Identifier of a SITE PATH LINK. - - - - Reference to a PATH LINK BY VALUE. - - - - - Type for a reference to a PATH LINK BY VALUE. - - - - - - Identifier of a POINT. at which LINK starts. - - - - - Identifier of a POINT. at which LINK ends. - - - - - Class of POINT referenced by LINK. - - - - - - - + + - Type for identifier of a PATH JUNCTION. + Type for identifier of a SITE PATH JUNCTION. - + - + - Reference to a PATH JUNCTION. + Reference to a SITE PATH JUNCTION. - + - Type for a reference to a PATH JUNCTION. + Type for a reference to a SITE PATH JUNCTION. - - + + - Identifier of a PATH JUNCTION. + Identifier of a SITE PATH JUNCTION. - - - - + + - Type for a list of references to a NAVIGATION PATH. + Type for a list of references to a OFF SITE PATH LINK. - - - + + + + - + - Type for identifier of a NAVIGATION PATH. + Type for identifier of a OFF SITE PATH LINK. - + - + - Reference to a NAVIGATION PATH. + Reference to a OFF SITE PATH LINK. - + - Type for reference to a NAVIGATION PATH. + Type for a reference to a OFF SITE PATH LINK. - - + + - Identifier of a NAVIGATION PATH. + Identifier of a OFF SITE PATH LINK. - - - - Type for identifier of a NAVIGATION PATH. - - - - - - Allowed values for flow direction. - - - - - - - - - - Allowed values for path transition. - - - - - - - - - - - - Allowed values for path heading. - - - - - - - - - - - Allowed values for Navigation type. - - - - - - - - - - - - - - - - - - - - - Allowed values for tilt. +v1.1 - - - - - - - - - - - - - Allowed values for flooring. - - - - - - - - - - - - - - - - - - - - - - - - - - Allowed values for border types - - - - - - - - - - - - - - - - - - - - - - - - - - - Type for identifier of place step in a NAVIGATION PATH. - - - - - - Reference to a PLACE IN SEQUENCE. If given by context does not need to be stated. - - - + + - Type for reference to a PLACE IN SEQUENCE. + Type for a list of references to a SITE NAVIGATION PATH. - - - - - Identifier of a PLACE IN SEQUENCE. - - - - + + + + + + + - - + - Type for identifier of link step in a PATH LINK IN SEQUENCE. + Type for identifier of a SITE NAVIGATION PATH. - + - + - Reference to a PATH LINK IN SEQUENCE. If given by context does not need to be stated. + Reference to a SITE NAVIGATION PATH. - + - Type for Reference to a PATH LINK IN SEQUENCE. + Type for reference to a SITE NAVIGATION PATH. - - + + - Identifier of a PATH LINK IN SEQUENCE. + Identifier of a SITE NAVIGATION PATH. - - - Type for identifier of a PATH LINK VIEW> - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index f17e2c082..ac00bd44f 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -1,6 +1,7 @@ - + + @@ -34,10 +35,11 @@ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___ + + 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink + NeTEx Network Exchange - PATH types. -

                                            -

                                            text/xml @@ -77,132 +79,69 @@ Rail transport, Roads and Road transport IFOPT PATH LINK Model. - + - Common elements of a PATH. + Elements of a OFF SITE PATH LINK. - - - + - Maximum number of passengers who can traverse PATH LINK per minute. + Description of PATH LINK. + + + + - + - Common Navigation elements of a PATH. + Type for an OFF SITE P PATH LINK END. - - - Direction heading to show for PATH LINK when travelling in its FROM / TO sense. - - - - - Direction heading to show for PATH LINK when travelling in its TO / FROM sense. - - - - - Number of steps to take PATH LINK. - - - - - Minimum Height of PATH LINK. +v1.1 - - - - - Minimum Width of PATH LINK. +v1.1 - - - - - Allowed direction of use: one way or two way. Default is two way. - - - - - Whether PATH LINK is up down or level in from to direction. - - - - - Maximum gradient in degrees (in the direction of the PATH LINK way). +v1.1 - - - + - Coded value of the maximum gradient.+v1.1 + Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. - + - Maximum Tilt angle in degrees between -20 and 20 (in the direction of the PATH LINK way). +v1.1 + Reference to a LEVEL on which SITE COMPONENT is found. - + - Coded value of the maximum tilt. See allowed va;ues. +v1.1 + Reference to an ENTRANCE of a PLACE. - - +                                             + - Common Description elements of a PATH. + Elements of a PATH SITE ELEMENT. - - - Type of physical feature of PATH LINK. - - - - - Type of passage feature of PATH LINK. - - - - - Type of flooring of the walking surface. +v1.1 - - - - - Type of border on the right side (in the direction of the PATH LINK). - - - - - Type of border on the left side (in the direction of the PATH LINK). +v1.1 - - - - - Nature of the tactile warning strips (in the direction of the PATH LINK). +v1.1 - - - + + + + + - Indicates whether there are guiding strips. +v1.1 + Allowed MODEs to use in component. + - - + + - A link between any two PLACEs (That is STOP PLACEs, ACCESS SPACEs or QUAYs, BOARDING POSITIONs, POINTs OF INTEREST etc or PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out of vehicle passengers within or between a PLACE. + A link outside of a SITE between any two PLACEs ( PKACES PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out of vehicle passengers within or between a PLACE. +v2.0 - + @@ -216,101 +155,50 @@ Rail transport, Roads and Road transport + + + - + + + Identifier of ENTITY. + + - + - Type for a PATH LINK. + Type for an OFF SITE PATH LINK. - + - + - + - Elements of a PATH LINK. + Elements of an OFF SITE PATH LINK. - + Origin end of PATH LINK. - + Destination end of PATH LINK. - - - Description of PATH LINK. - - - - - - - - - - Duration properties of a LINK. - - - - - Timings for the transfer. - - - - - - - Type for a PATH LINK END. - - - - - Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. - - - - - Reference to a LEVEL on which SITE COMPONENT is found. - - - - - Reference to an ENTRANCE of a PLACE. - - - - - - - Elements of a PATH SITE ELEMENT. - - - - - - - - - Allowed MODEs to use in component. - - - + - + Type for a list of SITE PATH LINKs. @@ -318,7 +206,7 @@ Rail transport, Roads and Road transport - + PATH LINK for a SITE. @@ -349,11 +237,10 @@ Rail transport, Roads and Road transport - - + @@ -365,7 +252,6 @@ Rail transport, Roads and Road transport - @@ -373,27 +259,43 @@ Rail transport, Roads and Road transport - Elements of a SITE PATH LINK. + Elements of a SITE PATH LINK. + + + Origin end of PATH LINK. + + + + + Destination end of PATH LINK. + + + + + Elements of a fixed PATH LINK. + + Additional public label for the SITE PATH LINK + - - - + + - Type for a list of PATH JUNCTIONs. + Type for a list of SITE PATH JUNCTIONs. - + + PATH JUNCTION for a SITE. @@ -402,13 +304,13 @@ Rail transport, Roads and Road transport - + - A designated point, inside or outside of a STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + A designated point, inside a SITE ie STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. - + @@ -420,7 +322,7 @@ Rail transport, Roads and Road transport - + @@ -428,21 +330,21 @@ Rail transport, Roads and Road transport - + - Type for a PATH JUNCTION/ + Type for a SITE PATH JUNCTION. - + - + - Elements of a PATH JUNCTION. + Elements of a SITE PATH JUNCTION. @@ -465,89 +367,12 @@ Rail transport, Roads and Road transport PATH JUNCTION is within the referenced SITE COMPONENT. + + + Items of fixed EQUIPMENT that may be lused at the spot 0 in particular SIGN EQUIPMENT and BAECON EQUIPMENT +V2.0 + + - - - A VIEW of a PATH LINK used to select items for presentation. - - - - - - - - - Whether link should be hidden in the PATH LINK VIEW. - - - - - Whether destination of PATH LINK should be hidden. - - - - - Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. - - - - - Whether exit at end of PATH LINK should be shown as separate step in view. - - - - - Whether Heading element should be shown as separate step in view e.g. turn left right. - - - - - - - Identifier of Object of which this is a view. - - - - - - - - - Type for a PATH LINK VIEW. - - - - - - - Whether link should be hidden in the PATH LINK VIEW. - - - - - Whether destination of PATH LINK should be hidden. - - - - - Whether ENTRANCE on beginning of PATH LINK should be shown as separate step in view. - - - - - Whether exit at end of PATH LINK should be shown as separate step in view. - - - - - Whether Heading element should be shown as separate step in view e.g. turn left right. - - - - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 22987f35e..e0aefe7a9 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -13,11 +13,17 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes + + + 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure - 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure + + 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration - 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration + + 2024-01-15PATH DECPLAN REmodularise - move PublicUseEnumeration CoveredEnumeration GatedEnumeration AccessSpaceTypeEnumeration PassageTypeEnumeration to netex_environment_support

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

                                            @@ -377,40 +383,9 @@ Rail transport, Roads and Road transport                                             - - - Allowed values for public use. - - - - - - - - - - - - Allowed values for covered. - - - - - - - - - - - - Allowed values for gated. - - - - - - - + + + Allowed values for doors status. @@ -427,44 +402,7 @@ Rail transport, Roads and Road transport - - - Allowed values for ACCESS SPACE TYPEs. - - - - - - - - - - - - - - - - - - - - - - - Allowed values for Passage Types. - - - - - - - - - - - - + Types of SITE. 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 76a614d9f..4bbed7e2b 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 @@ -24,9 +24,11 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2020-10-10New Modes : Add PRESENTATGION To Site ELement + + 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

                                            @@ -131,36 +133,7 @@ Rail transport, Roads and Road transport Detailed properties of a SITE ELEMENT. - - - Whether the component is available for public use or is restricted. - - - - - Whether the component is Indoors or outdoors. Default is Indoors. - - - - - Whether the component is within a gated area or freely accessible without a pass or ticket. - - - - - Whether the component is lit or not. Default is well Lit. - - - - - Whether all areas of the component are wheelchair accessible. - - - - - Total number of people that component can contain. - - + Presentation defaults for SITE ELEMENT. +V1.2.2 diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 396d174e2..251f98269 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -19,12 +19,15 @@ 2011-12-16 - 2017-06-13CR046 Add BusPlatform to enum + + 2017-06-13CR046 Add BusPlatform to enum - 2019-03-25CR055 CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__ with values _international, national, regional, local_. + + 2019-03-25CR055 CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__ with values _international, national, regional, local_. NJSK Review: Make values lowerCamelCase consistent with NeTEx conventions. - 2017-06-13Issue #125 Add Multimodal to QuayType enums + + 2017-06-13Issue #125 Add Multimodal to QuayType enums

                                            NeTEx - Network Exchange. This subschema defines STOP PLACE base types.

                                            @@ -297,14 +300,6 @@ Rail transport, Roads and Road transport                                             - - - Type for Unique Reference to SITE PATH LINK. - - - - - Type for reference to a SITE PATH LINK. diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index a5783b63c..1827ce96f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,10 @@ - 2017-03-28 CR_038 Add missing type of value tsubst group o DIRECTION + 2017-03-28 CR_038 Add missing type of value to subst group of DIRECTION + + + 2024-02-16 Revesie to use generic deck_plan_support , not ifopt

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

                                            @@ -38,7 +41,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2017 + CEN, Crown Copyright 2009-2024
                                              @@ -61,11 +64,10 @@ Rail transport, Roads and Road transport Standard - NeTEx ROUTE types. + NeTEx ROUTE INSTRUCTION types. - - + Type for a list of ROUTE INSTRUCTIONs. @@ -167,5 +169,4 @@ Rail transport, Roads and Road transport - From cf145b2ca17256b99d708d28f1954c632682ae78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 8 Feb 2024 17:37:37 +0100 Subject: [PATCH 021/144] fixing import --- .../part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 285cd70e5..9b6b40c0d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -4,6 +4,7 @@ + From 88d5eeb8c8759ae159b76eaa61bd4ef85088c5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 8 Feb 2024 17:41:50 +0100 Subject: [PATCH 022/144] Update netex_ifopt_path_support.xsd --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index f04ef46c0..b0abd529d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -1,7 +1,6 @@ - From f63d949ae8f5c61313052ff31d6962540110bb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 8 Feb 2024 22:38:00 +0100 Subject: [PATCH 023/144] fixing validation errors same way Nick fixed stuff in the new examples --- ...topPlace_uk_ComplexStation_Wimbledon_1.xml | 64 +++++++++---------- .../Netex_simpleVehicleSchedule_01.xml | 4 +- 2 files changed, 34 insertions(+), 34 deletions(-) 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 0365b0e82..635c5ad27 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 @@ -2977,7 +2977,7 @@ Changes - + Branch from main entrance to DL stairs 1-4 -180 @@ -2985,8 +2985,8 @@ Changes indoors - - + + Branch from main entrance to Rail stairs to 5 and 6 -180 @@ -2994,8 +2994,8 @@ Changes indoors - - + + Branch from path junction 2 to Rail stairs to 7 and 8 -180 @@ -3003,8 +3003,8 @@ Changes indoors - - + + Branch from path junction 3 to Rail stairs to 9 and 10 -180 @@ -3012,8 +3012,8 @@ Changes indoors - - + + Branch from lift area internal entrance 5 to Lift 1 and Lift 2 -180 @@ -3021,8 +3021,8 @@ Changes indoors - - + + Branch from lift area internal entrance 6 to Lift 3 and Lift 4 -180 @@ -3030,8 +3030,8 @@ Changes indoors - - + + Branch in front foreCourt Near entrance -180 @@ -3039,8 +3039,8 @@ Changes outdoors - - + + Branch in front foreCourt near street -180 @@ -3048,7 +3048,7 @@ Changes outdoors - + @@ -5367,7 +5367,7 @@ Changes - + Landing on Stairs 1 on way to DL -180 @@ -5375,7 +5375,7 @@ Changes indoors - + @@ -6169,7 +6169,7 @@ Changes - + Branch in way to Stop D and Stop P -180 @@ -6177,8 +6177,8 @@ Changes outdoors - - + + Branch on way from main entrance to Stop P -180 @@ -6186,8 +6186,8 @@ Changes outdoors - - + + Branch on way from Stop P to Stop L -180 @@ -6195,8 +6195,8 @@ Changes outdoors - - + + Branch on way from Stop D and Stop L to centre Court -180 @@ -6204,8 +6204,8 @@ Changes outdoors - - + + Branch on way to Stop L from Centre Court -180 @@ -6213,7 +6213,7 @@ Changes outdoors - + @@ -6660,7 +6660,7 @@ Changes - + first Branch on way from main entrance to Alexandra Road 1 -180 @@ -6668,8 +6668,8 @@ Changes outdoors - - + + second Branch on way to Alexandra Road 1 -180 @@ -6677,7 +6677,7 @@ Changes outdoors - + diff --git a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml index 1bd0acd2c..dde2db183 100644 --- a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml +++ b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml @@ -1894,7 +1894,7 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS Big red bus - + 50 20 2 @@ -1903,7 +1903,7 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS Small blue red bus - + 20 120 0 From 48135fe9df855cbc263714697a5797db10625800 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:39:31 +0000 Subject: [PATCH 024/144] Lint and update documentation tables --- .../deckPlans/DeckPlans-Example_train.xml | 10 +- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 2 +- .../site/Netex_01_Sites_SimpleStadium_1.xml | 4 +- .../Netex_10_Sites_OlympicPark_2_basic.xml | 36 ++--- .../norway/stops/PointOfInterest.xml | 4 +- .../norway/vehicles/submodel-VehicleType.xml | 4 +- .../vdv452/timetable/NeTEx VDV Example.xml | 2 +- xsd/NeTEx_publication.xsd | 123 ++++++------------ .../netex_all_objects_generic.xsd | 2 +- .../netex_path_support.xsd | 3 +- .../netex_path_version.xsd | 3 +- .../netex_place_support.xsd | 6 +- .../netex_all_objects_reusableComponents.xsd | 2 +- .../netex_deckPath_support.xsd | 3 +- .../netex_deckPlan_support.xsd | 3 +- .../netex_deckPlan_version.xsd | 3 +- .../netex_environment_support.xsd | 3 +- .../netex_environment_version.xsd | 3 +- ...etex_equipmentVehiclePassenger_version.xsd | 6 +- .../netex_facility_support.xsd | 38 ++---- .../netex_facility_version.xsd | 21 +-- .../netex_seatingPlan_support.xsd | 3 +- .../netex_seatingPlan_version.xsd | 3 +- .../netex_serviceRestrictions_support.xsd | 24 ++-- .../netex_spotEquipment_support.xsd | 6 +- .../netex_spotEquipment_version.xsd | 3 +- .../netex_trainElement_version.xsd | 21 +-- .../netex_vehicleType_support.xsd | 30 ++--- .../netex_vehicleType_version.xsd | 21 +-- .../netex_ifopt_checkConstraint_support.xsd | 11 +- .../netex_ifopt_checkConstraint_version.xsd | 9 +- .../netex_ifopt_equipmentAccess_support.xsd | 12 +- .../netex_ifopt_equipmentAccess_version.xsd | 18 +-- ...netex_ifopt_equipmentPassenger_support.xsd | 8 +- ...netex_ifopt_equipmentPassenger_version.xsd | 20 +-- .../netex_ifopt_navigationPath_version.xsd | 6 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 6 +- .../part1_ifopt/netex_ifopt_path_version.xsd | 9 +- .../part1_ifopt/netex_ifopt_site_support.xsd | 17 +-- .../part1_ifopt/netex_ifopt_site_version.xsd | 6 +- .../netex_ifopt_stopPlace_support.xsd | 9 +- .../netex_deckPlanAssignment_version.xsd | 5 +- 42 files changed, 187 insertions(+), 341 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 51431fdda..66585e528 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1020,7 +1020,7 @@ C) CEN 2024 - + Compartment 1: Seats 01-02 First class compartment with two beds @@ -1151,7 +1151,7 @@ C) CEN 2024 - + Compartment 2: Seats 02-03 Rirst class with two beds @@ -1503,7 +1503,7 @@ C) CEN 2024 - + Compartment 4 : Seats 12-20 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths @@ -1731,7 +1731,7 @@ C) CEN 2024 - + Compartment 5 : Seats 21-28 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths @@ -2415,7 +2415,7 @@ C) CEN 2024 - >Passenger access Right External Door + >Passenger access Right External Door 1.00 1.90 diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml index eed536e62..220f11d41 100644 --- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml +++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml @@ -465,7 +465,7 @@ v1.1 revised ids Big red bus - + 50 20 2 diff --git a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml index 99be308d9..b2737a280 100644 --- a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml +++ b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml @@ -906,7 +906,7 @@ The example comprises - + Entrance A true forward @@ -1062,7 +1062,7 @@ The example comprises - + Entrance A true forward diff --git a/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml b/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml index f0a6f4b01..410ffb2f2 100644 --- a/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml +++ b/examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml @@ -2163,63 +2163,63 @@ that defines a number of - + Entrance to aquatics vicinity false forward level - + quatics vicinity to bridge 4 false forward level - + from bridge 4 to Stadium vicinity false right level - + Stadium vicinity to Stadium vicinity false forward level - + Stadium vicinity to handball area vicinity ea false forward level - + Handball vicinity to haHockey arvicinity ea true forward level - + hockey vicinity to bridge 2 false right level - + bridge2 to velo vicinity false forward level - + to BMX true forward @@ -2414,63 +2414,63 @@ that defines a number of - + to BMX false forward level - + bridge2 to velo vicinity true forward level - + hockey vicinity to bridge 2 true forward level - + Handball vicinity to haHockey arvicinity ea true left level - + Stadium vicinity to handball arvicinity ea false forward level - + Stadium vicinity to Stadium vicinity false forward level - + from bridge 4 to Stadium vicinity false left level - + quatics vicinity to bridge 4 false forward level - + Entrance to aquatics vicinity false forward diff --git a/examples/standards/norway/stops/PointOfInterest.xml b/examples/standards/norway/stops/PointOfInterest.xml index 12f247575..5a4b12963 100644 --- a/examples/standards/norway/stops/PointOfInterest.xml +++ b/examples/standards/norway/stops/PointOfInterest.xml @@ -894,7 +894,7 @@ The example comprises - + Entrance A true forward @@ -1050,7 +1050,7 @@ The example comprises - + Entrance A true forward diff --git a/examples/standards/norway/vehicles/submodel-VehicleType.xml b/examples/standards/norway/vehicles/submodel-VehicleType.xml index 04a408851..8836c64d7 100644 --- a/examples/standards/norway/vehicles/submodel-VehicleType.xml +++ b/examples/standards/norway/vehicles/submodel-VehicleType.xml @@ -1,7 +1,7 @@ example - V + V Euro 6 true diesel @@ -15,7 +15,7 @@ 2 2 - + standardClass 300 250 diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml index 1dbc830ca..c984a228b 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -182,7 +182,7 @@ GT 4/ Oldtimer Old 7 - + 31 31 0 diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index a9faf95ce..09faa271b 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,40 +16,29 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON - - 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug + 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug - - 2021-09-01NewModes: AddPOOL OF VEHICLEs + 2021-09-01NewModes: AddPOOL OF VEHICLEs - - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - - 2021-09-01NewModes: Add PoolOfVehicles + 2021-09-01NewModes: Add PoolOfVehicles - - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - - 2021-07-09Revise name sto allign with TM + 2021-07-09Revise name sto allign with TM VehicleRentalOperation --> VehicleRental, VehicleSharingOperation --> VehicleSharing, VehiclePoolingOperation --> VehiclePooling - - 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment + 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment - - 2020-11-16NewModes: Drop AlternativeTransportOperator + 2020-11-16NewModes: Drop AlternativeTransportOperator - - 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. + 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. - - 2020-10-14NewModes Add Constraints (NM) + 2020-10-14NewModes Add Constraints (NM) Add MobilityServiceFrame, MobilityJourneyFrame. TypeOfProof, TaxiRank, TaxiStand. TypeOfParking ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling. @@ -73,66 +62,50 @@ FIX: Add OpenTransportMode, Submode, VehicleChargingEquipment, CycleStorageEquipment, HailAndRideArea FIX: Remove PlaceRef and EquipmentRef and bogus restrictions on uniqueness across places and equipment. - - 2020-08-20Corrections + 2020-08-20Corrections Add UicOperatingPeriod key and ref constraints - - 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent + 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent - - 2020-04-17Corrections + 2020-04-17Corrections Add ParentFareZoneRef constraint - - 2020-04-02Corrections + 2020-04-02Corrections Add constraint for RowRef and ColumnRef - - 2019-05-15Corrections + 2019-05-15Corrections Add TypeOfLine constraint - - 2019-05-02 + 2019-05-02 Corrections Add missing constraint selectors for DefaultResponsibilitySetRef and DefaultDataSourceRef Add missing constraints ref DefaultCodespaceRef - - 2019-04-24Corrections + 2019-04-24Corrections Add missing constraints ref for JourneyPart/MainPartRef to JourneyPartCouple - - 2019-04-24Corrections + 2019-04-24Corrections (1)Add constraints ref for ParkingEntranceForVehicles and ParkingPasengerEntrance (2) Drop general EntranceRef constraint - - 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment + 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment - - 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef + 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef - - 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. + 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. - - 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, + 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, Also drop some spurious selectors. - - 2019-03-10Fix: Add constraint for SupplementToFareProductRef . + 2019-03-10Fix: Add constraint for SupplementToFareProductRef . - - 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element + 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element - - 2019-02-18 + 2019-02-18 (a) Relax uniqueness constraint on FareTable and PriceGroup now unique within type, - - 2019-01-15 + 2019-01-15 (a) Fix keyref constraint on TimingLinkInJourneyPattern_AnyVersionedKey, (Drop DropFarePointInPattern. TimingTimingLinkInJournePattern, STopTimingLinkInJourneyPattern) (b) Fix keyref constraint on ServiceLinkInJourneyPattern_AnyVersionedKey (Drop points) (c) Fix keyref constraint on FarePointInPattern_AnyVersionedKey - Add Points @@ -149,61 +122,45 @@ (n) Fix Add Constraints on SectionInSequence (o) Revise key names to emphasise when key is ordered - - 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE + 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE - - 2018-01-07 Remove trailing blanks on names - - 2017-08-10Align with TM6 + 2018-01-07 Remove trailing blanks on names + 2017-08-10Align with TM6 Rename Passenger Contract to FareContract. Rename Passenger Contract Event to FareContractEntry. Rename Type of Passenger Contract to TypeOfFareContract. Adjust References in Dependent packages. - - 2017-08-10 + 2017-08-10 Rename FareContractEvent to FareContractEntry Add constraints for CustomerPurchasePackage, CustomerPurchasePackageElement, CustomerPurchaseParameterAssignment Add constraints for CustomerAccount, CustomerAccountStatus, TypeOf CustomerAccount, Add constraints for CustomerEligibility, UserProfileEligibility, CommercialProfileEligibility, ResidentialQualifactionEligibility - - 2017-06-29 + 2017-06-29 CR048 add constraints WHITE LIST Fix: Add Constraint on CUSTOMER CR00310 add constraints on JOURNEY PART POSITION - - 2017-05-09 + 2017-05-09 Correct COnstraints for PointOnRoute Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er Add Missing Constraints For GroupOfServicesMember , JourneyAccounting DelegatedResponsibilitySet Reinstate Constraints for CAll Fix constraints that were missing namespace on subpart - - 2017-03-27 + 2017-03-27 Various 1.1 changes see CRS. CR0038 revise constraints on ResponsibilityRole - - 2011-01-17V0.94 Revised + 2011-01-17V0.94 Revised - - 2010-09-04Created from Siri.xsd + 2010-09-04Created from Siri.xsd - -

                                              netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                              . -

                                              The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                              -

                                              This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). -

                                                -
                                              • For each data object type it describes an XML representation which can be used to exchange netex data.
                                                • -
                                              • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                                • -
                                              • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                                • -
                                              -

                                              -                                               +

                                              netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                              . +

                                              The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                              This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). +

                                              • For each data object type it describes an XML representation which can be used to exchange netex data.
                                              • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                              • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                              +

                                              text/xml http://www.w3.org/2001/XMLSchema diff --git a/xsd/netex_framework/netex_all_objects_generic.xsd b/xsd/netex_framework/netex_all_objects_generic.xsd index 407509054..86043fb4b 100644 --- a/xsd/netex_framework/netex_all_objects_generic.xsd +++ b/xsd/netex_framework/netex_all_objects_generic.xsd @@ -30,7 +30,7 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index e42163193..e91f6fd29 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -11,8 +11,7 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-01-05Factored out of Ifopt path + 2024-01-05Factored out of Ifopt path 2024-01-05 diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 2b8111c42..263331160 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -15,8 +15,7 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - - 2024-02-05Factored out from ifopt_path_link + 2024-02-05Factored out from ifopt_path_link 2024-02-05 diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd index 66968aea2..abfe9bbc8 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd @@ -14,11 +14,9 @@ 2010-09-04 - - 2011-02-05 Name Space changes + 2011-02-05 Name Space changes - - 2019-02-07Mark PlaceRef_ as Abstract + 2019-02-07Mark PlaceRef_ as Abstract Add dummGroupOfPlaceRefs so that all place tpesrefs can be included diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index f1179af0e..ccfc0b5c4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -45,7 +45,7 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 8fcfe35ca..8acb54e86 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -12,8 +12,7 @@ 2024-01-18 - - 2024-01-18Move from Part1 Ifoft and bas on generic + 2024-01-18Move from Part1 Ifoft and bas on generic

                                              NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 528a9af75..cdced40fe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,8 +13,7 @@ 2023-01-30 - - 2024-01-11Revise enum values + 2024-01-11Revise enum values

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

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 210eeb0d4..935a6c23a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,8 +16,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 1a23d9d29..f01f1c034 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -10,8 +10,7 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc + 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc 2024-02-05 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd index 474387c3f..136a07360 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -17,8 +17,7 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - - 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK + 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK 2024-01-06 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 9d68b24da..2fc096bb1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -16,16 +16,14 @@ 2011-12-16 - - 2021-01-29BUG Issue #143: Correct data type on GapToPlatform + 2021-01-29BUG Issue #143: Correct data type on GapToPlatform

                                              NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT

                                              text/xml - http://www.w3.org/2 - 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. + http://www.w3.org/2 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. 001/XMLSchema XML schema, W3C Recommendation 2001 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index ccb9e71ff..703d7f1d4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -13,44 +13,32 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2013-01-07No Pull request correct spelling of coffeeShop, nofoodavailable enum value + 2013-01-07No Pull request correct spelling of coffeeShop, nofoodavailable enum value - - 2017-05-25Add buggy and umbrella to accessibility tools + 2017-05-25Add buggy and umbrella to accessibility tools - - 2017-11-10Update Nuisance list to match UML + 2017-11-10Update Nuisance list to match UML - - 2019-03-25Fix #43 by Skinkie from 2019.01.07 Fix typo on _tactilePlatformEdges. + 2019-03-25Fix #43 by Skinkie from 2019.01.07 Fix typo on _tactilePlatformEdges. - - 2019-03-25NL32 CD #61 Add new values to (Site) AccessFacility enum; wheelchairLift, automaticRamp and slidingStep. + 2019-03-25NL32 CD #61 Add new values to (Site) AccessFacility enum; wheelchairLift, automaticRamp and slidingStep. NJSK Review: Keep Site and Service aspects separate; add separate VehicleAccessFacility enum with values unknown, wheelchairLift, manualRamp, automaticRamp, steps, slidingStep, narrowEntrance, lowFloorAccess, validator. - - 2019-04-14Fix Add new values ti PassengerInfromation LienStatus and realTimeDIsruption + 2019-04-14Fix Add new values ti PassengerInfromation LienStatus and realTimeDIsruption - - 2020-10-16New modes 0- add ski racks to Luggagefacility enum values + 2020-10-16New modes 0- add ski racks to Luggagefacility enum values Fix Add missing animalsAllowed values to NuisanceFacility Add unspecifed to Gender list - - 2021-04-15New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other. + 2021-04-15New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other. - - 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility + 2021-07-07Add values to NuisanceFacility, MobilityFacility, LuggageCarriageFacility and AccommodationFacility - - 2024-01-01Add ClimateControl and LightingControl faciliies + 2024-01-01Add ClimateControl and LightingControl faciliies - - 2024-01-01DECK PLANs Add values to Berth facility + 2024-01-01DECK PLANs Add values to Berth facility

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

                                              @@ -429,7 +417,7 @@ Rail transport, Roads and Road transport - + Allowed values for Lighting Control Facility. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd index a475fe36a..24fad1152 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd @@ -16,27 +16,20 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2019-03-25FR-5 CD change #53 Add AccessFacilityList to SiteFacilitySet. + 2019-03-25FR-5 CD change #53 Add AccessFacilityList to SiteFacilitySet. - - 2019-03-25NL32 CD change #61 Add new attribute VehicleAccessFacilityList to ServiceFacilitySet. + 2019-03-25NL32 CD change #61 Add new attribute VehicleAccessFacilityList to ServiceFacilitySet. NJSK Review: Do not add SiteAccess facilitrie to vehicle, but rather add a new VehicleAccessFacilityList - - 2019-04-05Fix add FacilitySet as substitiution group for SiteFacilitySet and ServcieFacilitySet + 2019-04-05Fix add FacilitySet as substitiution group for SiteFacilitySet and ServcieFacilitySet - - 2019-04-14FIX ACCOMMODATION and onBOARD STAY add missing elements name, parent and use GROUP. FIX TYPO on BoardingPermissione + 2019-04-14FIX ACCOMMODATION and onBOARD STAY add missing elements name, parent and use GROUP. FIX TYPO on BoardingPermissione - - 2020-10-20Add facility sets on Frame. + 2020-10-20Add facility sets on Frame. - - 2024-01-01Add ClimateControl and LightingControl faciliies + 2024-01-01Add ClimateControl and LightingControl faciliies

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

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index dd91dfe1a..ddb405832 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,8 +13,7 @@ 2023-02-02 - - 2024-01-17Add bed to locatable spot type enumerations + 2024-01-17Add bed to locatable spot type enumerations

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

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index aa99cc457..924b9e23f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -16,8 +16,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd index bf079c3ad..55712185c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -11,38 +11,30 @@ 2010-09-04 - - 2014-07-15Add PurchaseMoment enum + 2014-07-15Add PurchaseMoment enum - - 2019-03-02 Add open PaymentMethod as first class object so that user defined methods can be added. Add epayDevice and epayAccount and mileagePoints to enum + 2019-03-02 Add open PaymentMethod as first class object so that user defined methods can be added. Add epayDevice and epayAccount and mileagePoints to enum Add documentation on payment method enumerations. - - 2019-03-11Fix rename PaymentMethod to TypeOfPaymentMethod to avoid name clash with enum + 2019-03-11Fix rename PaymentMethod to TypeOfPaymentMethod to avoid name clash with enum UK-40 Add subscriptionOnly , also onCheckIn , inAdvanceOnly, beforeBoardingOnly , onBoardingOnly to PurchasentMoment enum. UK-40 a Add bankTransfer and directDebit to payment methods. values EURA-84 add cashExactChangeOnly to values for PaymentMethods - - 2019-03-12EURA-84 add cashExactChangeOnly to values for PaymentMethods + 2019-03-12EURA-84 add cashExactChangeOnly to values for PaymentMethods - - 2019-03-27NL-27 Add default TypeOfProductCategory and TypeOfService to Line + 2019-03-27NL-27 Add default TypeOfProductCategory and TypeOfService to Line Move TypeOfProductCategory amnd TypeOfService from netex_vehicleJourney to Framework reusable components netex_travelRights so they are visible from part 1 Rename netex_travel_rights to netext_serviceRestrictions so as to align with TM6, Fx SuvsriptionOnly and checkin values on PurchaseMoment - - 2020-10-07NewModes Booking arrangements add further attributes + 2020-10-07NewModes Booking arrangements add further attributes MaximumBookingPeriod, MinimBookingDuration, MaximumBookingDuration, DepositRequired, Add ServiceBookimngArrangements. - - 2020-06-21FIX: Issue #75 FareClassEnumeration Remove space from end of secondClass enum value + 2020-06-21FIX: Issue #75 FareClassEnumeration Remove space from end of secondClass enum value - - 2024-01-17DECKPLANS dd washbasin to sanitary facilities + 2024-01-17DECKPLANS dd washbasin to sanitary facilities

                                              NeTEx - Network Exchange. This subschema defines NetEX:TRAVEL RIGHTS identifier types.

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd index db70a55ed..b51eb9531 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -12,11 +12,9 @@ 2023-02-06 - - 2023-02-01Split out from Charging Equipoment + 2023-02-01Split out from Charging Equipoment - - 2024-01-24Add btype of bed + 2024-01-24Add btype of bed

                                              NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT types

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index d33088465..4728b94b6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -14,8 +14,7 @@ 2023-02-06 - - 2023-02-06 + 2023-02-06 Definition of CycleStorage number of spaces corrected. Doc change only. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index c0953c3c5..bda722add 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -38,26 +38,19 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-04-271.1 CR0039 Add Width to TRAIN ELEMENT + 2017-04-271.1 CR0039 Add Width to TRAIN ELEMENT - - 2019-02-21Make ValidityCondition etc visible on TrainElement + 2019-02-21Make ValidityCondition etc visible on TrainElement - - 2019-03-27Fix add missing TrainSize attribute to TrainElement + 2019-03-27Fix add missing TrainSize attribute to TrainElement - - 2019-04-18Fix add missing orientation to TrainComponent + 2019-04-18Fix add missing orientation to TrainComponent - - 2021-09-01NewModes: revise to allow chargingEquipmentProfile + 2021-09-01NewModes: revise to allow chargingEquipmentProfile - - 2024-01-17DECK PLANS add a defualt DECK PLAN + 2024-01-17DECK PLANS add a defualt DECK PLAN

                                              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_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 8e792099a..43676e0bc 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -14,40 +14,30 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2012-04-15Revise Passenger Capacity + 2012-04-15Revise Passenger Capacity - - 2019-04-09Add list of vehicle type refs for PARKING and general use + 2019-04-09Add list of vehicle type refs for PARKING and general use - - 2020-08-11Issue #110 Add missing fuel types + 2020-08-11Issue #110 Add missing fuel types electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol - - 2020-10-04NewModes: Add list of VEHICLEs. + 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-04-19NewModes: GBFS compatibility Add car to vehicle Types - - 2021-07-07NewModes: Add extra fuel types from APDS + 2021-07-07NewModes: Add extra fuel types from APDS - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit - - 2024-01-17TM CR: Enhancement Add PASSENGER VEHICLE CAPACITY + 2024-01-17TM CR: Enhancement Add PASSENGER VEHICLE CAPACITY

                                              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 23fb0fd61..50915ab44 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -20,21 +20,16 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-27CR0001 - Vehicle Dimensions added. + 2017-03-27CR0001 - Vehicle Dimensions added. - - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -42,11 +37,9 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 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_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd index 88cd60c7c..d460e9c50 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd @@ -14,14 +14,11 @@ 2011-02-05 - - 2017-10-25 Add TYPE OF CONGESTION. + 2017-10-25 Add TYPE OF CONGESTION. - - 2024-01-17DECK PLANS: add ladder to AccesFeatureType enumeration. + 2024-01-17DECK PLANS: add ladder to AccesFeatureType enumeration. - - 2024-02-17DECK PLANS: REmodularise Move AccsesFeatureType enumeration to acceeess_Support + 2024-02-17DECK PLANS: REmodularise Move AccsesFeatureType enumeration to acceeess_Support

                                              NeTEx - Network Exchange. This subschema defines common Check types.

                                              @@ -223,7 +220,7 @@ Rail transport, Roads and Road transport                                               - + Allowed values for a congestion. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd index f59cff3ef..a0707cf8d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd @@ -23,14 +23,11 @@ 2011-12-16 - - 2017-05-25CR0035 Add Type of COngestion open value. + 2017-05-25CR0035 Add Type of COngestion open value. - - 2019-04-09 FIX Make data type of throughut counts NumberOfPassengers. + 2019-04-09 FIX Make data type of throughut counts NumberOfPassengers. - - 2024-02-01 Remodularise - add include to access_support + 2024-02-01 Remodularise - add include to access_support

                                              NeTEx - Network Exchange. This subschema defines common Check types.

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index 2395cf220..a700116b9 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd @@ -15,8 +15,7 @@ 2007-06-12 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown CD add LightingMethodEnumeration with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector Add value_alwaysOn_ to LightingMethodEnumeration. Rename to LightinOnMethod. @@ -25,14 +24,11 @@ CD add BorderTypeEnumeration with values _wall, grass, dirt, barrier, road, cyclingLane, step, rail, plants, trees, mud, solidEdge, water, gravel, noPhysicalBorder, otherPhysicalBorder, unknown, other,_ NJSK Review: Move TactileWarningStripEnumeration, here from netex_path_support , use lower camel case for values. - - 2021-07-14Fix catch up - Make Access Equipment Abstarct + 2021-07-14Fix catch up - Make Access Equipment Abstarct - - 2024-01-17DECK PLAN and EPIA add DoorType + 2024-01-17DECK PLAN and EPIA add DoorType - - 2024-02-05Path refactoring: Move TactileWarningStripEnumeration to path_support. Also cdrop unusued LightingMethod - shoudl be LightingOnMethod + 2024-02-05Path refactoring: Move TactileWarningStripEnumeration to path_support. Also cdrop unusued LightingMethod - shoudl be LightingOnMethod

                                              NeTEx - Network Exchange. This subschema defines ACCESS EQUIPMENT types for Place access.

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd index 77ec6df41..dd9755294 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd @@ -22,11 +22,9 @@ 2011-12-16 - - 2017-05-25 Integrate NPR documentation correction to lift passable + 2017-05-25 Integrate NPR documentation correction to lift passable - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add new attribute NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown CD add new attributeLightingOOnMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector @@ -45,21 +43,17 @@ NJSK Review: NB AudioOrVideoIntercom overlap with EntranceAttention CD Add new attributes to QueuingEquipment: DisabledPriority QueuingSeatedPossible. - - 2019-05-27Fix add missing DropKerbOutside value to Entrance Eqeuipment + 2019-05-27Fix add missing DropKerbOutside value to Entrance Eqeuipment Rename Slope to Gradient to be conistent Move WIthoutRaiser to be specifc to Staircase. - - 2019-05-27Doc tidy up + 2019-05-27Doc tidy up Rename Accoustic(six) to AUdio Correct comments - - 2021-07-14Fix catch up - Make Access Equipment Abstarct + 2021-07-14Fix catch up - Make Access Equipment Abstarct - - 2024-01-16EPIAP Add EntranceControlHeight to ENTRANCE + 2024-01-16EPIAP Add EntranceControlHeight to ENTRANCE

                                              NeTEx - Network Exchange. This subschema defines EQUIPMENT base types.

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd index c6e5935e0..0069d6e16 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd @@ -12,15 +12,13 @@ 2007-06-12 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add AcousticAnnouncementsTriggerEnumeration with values _onDemand, automatic_. CD add AnnouncementsTriggeringMethodEnumeration with values _presenceDetector, app, internetPage, specificDevice, pushButton_. NK Review rename Acoustic to Audio. rename app value to mobileApp, add cyclicReadingValue - - 2024.01.15EPIA Merge in Beacon Point enhancement - + 2024.01.15EPIA Merge in Beacon Point enhancement +

                                              NeTEx - Network Exchange. This subschema defines PASSENGER EQUIPMENT types for Place access.

                                               diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 9b6b40c0d..05ff2fd8c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -4,7 +4,7 @@ - + @@ -22,29 +22,23 @@ 2011-12-16 - - 2017-05-25NPR make Gender optional + 2017-05-25NPR make Gender optional - - 2019-03-25Fix #38 Skinkie. Fix typo on KeyScheme. NB this will break existing XML. + 2019-03-25Fix #38 Skinkie. Fix typo on KeyScheme. NB this will break existing XML. - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add new attribute to ___PassengerSafetyEquipment___; ___AcousticAnnouncementsTrigger___ with values _onDemand, automatic_. CD add new attribute to ___PassengerSafetyEquipment___; ___AnnouncementsTriggeringMethod___ with values _presenceDetector, app, internetPage, specificDevice, pushButton_. CD add new attributes to ___SanitaryEquipment___; ___CallButtonAvailable___ , ___SupportBarHeigth____. , ___LockedAccess___. NJSK Review: Correct typo on SupportBarHeigth, reorder elements - - 2019-03-29FR49 CD #65 Accessibility changes + 2019-03-29FR49 CD #65 Accessibility changes NSKK Review: Add missing ___ChangeAvailable___ attribute NJSK Review : revises name to be AudioANnouncementsType, AudioTriggerMethod - - 2019-04-06Fix Add back missing attribute to SanitaryEquipment: NumberofToilets + 2019-04-06Fix Add back missing attribute to SanitaryEquipment: NumberofToilets - - 2021-01-17EPIA merge in BEACON POINT. + 2021-01-17EPIA merge in BEACON POINT.

                                              NeTEx - Network Exchange. This subschema defines EQUIPMENT base types.

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 6dcf5e303..21affb572 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -26,11 +26,9 @@ 2007-03-22 - - 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence + 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence - - 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc + 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc NeTEx Network Exchange - NAVIGATION PATH types. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index b0abd529d..dd0963696 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -15,13 +15,11 @@ 2011-12-16 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add CodedTiltEnumeration with values _strongLeftTilt, mediumLeftTilt, nearlyFlat, mediumRightTilt, strongRightTilt, unknown_. Revise name of ___CodedTilt___ to ___TiltType___ to be consistent - - 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH + 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH

                                              NeTEx - Network Exchange. This subschema defines PATH types.

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index ac00bd44f..caf057098 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -23,20 +23,17 @@ 2007-03-22 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip NK Review: Reorder so as to place like elements toigether, add sub Groups to organize - - 2019-03-28FR49 CD #65 Accessibility changes + 2019-03-28FR49 CD #65 Accessibility changes NJSK Doc rewviewe Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___ - - 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink + 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink NeTEx Network Exchange - PATH types. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index e0aefe7a9..38f6ef237 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -13,17 +13,13 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure + 2019-03-25Fix #39 by Skinkie from 2019.01.07 Fix typo on ServiceSiteRefStructure - - 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration + 2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration - - 2024-01-15PATH DECPLAN REmodularise - move PublicUseEnumeration CoveredEnumeration GatedEnumeration AccessSpaceTypeEnumeration PassageTypeEnumeration to netex_environment_support + 2024-01-15PATH DECPLAN REmodularise - move PublicUseEnumeration CoveredEnumeration GatedEnumeration AccessSpaceTypeEnumeration PassageTypeEnumeration to netex_environment_support

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

                                              @@ -383,9 +379,6 @@ Rail transport, Roads and Road transport                                               - - - Allowed values for doors status. @@ -402,7 +395,7 @@ Rail transport, Roads and Road transport - + Types of SITE. 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 4bbed7e2b..d0855d66b 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 @@ -24,11 +24,9 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2020-10-10New Modes : Add PRESENTATGION To Site ELement + 2020-10-10New Modes : Add PRESENTATGION To Site ELement

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

                                              diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index 251f98269..a9d35853c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd @@ -19,15 +19,12 @@ 2011-12-16 - - 2017-06-13CR046 Add BusPlatform to enum + 2017-06-13CR046 Add BusPlatform to enum - - 2019-03-25CR055 CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__ with values _international, national, regional, local_. + 2019-03-25CR055 CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__ with values _international, national, regional, local_. NJSK Review: Make values lowerCamelCase consistent with NeTEx conventions. - - 2017-06-13Issue #125 Add Multimodal to QuayType enums + 2017-06-13Issue #125 Add Multimodal to QuayType enums

                                              NeTEx - Network Exchange. This subschema defines STOP PLACE base types.

                                              diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index b4c546c57..78868ce81 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -18,8 +18,7 @@ 2023-01-30 - - 2024-01-17Revise to add TRAIN ELEMENT + 2024-01-17Revise to add TRAIN ELEMENT

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

                                              @@ -144,7 +143,7 @@ - + From 1fcb69393e226e4aeca89f88948dacb2c3f0ece8 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 00:39:43 +0000 Subject: [PATCH 025/144] Extend DECK Plan Examples and add Transmodel enhancements to TRAIN ELEEMNT Extend the DECK PLAN Examples Apply Transmodel enhancements to ELEMENT TYPES and TRAINs Revise VEHICLE Add ROLLING STOCK --- NeTEx.spp | 13 +- .../deckPlans/DeckPlans-Example_bus.xml | 1126 ++--- .../deckPlans/DeckPlans-Example_train.xml | 3879 +++++++++++------ .../versioning/Netex_Uniqueness_01.xml | 4 +- xsd/NeTEx_publication.xsd | 93 +- .../netex_resourceFrame_version.xsd | 17 +- .../netex_all_objects_reusableComponents.xsd | 9 +- .../netex_deckPath_version.xsd | 5 +- .../netex_deckPlan_support.xsd | 2 +- .../netex_deckPlan_version.xsd | 26 +- .../netex_nm_fleet_version.xsd | 17 +- .../netex_seatingPlan_support.xsd | 27 + .../netex_seatingPlan_version.xsd | 1 + .../netex_trainElementType_support.xsd | 166 + .../netex_trainElementType_version.xsd | 279 ++ .../netex_trainElement_support.xsd | 70 +- .../netex_trainElement_version.xsd | 359 +- .../netex_vehicleType_support.xsd | 38 - .../netex_vehicleType_version.xsd | 143 +- .../netex_vehicle_support.xsd | 254 ++ .../netex_vehicle_version.xsd | 538 +++ .../netex_infrastructureFrame_version.xsd | 2 +- .../netex_ifopt_localService_support.xsd | 2 +- .../part1_ifopt/netex_ifopt_path_version.xsd | 13 +- .../netex_stopAssignment_version.xsd | 80 +- .../netex_timetableFrame_version.xsd | 9 +- .../netex_deckEntranceAlignment_version.xsd | 10 +- .../netex_deckPlanAssignment_version.xsd | 4 +- .../netex_vehicleJourney_version.xsd | 21 +- 29 files changed, 4936 insertions(+), 2271 deletions(-) create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 156df8df3..8f531635c 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -110,7 +110,7 @@ - + @@ -119,10 +119,18 @@ + + + + + + + + @@ -135,6 +143,8 @@ + + @@ -780,6 +790,7 @@ + diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 6bf80b055..4c5e3b0ed 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -2,7 +2,6 @@ + + 2020-12-17T09:30:47.0Z SYS001 @@ -118,7 +124,7 @@ Lower deck - + @@ -128,16 +134,16 @@ Lower deck Example of DeckPlans - + 2023-01-01T00:00:00 2023-12-31T12:00:00 - Deck Plan Example + Deck Plan Example for DOuble DEcker Bus This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. - + mb http://www.erebus.eu/ erebus data @@ -146,48 +152,48 @@ Lower deck - - + + - + erebus Operator specific common resources - + - + feedback@erebus.eu - + Operator data - + creates Operation - erebus + erebus - + Operator timetable data - + creates Planning - erebus + erebus - + MBK erebus erebus @@ -205,7 +211,7 @@ Lower deck - + Bench seat Bench Seat contiguous with neighbour 0.48 @@ -213,25 +219,25 @@ Lower deck 0.50 false - + Pulldown seat 0.48 0.40 0.40 true - + Single seat 0.48 0.50 0.45 false - + Seat sensor cable - + true 1 2.00 @@ -240,38 +246,38 @@ Lower deck true - + 0.90 1.00 0.45 0 - + 0.90 1.00 0.80 1.0 - + 1.20 true PT90S - + true foldingPair true true false - + External Door sensor cable - - Spiral starcase from deck1 to deck2 + + Spiral staircase from deck1 to deck2 2.0 both 6 @@ -292,16 +298,16 @@ Lower deck true 1 - + Internal sensor on step cable - + true cashAndCard contactlessPaymentCard travelCard - + paperStamp true true @@ -309,7 +315,7 @@ Lower deck - + freeWifi purchase steps @@ -320,7 +326,7 @@ Lower deck - + Double Decker Bus Double decker bus with staircase. Wheelchair and luggage spaces on lower deck. false @@ -328,12 +334,13 @@ Lower deck human diesel bus - + 60 20 2 1 + Default to use. false 0.15 10 @@ -342,51 +349,51 @@ Lower deck - + Double decker bus - + Doors open Configuration - + Doors shut Configuration - + - + - + Lower Deck - + - + Driver seat - + 1 - + - + 1 - + false 1 - + Lower Deck seating area - + true standardClass - + true @@ -399,15 +406,15 @@ Lower deck true false - + Front Door 1.00 1.90 - + 1 - + true @@ -419,23 +426,23 @@ Lower deck true true - - + + - + Rear Door 0.95 1.90 - + 1 - + - - + + true @@ -447,46 +454,46 @@ Lower deck true true - - + + - + Downstairs Entrance to stairs 0.80 1.90 - - + + internal internal false - - + + - + entry - + - + With rear door set open so passengers can alight when stopped in town exit open - + - + With rear door set shut exit @@ -496,394 +503,394 @@ Lower deck 43 - + seat 22 - + standingSpace 20 - + wheelchairSpace 1 - + pushchairSpace 2 - + leftwards - - + + - - + + true true - + rightwards - - + + - - + + true true - + leftwards - - + + - - + + true true - + rightwards - - + + - - + + true true - + leftwards - - + + - - + + true true - + rightwards - + 1 - + - + 1 - + - - + + true true - + leftwards - - + + - - + + true true - + rightwards - + 1 - + - - + + true true - + forwards - - + + - - + + false true - + forwards - - + + - - + + true false - + forwards - - + + - - + + true false - + forwards - - + + - - + + false true - + forwards - - + + - - + + false true - + forwards - - + + - - + + true false - + forwards - - + + - - + + true false - + forwards - - + + - - + + false true - + forwards - - + + - - + + false true - + forwards - - + + - - + + true false - + forwards - - + + - - + + true false - + forwards - - + + - - + + false true - + forwards - - + + - - + + false true - + forwards - - + + - - + + false false - + forwards - - + + - - + + false true - + forwards - - + + - - + + true false - + forwards - - + + - - + + false false - + leftwards - + - - + + - + Stairwell to upper deck - + - + 1 - + - + Stop button at top of stairs - + false - + Bottom of stairwell 1.00 @@ -891,7 +898,7 @@ Lower deck internal true - + Top of Stairwell 1.00 @@ -901,76 +908,77 @@ Lower deck - - - + + + - - - + + + - + entryAndExit - + entryAndExit - + - + - + - + - + - + - + - + - + - + - + - + - + - + Upper Deck + - + Upper Deck seating area - + false @@ -983,7 +991,7 @@ Lower deck true false - + Entrance to top of stairs 0.80 2.00 @@ -991,687 +999,687 @@ Lower deck - + seat 37 - + standingSpace 12 - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + false false - + forwards - - + + - - + + - + false true - + forwards - - + + - - + + - + true false - + forwards - - + + - - + + - + false @@ -1681,51 +1689,51 @@ Lower deck - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1734,71 +1742,74 @@ Lower deck - + Basic Elements for map of bus http:erebus.eu/plans/double_decker_floor_plan - + Bottom Deck - + - + Forward Entrance - + + true - + Rear Entrance - + + true - + Stairs - + + true - + Top Deck - + - + Deck Plan Assignment Example - This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry . + This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on the platform . More sense for a train of ferry . - - To a particalar stopt - - - - + + To a particular stopt + + + + - + Board at front from position A true false 1 - + Board at front - - + + - - Exit at rear from position A + + Exit at rear from position A false true 1 - + exit at rear - - + + @@ -1807,41 +1818,41 @@ Lower deck - + Deck Plan Example - This is an example showing how one might assign a deck plan to a journey. + This is an example showing how one might assign a deck plan to a journey and also apply conditions. - + 10:10:00 - - + + - + In to centre - - - + + + 10:10:00 10:30:00 - + Across centre - doors open - - - + + + 10:31:00 10:50:00 - + Out of to centre doors open - - - + + + 10:50:00 11:20:00 @@ -1849,34 +1860,35 @@ Lower deck - - + + Assign double decker bus to Journey - doors shut - - - - + + + + - + Assign double decker bus to Journey - doors open - - - + + + - + Assign double decker bus to Journey - doors shut - - - - + + + + - - Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY - - + + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY + Will use a specific assignment at a specifc stiop just for this journey + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 51431fdda..1aa093c2a 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1,82 +1,137 @@ - + - - + 2020-12-17T09:30:47.0Z SYS001 @@ -270,33 +365,34 @@ C) CEN 2024 Example of DeckPlans - + 2023-01-01T00:00:00 2023-12-31T12:00:00 - Deck Plan Example - This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + Deck Plan Example + This is an example showing how one might encode a Deck plan for a train in NeTEx. It Also shows how the Deck plan can be related to the train in a specific station. - + rc - http://www.fakerail.eu/ - Fake rail data + http://www.frail.eu/ + Frail rail data - + - - Rail examples Sleeper wagon + + Rail examples of sleeper train with motor rail transport + Describes a train with sleeper wagons, a buffet car and car transport carriages. - + MRC Motor Rail CO Moto @@ -314,7 +410,7 @@ C) CEN 2024 - + Passenger Train door true hingedSingle @@ -322,7 +418,7 @@ C) CEN 2024 true false - + Sliding door to compartment true slidingSingle @@ -330,7 +426,7 @@ C) CEN 2024 true true - + Hinged door to compartment true hingedSingle @@ -338,44 +434,44 @@ C) CEN 2024 true true - + Passenger Train dor on car transporter false hingedSingle false false - + External Door sensor cable - + true slidingPair true true true - + External Door sensor cable - - + + Bottom seat in couchette 0.48 0.50 0.50 false - + Bottom seat in couchette 0.48 0.50 0.50 false - + Bottom bed in couchette 0.48 true @@ -385,7 +481,7 @@ C) CEN 2024 1.0 0.50 - + Middle bed in couchette 2.0 true @@ -394,7 +490,7 @@ C) CEN 2024 1.0 0.50 - + Top bed in couchette 3.0 true @@ -403,21 +499,21 @@ C) CEN 2024 1.2 0.50 - + Standard carriage seate 0.48 0.50 0.50 false - + Bold down chaire 0.48 0.50 0.50 true - + true 1 2.00 @@ -426,7 +522,7 @@ C) CEN 2024 true - + luggage area 4.00 1.25 @@ -436,7 +532,7 @@ C) CEN 2024 0.40 false - + luggage area 2.00 0.20 @@ -445,7 +541,7 @@ C) CEN 2024 false - + toilet washbasin 1 true @@ -454,20 +550,19 @@ C) CEN 2024 - + General facilities - buffet firstClass standardClass suitableForWheelchairs mobilePhoneFreeZone mobilePhoneUseZone noSmoking - freeWifi powerSupplySockets + publicWifi powerSupplySockets nextStopIndicator passengerInformationDisplay realTimeConnections stopAnnouncements - toilet wheelchairAccessToilet wheelchairAccessToilet + toilet wheelchairAccessToilet couchette seating sleeper C2 C6 T2 baggageStorage baggageVan cyclesAllowedWithReservation luggageRacks - + First class facilities breakfastInCar airConditioning heating @@ -477,7 +572,7 @@ C) CEN 2024 reservation sleeper - + firstClass sleeper 1 @@ -485,7 +580,7 @@ C) CEN 2024 noSmoking mobilePhoneFreeZone freeWifi - + firstClass doubleSleeper C2 @@ -494,29 +589,29 @@ C) CEN 2024 - + firstClass earlyBoardingPossibleBeforeDeparture PT1H - + firstClass overnightStayOnboardAllowed PT9H - + Second class facilities buffet airConditioning heating - economyClass + standardClass blinds tintedWindows powerSupplySockets publicWifi reservation couchette - + secondClass couchette C6 @@ -526,68 +621,25 @@ C) CEN 2024 + + Buffet facilities + buffet + - + General facilities recharging - - Rail Sleeper coach - Sleeper coach with 1st and second class compartments and WC at end - true - false - human - rail - - - - - - 60 - 20 - - - - - - 60 - 20 - - - false - 0.15 - 10 - 4 - 2000 - - - Rail Sleeper coach - Sleeper coach with 1st and second class compartments and WC at end - true - false - human - rail - - - allPassengerVehicles - - - false - 0.15 - 10 - 4 - 2000 - - - 40447 Alpha - Charley Sleepor with Motorrail - [Vehicles2] [Velicles1] [Sleeper3] [Sleeper2] [Sleeper1] [Buffet1] [Engine] + + 4 carriage sleeper train with 2 Motorrail + [Vehicles2] [Velicles1] [Sleeper3] [Buffet1] [Sleeper1] [Sleeper1] [Engine] true electric - + 186 @@ -595,123 +647,208 @@ C) CEN 2024 60 - + 32 + false + true + 0.40 - - + + - + Engine - - Engine - engine - + forwards + + true + noThroughAccess + - + - - Sleeper Waggon F01 - sleeperCarriage - firstClass economyClass - - + Sleeper + forwards + + false + door + - + - - Buffet car F02 - carriage - economyClass - - + Sleeper + forwards + + false + door + - + - - Sleeper Waggon F03 - sleeperCarriage - firstClass economyClass - - + Buffet car + forwards + + false + door + - + - - Sleeper Waggon F04 - sleeperCarriage - firstClass economyClass - - + Sleeper + + forwards + + false + door + - + - - Vehicle Wagon V01 - carTransporter - any - - + backwards + + true + noThroughAccess + - + - - Vehicle Wagon V02 - carTransporter - any - - + backwards + + true + noThroughAccess + + + + Engine + engine + 10 + 3.5 + 4 + 1000 + + + Sleeper Waggon + sleeperCarriage + firstClass economyClass + false + true + 0.15 + 25 + 3.5 + 4 + 1000 + + + + Buffet car + sleeperCarriage + firstClass standardClass + + + + Vehicle Wagon + sleeperCarriage + any + + + + + + Example rail stock + + + Engine + + + + car transporter + + + + car transporter + + + + Sleeper + + + + buffet + + + + Sleeper + + + + Sleeper + + + + + - + Rail sleeper wagon - + Day Configuration + Couchettes used as seats 8 per seconf class compartment + + + Night Time confguration + Couchettes used as bunk beds 6 per seconf class compartment - + + + Folded down + Wheel chair space used a fold down seat + + + Folded up for wheelchair + Wheel chair space used for wheel chair - - Cairl sleeper wagon Passenger deck + + Sleeper wagon Passenger deck - + Corridor - + false - - - Front Door + + + Left Front Door 1.00 1.90 - + 1 - + - + 1 - + - + @@ -724,24 +861,24 @@ C) CEN 2024 true true - - + + - - + + Front Right External Door 1.00 1.90 - + 1 - + - + 1 - + true @@ -753,25 +890,25 @@ C) CEN 2024 true true - - + + - - + + Rear External Door 0.95 1.90 - + 1 - + - - + + - + @@ -784,23 +921,23 @@ C) CEN 2024 true true - - + + - - + + Rear Right External Door 0.95 1.90 - + 1 - + - - + + true @@ -812,20 +949,20 @@ C) CEN 2024 true true - - + + - - + + Rear end door connecting to next carriage 0.80 1.90 - - + + true @@ -835,22 +972,22 @@ C) CEN 2024 true true - - + + - - + + Rear end door connecting to next carriage 0.80 1.90 - - + + - - + + true @@ -860,19 +997,19 @@ C) CEN 2024 true true - - + + - + Compartment 1 door 0.80 1.80 - - + + internal @@ -880,44 +1017,50 @@ C) CEN 2024 false - + + Compartment 1 door 0.80 1.80 - - + + internal true false - + + Compartment 2 door internal true false - + + Compartment 3 door internal true false - + + Compartment 4 door internal true false - + + Compartment 5 door internal true false - + + Compartment 6 door internal true @@ -925,39 +1068,64 @@ C) CEN 2024 - + + Access to seats 01-12 entryAndExit shut true - + + + Seat 01 + + + Seat 12 + - + entryAndExit shut true - + + + Seat 01 + + + Seat 12 + - + entryAndExit shut true - + + + Seat 13 + + + Seat 36 + - + entryAndExit shut true - + + + Seat 13 + + + Seat 36 + - + 1 4 true true - + 2 14 true @@ -967,7 +1135,7 @@ C) CEN 2024 20 - + standingSpace 20 @@ -975,26 +1143,26 @@ C) CEN 2024 true - - WC + + Passenger Toilet - + 1 - + true true false - + - CToilet door connecting to corridor + Toilet door connecting to corridor 0.80 1.80 - - + + true @@ -1003,30 +1171,30 @@ C) CEN 2024 - + Connected to corridor - - + + - + entryAndExit shut - + 1 - + Compartment 1: Seats 01-02 First class compartment with two beds - + true standardClass - + true @@ -1039,14 +1207,14 @@ C) CEN 2024 true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true @@ -1056,21 +1224,21 @@ C) CEN 2024 - + Connected to corridor - - + + - + entryAndExit shut - + - + leftwards 1.50 @@ -1080,84 +1248,84 @@ C) CEN 2024 8 - + - + seat 8 - + - + bed 6 - + standingSpace 0 false - - + + backwards 0.60 0.50 2.0 - + - + - + - - + + - - + + true true true true - + + forwards - + - + - + - - + + - - + + true true true true - - + Compartment 2: Seats 02-03 Rirst class with two beds - + true standardClass - + true @@ -1170,14 +1338,14 @@ C) CEN 2024 true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true @@ -1187,83 +1355,84 @@ C) CEN 2024 - + Connected to corridor - - + + - + entryAndExit shut - + 8 - + - + seat 8 - + - + bed 6 - + standingSpace 0 false - - - + + + backwards 0.60 0.50 2.0 - + - + - + - - + + - - + + true true true true - - + + + forwards - + - + - + - - + + - - + + true true true @@ -1273,53 +1442,53 @@ C) CEN 2024 - + Compartment 3 : Seats 05-12 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths - + true standardClass true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true - firstClass + standardClass true false - + entryAndExit shut - + 8 - + - + - 8 people as daytime compartment + 8 people as daytime compartment seat 8 - + - + 6 people as nightime couchette bed @@ -1328,226 +1497,229 @@ C) CEN 2024 false - - + + + Seat 05 turns into bottom Bunk backwards - + - + - + - + - + - + - - + + false true true - + + Seat 06 turns into middle Bunk backwards - + - + - + - + - + - + - - + + false true - + + Seat 06 turns into top Bunk backwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime backwards - + - + - + - - + + true false true - - + + forwards - + - + - + - + - + - + - - + + false true true - + forwards - + - + - + - + - + - + - - + + false true - + forwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime forwards - + - + - + - - + + true false true - + Compartment 4 : Seats 12-20 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths - + true standardClass true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true - firstClass + standardClass true false - + entryAndExit shut - + 8 - + - + - 8 people as daytime compartment + 8 people as daytime compartment seat 8 - + - + 6 people as nightime couchette bed @@ -1556,226 +1728,228 @@ C) CEN 2024 false - - + + backwards - + - + - + - + - + - + - - + + false true true - + backwards - + - + - + - + - + - + - - + + false true - + backwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime backwards - + - + - + - - + + true false true - - + + forwards - + - + - + - + - + - + - - + + false true true - + forwards - + - + - + - + - + - + - - + + + false false true - + forwards - + - + - + - + - + - + - - + + + false false true - + Seat only available in daytime forwards - + - + - + - - + + true false true - + Compartment 5 : Seats 21-28 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths - + true standardClass true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true - firstClass + standardClass true false - + entryAndExit shut - + 8 - + - + - 8 people as daytime compartment + 8 people as daytime compartment seat 8 - + - + 6 people as nightime couchette bed @@ -1784,226 +1958,226 @@ C) CEN 2024 false - - + + backwards - + - + - + - + - + - + - - + + false true true - + backwards - + - + - + - + - + - + - - + + false true - + backwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime backwards - + - + - + - - + + true false true - - + + forwards - + - + - + - + - + - + - - + + false true true - + forwards - + - + - + - + - + - + - - + + false true - + forwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime forwards - + - + - + - - + + true false true - + compartment 6 : Seats 21-28 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths - + true standardClass true false - + Compartment 1 door connecting to corridor 0.80 1.80 - - + + true - firstClass + standardClass true false - + entryAndExit shut - + 8 - + - + - 8 people as daytime compartment + 8 people as daytime compartment seat 8 - + - + 6 people as nightime couchette bed @@ -2012,174 +2186,174 @@ C) CEN 2024 false - - + + backwards - + - + - + - + - + - + - - + + false true true - + backwards - + - + - + - + - + - + - - + + false true - + backwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime backwards - + - + - + - - + + true false true - - + + forwards - + - + - + - + - + - + - - + + false true true - + forwards - + - + - + - + - + - + - - + + false true - + forwards - + - + - + - + - + - + - - + + false true - + Seat only available in daytime forwards - + - + - + - - + + true false true @@ -2187,49 +2361,49 @@ C) CEN 2024 - + WC true true false 1 - + angledRight 0.5 2.5 2.0 - + 1 - + - + angledRight 0.5 2.5 2.0 - + 1 - + - + angledRight 0.5 2.5 2.0 - + 1 - + @@ -2237,123 +2411,144 @@ C) CEN 2024 - - - - - - + + + + + + + + + + + + - + - + - + - + - - + + mid point at front fo carriage 3 2 all - + - - + + mid point at front fo carriage 3 2 all - + - + - + - + - + - + - + - + - + link to Compartment 1 - + - + - + link to Compartment 1 - + - + - + link to Compartment3 - + - + + + + Seat in Compartment 3 + + + + + + + - - Static Navigation path to get from right rear door to C3 + + Static Navigation path to get from right rear door to Compartment 3 seat 05 - + - + wellLit true - - + + left Turn right into coridoor - - + + forward - Go down corridor third compart ment on right + Go down corridor third compartment from end on leftt + + + + left + Seat 9is on far side by window on left @@ -2361,48 +2556,50 @@ C) CEN 2024 - + Rail sleeper wagon + Double decker wagon drive through eaxis from front and back. Passenger doors on side - - Day Configuration + + If One vehicle per space - + + If Two vehiclesper space - + Lower vehicle deck true - + Lower vehicle deck true - + Car transporter Waggon - lower deck - + - + Car area - + false - + Passenger access left Door 1.00 1.90 - + 1 - + true @@ -2413,15 +2610,15 @@ C) CEN 2024 true false - + >Passenger access Right External Door 1.00 1.90 - + 1 - + true @@ -2454,26 +2651,26 @@ C) CEN 2024 - + entryAndExit shut false - + - + entryAndExit shut false - + 4 - + vehicleSpace 4 - + vehicleSpace 2 @@ -2482,7 +2679,7 @@ C) CEN 2024 - + 5.0 @@ -2492,7 +2689,7 @@ C) CEN 2024 - + 5.0 @@ -2502,7 +2699,7 @@ C) CEN 2024 - + 5.0 @@ -2513,7 +2710,7 @@ C) CEN 2024 - + 5.0 @@ -2523,7 +2720,7 @@ C) CEN 2024 - + 5.0 @@ -2533,7 +2730,7 @@ C) CEN 2024 - + 5.0 @@ -2545,14 +2742,14 @@ C) CEN 2024 - + Car transporter Waggon - upper deck - + - + Car area - + false @@ -2577,7 +2774,7 @@ C) CEN 2024 4 - + vehicleSpace 4 @@ -2619,35 +2816,35 @@ C) CEN 2024 - + Rail sleeper wagon - + Buffet car Passenger deck - - seating - + + @seating_area@ + false - + Front Door 1.00 1.90 - + 1 - + - + 1 - + - - + + true @@ -2659,24 +2856,24 @@ C) CEN 2024 true true - - + + - + Front Right External Door 1.00 1.90 - + 1 - + - + 1 - + true @@ -2688,25 +2885,25 @@ C) CEN 2024 true true - - + + - + Rear External Door 0.95 1.90 - + 1 - + - - + + - + @@ -2719,23 +2916,23 @@ C) CEN 2024 true true - - + + - + Rear Right External Door 0.95 1.90 - + 1 - + - - + + true @@ -2747,20 +2944,20 @@ C) CEN 2024 true true - - + + - + Rear end door connecting to next carriage 0.80 1.90 - - + + true @@ -2770,22 +2967,22 @@ C) CEN 2024 true true - - + + - + Rear end door connecting to next carriage 0.80 1.90 - - + + - - + + true @@ -2795,19 +2992,19 @@ C) CEN 2024 true true - - + + - + Compartment 1 door 0.80 1.80 - - + + internal @@ -2815,20 +3012,20 @@ C) CEN 2024 false - + Compartment 1 door 0.80 1.80 - - + + internal true true - + Compartment 2 door internal true @@ -2837,57 +3034,81 @@ C) CEN 2024 - + entryAndExit shut true - + + + Seat 01 + + + Seat 24 + - + entryAndExit shut true - + + + Seat 01 + + + Seat 24 + - + entryAndExit shut true - + + + Seat 25 + + + Seat 46 + - + entryAndExit shut true - + + + Seat 25 + + + Seat 46 + - + entryAndExit shut true - + - + entryAndExit shut true - + - + entryAndExit lockedShut - + - + 1 4 true true - + 2 14 true @@ -2897,354 +3118,476 @@ C) CEN 2024 20 - + standingSpace 20 true - - + + forwards - - + + - - + + false true false true - + forwards - - + + - - + + true false false true - + forwards - - + + - - + + true false false true - + forwards - - + + - - + + false true false true - - + + forwards - - + + - - + + false true true true - + forwards - - + + - - + + true false false true - - + + forwards - - + + - - + + true false false true - + forwards - - + + - - + + true false false true - - + + forwards - - + + - - + + false true true true - + forwards - - + + - - + + true false false true - + forwards - - + + - - + + true false false true - + forwards - - + + - - + + false true false true - - + + backwards - - + + - - + + false true true true - + backwards - - + + - - + + true false true true - + backwards - - + + - - + + true false true true - + forwards - - + + - - + + true false true true - - - + + + forwards - - + + - - + + false true true true - - + + forwards - - + + - - + + true false true true - - + + forwards - - + + - - + + true false true true - - + + forwards - - + + - - + + + false + true + true + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + false + true + true + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + false true true true - - + + forwards - - + + - - + + false true true true - + forwards - + - + - + - + - + - + - - + + true false true @@ -3253,12 +3596,12 @@ C) CEN 2024 - + WC - + 1 - + true @@ -3267,25 +3610,25 @@ C) CEN 2024 1 - + Luggage true true false - + Galley false true false - + buffet false true false - + Snack area true true @@ -3294,36 +3637,30 @@ C) CEN 2024 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - + @@ -3338,66 +3675,93 @@ C) CEN 2024 Bottom Deck - + Forward Entrance left - + Rear Entrance left - + Forward Entrance right - + Rear Entrance right - + Toilet - + - + Deck Plan - Train and Journey assignment Example - Example paths + Example descripotion of a Station with Navigation paths to reach a platform - + xx http://www.natrail.rt/ Fake stop data - + + + + Station Opening hours + + + + + Everyday + + + + + 05:30:00 + 00:30:00 + 1 + + + + + + Erewhon hbf - + Street Level ST 0 - + Platform Level PL 1 - - - - - External Entrance to Ticket Hall - - + + Main Entrance + External Entrance to Ticket Hal + + + Passenger Terminal + 45 + Bahnhof Srasse + Erewhon + 7562 + Ruritania + + true @@ -3406,7 +3770,23 @@ C) CEN 2024 - + + + + Main door + true + hingedPair + true + true + true + false + true + true + true + noForce + + + openDoor true true @@ -3414,69 +3794,184 @@ C) CEN 2024 3.0 2.0 - - Ticket Hall Entrance to Platforms 1 and 2 - top of stairs - - - opening - false - true - true - 3.0 - 3.0 - - - Platforms 1 and 2 -from bottom of stairs - - - opening - false - true - true - 3.0 - 3.0 - - + - + -1 - + - + 0 - + + + + Boarding assistance is availabel if booked + boardingAssistance wheelchairAssistance + availableIfBooked + fullTime + true + firstAid + ccTv sosPoints + + + rail + local + railStation + false + + + - - Quay 3 - + + Quays 1 and 2 + + true + + + true + true + + + + + + + Assisted boarding for wheelchair + bothWays + boarding + ramp + + + + PT3M + PT5M + PT10M + + + + + + + true + 300.00 + 0.30 + 0.10 + rampRequired + boardOnlyAtSpecifiedPositions + + + Info assistance + true + true + true + wellLit + true + automatic + + + + + + + + + + + + E + railPlatform + 1.0 + + + Quay 1 - Trains to Pas de Ville + P1 + + + + Entrance to quay 1 + + + + + http://rcicons.com/platform + Platform 1 + transportModePoint + + + opening + false + true + true + 4.0 + 4.0 + + + + + + railPlatform + 1.0 + 4 + + + + Quay 2 - Trains to Keinstadt + P2 + true - - unknown - false + + true + true - + + + + + + 0.12345 + -53.654 + + + + + + + 20 + EREWHON HBF2 + + + + + + + + + + railPlatform + 4 + - + covered positionOnRailPlatform - + covered positionOnRailPlatform - + covered positionOnRailPlatform @@ -3484,124 +3979,690 @@ C) CEN 2024 + + + Ticket Hall + indoors + openArea + wellLit + true + + + + Possible delay Queueing for ticket counter + ticketPurchase + counterService + hall + + + + PT2M + PT5M + PT21M + + + + + + + ticketMachines ticketOffice mobileTicketing + purchase refund exchange reservations renewal collection + true + 2 + separateLines + cashAndCard + all + localTicket nationalTicket + true + 1.2 + true + false + true + + + realTimeDepartures networkStatus lineNetworkPlan + + + + + + + + bookingHall + + + Stairwell to Q1 and Q2 + indoors + openArea + wellLit + false + + + 4.00 + 20 + 0.20 + true + bothSides + 1.4 + 0.8 + + false + true + true + + + false + true + true + + true + 2 + + + 2.00 + 10 + true + 0.8 + true + + + 2.00 + 10 + true + 0.8 + true + + + + + + + Ticket Hall Entrance to stairs to Platforms 1 and 2 + + + + + http://rcicons.com/platform + Stairs to Platforms 1 & 2 + transportModePoint + + + opening + false + true + true + 3.0 + 3.0 + + + Platforms 1 and 2 -from bottom of stairs + + + opening + false + true + true + 3.0 + 3.0 + + + staircase + + + Lift to Q1 and Q2 + openArea + true + 6 + + + Possible delay Waiting for lift + bothWays + waitForLift + lift + + + + PT2M + PT4M + PT10M + + + + + + + Lift to platforms + both + 6 + true + 3.00 + 400 + true + 2.5 + 2.5 + bothSides + 1.3 + 1.2 + 1.2 + true + false + true + false + false + false + false + true + false + true + true + true + true + true + 1.2 + + + + + Ticket Hall Kift entrance at street level + + + + + 1.2 + true + false + false + true + true + E + + + + automaticDoor + false + true + true + 2.0 + 2.0 + + + Ticket Hall lift entrance at street level + + + + + 1.4 + true + false + false + true + true + S + + + + automaticDoor + false + true + true + 2.0 + 2.0 + + + lift + + - - Ticket Hall Entrance to middle + + + Ticket Hall Entrance to middle junction point + 20 - - - + + + - - + + - 1 + 0 + twoWay + level + concrete + true - + Ticket Hall middle to Platforms 1 and 2 - top of stairs + 20 - - + + - - - + + + 0 + twoWay + handrail + handrail + false - - top of stairs Entrance to Platforms 1 and 2 - bottom of stairs + + Ticket Hall middle to Lift entrance street level + 20 - - - + + - - - + + + - 10 + 0 + twoWay + level + concrete + true - + + + Stairs to platform level top of stairs Entrance to Platforms 1 and 2 - bottom of stairs + 15 + + + + + + + + + + + 0 + downAndUp + + + + + + Lift to platform level: Lift entrance street level to Lift entrance platform level + 20 + + + + + + + + + + + 0 + downAndUp + lift + + + + + + + + + + Bottom of of stairs Entrance to Platforms 2 - boarding position c + 15 + + + + + + + Boarding PointC + + + 0 + twoWay + level + concrete + tactileStripAtEnd + true + + + Lift entrance street level to bottom of start to q1 and q2 level + 20 + + + + + + + + + + + 0 + twoWay + level + concrete + true + + + + Lift entrance street level to entrance to quay 1 + 3 - - - + + + - - + + + 0 + twoWay + level + concrete + true + + + Entrance to quay 1 to middle of platform + 20 + + + + + + + + + + 0 + twoWay + level + concrete + wall + noPhysicalBorder + true - - From Station main entrance to QUAY 2 Boarding point 1 + + From Station main entrance to QUAY 2 Boarding point C - via stairs + 70 + + + + + + + Boarding PointC + + + + + hall + 1 + level + + + stairs + 1 + down + + + indoors + openArea + false + streetToQuay + + + + forward + level + Enter station main entrance and cross ticket hall to far side + + + + left + level + Turn left and proceed to entrance to platforms 1 and 2 + + + + forward + down + Take stairs down to platform level + + + + right + level + Turn right and Walk along platform to boarding point C + + + + + From Station main entrance to QUAY 2 Boarding point C - via lift + 65 + + + + + + + Boarding PointC + + + + + hall + 1 + level + + + lift + 1 + down + + + indoors + openArea + true + streetToQuay - - + + + forward + level + Enter station main entrance - - + + + left + level + Turn left and walk to lift entrance at end of lobby - - + + + right + down + Take lift down to platform level. Exit on right - - + + + left + level + Turn left on exit from lift and Walk to bottom of stairs + + + + right + level + Walk along platform to boarding point C - + + - + Deck Plan - Train and Journey assignment Example This is an example showing how one might assign a deck plan to a journey. Note that Train elements can specify a default deck plan - - 10:10:00 + + Train from Pas de Ville - Erewhon - Cockaigne - Keinstadt + Operates as sleeper between Erewhon -Keinstadt + 18:10:00 - + - - - + + + + + + - - In to centre - - - - 10:10:00 - 10:30:00 + + Day Configuration as seats + + + + 18:10:00 + 20:30:00 + true + + + Night configuration as bunk beds + + + + 20:45:00 + 06:50:00 + 1 + + false - - Across centre - doors open - - - - 10:31:00 - 10:50:00 + + + Buffet Service betwen 18:30 and 11:45 + + 18:30:00 + 11:45:00 + + + + + + Pas de Ville + + + true + + + + + + + Erewhon + + + true + + + + + true + + + + + + + Very Short Platform. Access only to front two carriages + + + + + + + Cockaigne + + + true + + + + + true + + + + true + + + Keinstadt + + + 1 + true + + + + + + + Connecting journey Erewhon - Novado + 21:00:00 + + + + + + + + + + + + Erewhon + + + true + + + + + + Novado + + + true + + + - + - + General service specific facilities boardingAssistance conductor wheelchairAssistance buffet @@ -3614,78 +4675,304 @@ C) CEN 2024 - + Day Coach leg of journey - - - - + + + + - + - + Night leg of journey - - - - + + + + - + - + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY - - + + + + + Interchange to train to Novado + + true + true + guaranteed + PT2M + + + + - + Rail Deck Plan Assignment Example This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on the platform . + + + Pas de Ville + + + Keinstadt + + + Keinstadt + + + Cockaygne + + + + + Novado + + + + + + Pas de Ville - Gare de L'Eest + Pas de Ville + railStation + rail metro + + true + + + Erewhon HBF + Erewhon + railStation + rail + + true + + + Erewhon HBF Platform 2 + Erewhon + railStation + rail + + true + + + Cockaygne BF + Cockaygne + railStation + rail + + true + + + Keinstadt Bhf + Keinstadt + railStation + rail metro + + true + + + + + Novado FS + Novado + railStation + rail + + false + + + + + + + PT5M + PT12M + + true + + bus + + + rail + + + + Connection between platforms 1 and 2 in timetable + 40.00 + + PT2M + PT6M + + true + + + + + + + + - - Assignment for train To a particular stop - - - + + Assignment for train at particular stop Erewhon 015E + Short platform so only front three doors accessible. Train reverses in station + + true + false + true + false + + - + true - false - 10 - + true + + + + sleeperCarriage + + 2 + Board at front - - + + Entrance to F01 is at Boarding Position A via forward door on right hand side of train + + + Seat 01 + + + Seat 12 + - - false + + true true - 9 - + + + + sleeperCarriage + + 2 + exit at rear - - + + Entrance to F01 at Boarding Position B via rear door on right hand side of train + + shut + + + Seat 13 + + + Seat 36 + - - false + + true true - 1 - + + + + sleeperCarriage + + 3 + + exit at front + + + Entrance to F02 at Boarding Position A via forward door on right hand side of train + + shut + + Seat 01 + + + Seat 36 + + + + + + Short platform means doors cannot be used + false + false + + + + sleeperCarriage + + 3 exit at front - - + + No Entrance to F02 via rear door on right hand side of train + + lockedShut + + + + + Short platform means F03 (buffet car) doors cannot be used + false + false + + + + buffetCar + + 4 + exit at front + + + No Entrance to F03 via front door on right hand side of train + + lockedShut + + + No Entrance to F03 via rear door on right hand side of train + + lockedShut + + + + + Short platform means F04 (sleeper wagon) doors cannot be used + false + false + + + + sleeperCarriage + + 5 + exit at front + + + No Entrance to F04 via front door on right hand side of train + + lockedShut + + + No Entrance to F04 via rear door on right hand side of train + + lockedShut diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml index 902e7df1f..4df0c0ea0 100644 --- a/examples/functions/versioning/Netex_Uniqueness_01.xml +++ b/examples/functions/versioning/Netex_Uniqueness_01.xml @@ -115,7 +115,7 @@ This is part 1 of a multistep example on versioning - + @@ -126,7 +126,7 @@ This is part 1 of a multistep example on versioning - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index a9faf95ce..ae3c2c2a6 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -2590,6 +2590,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [HelpPointEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -3921,6 +3942,18 @@ Correct COnstraints for PointOnRoute + + + + + + + + + + + + @@ -3975,7 +4008,7 @@ Correct COnstraints for PointOnRoute - + @@ -4557,18 +4590,18 @@ Correct COnstraints for PointOnRoute Every [Train Id + Version] must be unique within document. - + - + - + @@ -4594,26 +4627,27 @@ Correct COnstraints for PointOnRoute - - + + - Every [TrainElement Id + Version] must be unique within document. + Every [TrainElementType Id + Version] must be unique within document. - + - - - + + + - - + + + @@ -4702,6 +4736,18 @@ Correct COnstraints for PointOnRoute + + + + + + + + + + + + @@ -4907,7 +4953,7 @@ Correct COnstraints for PointOnRoute - + @@ -5798,6 +5844,25 @@ Correct COnstraints for PointOnRoute + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index eeadd035d..516813ba4 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -17,15 +17,20 @@ 2011-02-05 - 2017-03-28CR031 Add Zones to RESOURCE FRAME + + 2017-03-28CR031 Add Zones to RESOURCE FRAME - 2017-06-28CR048 Add Security Lists to RESOURCE FRAME + + 2017-06-28CR048 Add Security Lists to RESOURCE FRAME - 2020-08-12Issue 104 Add ResponsibilityRoles to RESOURCE FRAME + + 2020-08-12Issue 104 Add ResponsibilityRoles to RESOURCE FRAME - 2020-10-20New Modes Add Facility sets to RESOURCE FRAME. + + 2020-10-20New Modes Add Facility sets to RESOURCE FRAME. - 2023-02-02Add DECK PLAN CHANGES. + + 2023-02-02Add DECK PLAN CHANGES.

                                              NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.

                                              @@ -114,6 +119,8 @@ Rail transport, Roads and Road transport + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index f1179af0e..ade29180f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -45,7 +45,7 @@ - + @@ -60,8 +60,15 @@ + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index c6524cde6..1bbe7b297 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -1,6 +1,6 @@ - + @@ -73,7 +73,7 @@ Rail transport, Roads and Road transport Deck Path elemenst fro DECK - + PATH JUNCTIONs for DECK @@ -370,6 +370,7 @@ Rail transport, Roads and Road transport + Branching level of place. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 528a9af75..055d059fb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -15,7 +15,7 @@                                               2024-01-11Revise enum values - +

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

                                              This sub-schema describes the DECK PLAN types.

                                              diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 210eeb0d4..9c7f612f3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -17,9 +17,8 @@ 2023-01-30                                               - 2023-01-30 - Name Space changes - + 2024-02-09Add locatbale spot range for usage. +

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

                                              This sub-schema describes the DECK PLAN types.

                                              @@ -37,11 +36,11 @@ Unclassified - CEN, Crown Copyright 2022-2023 + CEN, Crown Copyright 2022-2024
                                                -
                                              • Derived from the Transmodel, standards.
                                                • +
                                              • Derived from the Transmodel, standards.
                                              Version 1.0 @@ -67,17 +66,18 @@ - Elements for a DECK PLAN in Frame. + Deck Plans in Frame - + - DECK OKANs in FRAME. + A List OF DECK PLANs - + + Type for containment in frame of DECK PLANs @@ -89,7 +89,6 @@ - A plan for the layout of seating and other areas of use of an entire VEHICLE (train, coach, vessel etc.) or individual TRAIN ELEMENT for all or part of a journey. +v2.0 @@ -148,7 +147,7 @@ - VALIDTY CONDITIONs used to configure DECK PLAN + VALIDITY CONDITIONs used to configure DECK PLAN @@ -1025,12 +1024,13 @@ Door setting: whether keot open, shut or locked. See allowed values. Default is shut. - + - Whether door is normally locked for safety when in motiion. + Whether door is normally locked for safety when in motiion. Default is true. + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd index a5096a522..0df4eeaf1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd @@ -1,8 +1,8 @@ - + - - + + @@ -14,9 +14,14 @@ Nicholas Knowles Europe First drafted for NeTEx version 1.2.2 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2020-10-04Add for New Modes + + 2020-10-04Add for New Modes - 2020-10-07Revise to use TransportType + + 2020-10-07Revise to use TransportType + + + 2024-02-14Revise dependecies because of ewseparate Vehice_version package

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

                                              @@ -34,7 +39,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2024
                                                diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index dd91dfe1a..84db73216 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -187,6 +187,33 @@ + + + A Range of LOCATABLE SPOTs. + + + + + Start of range of LOCATABLE SPOTs. + + + + + + + + + + End of range of LOCATABLE SPOTs. + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index aa99cc457..bce0f7277 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -348,6 +348,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd new file mode 100644 index 000000000..c821b787d --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd @@ -0,0 +1,166 @@ + + + + + + + + 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 + + 2024-02-11Transmodel revision of TRAINN ELEMENT TYPES - add specifc subtype PoweredTrain, UnpoweredTrain, Tractiveelement TrailingElement + + + 2024-02-11 + + +

                                                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_trainElement_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-2024 + + +
                                                  +
                                                • Derived from the Transmodel, 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 TRAIN ELEMENT TYPE types. + Standard +                                                 +                                                 + TYPES for TRAIN ELEMENT TYPES +                                                 + + + + Type for identifier of a POWERED TRAIN. + + + + + + Reference to a POWERED TRAIN. v2.0 + + + + + Type for a reference to a POWERED TRAIN. + + + + + + Identifier of a POWERED TRAIN. + + + + + + + + + Type for identifier of a UNPOWERED TRAIN. + + + + + + Reference to a UNPOWERED TRAIN. v2.0 + + + + + Type for a reference to a UNPOWERED TRAIN. + + + + + + Identifier of a UNPOWERED TRAIN. + + + + + + + + + Type for identifier of a TRACTIVE ELEMENT TYPE. + + + + + + Reference to a TRACTIVE ELEMENT TYPE. v2.0 + + + + + Type for a reference to a TRACTIVE ELEMENT TYPE. + + + + + + Identifier of a TRACTIVE ELEMENT TYPE. + + + + + + + + + Type for identifier of a TRAILING ELEMENT TYPE. + + + + + + Reference to a TRAILING ELEMENT TYPE. v2.0 + + + + + Type for a reference to a TRAILING ELEMENT TYPE. + + + + + + Identifier of a TRAILING ELEMENT TYPE. + + + + + + +                                                 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd new file mode 100644 index 000000000..ae7662771 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -0,0 +1,279 @@ + + + + + + + + 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 + + 2024-01-11Transmodel - exten TRAIN and TRAIN ELEMENT tYPES + + + 2024-01-11Name Space changes + + +

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

                                                +

                                                This sub-schema describes the TRAIN ELEMENT TYPE 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_trainElement_version.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-2024 + + +
                                                  +
                                                • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
                                                  • +
                                                + + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx TRAIN ELEMENT Types. + Standard +                                                 +                                                 + NeTEx TRAIN ELEMENT TYPEs Type specification +                                                 + + + + Elements for TRAIN TYPEs in frame. + + + + + TRAIN ELEMENT TYPEs in frame _V2.0 in frame. + + + + + + + Type for containment in frame of TRAIN ELEMENT TYPEs. + + + + + + + + + + + + + + + A TRAIN that is able to move under its own power, + ++v2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a POWERED TRAIN. + + + + + + + + + + + + Elements for a POWERED TRAIN. + + + + + + + A TRAIN that is able to move under its own power, + ++v2.0 + + + + + + + + + + + + + + + + + + Elements for a UNPOWERED TRAIN. + + + + + + + + + + + + Type for a UNPOWERED TRAIN. + + + + + + + + + + + + Elements for a UNPOWERED TRAIN. + + + + + + + A TRAIN ELEMENT TYPE that is self-propelled, e.g., a locomotive or powered railcar. ++v2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a TRAIN ELEMENT. + + + + + + + + + + + + Elements for a TRACTIVE ELEMENT TYPE. + + + + + + + A TRAIN ELEMENT TYPE that cannot propel itself, e.g. a railway carriage, luggage van, passenger vehicle wagon, etc +. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Type for a TRAILING ELEMENT TYPE. + + + + + + + + + + + + Elements for a Trailing ELEMENT TYPE. + + + + +                                                 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index 203132a9d..587a02dcb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -1,5 +1,5 @@ - + @@ -15,8 +15,10 @@ 2010-09-04 - 2011-02-05 - + 2011-02-05Name Space changes + + + 2024-03-09Add TrainComponentCoupling and ThroughACcessEnumeration

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

                                                @@ -34,7 +36,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2014 + CEN, Crown Copyright 2009-2024
                                                  @@ -57,8 +59,9 @@ Rail transport, Roads and Road transport Standard + TRAIN Types - + Type for identifier of a TRAIN. @@ -84,7 +87,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a COMPOUND TRAIN. @@ -115,7 +118,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a TRAIN IN COMPOUND TRAIN. @@ -141,35 +144,40 @@ Rail transport, Roads and Road transport - - + + - Type for identifier of a TRAIN ELEMENT. + Type for identifier of a TRAIN ELEMENT TYPE. - + + + Reference to a TRAIN ELEMENT TYPE. v2.0 + + + - Reference to a TRAIN ELEMENT. + DEPRECATED v2.0 - renamed to TRAIN ELEMENT TYPE. - + - Type for a reference to a TRAIN ELEMENT. + Type for a reference to a TRAIN ELEMENT TYPE. - + - Identifier of a TRAIN ELEMENT. + Identifier of a TRAIN ELEMENT TYPE. - + - Allowed values for TYPE OF TRAIN ELEMENT. + Allowed values for TYPE OF TRAIN ELEMENT TYPE. @@ -183,7 +191,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a TRAIN COMPONENT. @@ -210,6 +218,30 @@ Rail transport, Roads and Road transport + + + The size of a train in relative terms. + + + + + No through access to next carriage + + + + + Access to next carriage through open entrance + + + + + Access to next carriage through door that can be opened. + + + + + + The size of a train in relative terms. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index c0953c3c5..339bc1cc6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -1,31 +1,11 @@ - + + - - - SERVICE REQUIEMENTS for SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT. - - - - - Required Minimum capacity for service. Note actual Capacity is given by vehicle type. - - - - - - - - VEHICLE EQUIPMENT available on service. - - - - - @@ -57,7 +37,10 @@ 2021-09-01NewModes: revise to allow chargingEquipmentProfile - 2024-01-17DECK PLANS add a defualt DECK PLAN + 2024-02-05DECK PLANS add a default DECK PLAN and TRAIN COMPONENT COUPLING + + + 2024-02-09Rename TRAIN ELEMENT to TRAIN ELEMNT TYPE. DEerecate old element

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

                                                  @@ -98,12 +81,33 @@ Rail transport, Roads and Road transport Standard                                                   - NeTEx Train specifcation + NeTEx Train specification                                                   + + + SERVICE REQUIEMENTS for SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT. + + + + + Required Minimum capacity for service. Note actual Capacity is given by vehicle type. + + + + + + + + VEHICLE EQUIPMENT available on service. + + + + + - Elements for a VEHICLE TYPEs in frame. + Elements for VEHICLE TYPEs in frame. @@ -113,9 +117,21 @@ Rail transport, Roads and Road transport - + + + Type for containment in frame of VEHICLE TYPEs. + + + + + + + + + + - Elements for a VEHICLEs in frame. + Elements for VEHICLE TYPEs, VEHICLE MODELS, etc in frame. @@ -138,56 +154,40 @@ Rail transport, Roads and Road transport VEHICLE MODEL PROFILEs in frame. +v1.2.2                                                   - - - VEHICLEs in frame. - - - + - Type for containment in frame of VEHICLE EQUIPMENT PROFILEs. + Type for containment in frame of VEHICLE MODELs. - - - - + + + - + - Type for containment in frame of VEHICLE TYPEs. + Type for containment in frame of VEHICLE EQUIPMENT PROFILEs. - - + + - + + - Type for containment in frame of VEHICLE TYPEs. + Dummy type to work around SG limitations - - - - - - - - - - - - - + + A vehicle composed of TRAIN ELEMENTs in a certain order, i.e. of wagons assembled together and propelled by a locomotive or one of the wagons. @@ -237,7 +237,7 @@ Rail transport, Roads and Road transport - + Requirements for TRAIN SIZe. @@ -260,8 +260,8 @@ Rail transport, Roads and Road transport - - + + A vehicle composed of COMPOUND TRAIN ELEMENTs in a certain order, i.e. of wagons assembled together and propelled by a locomotive or one of the wagons. @@ -310,14 +310,38 @@ Rail transport, Roads and Road transport - + + + + Dummy Tpe for Train Element substitution + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + - An elementary component of a TRAIN (e.g. wagon, locomotive). + According to Transmodel 6.2 This shoud really be called TRAIN ELEMENT TYPE and be abstract . Use as concrete element DEPRECATED - use more specific TRAILING ELEMENT TYPE or TRACTIVE ELEMENT TYPE subtypes, Shoul dbe renmaed and removed in V3.0 - + @@ -326,78 +350,118 @@ Rail transport, Roads and Road transport - - - Elements for a VEHICLE TYPE. - - + - + - + - Type for a TRAIN ELEMENT. + Type for a TRAIN ELEMENT TYPE. - + - + - Elements for a TRAIN ELEMENT. + Elements for a TRAIN ELEMENT TPE. - Name of TRAIN ELEMENT. + Name of TRAIN ELEMENT TYPE. - Description of TRAIN ELEMENT. + Description of TRAIN ELEMENT TYPE. - + - Type of TRAIN ELEMENT. + Type of TRAIN ELEMENT TYPE. NB THere is a name class with the suppertype. Fix in v2.0 - Total Number of passengers that TRAIN ELEMENT. can carry. + Total Number of passengers that TRAIN ELEMENT TYPE. can carry. + + + + + + Facilities in TRAIN ELEMENT TYPE + + + + + Actual EQUIPMENT on element. - + + + + + + Dimension Elements for a TRAIN ELEMENT TPE. + + - The length of a TRAIN ELEMENT. + The length of an ELEMENT. - The width of a TRAIN ELEMENT. + The width of an ELEMENT. - - - + - Actual EQUIPMENT on element. + The width of an ELEMENT. +V2.0 - + + + Elements for a TRAIN ELEMENT VIEW. + + + + + + + Reference to a TRAIN ELEMENT. + + + + + + + + Type of TRAIN ELEMENT TYPE. V2.0. + + + + + Type of TRAIN ELEMENT. DEPRECATED 2.0 Renamed to TYPE OF TRAIN ELEMENG TYPE + + + + + + Type for a list of TRAIN COMPONENTs. @@ -472,11 +536,8 @@ Rail transport, Roads and Road transport - - - Reference to a TRAIN ELEMENT. - - + + @@ -484,46 +545,31 @@ Rail transport, Roads and Road transport Orientation of the TRAIN ELEMENT within the TRAIN. +v1.1.                                                   + + + The nature of the coupling between the TRAIN COMPONENT and the TRAIN COMPONENT ahead of it within the TRAIN. +v2.0 + + - - + - Type for a list of TRAIN IN COMPOUND TRAIN. + Type for a TRAIN COMPONENT COUPLING. - - - - - - An instance of a TRAIN making up a COMPOUND TRAIN. - - - - - - - - - Type for a TRAIN IN COMPOUND TRAIN. - - - - - - Elements for a TRAIN IN COMPOUND TRAIN. - - - - - - Order of TRAIN IN COMPOUND TRAIN within TRAIN. - - - - - + + + + Whether the component can be split in normal usage + + + + + Whether passenger can walk through coupling to next carriage. + + + + Elements for a TRAIN IN COMPOUND TRAIN. @@ -564,7 +610,43 @@ Rail transport, Roads and Road transport - + + + Type for a list of TRAIN IN COMPOUND TRAIN. + + + + + + + An instance of a TRAIN making up a COMPOUND TRAIN. + + + + + + + + + Type for a TRAIN IN COMPOUND TRAIN. + + + + + + Elements for a TRAIN IN COMPOUND TRAIN. + + + + + + Order of TRAIN IN COMPOUND TRAIN within TRAIN. + + + + + + @@ -609,7 +691,7 @@ Rail transport, Roads and Road transport Description of TRAIN COMPONENT. - + Elements for a TRAIN ELEMENT derived. @@ -617,23 +699,4 @@ Rail transport, Roads and Road transport - - - Elements for a TRAIN ELEMENT VIEW. - - - - - Reference to a TRAIN ELEMENT. - - - - - - Type of TRAIN ELEMENT. - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 8e792099a..d35b188b7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -359,44 +359,6 @@ Rail transport, Roads and Road transport - - - - Type for a list of VEHICLEs. - - - - - - - - - - - - Type for identifier of a VEHICLE. - - - - - - Reference to a VEHICLE. - - - - - Type for a reference to a VEHICLE. - - - - - - Identifier of a VEHICLE. - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 23fb0fd61..e539bf42a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -5,6 +5,7 @@ + @@ -48,6 +49,9 @@ 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her +

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

                                                  This sub-schema describes the VEHICLE TYPE types.

                                                  @@ -64,7 +68,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2021 + CEN, Crown Copyright 2009-2024
                                                    @@ -90,25 +94,13 @@ Rail transport, Roads and Road transport VEHICLE TYPE data types - - - Type for containment in frame of VEHICLE MODELs. - - - - - - - - - - + Dummy type to work around SG limitations - + A classification of any type of VEHICLE according to its properties. @@ -179,6 +171,7 @@ Rail transport, Roads and Road transport + @@ -226,7 +219,7 @@ Rail transport, Roads and Road transport - + A classification of public transport vehicles according to the vehicle scheduling requirements in mode and capacity (e.g. standard bus, double-deck, ...). @@ -405,7 +398,7 @@ Rail transport, Roads and Road transport - + A classification of personal use vehicles according to their properties, +v1.2.2 @@ -1031,122 +1024,6 @@ Rail transport, Roads and Road transport - - - - Type for a list of VEHICLEs. - - - - - - - - An area within a Site. May be connected to Quays by PATH LINKs. - - - - - - - - - A public transport vehicle used for carrying passengers. - - - - - - - - - - - - - - - - - - Identifier of VEHICLE. - - - - - - - - - Type for a VEHICLE. - - - - - - - - - - - - Elements for VEHICLE. - - - - - Name of VEHICLE. - - - - - Short Name of VEHICLE. - - - - - Description +V1.2.2 - - - - - Licence plate of VEHICLE. - - - - - Date of registration or commissioning - may be used to determine the age of a vehice. - - - - - - - - - - ACTUAL EQUIPMENT found in VEHICLE. - - - - - - - Alternative Code Elements for VEHICLE. - - - - - Operational Number of VEHICLE. - - - - - DEPRECATED - use privateCodes - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd new file mode 100644 index 000000000..60a1d8a3b --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd @@ -0,0 +1,254 @@ + + + + + + + + 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 + + 2024-02-11Factor out from vehicleType_support package + + + 2024-02-11Add RollinhgSTockInvenotry, RollingSTock item etc + + +

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

                                                    +

                                                    This sub-schema describes the VEHICLE 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_vehicle_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-2024 + + +
                                                      +
                                                    • Derived from the Transmodel, 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 +                                                     +                                                     + NeTEx VEHICLE types +                                                     + + + + Type for a list of VEHICLEs. + + + + + + + + + + + + Type for identifier of a VEHICLE. + + + + + + Reference to a VEHICLE. + + + + + Type for a reference to a VEHICLE. + + + + + + Identifier of a VEHICLE. + + + + + + + + + Type for a list of ROLLING STOCK ITEMs. + + + + + + + + + + + + Type for identifier of a ROLLING STOCK ITEM. + + + + + + Reference to a ROLLING STOCK ITEM. +v2.0 + + + + + Type for a reference to a ROLLING STOCK ITEM. + + + + + + Identifier of a ROLLING STOCK ITEM. + + + + + + + + + Type for identifier of a TRACTIVE ROLLING STOCKITEM. + + + + + + Reference to a TRACTIVE ROLLING STOCK ITEM. +v2.0 + + + + + Type for a reference to a TRACTIVE ROLLING STOCK ITEM. + + + + + + Identifier of a TRACTIVE ROLLING STOCK ITEM. + + + + + + + + + Type for identifier of a TRAILING ROLLING STOCKITEM. + + + + + + Reference to a TRAILING ROLLING STOCK ITEM. +v2.0 + + + + + Type for a reference to a TRAILING ROLLING STOCK ITEM. + + + + + + Identifier of a TRAILING ROLLING STOCK ITEM. + + + + + + + + + Type for a list of ROLLING STOCK INVENTORYs. + + + + + + + + + + + + Type for identifier of a ROLLING STOCK INVENTORY. + + + + + + Reference to a ROLLING STOCK INVENTORY. +v2.0 + + + + + Type for a reference to a ROLLING STOCK INVENTORY. + + + + + + Identifier of a ROLLING STOCK INVENTORY. + + + + + + + + + Type for identifier of a TYPE OF ROLLING STOCK. + + + + + + Reference to a TYPE OF ROLLING STOCK. +V2.0 + + + + + Type for a TYPE OF ROLLING STOCK. + + + + + + Reference to a TYPE OF ROLLING STOCK. + + + + + + +                                                     diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd new file mode 100644 index 000000000..1a99d6d0b --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -0,0 +1,538 @@ + + + + + + + + + + + + main schema + e-service developers + V1.0 Christophe Duquesne + Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2010-09-04 + + + 2011-02-05Name Space changes + + + 2017-03-27CR0001 - Vehicle Dimensions added. + + + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + NJSK Review correct data types of new attributes to be of LengthType + + + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType + Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType + Replace Vehicle OperatorRef with TransportOrganisationRef. + Add VehicleModelRef to Vehicle. + Add ModelProfileRef to VehicleModel + Add Description to Vehicle. + Add PropulsionType . and MaximumRange to TransportType + + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + + +

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

                                                    +

                                                    This sub-schema describes the VEHICLE TYPE 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_version.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-2024 + + +
                                                      +
                                                    • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
                                                      • +
                                                    + + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx VEHICLE TYPE types. + Standard +                                                     +                                                     + VEHICLE data types +                                                     + + + Elements for a VEHICLE in frame. + + + + + VEHICLEs in frame. + + + + + ROLLING STOCK INVENTORies in frame. +v2.0 + + + + + + + Type for containment in frame of VEHICLEs. NB SLight breaaka v2.0 v2 Vehicle ELement moved to + + + + + + + + + + + + + Type for a list of VEHICLEs. + + + + + + + + An area within a Site. May be connected to Quays by PATH LINKs. + + + + + + + + + A public transport vehicle used for carrying passengers. + + + + + + + + + + + + + + + + + + Identifier of VEHICLE. + + + + + + + + + Type for a VEHICLE. + + + + + + + + + + + + Elements for VEHICLE. + + + + + + + + + + + + ACTUAL EQUIPMENT found in VEHICLE. + + + + + + + Elements for VEHICLE. + + + + + Name of VEHICLE. + + + + + Short Name of VEHICLE or item + + + + + Description +V1.2.2 + + + + + Build date _V2.0 + + + + + Chassis number +V2.0 + + + + + Licence plate of VEHICLE. + + + + + Date of registration or commissioning - may be used to determine the age of a vehice. + + + + + + + Alternative Code Elements for VEHICLE. + + + + + Operational Number of VEHICLE. + + + + + DEPRECATED - use privateCodes + + + + + + + + A specific instance of an elementary unit of rolling stock (e.g., railcar, wagon, locomotive). Its properties are given by a TRAIN ELEMENT TYPE. + + + + + Type for a list of ROLLING STOCK ITEMs. + + + + + + + + An area within a Site. May be connected to Quays by PATH LINKs. + + + + + + + + + A specific instance of an elementary unit of rolling stock (e.g., railcar, wagon, locomotive). Its properties are given by a TRAIN ELEMENT TYPE. + + + + + + + + + + + + + + + + + + Identifier of ROLLING STOCK ITEM. + + + + + + + + + Type for a ROLLING STOCK ITEM. + + + + + + + + + + + + Elements for ROLLING STOCK ITEM. + + + + + + + + Fixed classication of ROLLING STOCK ITEM. + + + + + + Faciliies found in ROLLING STOCK ITEM. + + + + + ACTUAL EQUIPMENT found in ROLLING STOCK ITEM. + + + + + + + + An unpowered item of rolling stock such as a specific passenger carriage, luggage van, passenger vehicle carrier wagon or freight wagon. +v2.0 + + + + + + + + + + + + + + + + + + + + + Identifier of TRAILING ROLLING STOCK ITEM + + + + + + + + + Type for a TRAILING ROLLING STOCK ITEM. + + + + + + + + + + + + Elements for TRAILING ROLLING STOCK ITEM. + + + + + + + + + A powered item of rolling stock, such as a specific locomotive or powered railcar. +v2.0 + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a TRACTIVE ROLLING STOCK ITEM. + + + + + + + + + + + + Elements for TRACTIVE ROLLING STOCK ITEM. + + + + + + + + + Type for a list of ROLLING STOCK INVENTORies.. + + + + + + + A collection of ROLLING STOCK ITEMs of any type used to assemble trains. +v.2.0 + + + + + + + + + + A collection of rolling stock of any type used to assemble trains. +v.2.0 + + + + + + + + + + + + + + + + + + + Identifier of ROLLING STOCK ITEM. + + + + + + + + + Type for a ROLLING STOCK INVENTORY. + + + + + + + + + + + + Elements for ROLLING STOCK INVENTORY + + + + + Name of ROLLING STOCK INVENTORY + + + + + + Faciliies found in ROLLING STOCK ITEM. + + + + + + + + A classification of a ROLLING STOCK ITEM according to its functional purpose. +v1.1. + + + + + Type for a TYPE OF ROLLING STOCK. +v2.0 + + + + + + +                                                     diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd index 8bc9a71aa..ed514fe9f 100644 --- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd index 58c2e599e..6976d3bdc 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd @@ -53,7 +53,7 @@ Rail transport, Roads and Road transport LOCAL SERVICE identifier types for IFOPT Fixed Objects in Public Transport.                                                     - + Reference to a LOCAL SERVICE. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index ac00bd44f..fcd8ebce6 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -100,11 +100,14 @@ Rail transport, Roads and Road transport Type for an OFF SITE P PATH LINK END. - - - Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. - - + + + + + Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. DEPRECATED 2.0 use more specifc SITE COMPONENT + + + Reference to a LEVEL on which SITE COMPONENT is found. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 04f354733..08306d96a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,11 +19,17 @@ 2011-02-05 - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. + + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. + + + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments

                                                    NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

                                                    @@ -37,7 +43,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2024
                                                      @@ -136,6 +142,39 @@ Rail transport, Roads and Road transport + + + Directional elements for a STOP ASSIGNMENT. +v2.0 + + + + + + + EDirectional lements for a STOP ASSIGNMENT. + + + + + Whether VEHICLE or TRAIN arrives at stop travelling in a forwards direction, i.e. operational orientation. Default is true. +v2.0 + + + + + Whether VEHICLE or TRAIN departs from stop travelling in a forwards direction, i.e. operational orientation. Default is true.. Default is true. . +v2.0 + + + + + Whether VEHICLE or TRAIN is expected to arrive at the QUAY from the left of a bystander facing the track edge of the platform. Default is true. +v2.0 + + + + + Whether VEHICLE or TRAIN is expected to depart from the QUAY to the right of a bystander facing the track edge of the platform. + Default is true. +v2.0 + + @@ -208,16 +247,28 @@ Rail transport, Roads and Road transport - - - Train elements to which SCHEDULED STOP POINT is to be assigned. - - - - - - - + + + + Train stop assignemnts elements to use for which SCHEDULED STOP POINT + + + + + + + + + + Train elements to which SCHEDULED STOP POINT is to be assigned. DEPRECATED 2.0 + + + + + + + + @@ -371,7 +422,6 @@ Rail transport, Roads and Road transport - View of an assignment of a SCHEDULED STOP POINT to a STOP PLACE and quay. etc. diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index f8827a4cf..380b4cb29 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -15,13 +15,16 @@ 2010-09-04 - 2017-05-09 Add Header + + 2017-05-09 Add Header - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - 2020-10-08New Modes: Widen VehicleType to TransportType + + 2020-10-08New Modes: Widen VehicleType to TransportType

                                                      NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

                                                      diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd index ad264d39e..c3597ed62 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -1,5 +1,6 @@ + @@ -16,7 +17,8 @@ 2023-01-30 - 2023-01-30 + + 2023-01-30 Name Space changes @@ -129,6 +131,12 @@ + + + Default setting for doors when while at stop - are the doors held open, shut or locked shut. + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index b4c546c57..7912505ba 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -144,8 +144,8 @@                                                       - - + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd index 3b9e2672d..1114f68b8 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -24,22 +24,29 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset + + 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review CR51: make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. NJSK Review CR51: Allow inlining of vehicleJourneyStopAssignments within VehicleJourney. NJSK Also correct camel case on trainComponentLabelAssignents trainComponentLabelAssignents_RelStructure. - 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment + + 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Replace VehicleTypeRef with TransportTypeRef so as to be more general From 0058e7e70f8eaf403e39d8cdeab44bb8f723f274 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 01:02:32 +0000 Subject: [PATCH 026/144] DECK Plan Examples add constraints Add Constraints to publication --- .../deckPlans/DeckPlans-Example_train.xml | 6 +- xsd/NeTEx_publication.xsd | 220 +++++++++++++----- 2 files changed, 171 insertions(+), 55 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 50494c3ea..6c45bc270 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -769,8 +769,10 @@ The train reverse in the station and departs, oriented backwards to the right Example rail stock - - + + + + Engine diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 35646688c..c9de9c98c 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,29 +16,40 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT + + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON - 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug + + 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug - 2021-09-01NewModes: AddPOOL OF VEHICLEs + + 2021-09-01NewModes: AddPOOL OF VEHICLEs - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - 2021-09-01NewModes: Add PoolOfVehicles + + 2021-09-01NewModes: Add PoolOfVehicles - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - 2021-07-09Revise name sto allign with TM + + 2021-07-09Revise name sto allign with TM VehicleRentalOperation --> VehicleRental, VehicleSharingOperation --> VehicleSharing, VehiclePoolingOperation --> VehiclePooling - 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment + + 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment - 2020-11-16NewModes: Drop AlternativeTransportOperator + + 2020-11-16NewModes: Drop AlternativeTransportOperator - 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. + + 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. - 2020-10-14NewModes Add Constraints (NM) + + 2020-10-14NewModes Add Constraints (NM) Add MobilityServiceFrame, MobilityJourneyFrame. TypeOfProof, TaxiRank, TaxiStand. TypeOfParking ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling. @@ -62,50 +73,66 @@ FIX: Add OpenTransportMode, Submode, VehicleChargingEquipment, CycleStorageEquipment, HailAndRideArea FIX: Remove PlaceRef and EquipmentRef and bogus restrictions on uniqueness across places and equipment. - 2020-08-20Corrections + + 2020-08-20Corrections Add UicOperatingPeriod key and ref constraints - 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent + + 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent - 2020-04-17Corrections + + 2020-04-17Corrections Add ParentFareZoneRef constraint - 2020-04-02Corrections + + 2020-04-02Corrections Add constraint for RowRef and ColumnRef - 2019-05-15Corrections + + 2019-05-15Corrections Add TypeOfLine constraint - 2019-05-02 + + 2019-05-02 Corrections Add missing constraint selectors for DefaultResponsibilitySetRef and DefaultDataSourceRef Add missing constraints ref DefaultCodespaceRef - 2019-04-24Corrections + + 2019-04-24Corrections Add missing constraints ref for JourneyPart/MainPartRef to JourneyPartCouple - 2019-04-24Corrections + + 2019-04-24Corrections (1)Add constraints ref for ParkingEntranceForVehicles and ParkingPasengerEntrance (2) Drop general EntranceRef constraint - 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment + + 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment - 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef + + 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef - 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. + + 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. - 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, + + 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, Also drop some spurious selectors. - 2019-03-10Fix: Add constraint for SupplementToFareProductRef . + + 2019-03-10Fix: Add constraint for SupplementToFareProductRef . - 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element + + 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element - 2019-02-18 + + 2019-02-18 (a) Relax uniqueness constraint on FareTable and PriceGroup now unique within type, - 2019-01-15 + + 2019-01-15 (a) Fix keyref constraint on TimingLinkInJourneyPattern_AnyVersionedKey, (Drop DropFarePointInPattern. TimingTimingLinkInJournePattern, STopTimingLinkInJourneyPattern) (b) Fix keyref constraint on ServiceLinkInJourneyPattern_AnyVersionedKey (Drop points) (c) Fix keyref constraint on FarePointInPattern_AnyVersionedKey - Add Points @@ -122,45 +149,61 @@ (n) Fix Add Constraints on SectionInSequence (o) Revise key names to emphasise when key is ordered - 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE + + 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE - 2018-01-07 Remove trailing blanks on names - 2017-08-10Align with TM6 + + 2018-01-07 Remove trailing blanks on names + + 2017-08-10Align with TM6 Rename Passenger Contract to FareContract. Rename Passenger Contract Event to FareContractEntry. Rename Type of Passenger Contract to TypeOfFareContract. Adjust References in Dependent packages. - 2017-08-10 + + 2017-08-10 Rename FareContractEvent to FareContractEntry Add constraints for CustomerPurchasePackage, CustomerPurchasePackageElement, CustomerPurchaseParameterAssignment Add constraints for CustomerAccount, CustomerAccountStatus, TypeOf CustomerAccount, Add constraints for CustomerEligibility, UserProfileEligibility, CommercialProfileEligibility, ResidentialQualifactionEligibility - 2017-06-29 + + 2017-06-29 CR048 add constraints WHITE LIST Fix: Add Constraint on CUSTOMER CR00310 add constraints on JOURNEY PART POSITION - 2017-05-09 + + 2017-05-09 Correct COnstraints for PointOnRoute Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er Add Missing Constraints For GroupOfServicesMember , JourneyAccounting DelegatedResponsibilitySet Reinstate Constraints for CAll Fix constraints that were missing namespace on subpart - 2017-03-27 + + 2017-03-27 Various 1.1 changes see CRS. CR0038 revise constraints on ResponsibilityRole - 2011-01-17V0.94 Revised + + 2011-01-17V0.94 Revised - 2010-09-04Created from Siri.xsd + + 2010-09-04Created from Siri.xsd -

                                                      netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                                      . -

                                                      The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                                      This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). -

                                                      • For each data object type it describes an XML representation which can be used to exchange netex data.
                                                      • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                                      • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                                      -

                                                      + +

                                                      netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                                      . +

                                                      The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                                      +

                                                      This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). +

                                                        +
                                                      • For each data object type it describes an XML representation which can be used to exchange netex data.
                                                        • +
                                                      • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                                        • +
                                                      • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                                        • +
                                                      +

                                                      +                                                       text/xml http://www.w3.org/2001/XMLSchema @@ -3478,19 +3521,6 @@ Correct COnstraints for PointOnRoute - - @@ -3563,6 +3593,90 @@ Correct COnstraints for PointOnRoute + + + + + Every [RollingStockInventory Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TrailingRollingStockItem Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TractiveRollingStockItem Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [TypeOfRollingStockItem Id + Version] must be unique within document. + + + + + + + + + + + + + + + + From d759a02d35516722dc8ee4935bac1656e535c399 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 09:07:37 +0000 Subject: [PATCH 027/144] DECK Plan example - fix broken examples Tidy up to fix broken exampels - correction to constraing --- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- .../versioning/Netex_Uniqueness_01.xml | 4 +- ...ex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml | 2 +- .../norway/vehicles/submodel-Vehicle.xml | 39 +++++++++++++------ xsd/NeTEx_publication.xsd | 2 +- 5 files changed, 33 insertions(+), 16 deletions(-) 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 998588691..6f1a6ca00 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 @@ -2053,7 +2053,7 @@ Changes From Lift Area Entrance to Upper concourse Path Junction 1 5.00 - + diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml index 4df0c0ea0..902e7df1f 100644 --- a/examples/functions/versioning/Netex_Uniqueness_01.xml +++ b/examples/functions/versioning/Netex_Uniqueness_01.xml @@ -115,7 +115,7 @@ This is part 1 of a multistep example on versioning - + @@ -126,7 +126,7 @@ This is part 1 of a multistep example on versioning - + diff --git a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml index d50de6342..762228caf 100644 --- a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml +++ b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml @@ -193,7 +193,7 @@ - + oneWay diff --git a/examples/standards/norway/vehicles/submodel-Vehicle.xml b/examples/standards/norway/vehicles/submodel-Vehicle.xml index 9dd858a2f..5c3305651 100644 --- a/examples/standards/norway/vehicles/submodel-Vehicle.xml +++ b/examples/standards/norway/vehicles/submodel-Vehicle.xml @@ -1,12 +1,29 @@ - - SL78 - unknown - X4533 - Ruter - SL78 - - - - - + + 2020-12-17T09:30:47.0Z + SYS001 + + + 2020-12-17T09:30:46.0Z + SYS002 + + P1M + + + + + + SL78 + unknown + X4533 + Ruter + SL78 + + + + + + + + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index c9de9c98c..2795a9d7f 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -5930,7 +5930,7 @@ Correct COnstraints for PointOnRoute - + From 937c3486fd24b22b977eba1b2ef83d16c27ef0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:22:02 +0100 Subject: [PATCH 028/144] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 08306d96a..936879277 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -414,7 +414,7 @@ Rail transport, Roads and Road transport Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear.                                                       - + Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION From df9436d2cc8607364b543a98dc28af659a34561f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:22:16 +0100 Subject: [PATCH 029/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 1b4c0f8e7..7699a3567 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -715,7 +715,7 @@ - Height of ENtrance from ground. + Height of Entrance from ground. From f4bceec00c11eac799219a3b0b757087b33921c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:22:28 +0100 Subject: [PATCH 030/144] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 936879277..52820c4ff 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + From ecc968a06451eef900a2a7cc1519d47dfd44dbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:22:44 +0100 Subject: [PATCH 031/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 7699a3567..ac4669f7a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -1021,7 +1021,7 @@                                                       - Door setting: whether keot open, shut or locked. See allowed values. Default is shut. + Whether door is kept open, shut or locked. See allowed values. Default is shut. From fbf4ace1744581ad9501f9590a465a2b86961b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:22:57 +0100 Subject: [PATCH 032/144] Update xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index 46e5d878f..3349e94e0 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -155,7 +155,7 @@ Rail transport, Roads and Road transport - GROUPS of SITESs in frame. +v.0 + GROUPS of SITESs in frame. +v2.0 From 7b93b8f542a92856b0c385045c75b74430e970b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:23:10 +0100 Subject: [PATCH 033/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index ac4669f7a..79bbe619a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -1481,7 +1481,7 @@ - Identifier of PURPOSE OF EQUIMENT PROFILE. + Identifier of PURPOSE OF EQUIPMENT PROFILE. From 0da7ca56c5ad84e55cde917d25a5b537f07e143f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:23:21 +0100 Subject: [PATCH 034/144] Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/tmp0000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd index 862a4f4b3..cbc670f20 100644 --- a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd +++ b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd @@ -309,7 +309,7 @@ Rail transport, Roads and Road transport - + Type for a list of SITE PATH LINKs. From 3f7c6a91281f131476b685525d2b9e9e951e6a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:23:30 +0100 Subject: [PATCH 035/144] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 52820c4ff..289f96c50 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -254,7 +254,7 @@ Rail transport, Roads and Road transport - + From 57f690990eeeabd5a4edf8069b8302b89a41a668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:23:41 +0100 Subject: [PATCH 036/144] Update xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 380b4cb29..a3f7391d5 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -208,7 +208,7 @@ Rail transport, Roads and Road transport SERVICE FACILITies in frame.                                                       - + DECK PLAN ASSIGNMENTs in frame. From b13321cd28f8b5e74a5184a8c076fe0a88f59b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:23:56 +0100 Subject: [PATCH 037/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d0855d66b..ecbc6685a 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 @@ -743,7 +743,7 @@ Rail transport, Roads and Road transport - + Type for a list of ENTRANCEs. From f0148aacac29f6139ee791f3398da43d1178d5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:24:08 +0100 Subject: [PATCH 038/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ecbc6685a..923577ddc 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 @@ -735,7 +735,7 @@ Rail transport, Roads and Road transport - + LEVELs found within SITe. From d303652d87459b1a79ad2274fe606f6a28911c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:24:19 +0100 Subject: [PATCH 039/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 923577ddc..b5a13ce00 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 @@ -689,7 +689,7 @@ Rail transport, Roads and Road transport - + Type for list of SITE STRUCTURES. From b34485bb57598c9b8265c67f40b22193da57e5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:24:29 +0100 Subject: [PATCH 040/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b5a13ce00..033c8e3d4 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 @@ -681,7 +681,7 @@ Rail transport, Roads and Road transport - + Projections of SITE onto another layer. From 5b13b25534de4cfcff2774fe4d6905efe2e5a958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:24:40 +0100 Subject: [PATCH 041/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 033c8e3d4..857888ca4 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 @@ -653,7 +653,7 @@ Rail transport, Roads and Road transport - + Alternative names. From 9b9becf316ac2be237e2de54151645970d544115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:24:50 +0100 Subject: [PATCH 042/144] Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_genericFramework/netex_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 263331160..f67233647 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -291,7 +291,7 @@ Rail transport, Roads and Road transport - + A collection of one or more PATH LINKs in SEQUENCE. From a990cc960f23fe94c996e8a64b2de6a06b43a780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:00 +0100 Subject: [PATCH 043/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 1bbe7b297..990b30041 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -223,7 +223,7 @@ Rail transport, Roads and Road transport - + Type for a list of DECK PATH JUNCTIONs. From 811dac2a1fcba1d399868a9094a6d5c5b0300e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:09 +0100 Subject: [PATCH 044/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 990b30041..eb4f1a61b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -73,7 +73,7 @@ Rail transport, Roads and Road transport Deck Path elemenst fro DECK - + PATH JUNCTIONs for DECK From bb703cd95faa14f98deaea99b7a9e2f8293b52c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:18 +0100 Subject: [PATCH 045/144] Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_part_1/part1_ifopt/tmp0000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd index cbc670f20..9d3d45f7e 100644 --- a/xsd/netex_part_1/part1_ifopt/tmp0000.xsd +++ b/xsd/netex_part_1/part1_ifopt/tmp0000.xsd @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport - + Type for a list of PATH JUNCTIONs. From 83dbb661ada4500cbc4d23ba27da48d3e1babb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:28 +0100 Subject: [PATCH 046/144] Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_genericFramework/netex_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index f67233647..0badaaa26 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -141,7 +141,7 @@ Rail transport, Roads and Road transport - + Type for a list of PATH JUNCTIONs. From e56c39b73b40bc8b971d7d31de06b7f3e1e4592d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:37 +0100 Subject: [PATCH 047/144] Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd --- .../netex_reusableComponents/netex_trainElement_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index c23fe6d3c..dbefd3c73 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -307,7 +307,7 @@ Rail transport, Roads and Road transport - Dummy Tpe for Train Element substitution + Dummy Tpe for Train Element substitution. From e1d02763bfae2e0504ab340b264d4cffe723ad61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:49 +0100 Subject: [PATCH 048/144] Update xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd --- .../netex_reusableComponents/netex_environment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd index 136a07360..8b5976bc0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - Elements of a NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. + Elements of a NAVIGATION PATH that summarise properties of the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. From e474eafb1cb1022bd905d2b44d4ca2237779e303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:25:58 +0100 Subject: [PATCH 049/144] Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd --- .../netex_genericFramework/netex_zone_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index bf04a0241..34b6001fd 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -235,7 +235,7 @@ Rail transport, Roads and Road transport - Elements for GROUP OF TARIFF ZONES. + Elements for GROUP OF TARIFF ZONES. +v2.0 From ece14720e1ff45a6e671a31e8d5801fb075c1d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:26:10 +0100 Subject: [PATCH 050/144] Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd --- .../netex_genericFramework/netex_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 0badaaa26..2a646ae29 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -378,7 +378,7 @@ Rail transport, Roads and Road transport - Label On step. + Label on step. From 049df9e0891663d76ca187da51cc5f5f8e1b8c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:26:21 +0100 Subject: [PATCH 051/144] Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd --- .../netex_genericFramework/netex_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 2a646ae29..97d4a53af 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport - Whether Heading element should be shown as separate step in view e.g. turn left right. + Whether heading element should be shown as separate step in view e.g. turn left right. From 0c10063842fa1a0d6abf1144840bd0d6906dd1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 12:26:35 +0100 Subject: [PATCH 052/144] Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd --- .../netex_genericFramework/netex_path_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 97d4a53af..e095e41ca 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -305,7 +305,7 @@ Rail transport, Roads and Road transport - A step in a Navigation PATH. + A step in a NAVIGATION PATH. From 20caf28c0320c3c4e37fb3d6362ca9a56879fc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 15:00:35 +0100 Subject: [PATCH 053/144] fixing merge problems --- .../netex_deckPath_version.xsd | 4 +- .../netex_vehicleType_version.xsd | 116 -------------- .../netex_ifopt_navigationPath_version.xsd | 4 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 144 ------------------ .../part1_ifopt/netex_ifopt_path_version.xsd | 46 ------ .../part1_ifopt/netex_ifopt_site_support.xsd | 49 ------ .../part1_ifopt/netex_ifopt_site_version.xsd | 6 +- 7 files changed, 8 insertions(+), 361 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index eb4f1a61b..40c59701b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -382,7 +382,7 @@ Rail transport, Roads and Road transport - + @@ -469,7 +469,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 22d342d41..b86030507 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1027,122 +1027,6 @@ Rail transport, Roads and Road transport - - - - Type for a list of VEHICLEs. - - - - - - - - An area within a Site. May be connected to Quays by PATH LINKs. - - - - - - - - - A public transport vehicle used for carrying passengers. - - - - - - - - - - - - - - - - - - Identifier of VEHICLE. - - - - - - - - - Type for a VEHICLE. - - - - - - - - - - - - Elements for VEHICLE. - - - - - Name of VEHICLE. - - - - - Short Name of VEHICLE. - - - - - Description +V1.2.2 - - - - - Licence plate of VEHICLE. - - - - - Date of registration or commissioning - may be used to determine the age of a vehice. - - - - - - - - - - ACTUAL EQUIPMENT found in VEHICLE. - - - - - - - Alternative Code Elements for VEHICLE. - - - - - Operational Number of VEHICLE. - - - - - DEPRECATED - use privateCodes - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 21affb572..17f5a9693 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -278,7 +278,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. @@ -366,7 +366,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 89545de2e..9fbd956d2 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -175,132 +175,6 @@ Rail transport, Roads and Road transport - - - - Type for identifier of a NAVIGATION PATH. - - - - - - Allowed values for flow direction. - - - - - - - - - - Allowed values for path transition. - - - - - - - - - - - - Allowed values for path heading. - - - - - - - - - - - Allowed values for Navigation type. - - - - - - - - - - - - - - - - - - - - - Allowed values for tilt. +v1.1 - - - - - - - - - - - - - Allowed values for flooring. - - - - - - - - - - - - - - - - - - - - - - - - - - Allowed values for border types - - - - - - - - - - - - - - - - - - - - - - - Allowed values for the status of the flooring. @@ -341,24 +215,6 @@ Rail transport, Roads and Road transport - - - Type for identifier of place step in a NAVIGATION PATH. - - - - - - Type for a list of references to a SITE NAVIGATION PATH. - - - - - - - - - Type for identifier of a SITE NAVIGATION PATH. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index d878c2d83..e63ea9c56 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -127,56 +127,10 @@ Rail transport, Roads and Road transport - - - Type of physical feature of PATH LINK. - - - - - Type of passage feature of PATH LINK. - - - - - Type of flooring of the walking surface. +v1.1 - - - - - Status of the flooring. - - - - - Type of border on the right side (in the direction of the PATH LINK). - - - - - Type of border on the left side (in the direction of the PATH LINK). +v1.1 - - - - - Nature of the tactile warning strips (in the direction of the PATH LINK). +v1.1 - - - - - Indicates whether the color of the possible warning strip is sufficiently contrasted with the color of the floor. - - - Allowed MODEs to use in component. - - - Provides additional details on possible guiding strip. - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 5e0d60723..251fc833d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -256,18 +256,6 @@ Rail transport, Roads and Road transport - - - Type for a collection of one or more SITE STRUCTUREs. - - - - - - - - - @@ -417,43 +405,6 @@ Rail transport, Roads and Road transport - - - Allowed values for ACCESS SPACE TYPEs. - - - - - - - - - - - - - - - - - - - - - - - Allowed values for Passage Types. - - - - - - - - - - - Types of SITE. 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 98754721b..d29cf70f2 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 @@ -11,6 +11,8 @@ + + @@ -230,7 +232,7 @@ Rail transport, Roads and Road transport ENTRANCEs to and within SITE. - + SITE STRUCTUREs within SITE. +v2.0 @@ -686,7 +688,7 @@ Rail transport, Roads and Road transport - + Projections of SITE onto another layer. From f9ce5cb5f8728604e0f1834969d72d348cdb88a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 15:10:14 +0100 Subject: [PATCH 054/144] more problems fixed --- .../netex_trainElementType_version.xsd | 1 + .../netex_reusableComponents/netex_trainElement_version.xsd | 1 - .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index ae7662771..541f26e52 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -2,6 +2,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index dbefd3c73..ee1211607 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -2,7 +2,6 @@ - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 289f96c50..936879277 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -254,7 +254,7 @@ Rail transport, Roads and Road transport - + @@ -264,7 +264,7 @@ Rail transport, Roads and Road transport - + From 4771bdfaddecc396d27c973beadc4fcf44e08b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 15:28:46 +0100 Subject: [PATCH 055/144] fixing PathLinks --- examples/standards/epiap/eiap_test1_ramp.xml | 440 +++++++++---------- xsd/NeTEx_publication.xsd | 3 +- 2 files changed, 221 insertions(+), 222 deletions(-) diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index 816d13613..9fde29a6d 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -5539,7 +5539,7 @@ - + 61 9.529293 46.853855 @@ -5564,8 +5564,8 @@ PT14S - - + + 0 @@ -5577,8 +5577,8 @@ oneWay stairs - - + + 328 9.528960 46.853056 @@ -5626,8 +5626,8 @@ PT1M15S - - + + 89 9.529293 46.853855 @@ -5654,8 +5654,8 @@ PT1M34S - - + + 0 @@ -5667,8 +5667,8 @@ oneWay lift - - + + 52 9.530119 46.853363 @@ -5695,8 +5695,8 @@ PT55S - - + + 0 @@ -5709,8 +5709,8 @@ PT3M - - + + 47 9.529293 46.853855 @@ -5732,8 +5732,8 @@ PT1M21S - - + + 0 @@ -5745,8 +5745,8 @@ oneWay lift - - + + 40 9.529472 46.853542 @@ -5768,8 +5768,8 @@ PT1M8S - - + + 61 9.529293 46.853855 @@ -5794,8 +5794,8 @@ PT9S - - + + 0 @@ -5807,8 +5807,8 @@ oneWay ramp - - + + 343 9.528960 46.853056 @@ -5856,8 +5856,8 @@ PT50S - - + + 61 9.529293 46.853855 @@ -5882,8 +5882,8 @@ PT8S - - + + 0 @@ -5895,8 +5895,8 @@ oneWay ramp - - + + 362 9.528960 46.853056 @@ -5946,8 +5946,8 @@ PT51S - - + + 61 9.529293 46.853855 @@ -5972,8 +5972,8 @@ PT8S - - + + 378 9.528960 46.853056 @@ -6024,8 +6024,8 @@ PT51S - - + + 61 9.529293 46.853855 @@ -6050,8 +6050,8 @@ PT8S - - + + 0 @@ -6063,8 +6063,8 @@ oneWay ramp - - + + 390 9.528960 46.853056 @@ -6116,8 +6116,8 @@ PT51S - - + + 61 9.529293 46.853855 @@ -6142,8 +6142,8 @@ PT38S - - + + 0 @@ -6155,8 +6155,8 @@ oneWay stairs - - + + 83 9.528960 46.853056 @@ -6181,8 +6181,8 @@ PT51S - - + + 92 9.529293 46.853855 @@ -6208,8 +6208,8 @@ oneWay lift - - + + 61 9.529293 46.853855 @@ -6234,8 +6234,8 @@ PT7M49S - - + + 0 @@ -6250,8 +6250,8 @@ PT18S - - + + 77 9.528960 46.853056 @@ -6274,8 +6274,8 @@ PT9M52S - - + + 328 9.528592 46.854451 @@ -6323,8 +6323,8 @@ PT1M15S - - + + 0 @@ -6336,8 +6336,8 @@ oneWay stairs - - + + 61 9.529580 46.853443 @@ -6362,8 +6362,8 @@ PT14S - - + + 52 9.530065 46.853191 @@ -6390,8 +6390,8 @@ PT55S - - + + 0 @@ -6403,8 +6403,8 @@ oneWay lift - - + + 89 9.530101 46.853388 @@ -6431,8 +6431,8 @@ PT1M34S - - + + 70 9.530065 46.853191 @@ -6457,8 +6457,8 @@ PT2M - - + + 175 9.528242 46.852681 @@ -6483,8 +6483,8 @@ PT2M - - + + 58 9.528242 46.852681 @@ -6509,8 +6509,8 @@ PT3M - - + + 360 9.528242 46.852681 @@ -6550,8 +6550,8 @@ PT1M59S - - + + 0 @@ -6563,8 +6563,8 @@ oneWay stairs - - + + 2 9.527703 46.852804 @@ -6580,8 +6580,8 @@ oneWay stairs - - + + 0 @@ -6594,8 +6594,8 @@ PT4M - - + + 40 9.529544 46.853701 @@ -6617,8 +6617,8 @@ PT1M8S - - + + 0 @@ -6630,8 +6630,8 @@ oneWay lift - - + + 47 9.529490 46.853535 @@ -6653,8 +6653,8 @@ PT1M21S - - + + 175 9.529544 46.853701 @@ -6679,8 +6679,8 @@ PT2M - - + + 71 9.529544 46.853701 @@ -6707,8 +6707,8 @@ PT2M30S - - + + 238 9.529544 46.853701 @@ -6745,8 +6745,8 @@ PT2M30S - - + + 312 9.529544 46.853701 @@ -6785,8 +6785,8 @@ PT4M58S - - + + 0 @@ -6798,8 +6798,8 @@ oneWay lift - - + + 2 9.527703 46.852804 @@ -6818,8 +6818,8 @@ PT1S - - + + 128 9.529544 46.853701 @@ -6851,8 +6851,8 @@ oneWay footpath - - + + 343 9.529347 46.853824 @@ -6900,8 +6900,8 @@ PT50S - - + + 0 @@ -6913,8 +6913,8 @@ oneWay ramp - - + + 61 9.529580 46.853443 @@ -6939,8 +6939,8 @@ PT9S - - + + 168 9.529347 46.853824 @@ -6964,8 +6964,8 @@ PT4M56S - - + + 0 @@ -6977,8 +6977,8 @@ oneWay lift - - + + 2 9.527703 46.852804 @@ -6997,8 +6997,8 @@ PT3S - - + + 362 9.529221 46.853959 @@ -7048,8 +7048,8 @@ PT51S - - + + 0 @@ -7061,8 +7061,8 @@ oneWay ramp - - + + 61 9.529580 46.853443 @@ -7087,8 +7087,8 @@ PT8S - - + + 306 9.529221 46.853959 @@ -7128,8 +7128,8 @@ PT4M58S - - + + 0 @@ -7141,8 +7141,8 @@ oneWay lift - - + + 2 9.527703 46.852804 @@ -7161,8 +7161,8 @@ PT1S - - + + 378 9.529122 46.854076 @@ -7213,8 +7213,8 @@ PT51S - - + + 0 @@ -7226,8 +7226,8 @@ oneWay ramp - - + + 61 9.529580 46.853443 @@ -7252,8 +7252,8 @@ PT8S - - + + 322 9.529122 46.854076 @@ -7294,8 +7294,8 @@ PT4M58S - - + + 0 @@ -7307,8 +7307,8 @@ oneWay lift - - + + 2 9.527703 46.852804 @@ -7327,8 +7327,8 @@ PT1S - - + + 390 9.528969 46.854162 @@ -7380,8 +7380,8 @@ PT51S - - + + 0 @@ -7393,8 +7393,8 @@ oneWay ramp - - + + 61 9.529580 46.853443 @@ -7419,8 +7419,8 @@ PT8S - - + + 334 9.528969 46.854162 @@ -7462,8 +7462,8 @@ PT3M58S - - + + 0 @@ -7475,8 +7475,8 @@ oneWay stairs - - + + 2 9.527703 46.852804 @@ -7495,8 +7495,8 @@ PT1S - - + + 83 9.529805 46.853425 @@ -7521,8 +7521,8 @@ PT51S - - + + 0 @@ -7534,8 +7534,8 @@ oneWay stairs - - + + 61 9.529580 46.853443 @@ -7560,8 +7560,8 @@ PT38S - - + + 51 9.529805 46.853425 @@ -7583,8 +7583,8 @@ PT1M - - + + 92 9.529760 46.853492 @@ -7610,8 +7610,8 @@ oneWay lift - - + + 71 9.529760 46.853492 @@ -7638,8 +7638,8 @@ PT2M30S - - + + 61 9.529760 46.853492 @@ -7665,8 +7665,8 @@ PT1M - - + + 0 9.557985 46.727426 @@ -7683,8 +7683,8 @@ PT1M - - + + 58 9.527730 46.852823 @@ -7709,8 +7709,8 @@ PT3M - - + + 2 9.527730 46.852823 @@ -7726,8 +7726,8 @@ oneWay footpath - - + + 0 @@ -7739,8 +7739,8 @@ oneWay stairs - - + + 360 9.527613 46.852878 @@ -7780,8 +7780,8 @@ PT1M59S - - + + 2 9.527730 46.852823 @@ -7800,8 +7800,8 @@ PT1S - - + + 0 @@ -7813,8 +7813,8 @@ oneWay lift - - + + 312 9.527613 46.852878 @@ -7853,8 +7853,8 @@ PT4M58S - - + + 2 9.527730 46.852823 @@ -7873,8 +7873,8 @@ PT3S - - + + 0 @@ -7886,8 +7886,8 @@ oneWay lift - - + + 168 9.527613 46.852878 @@ -7911,8 +7911,8 @@ PT4M56S - - + + 2 9.527730 46.852823 @@ -7931,8 +7931,8 @@ PT1S - - + + 0 @@ -7944,8 +7944,8 @@ oneWay lift - - + + 306 9.527613 46.852878 @@ -7985,8 +7985,8 @@ PT4M58S - - + + 2 9.527730 46.852823 @@ -8005,8 +8005,8 @@ PT1S - - + + 0 @@ -8018,8 +8018,8 @@ oneWay lift - - + + 322 9.527613 46.852878 @@ -8060,8 +8060,8 @@ PT4M58S - - + + 2 9.527730 46.852823 @@ -8080,8 +8080,8 @@ PT1S - - + + 0 @@ -8093,8 +8093,8 @@ oneWay stairs - - + + 334 9.527613 46.852878 @@ -8136,8 +8136,8 @@ PT3M58S - - + + 70 9.529859 46.853363 @@ -8162,8 +8162,8 @@ PT2M - - + + 128 9.529859 46.853363 @@ -8195,8 +8195,8 @@ oneWay footpath - - + + 51 9.529859 46.853363 @@ -8218,8 +8218,8 @@ PT1M - - + + 61 9.529859 46.853363 @@ -8245,8 +8245,8 @@ PT1M - - + + 39 9.529859 46.853363 @@ -8265,8 +8265,8 @@ PT1M - - + + 39 9.529796 46.853247 @@ -8285,8 +8285,8 @@ PT1M - - + + 32 9.555721 46.740700 @@ -8307,8 +8307,8 @@ PT1M - - + + 32 9.555946 46.740479 @@ -8329,7 +8329,7 @@ PT1M - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 5be8db7af..f039c7954 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -5911,14 +5911,13 @@ Correct COnstraints for PointOnRoute - - + From e6c08023698f7fb2d8522e29671d46831dbc2687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 15:37:30 +0100 Subject: [PATCH 056/144] Update EPIAP_Accessibility_Chur_V08_vehicletypes.xml --- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index c8d6beac9..fef1fecf3 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -145,7 +145,7 @@ Wagen 1 engine secondClass - + 46 10 2 @@ -162,7 +162,7 @@ Wagen 2 carriage secondClass - + 45 20 0 @@ -179,7 +179,7 @@ Wagen 3 carriage firstClass secondClass - + 38 20 0 @@ -196,7 +196,7 @@ Wagen 4 engine secondClass - + 46 10 0 @@ -686,7 +686,7 @@ - + @@ -699,8 +699,8 @@ PT5M30S - - + + @@ -713,8 +713,8 @@ PT3M30S - - + + @@ -727,7 +727,7 @@ PT3M - + From 76bd46d3cc1c3ad281f603bcf66a032027ddda0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 16 Feb 2024 16:32:06 +0100 Subject: [PATCH 057/144] more errors --- .../netex_environment_support.xsd | 54 +++++++++++++++++++ .../part1_ifopt/netex_ifopt_path_support.xsd | 39 -------------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index f01f1c034..3403e86ef 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -151,6 +151,11 @@ Rail transport, Roads and Road transport Type of flooring of the walking surface. +v1.1 + + + Status of flooring of the walking surface. +v1.3 + + Type of border on the right side (in the direction of the PATH LINK). @@ -166,11 +171,21 @@ Rail transport, Roads and Road transport Nature of the tactile warning strips (in the direction of the PATH LINK). +v1.1 + + + Indicates whether there is contrast for the tactile warning strips. +v1.1 + + Indicates whether there are guiding strips. +v1.1 + + + Indicates the status of the tactile guiding strips. +v1.1 + + @@ -284,6 +299,45 @@ Rail transport, Roads and Road transport + + + Allowed values for the status of the flooring. + + + + + + + + + + + + Allowed values for the status of the Tactile Guiding Strip. + + + + + When the guiding strip has the expected quality level. + + + + + When there is no guiding strip as such but a decorative element or ledge can be used for this purpose. + + + + + When there is a guiding strip but it does not correspond to a path that can actually be used (passes through the middle of an obstacle without going around it for example). + + + + + When the guiding strip is degraded and difficult to interpret. + + + + Allowed values for border types diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 9fbd956d2..1069efa86 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -175,45 +175,6 @@ Rail transport, Roads and Road transport - - - Allowed values for the status of the flooring. - - - - - - - - - - - - Allowed values for the status of the Tactile Guiding Strip. - - - - - When the guiding strip has the expected quality level. - - - - - When there is no guiding strip as such but a decorative element or ledge can be used for this purpose. - - - - - When there is a guiding strip but it does not correspond to a path that can actually be used (passes through the middle of an obstacle without going around it for example). - - - - - When the guiding strip is degraded and difficult to interpret. - - - - From f405d19966b19471a891fa87349d4da27dd73341 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:34:03 +0000 Subject: [PATCH 058/144] Lint and update documentation tables --- .../deckPlans/DeckPlans-Example_bus.xml | 25 ++-- .../deckPlans/DeckPlans-Example_train.xml | 12 +- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- xsd/NeTEx_publication.xsd | 138 +++++++----------- .../netex_resourceFrame_version.xsd | 17 +-- .../netex_deckPlan_support.xsd | 3 +- .../netex_deckPlan_version.xsd | 3 +- .../netex_environment_support.xsd | 8 +- .../netex_nm_fleet_version.xsd | 13 +- .../netex_seatingPlan_version.xsd | 1 - .../netex_trainElementType_support.xsd | 3 +- .../netex_trainElementType_version.xsd | 7 +- .../netex_trainElement_support.xsd | 6 +- .../netex_trainElement_version.xsd | 6 +- .../netex_vehicleType_version.xsd | 3 +- .../netex_vehicle_support.xsd | 6 +- .../netex_vehicle_version.xsd | 24 +-- ...netex_ifopt_equipmentPassenger_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 2 +- .../part1_ifopt/netex_ifopt_site_version.xsd | 1 - .../netex_stopAssignment_version.xsd | 12 +- .../netex_timetableFrame_version.xsd | 9 +- .../netex_deckEntranceAlignment_version.xsd | 3 +- .../netex_vehicleJourney_version.xsd | 21 +-- 24 files changed, 124 insertions(+), 203 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 4c5e3b0ed..02185d07b 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -101,13 +101,12 @@ Lower deck SPOT ROWs (x10) SPot COlumns (x5) --> - - +--> 2020-12-17T09:30:47.0Z SYS001 @@ -153,7 +152,7 @@ Lower deck - + @@ -340,7 +339,7 @@ Lower deck 2 1 - Default to use. + Default to use. false 0.15 10 @@ -371,7 +370,7 @@ Lower deck Lower Deck - + Driver seat @@ -909,12 +908,12 @@ Lower deck - - + + - - + + @@ -974,7 +973,7 @@ Lower deck Upper Deck - + Upper Deck seating area @@ -1754,12 +1753,12 @@ Lower deck Forward Entrance - true + true Rear Entrance - true + true Stairs diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 6c45bc270..3c48f9870 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -769,9 +769,7 @@ The train reverse in the station and departs, oriented backwards to the right Example rail stock - - - + Engine @@ -1190,7 +1188,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Compartment 1: Seats 01-02 First class compartment with two beds @@ -1321,7 +1319,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Compartment 2: Seats 02-03 Rirst class with two beds @@ -1677,7 +1675,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Compartment 4 : Seats 12-20 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths @@ -1907,7 +1905,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Compartment 5 : Seats 21-28 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths 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 8ef18186a..74c479c23 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 @@ -2067,7 +2067,7 @@ Changes From Lift Area Entrance to Upper concourse Path Junction 1 5.00 - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index f039c7954..1c24acc7d 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,40 +16,29 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON - - 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug + 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug - - 2021-09-01NewModes: AddPOOL OF VEHICLEs + 2021-09-01NewModes: AddPOOL OF VEHICLEs - - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - - 2021-09-01NewModes: Add PoolOfVehicles + 2021-09-01NewModes: Add PoolOfVehicles - - 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + 2021-08-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY - - 2021-07-09Revise name sto allign with TM + 2021-07-09Revise name sto allign with TM VehicleRentalOperation --> VehicleRental, VehicleSharingOperation --> VehicleSharing, VehiclePoolingOperation --> VehiclePooling - - 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment + 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment - - 2020-11-16NewModes: Drop AlternativeTransportOperator + 2020-11-16NewModes: Drop AlternativeTransportOperator - - 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. + 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. - - 2020-10-14NewModes Add Constraints (NM) + 2020-10-14NewModes Add Constraints (NM) Add MobilityServiceFrame, MobilityJourneyFrame. TypeOfProof, TaxiRank, TaxiStand. TypeOfParking ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling. @@ -73,66 +62,50 @@ FIX: Add OpenTransportMode, Submode, VehicleChargingEquipment, CycleStorageEquipment, HailAndRideArea FIX: Remove PlaceRef and EquipmentRef and bogus restrictions on uniqueness across places and equipment. - - 2020-08-20Corrections + 2020-08-20Corrections Add UicOperatingPeriod key and ref constraints - - 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent + 2020.07.28### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent - - 2020-04-17Corrections + 2020-04-17Corrections Add ParentFareZoneRef constraint - - 2020-04-02Corrections + 2020-04-02Corrections Add constraint for RowRef and ColumnRef - - 2019-05-15Corrections + 2019-05-15Corrections Add TypeOfLine constraint - - 2019-05-02 + 2019-05-02 Corrections Add missing constraint selectors for DefaultResponsibilitySetRef and DefaultDataSourceRef Add missing constraints ref DefaultCodespaceRef - - 2019-04-24Corrections + 2019-04-24Corrections Add missing constraints ref for JourneyPart/MainPartRef to JourneyPartCouple - - 2019-04-24Corrections + 2019-04-24Corrections (1)Add constraints ref for ParkingEntranceForVehicles and ParkingPasengerEntrance (2) Drop general EntranceRef constraint - - 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment + 2019-04-14Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment - - 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef + 2019-04-10Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef - - 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. + 2019-03-25Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey. - - 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, + 2019-03-12Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability, Also drop some spurious selectors. - - 2019-03-10Fix: Add constraint for SupplementToFareProductRef . + 2019-03-10Fix: Add constraint for SupplementToFareProductRef . - - 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element + 2019-03-01EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element - - 2019-02-18 + 2019-02-18 (a) Relax uniqueness constraint on FareTable and PriceGroup now unique within type, - - 2019-01-15 + 2019-01-15 (a) Fix keyref constraint on TimingLinkInJourneyPattern_AnyVersionedKey, (Drop DropFarePointInPattern. TimingTimingLinkInJournePattern, STopTimingLinkInJourneyPattern) (b) Fix keyref constraint on ServiceLinkInJourneyPattern_AnyVersionedKey (Drop points) (c) Fix keyref constraint on FarePointInPattern_AnyVersionedKey - Add Points @@ -149,61 +122,45 @@ (n) Fix Add Constraints on SectionInSequence (o) Revise key names to emphasise when key is ordered - - 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE + 2018-06-01 Rename Sales Package to SALES OFFER PACKAGE - - 2018-01-07 Remove trailing blanks on names - - 2017-08-10Align with TM6 + 2018-01-07 Remove trailing blanks on names + 2017-08-10Align with TM6 Rename Passenger Contract to FareContract. Rename Passenger Contract Event to FareContractEntry. Rename Type of Passenger Contract to TypeOfFareContract. Adjust References in Dependent packages. - - 2017-08-10 + 2017-08-10 Rename FareContractEvent to FareContractEntry Add constraints for CustomerPurchasePackage, CustomerPurchasePackageElement, CustomerPurchaseParameterAssignment Add constraints for CustomerAccount, CustomerAccountStatus, TypeOf CustomerAccount, Add constraints for CustomerEligibility, UserProfileEligibility, CommercialProfileEligibility, ResidentialQualifactionEligibility - - 2017-06-29 + 2017-06-29 CR048 add constraints WHITE LIST Fix: Add Constraint on CUSTOMER CR00310 add constraints on JOURNEY PART POSITION - - 2017-05-09 + 2017-05-09 Correct COnstraints for PointOnRoute Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er Add Missing Constraints For GroupOfServicesMember , JourneyAccounting DelegatedResponsibilitySet Reinstate Constraints for CAll Fix constraints that were missing namespace on subpart - - 2017-03-27 + 2017-03-27 Various 1.1 changes see CRS. CR0038 revise constraints on ResponsibilityRole - - 2011-01-17V0.94 Revised + 2011-01-17V0.94 Revised - - 2010-09-04Created from Siri.xsd + 2010-09-04Created from Siri.xsd - -

                                                      netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                                      . -

                                                      The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                                      -

                                                      This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). -

                                                        -
                                                      • For each data object type it describes an XML representation which can be used to exchange netex data.
                                                        • -
                                                      • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                                        • -
                                                      • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                                        • -
                                                      -

                                                      -                                                       +

                                                      netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.

                                                      . +

                                                      The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets.

                                                      This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI). +

                                                      • For each data object type it describes an XML representation which can be used to exchange netex data.
                                                      • It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.
                                                      • A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means.
                                                      +

                                                      text/xml http://www.w3.org/2001/XMLSchema @@ -218,7 +175,20 @@ Correct COnstraints for PointOnRoute Unclassified CEN, Crown Copyright 2009-2021 -
                                                      • Created for NeTEx.
                                                      Version 1.1Arts, recreation and travel, Tourism, Travel (tourism), Transport, Public transport, Bus services, Coach services, Business and industry, Transport, Public transport, Roads and Road transport.CEN TC278 WG3 SG9.NeTEx XML schema. bulk Publication Interface for exchanging NeTEx data Standard + + +
                                                        +
                                                      • Created for NeTEx.
                                                        • +
                                                      + + Version 1.1 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, Public transport, Bus services, Coach services, Business and industry, Transport, Public transport, Roads and Road transport. + CEN TC278 WG3 SG9. + + NeTEx XML schema. bulk Publication Interface for exchanging NeTEx data + Standard + NeTEx PUBLICATION SCHEMA                                                       diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index 516813ba4..b086cb7db 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -17,20 +17,15 @@ 2011-02-05 - - 2017-03-28CR031 Add Zones to RESOURCE FRAME + 2017-03-28CR031 Add Zones to RESOURCE FRAME - - 2017-06-28CR048 Add Security Lists to RESOURCE FRAME + 2017-06-28CR048 Add Security Lists to RESOURCE FRAME - - 2020-08-12Issue 104 Add ResponsibilityRoles to RESOURCE FRAME + 2020-08-12Issue 104 Add ResponsibilityRoles to RESOURCE FRAME - - 2020-10-20New Modes Add Facility sets to RESOURCE FRAME. + 2020-10-20New Modes Add Facility sets to RESOURCE FRAME. - - 2023-02-02Add DECK PLAN CHANGES. + 2023-02-02Add DECK PLAN CHANGES.

                                                      NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.

                                                      @@ -120,7 +115,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 055d059fb..89a3d887e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,8 +13,7 @@ 2023-01-30 - - 2024-01-11Revise enum values + 2024-01-11Revise enum values

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 79bbe619a..77432c609 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,8 +16,7 @@ 2023-01-30 - - 2024-02-09Add locatbale spot range for usage. + 2024-02-09Add locatbale spot range for usage.

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 3403e86ef..9455003bd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -155,7 +155,7 @@ Rail transport, Roads and Road transport Status of flooring of the walking surface. +v1.3 -                                                       +                                                       Type of border on the right side (in the direction of the PATH LINK). @@ -175,7 +175,7 @@ Rail transport, Roads and Road transport Indicates whether there is contrast for the tactile warning strips. +v1.1 - +                                                       Indicates whether there are guiding strips. +v1.1 @@ -185,7 +185,7 @@ Rail transport, Roads and Road transport Indicates the status of the tactile guiding strips. +v1.1 - +                                                       @@ -337,7 +337,7 @@ Rail transport, Roads and Road transport - + Allowed values for border types diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd index 0df4eeaf1..22825a5b4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd @@ -1,8 +1,8 @@ - - + + @@ -14,14 +14,11 @@ Nicholas Knowles Europe First drafted for NeTEx version 1.2.2 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2020-10-04Add for New Modes + 2020-10-04Add for New Modes - - 2020-10-07Revise to use TransportType + 2020-10-07Revise to use TransportType - - 2024-02-14Revise dependecies because of ewseparate Vehice_version package + 2024-02-14Revise dependecies because of ewseparate Vehice_version package

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 9f706004f..924b9e23f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -347,7 +347,6 @@ - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd index c821b787d..80718bbfa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_support.xsd @@ -11,8 +11,7 @@ Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-02-11Transmodel revision of TRAINN ELEMENT TYPES - add specifc subtype PoweredTrain, UnpoweredTrain, Tractiveelement TrailingElement + 2024-02-11Transmodel revision of TRAINN ELEMENT TYPES - add specifc subtype PoweredTrain, UnpoweredTrain, Tractiveelement TrailingElement 2024-02-11 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index 541f26e52..e9398c325 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -2,7 +2,6 @@ - @@ -12,11 +11,9 @@ Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-01-11Transmodel - exten TRAIN and TRAIN ELEMENT tYPES + 2024-01-11Transmodel - exten TRAIN and TRAIN ELEMENT tYPES - - 2024-01-11Name Space changes + 2024-01-11Name Space changes

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index 587a02dcb..fbd44ffb8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -14,11 +14,9 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2024-03-09Add TrainComponentCoupling and ThroughACcessEnumeration + 2024-03-09Add TrainComponentCoupling and ThroughACcessEnumeration

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index ee1211607..0e6e828c9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -29,11 +29,9 @@                                                       2021-09-01NewModes: revise to allow chargingEquipmentProfile - - 2024-02-05DECK PLANS add a default DECK PLAN and TRAIN COMPONENT COUPLING + 2024-02-05DECK PLANS add a default DECK PLAN and TRAIN COMPONENT COUPLING - - 2024-02-09Rename TRAIN ELEMENT to TRAIN ELEMNT TYPE. DEerecate old element + 2024-02-09Rename TRAIN ELEMENT to TRAIN ELEMNT TYPE. DEerecate old element

                                                      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 b86030507..62a1c3391 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -42,8 +42,7 @@                                                       2023-01-30TM CR: Enhancement Add Accepted Driver Permit - - 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd index 60a1d8a3b..9f16ca221 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd @@ -11,11 +11,9 @@ Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-02-11Factor out from vehicleType_support package + 2024-02-11Factor out from vehicleType_support package - - 2024-02-11Add RollinhgSTockInvenotry, RollingSTock item etc + 2024-02-11Add RollinhgSTockInvenotry, RollingSTock item etc

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

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index 1a99d6d0b..f7852d59a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -18,21 +18,16 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-27CR0001 - Vehicle Dimensions added. + 2017-03-27CR0001 - Vehicle Dimensions added. - - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -40,14 +35,11 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit - - 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her

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

                                                      diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd index 00ce5393e..556025c2f 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport                                                       - + Equipment for Passengers relating to a Rubbish disposal. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 1069efa86..7fb45c2b4 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -164,7 +164,7 @@ Rail transport, Roads and Road transport - + Type for a list of references to a SITE NAVIGATION PATH. 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 d29cf70f2..e7c9a6e79 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 @@ -12,7 +12,6 @@ - diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 936879277..59800cab5 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,17 +19,13 @@ 2011-02-05 - - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. - - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments

                                                      NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

                                                      diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index a3f7391d5..098e52b95 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -15,16 +15,13 @@ 2010-09-04 - - 2017-05-09 Add Header + 2017-05-09 Add Header - - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - - 2020-10-08New Modes: Widen VehicleType to TransportType + 2020-10-08New Modes: Widen VehicleType to TransportType

                                                      NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

                                                      diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd index c3597ed62..05409c5ad 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -17,8 +17,7 @@ 2023-01-30 - - 2023-01-30 + 2023-01-30 Name Space changes diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd index 1114f68b8..3b9e2672d 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd @@ -24,29 +24,22 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset + 2017-03-28CR0030 Vehicle Journey Service Times: add DepartureDayOffset - - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - - 2017-05-27PR correct definition of VehicleJourney. Doc change only. + 2017-05-27PR correct definition of VehicleJourney. Doc change only. - - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review CR51: make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. NJSK Review CR51: Allow inlining of vehicleJourneyStopAssignments within VehicleJourney. NJSK Also correct camel case on trainComponentLabelAssignents trainComponentLabelAssignents_RelStructure. - - 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment + 2019-04-12Fix Add missingl Label to TarinCOmpinentLAbel Assignment - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Replace VehicleTypeRef with TransportTypeRef so as to be more general From 3915e4497d94f7f04ff60a7766bc51b0aff5c1dc Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 10:04:29 +0000 Subject: [PATCH 059/144] DEck Plan - revise to use generic path Link In order to support DECK PATH LINKS, factor out common PATH LINK and NAVIGATION elements into a Generic framework component Move copmmonon environmental properties toa Reusuble component ENVIRONMENT properties in a new package Revise DECK PATH LINKS and DECK NVAIGATION to sepcaialise generic elements Revise Add SITE NAVIGATION , and revise IFOPT SITE PATH LINKS and PATH LINK ENDs to specialise generic components Rename NAVIGATHION PATH to NAVIGATION but retain (Site) NAVIGATION PATH as a deprecated element that is an alisa for SITE NAVIGATION --- .../deckPlans/DeckPlans-Example_train.xml | 53 +- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 28 + xsd/NeTEx_publication.xsd | 57 +- .../netex_path_support.xsd | 49 +- .../netex_path_version.xsd | 246 +++- .../netex_all_objects_reusableComponents.xsd | 1 + .../netex_deckPath_support.xsd | 35 +- .../netex_deckPath_version.xsd | 66 +- .../netex_deckPlan_version.xsd | 5 + .../netex_environment_support.xsd | 11 +- .../netex_environment_version.xsd | 28 +- .../netex_vehicleType_versionOld.xsd | 1311 +++++++++++++++++ .../netex_vehicle_version.xsd | 2 +- .../netex_ifopt_navigationPath_version.xsd | 177 +-- .../part1_ifopt/netex_ifopt_path_support.xsd | 37 +- .../part1_ifopt/netex_ifopt_path_version.xsd | 40 +- 16 files changed, 1898 insertions(+), 248 deletions(-) create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 6c45bc270..635f34416 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -12,7 +12,6 @@ It also describes (1.2) Association of certain FACILITIES with just part of the journey (buffet) - (2) Use of DECK PLANs for trip navigation (2.1) Alignment of the train and its individual carriages with the platforms (QUAYs) and BOARDING POSITIONs at one specific station for a SERVICE JOURNEY that is using the TRAIN and its DECK PLANs. @@ -769,9 +768,7 @@ The train reverse in the station and departs, oriented backwards to the right Example rail stock - - - + Engine @@ -2525,8 +2522,8 @@ The train reverse in the station and departs, oriented backwards to the right - - + + Static Navigation path to get from right rear door to Compartment 3 seat 05 @@ -2540,7 +2537,7 @@ The train reverse in the station and departs, oriented backwards to the right left - Turn right into coridoor + Turn right into corridoor @@ -2553,8 +2550,8 @@ The train reverse in the station and departs, oriented backwards to the right Seat 9is on far side by window on left - - + + @@ -4218,7 +4215,15 @@ The train reverse in the station and departs, oriented backwards to the right Ticket Hall Entrance to middle junction point - 20 + 15 + + + forward + 15 + level + Proceed though door to middle of ticket hall + + @@ -4486,13 +4491,13 @@ The train reverse in the station and departs, oriented backwards to the right forward level - Enter station main entrance + Enter station by main entrance left level - Turn left and walk to lift entrance at end of lobby + Turn left and proceed to lift entrance at left end of ticket hall @@ -4504,7 +4509,7 @@ The train reverse in the station and departs, oriented backwards to the right left level - Turn left on exit from lift and Walk to bottom of stairs + Turn left on exit from lift and proceed to bottom of stairs @@ -4516,8 +4521,26 @@ The train reverse in the station and departs, oriented backwards to the right - - + + Junction in middle of ticket hall + + + right + Turn right to go to lift + + + left + Turn left to go to ticket machine + + + forward + Cmtinue forward for stairs to platforms + + + + + Junction in middle of Quay 1 + diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml index 220f11d41..f93a19573 100644 --- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml +++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml @@ -606,10 +606,38 @@ v1.1 revised ids + + + Bear left uphill along Grub Street for 600 metres + left + E + 600 + up + Grub Street + + + Continue along Tin pan avenue for 200 metres + forward + E + 200 + level + TinPan Alley + + + + + Turn Right Into Carey Street + right + N + 100 + level + Carey Street + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 2795a9d7f..b00834d80 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,6 +16,13 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2024-02-14Add PATH INSTRUCTION, ROUTE INSTRUCTION + + + 2024-02-07Add TRACTIVE TRAIN ELEMENT TYPE, TRAILING TRAIN ELEMENT TYPE, ROLLING STOCK INVENTORY, + ROLLING STOCK TRACTIVE ITEM, ROLLLING STOCK TRAILING ITEM, etc + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON @@ -4445,6 +4452,30 @@ Correct COnstraints for PointOnRoute + + + + + Every [PathInstruction Id + Version + order] must be unique within document. + + + + + + + + + + + + + + + + + + + @@ -5940,7 +5971,7 @@ Correct COnstraints for PointOnRoute Every [PathJunction Id + Version] must be unique within document. - + @@ -6627,6 +6658,30 @@ Correct COnstraints for PointOnRoute + + + + + Every [RouteInstruction Id + Version + order] must be unique within document. + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index e91f6fd29..135a28cd9 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -11,10 +11,11 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2024-01-05Factored out of Ifopt path + + 2024-01-05Factored out of Ifopt path - 2024-01-05 + 2024-02-15Add PATH INSTRUCTION, Rename NAVIGATION PATH to NAVIGATION

                                                      NeTEx - Network Exchange. This subschema defines PATH types.

                                                      @@ -148,41 +149,61 @@ Rail transport, Roads and Road transport                                                       + + + + Type for identifier of a PATH INSTRUCTION. + + + + + + Reference to a PATH INSTRUCTION. + + + + + Type for a reference to a PATH INSTRUCTION. + + + + + - - + + - Type for a list of references to a NAVIGATION PATH. + Type for a list of references to a NAVIGATION path. - + - + - Type for identifier of a NAVIGATION PATH. + Type for identifier of a NAVIGATION path. - + - Reference to a NAVIGATION PATH. + Reference to a NAVIGATION path. - + - Type for reference to a NAVIGATION PATH. + Type for reference to a NAVIGATION path. - + - Identifier of a NAVIGATION PATH. + Identifier of a NAVIGATION path. diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 263331160..653499068 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -15,10 +15,11 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - 2024-02-05Factored out from ifopt_path_link + + 2024-02-05Factored out from ifopt_path_link - 2024-02-05 + 2024-02-18Rename NAVIGATION PATH to NAVIGATION NeTEx Network Exchange - Generic PATH types. @@ -103,7 +104,13 @@ Rail transport, Roads and Road transport Elements of a PATH LINK. - + + + + Instructiions for following PATH LINK. +v2.0 + + + @@ -121,24 +128,23 @@ Rail transport, Roads and Road transport Type for a PATH LINK END. - + Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. - + + Elements of a PATH SITE ELEMENT. - - - - - - + + + + @@ -206,6 +212,11 @@ Rail transport, Roads and Road transport Parent ZONE that contains this PATH JUNCTION.                                                       + + + Instructiions for following PATH LINK. +v2.0 + + @@ -290,6 +301,92 @@ Rail transport, Roads and Road transport + + + + Type for a list of PATH INSTRUCTIONs. + + + + + + + PATH INSTRUCTION for a PATH LINK. + + + + + + + + + An instruction to a passenger for an individual step when following a PATH LINK. +v2.0 + + + + + + + + + + + + + + + + + + + + + + + + Type for a PATH INSTRUCTION. + + + + + + + + + order of instructions + + + + + + + + Elements of a PATH INSTRUCTION. + + + + + + Heding used in Instruction. + + + + + Distance to use in instruction + + + + + Transition used in instruction. + + + + + Instruction for using path as text. + + + + @@ -393,5 +490,132 @@ Rail transport, Roads and Road transport                                                       + + + + A collection of one or more PLACEs in SEQUENCE. + + + + + + + + + + + + Point traversed by a NAVIGATION PATH in sequence. May be a PLACE PATH JUNCTION or POINT. + + + + + + + + + + + + + + + + + + + + + Identifier of ENTITY. + + + + + + + + + Type for a PLACE in SEQUENCE. + + + + + + + + + + + + Elements of PLACE in SEQUENCE. + + + + + Reference to a Place or Site Component , that is QUAY, ACCESS SPACE or BOARDING POSITION or PATH JUNCTION. + + + + + Branching level of place. + + + + + Onward links from this point. + + + + + + + + + + + + + A designated path between two places. May include an ordered sequence of PATH LINKs. + + + + + + + + + + + + + + + + + + + + + + + + + + Type for NAVIGATION. + + + + + + + + + + + + Elements of a NAVIGATION path. + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd index ade29180f..62b66c3f7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -47,6 +47,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 8acb54e86..2e9114591 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -12,7 +12,8 @@ 2024-01-18 - 2024-01-18Move from Part1 Ifoft and bas on generic + + 2024-01-18Move from Part1 Ifoft and bas on generic

                                                      NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                                      @@ -125,9 +126,9 @@ Rail transport, Roads and Road transport Type for identifier of a DECK PATH JUNCTION. - + - + Reference to a DECK PATH JUNCTION. @@ -137,7 +138,7 @@ Rail transport, Roads and Road transport Type for a reference to a DECK PATH JUNCTION. - + Identifier of a PATH JUNCTION. @@ -173,38 +174,38 @@ Rail transport, Roads and Road transport - + - Type for a list of references to a DECK NAVIGATION PATH. + Type for a list of references to a DECK NAVIGATION path. - + - + - Type for identifier of a DECK NAVIGATION PATH. + Type for identifier of a DECK NAVIGATION path. - + - + - Reference to a DECK NAVIGATION PATH. + Reference to a DECK NAVIGATION path. - + - Type for reference to a DECK NAVIGATION PATH. + Type for reference to a DECK NAVIGATION path. - - + + - Identifier of a DECK NAVIGATION PATH. + Identifier of a DECK NAVIGATION path. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 1bbe7b297..9258a255f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -1,6 +1,6 @@ - + @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport PATH LINKs for DECK - + NAVIGATION PATHs for DECK @@ -130,6 +130,17 @@ Rail transport, Roads and Road transport + + + + Description of PATH LINK. + + + + + + + @@ -150,6 +161,7 @@ Rail transport, Roads and Road transport + @@ -256,6 +268,9 @@ Rail transport, Roads and Road transport + + + @@ -270,7 +285,7 @@ Rail transport, Roads and Road transport Type for a DECK PATH JUNCTION - + @@ -389,29 +404,29 @@ Rail transport, Roads and Road transport - + - Type for a list of DECK NAVIGATION PATHs. + Type for a list of DECK NAVIGATION paths. - + - DECK NAVIGATION PATH for a SITE. + DECK NAVIGATION path for a SITE. - + A designated path between two places within a DECK PLAN. May include an ordered sequence of DECK PATH LINKs. +v2.0 - + @@ -423,10 +438,10 @@ Rail transport, Roads and Road transport - + - + Identifier of ENTITY. @@ -435,28 +450,28 @@ Rail transport, Roads and Road transport - + - Type for DECK NAVIGATION PATH. + Type for DECK NAVIGATION path. - + - + - + - Elements of a DECK NAVIGATION PATH. + Elements of a DECK NAVIGATION path. - + - Classification of Overall Accessibility of NAVIGATION PATH. + Classification of Overall Accessibility of NAVIGATION path. @@ -476,24 +491,25 @@ Rail transport, Roads and Road transport - + - Elements of a DECK NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the DECK NAVIGATION PATH forbids wheelchair. + Elements of a DECK NAVIGATION path that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the DECK NAVIGATION path forbids wheelchair. - Origin end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs are not given. + Origin end of DECK NAVIGATION path. Only needed if detailed PATH LINKs are not given. - Destination end of DECK NAVIGATION PATH. Only needed if detailed PATH LINKs not given. + Destination end of DECK NAVIGATION path. Only needed if detailed PATH LINKs not given. - + + Detailed properties of a DECK ELEMENT, (These are simialr to properties of a SIT ELEMENT @@ -502,7 +518,7 @@ Rail transport, Roads and Road transport - Presentation defaults for SITE ELEMENT. +V1.2.2 + Presentation defaults for DECK ELEMENT diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 1b4c0f8e7..1ace27b93 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -145,6 +145,11 @@ Description of DECK PLAN. + + + Description of DECK PLAN. + + VALIDITY CONDITIONs used to configure DECK PLAN diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index f01f1c034..812ef8c61 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -10,7 +10,8 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc + + 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc 2024-02-05 @@ -60,8 +61,8 @@ Rail transport, Roads and Road transport Common elements of a PATH. - - + + Maximum number of passengers who can traverse PATH LINK per minute. @@ -69,7 +70,7 @@ Rail transport, Roads and Road transport - + Common Navigation elements of a PATH. @@ -131,7 +132,7 @@ Rail transport, Roads and Road transport - + Common Description elements of a PATH. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd index 136a07360..e0ea75b1f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -17,7 +17,8 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK + + 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK 2024-01-06 @@ -60,8 +61,25 @@ Rail transport, Roads and Road transport Standard - Shared PATH features Model. + Shared PATH features Model. + + + + Path related Elements of a SITE LINK, OFF SITE LINK and DECK PATH LINK. + + + + + Description of PATH LINK. + + + + + + + + @@ -109,7 +127,7 @@ Rail transport, Roads and Road transport - Elements of a NAVIGATION PATH. + Elements of an ACCESS SUMMARY @@ -130,9 +148,9 @@ Rail transport, Roads and Road transport - + - Elements of a NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. + Elements of a NAVIGATION that summarise properties of the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd new file mode 100644 index 000000000..f3f032cc0 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd @@ -0,0 +1,1311 @@ + + + + + + + + + + + + + + + main schema + e-service developers + V1.0 Christophe Duquesne + Nicholas Knowles + Europe + First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2010-09-04 + + + 2011-02-05Name Space changes + + + 2017-03-27CR0001 - Vehicle Dimensions added. + + + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + NJSK Review correct data types of new attributes to be of LengthType + + + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType + Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType + Replace Vehicle OperatorRef with TransportOrganisationRef. + Add VehicleModelRef to Vehicle. + Add ModelProfileRef to VehicleModel + Add Description to Vehicle. + Add PropulsionType . and MaximumRange to TransportType + + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + + +

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

                                                      +

                                                      This sub-schema describes the VEHICLE TYPE 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_version.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-2024 + + +
                                                        +
                                                      • Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.
                                                        • +
                                                      + + Version 1.0 + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx VEHICLE TYPE types. + Standard +                                                       +                                                       + VEHICLE TYPE data types +                                                       + + + + + Dummy type to work around SG limitations + + + + + A classification of any type of VEHICLE according to its properties. + + + + + + + + + + + + + + + + + + Identifier of TRANSPORT TYPE. + + + + + + + + + Type for a TRANSPORT TYPE. + + + + + + + + + + + + Elements for a TRANSPORT TYPE. + + + + + Name of TRANSPORT TYPE. + + + + + Short Name of TRANSPORT TYPE. + + + + + Description of TRANSPORT TYPE. + + + + + DEPRECATED - use privateCodes + + + + + + MODE of Vehicle transport associated with VEHICLE TYPE. +v1.2.2 + + + + + + + + + Property Elements for a TRANSPORT TYPE. + + + + + Euroclass of the vehicle type. + + + + + Whether vehicles of the type have a reversing direction. + + + + + 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 + + + + + The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType. + + + + + + Maximum range between refuelling. +v1.2.2 + + + + + + + + A classification of public transport vehicles according to the vehicle scheduling requirements in mode and capacity (e.g. standard bus, double-deck, ...). + + + + + + + + + + + + + + + + + + + + + Identifier of VEHICLE TYPE. + + + + + + + + + Type for a VEHICLE TYPE. + + + + + + + + + + + + Elements for a VEHICLE TYPE. + + + + + + Included in definition of VEHICLE. + + + + + Classification of type as being of a particular VEHICLE MODEL. + + + + + Facilities of VEHICLE TYPE. + + + + + + + + Total Capacity elements for a VEHICLE TYPE. + + + + + Total Number of passengers that VEHICLE TYPE can carry. + + + + + + + Property elements for a VEHICLE TYPE. + + + + + Break down of Capacities by FARE CLASS. + + + + + + + + + Dimension elements for a VEHICLE TYPE. + + + + + The length of a VEHICLE of the type. + + + + + The width of a VEHICLE of the type. +v1.1 + + + + + The height of a VEHICLE of the type. +v1.1 + + + + + The weight of a VEHICLE of the type. +v1.1 + + + + + The height of the first axle of a VEHICLE of the type. + + + + + + + General Requirement properties of VEHICLE TYPE. Vehicle should satisfy all of these requirements. + + + + + Capacity that VEHICLE TYPE should meet - indicates minimum number of seats of each type. + + + + + Manoeuvring capabilities that VEHICLE TYPE should meet. + + + + + FACILITIES requirements that VEHICLE TYPE should meet. + + + + + + + Accessibility Requirement properties of VEHICLE TYPE. Vehicle should satisfy these requirements. + + + + + Whether Vehicle is low floor to facilitate access by the mobility impaired. + + + + + Whether vehicle has lift or ramp to facilitate wheelchair access. + + + + + Whether vehicle has hoist for wheelchair access. + + + + + Maximum step height to board. +v1.1 + + + + + Expected maximal gap between VEHICLE and platform. +v1.1 + + + + + + + + A classification of personal use vehicles according to their properties, +v1.2.2 + + + + + + + + + + + + + + + + + + + + + Identifier of PERSONAL TRANSPORT TYPE. + + + + + + + + + Type for a PERSONAL TRANSPORT TYPE. + + + + + + + + + + + + Elements for a PERSONAL TRANSPORT TYPE. + + + + + + Licence requirements to use. + + + + + Category of vehicle. + + + + + Minumum age to use TRANSPORT TYPE. + + + + + Whether vehicle can be carried easily, e.g. scooter, skateboard, foldable bicycle. + + + + + Required permit to operate the vehicle. + + + + + + + + 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 PROFILE. + + + + + + + + + Type for an ACCEPTED DRIVER PERMIT. + + + + + + Elements for an ACCEPTED DRIVER PERMIT. + + + + + + + + Elements for a ACCEPTED DRIVER PERMIT. + + + + + Name of ACCEPTED DRIVER PERMIT. + + + + + + + + + Requirements for service. + + + + + Type for a VEHICLE REQUIREMENT. + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + Elements for a VEHICLE REQUIREMENT relevant for passenger systems. + + + + + Name of FACILITY REQUIREMENT. + + + + + + + + Type for a list of PASSENGER CARRYING Requirements. + + + + + + + + + + + + + Requirements for carrying passengers on a service. + + + + + + + + + + + + + + + + + + + + + Identifier of PASSENGER CARRYING REQUIREMENT. + + + + + + + + + Type for a PASSENGER CARRYING REQUIREMENT. + + + + + + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT. + + + + + + + + + + Type for a list of PASSENGER and PASSENGER VEHICLE CAPACITies. + + + + + + + + + + + + + + Total number of passengers that can be carried by a VEHICLE of this type. + + + + + + + + + + + + + + + + + + + Identifier of PASSENGER CAPACITY. + + + + + + + + + Type for a PASSENGER CAPACITY. + + + + + + + + + + + + Elements for a PASSENGER CAPACITY. + + + + + Fare class for which capacity is specifyed. Default is any, i.e. capacity is for all FARE CLASSes. + + + + + + + + Capacity type Elements for a PASSENGER CAPACITY REQUIREMENT. Relevant for passenger systems. + + + + + The total capacity of vehicles of the type. For a requirement this is the minimum needed. + + + + + The seating 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. + + + + + The number of special places on vehicles of the type, e.g. seats for the disabled. For a requirement this is the minimum needed. + + + + + The number of push chair places on vehicles of the type. For a requirement this is the minimum needed. + + + + + The number of wheelchairs places on vehicles of the type. For a requirement this is the minimum needed. + + + + + + + + Total number of passenger vehicles s that can be carried by a VEHICLE of this type. + + + + + + + + + + + + + + + + + + Identifier of PASSENGER VEHICLE CAPACITY. + + + + + + + + + Type for a PASSENGER VEHICLE CAPACITY. + + + + + + + + + + + + Elements for a PASSENGER VEHICLE CAPACITY. + + + + + VEHicle categories for which capacity is specifyed. Default is allPAssengerVehicles i.e. capacity is for all VEHICLE CATEGORIES + + + + + The total capacity of passenger VEHICLES of the type. F + + + + + + + + Requirements for carrying passengers. + + + + + + + + + + + + + + + + + + + + + + + Type for a PASSENGER CARRYING REQUIREMENT. + + + + + + + + + + + + + Type for a list of PASSENGER CARRYING REQUIREMENTs. + + + + + + + + An area within a Site. May be connected to Quays by PATH LINKs. + + + + + + + + + Requirements for carrying passengers. + + + + + + + + + + + + + + + Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + + + + + + + + + + Identifier of VEHICLE MANOEVRING REQUIREMENT. + + + + + + + + + Type for a VEHICLE Manoeuvring REQUIREMENT. + + + + + + + + + + + + Elements for a VEHICLE MANOEUVRING REQUIREMENT. + + + + + Whether vehicle must be reversible. + + + + + Minimum distance needed to turn vehicle. + + + + + Minimum distance needed to overtake. + + + + + Minimum distance needed to accommodate vehicle. + + + + + + + Elements for a VEHICLE MANOEUVRING REQUIREMENT. relevant for passenger systems. + + + + + The seating capacity of vehicles of the type. + + + + + The standing capacity of vehicles of the type. + + + + + The number of special places on vehicles of the type. + + + + + + + + Type for a list of FACILITY REQUIREMENTs. + + + + + + + + + + + + + Requirements for carrying passengers. + + + + + + + + + + + + + + + Elements for a FACILITY REQUIREMENT TYPE. + + + + + + + Elements for a FACILITY REQUIREMENT TYPE. + + + + + + + Identifier of FACILITY REQUIREMENT. + + + + + + + + + Type for a FACILITY REQUIREMENT. + + + + + + + + + + + + Elements for a FACILITY REQUIREMENT. + + + + + Facilities required for VEHICLE. + + + + + + + + A classification of public transport vehicles according to the vehicle scheduling requirements in MODE and capacity (e.g. standard bus, double-deck, ...). + + + + + + + + + + + + + + + + Identifier of VEHICLE MODEL. + + + + + + + + + Type for a VEHICLE MODEL. + + + + + + + + + + Elements for a VEHICLE MODEL. + + + + + Name of VEHICLE MODEL. + + + + + Description of VEHICLE MODEL. + + + + + Manufacturer of VEHICLE MODEL. + + + + + + + Equipment profiles assoicated with model +v1.2.2 + + + + + + + + + + Each instantiation of this ENTITY gives the number of items of one TYPE OF EQUIPMENT a VEHICLE MODEL should contain for a given PURPOSE OF EQUIPMENT PROFILE. The set of instantiations for one VEHICLE MODEL and one purpose gives one complete 'profile'. + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROILE. + + + + + + + + + Type for a VEHICLE EQUIPMENT PROFILE. + + + + + + + + + + Elements for a VEHICLE EQUIPMENT PROFILE. + + + + + Name of VEHICLE EQUIPMENT PROFILE. + + + + + Description of VEHICLE EQUIPMENT PROFILE. + + + + + + Number of units of EQUIPMENT. + + + + + Manufacturer VEHICLE MODEL. + + + + + + + Members of Vehicle Profile. +v2.0 + + + + + + + + Type for a list of VEHICLE EQUIPMENT PROFILE MEMBERs. + + + + + + + + + + + + A element within a VEHICLE EQUIPMENT PROFILE specifying the number of units of a given TYPE OF EQUIPMENT. + + + + + + + + + + + + + + + + + Identifier of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + + + + Type for a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + + + + + + Elements for a VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Name of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Description of VEHICLE EQUIPMENT PROFILE MEMBER. + + + + + Number of units of EQUIPMENT. + + + + + + + + + A functional purpose which requires a certain set of EQUIPMENT of different types put together in a VEHICLE EQUIPMENT PROFILE or STOP POINT EQUIPMENT PROFILE. + + + + + + + + + + + + + + + + + + Identifier of PURPOSE OF EQUIPMENT PROFILE. + + + + + + + + + Type for a PURPOSE OF EQUIPMENT PROFILE. + + + + + + + + + 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 TYPE OF DRIVER PERMIT. + + + + + + + + + Type for a TYPE OF DRIVER PERMIT. + + + + + + +                                                       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd index 1a99d6d0b..d0f553671 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd @@ -321,7 +321,7 @@ Rail transport, Roads and Road transport Elements for ROLLING STOCK ITEM. - + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 21affb572..94af64ba1 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -26,9 +26,11 @@ 2007-03-22 - 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence + + 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence - 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc + + 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc NeTEx Network Exchange - NAVIGATION PATH types. @@ -81,14 +83,14 @@ Rail transport, Roads and Road transport NAVIGATION PATHs in frame. - + - PATH LINKs in frame. + SITE PATH LINKs in frame. - + - PATH JUNCTIONs in frame. + SITE PATH JUNCTIONs in frame. @@ -99,46 +101,47 @@ Rail transport, Roads and Road transport - - + + + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. - +                                                       - + - Type for containment in frame of PATH LINKs. + Type for containment in frame of SITE PATH LINKs. - A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. + - + - Type for containment in frame of PATH JUNCTIONs. + Type for containment in frame of SITE PATH JUNCTIONs. - + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. - + A designated path between two PLACEs. May include an Ordered sequence of references to PATH LINKS. @@ -193,12 +196,41 @@ Rail transport, Roads and Road transport + + DEPRECATED use SITE NAVIGATION instead + + + + + + + + + + + + + + + + + + + + + + + + + + + A designated path between two places. May include an ordered sequence of PATH LINKs. - + @@ -210,39 +242,42 @@ Rail transport, Roads and Road transport - + + + + - + - + Type for NAVIGATION PATH. - + - + - + - Elements of a NAVIGATION PATH. + Elements of a SITE NAVIGATION PATH. - + - + - + - Elements of a NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. + Elements of a SITE NAVIGATION PATH that summarise properties o the set of PATH LINKs. Will state the strictest constraint found . e.g. if any link forbids wheelchair, the NAVIGATION PATH forbids wheelchair. @@ -255,10 +290,10 @@ Rail transport, Roads and Road transport Destination end of NAVIGATION PATH. Only needed if detailed PATH LINKs not given. - + - + Elements of a NAVIGATION PATH. @@ -290,87 +325,5 @@ Rail transport, Roads and Road transport                                                       - - - - A collection of one or more PLACEs in SEQUENCE. - - - - - - - - - - - - Point traversed by a NAVIGATION PATH in sequence. May be a PLACE PATH JUNCTION or POINT. - - - - - - - - - - - - - - - - - - - - - Identifier of ENTITY. - - - - - - - - - Type for a PLACE in SEQUENCE. - - - - - - - - - - - - Elements of PLACE in SEQUENCE. - - - - - Reference to a Place or Site Component , that is QUAY, ACCESS SPACE or BOARDING POSITION or PATH JUNCTION. - - - - - Branching level of place. - - - - - Onward links from this point. - - - - - - - - - diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index dd0963696..b78831a1a 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -15,11 +15,13 @@ 2011-12-16 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add CodedTiltEnumeration with values _strongLeftTilt, mediumLeftTilt, nearlyFlat, mediumRightTilt, strongRightTilt, unknown_. Revise name of ___CodedTilt___ to ___TiltType___ to be consistent - 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH + + 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH. Rename NAVIGATH PATH to NAVIGATION

                                                      NeTEx - Network Exchange. This subschema defines PATH types.

                                                      @@ -163,42 +165,47 @@ Rail transport, Roads and Road transport                                                       - + - Type for a list of references to a SITE NAVIGATION PATH. + Type for a list of references to a SITE NAVIGATION path. - + - + - Type for identifier of a SITE NAVIGATION PATH. + Type for identifier of a SITE NAVIGATION path. - + - + - Reference to a SITE NAVIGATION PATH. + Reference to a SITE NAVIGATION path. - + - Type for reference to a SITE NAVIGATION PATH. + Type for reference to a SITE NAVIGATION path. - - + + - Identifier of a SITE NAVIGATION PATH. + Identifier of a SITE NAVIGATION path. + + + DEPRECATED use Reference to a SITE NAVIGATION path. + + diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index abe46e3b2..1ec39b69c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -3,6 +3,7 @@ + @@ -23,17 +24,20 @@ 2007-03-22 - 2019-03-25FR49 CD #65 Accessibility changes + + 2019-03-25FR49 CD #65 Accessibility changes CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip NK Review: Reorder so as to place like elements toigether, add sub Groups to organize - 2019-03-28FR49 CD #65 Accessibility changes + + 2019-03-28FR49 CD #65 Accessibility changes NJSK Doc rewviewe Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___ - 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink + + 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink NeTEx Network Exchange - PATH types. @@ -76,22 +80,6 @@ Rail transport, Roads and Road transport IFOPT PATH LINK Model. - - - Elements of a OFF SITE PATH LINK. - - - - - Description of PATH LINK. - - - - - - - - Type for an OFF SITE P PATH LINK END. @@ -195,7 +183,7 @@ Rail transport, Roads and Road transport Destination end of PATH LINK. - + @@ -272,7 +260,7 @@ Rail transport, Roads and Road transport Destination end of PATH LINK.                                                       - + Elements of a fixed PATH LINK. @@ -321,6 +309,9 @@ Rail transport, Roads and Road transport + + + @@ -335,7 +326,7 @@ Rail transport, Roads and Road transport Type for a SITE PATH JUNCTION. - + @@ -347,11 +338,6 @@ Rail transport, Roads and Road transport Elements of a SITE PATH JUNCTION. - - - Parent ZONE that contains this PATH JUNCTION. - - Elements of a SITE ELEMENTs. From ce08393f89f7640e3dae331d1b20fd84a2e70120 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 10:48:48 +0000 Subject: [PATCH 060/144] DEck Plan Path links Integrate with other changes --- .../deckPlans/DeckPlans-Example_train.xml | 12 ++++++++++-- .../netex_genericFramework/netex_path_support.xsd | 12 ++++++++++++ .../netex_genericFramework/netex_path_version.xsd | 2 +- .../netex_deckPath_version.xsd | 9 ++------- .../netex_ifopt_navigationPath_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 2 +- .../netex_stopAssignment_version.xsd | 14 +++++++++----- .../part2_frames/netex_timetableFrame_version.xsd | 11 +++++++---- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 6de2a04f3..224f1de4d 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -3781,8 +3781,16 @@ The train reverse in the station and departs, oriented backwards to the right false true true + + noForce + true - noForce + false + + false + true + outside + 4.00 @@ -3858,7 +3866,7 @@ The train reverse in the station and departs, oriented backwards to the right true - 300.00 + 300.00 0.30 0.10 rampRequired diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 135a28cd9..d504f3097 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -243,6 +243,18 @@ Rail transport, Roads and Road transport + + + Type for a list of references to a PATH LINK. + + + + + + + + + Type for identifier of link step in a PATH LINK IN SEQUENCE. diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index f82a43b00..3f982b4ab 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -388,7 +388,7 @@ Rail transport, Roads and Road transport - + A collection of one or more PATH LINKs in SEQUENCE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 5f7f0e9cb..6bdf0cc94 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -391,15 +391,10 @@ Rail transport, Roads and Road transport Branching level of place.                                                       - + Onward links from this point. - - - - - @@ -484,7 +479,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 68562b07e..94af64ba1 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -313,7 +313,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 905fa784c..34d196f10 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -178,7 +178,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a SITE NAVIGATION path. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 59800cab5..08306d96a 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,13 +19,17 @@ 2011-02-05 - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. + + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments + + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments

                                                      NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

                                                      @@ -410,7 +414,7 @@ Rail transport, Roads and Road transport Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear.                                                       - + Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 098e52b95..380b4cb29 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -15,13 +15,16 @@ 2010-09-04 - 2017-05-09 Add Header + + 2017-05-09 Add Header - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - 2020-10-08New Modes: Widen VehicleType to TransportType + + 2020-10-08New Modes: Widen VehicleType to TransportType

                                                      NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

                                                      @@ -205,7 +208,7 @@ Rail transport, Roads and Road transport SERVICE FACILITies in frame.                                                       - + DECK PLAN ASSIGNMENTs in frame. From 97a72cdbf2db0d0a2d492fd77c9fc21f46592edd Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 12:47:57 +0000 Subject: [PATCH 061/144] DEckPlans Add in Stefan Jugelts simplified train deck plan example Add in simplified train deck plan example. thanks stefan --- NeTEx.spp | 1 + .../DeckPlans-Example_train_simple.xml | 1850 +++++++++++++++++ 2 files changed, 1851 insertions(+) create mode 100644 examples/functions/deckPlans/DeckPlans-Example_train_simple.xml diff --git a/NeTEx.spp b/NeTEx.spp index 02f78c8c4..6b3b68064 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -792,6 +792,7 @@ + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml new file mode 100644 index 000000000..c47b431c5 --- /dev/null +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -0,0 +1,1850 @@ + + + + + + 2020-12-17T09:30:47.0Z + SYS001 + + + 2020-12-17T09:30:46.0Z + SYS002 + + P1M + Example of DeckPlans + + + + + 2023-01-01T00:00:00 + 2023-12-31T12:00:00 + + Deck Plan Example + This is an example showing how one might encode a Deck plan for a train in NeTEx. + + + + rc + http://www.frail.eu/ + Frail rail data + + + + + + + + + + + Rail examples of IC train seating cars + Describes a train with IC wagons. + + + + MRC + Motor Rail CO + Moto + Motovacation SA + operator +
                                                      + Prince Rupert Street + Strelsau + z354 + Ruritania +
                                                      + bus +                                                       +                                                       + + + + Passenger Train door + true + hingedSingle + true + true + false + + + true + slidingPair + true + true + true + + + Sliding door to the entrance room + true + slidingSingle + true + false + true + + + Hinged door to compartment + true + hingedSingle + false + true + true + + + Standard carriage seate + 0.48 + 0.50 + 0.50 + false + + + + luggage area + 4.00 + 1.25 + 0.40 + 1.90 + luggageBay + 0.40 + false + + + + toilet washbasin + 1 + true + + + + + + General facilities + standardClass + mobilePhoneUseZone noSmoking + publicWifi powerSupplySockets + nextStopIndicator passengerInformationDisplay realTimeConnections stopAnnouncements + toilet + seating + baggageStorage luggageRacks + + + + + + 4 carriage train + [Seating car 3] [Seating car 3] [Seating car 2] [Seating car 1] [Engine] + true + electric + + + + 400 + + 320 + + 80 + + + false + false + 0.40 + + + + + + + Engine + + forwards + + true + noThroughAccess + + + + + Seating car + + forwards + + true + door + + + + + Seating car + + forwards + + true + door + + + + + Seating car + + forwards + + true + door + + + + + Seating car + + forwards + + true + door + + + + + + + + Engine + engine + 10 + 3.5 + 4 + 1000 + + + Seating car + carriage + economyClass + false + false + 0.15 + 26.4 + 2.825 + 4 + 43000 + + + + + + IC seat wagon (DB Bpmmz284) + + + Seat car Passenger deck + + + + @seating_area@ + + false + + + + + Front Door + 0.80 + 1.90 + + + 1 + + + + true + leftSide + 1 + 0.20 + external + true + true + true + + + + Front Right External Door + 1.00 + 1.90 + + + 1 + + + + true + rightSide + 1 + 0.20 + external + true + true + true + + + + Rear External Door + 0.95 + 1.90 + + + 1 + + + + true + leftSide + 2 + 0.20 + external + true + true + true + + + + Rear Right External Door + 0.95 + 1.90 + + + 1 + + + + true + rightSide + 2 + 0.20 + external + true + true + true + + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + true + frontEnd + communicating + false + true + true + + + + Rear end door connecting to next carriage + 0.80 + 1.90 + + + + + + true + backEnd + communicating + false + true + true + + + + Compartment 1 door + 0.80 + 1.80 + + + + + + internal + true + false + + + + + + entryAndExit + shut + true + + + Seat 12 + + + Seat 76 + + + + entryAndExit + shut + true + + + Seat 12 + + + Seat 76 + + + + entryAndExit + shut + true + + + Seat 81 + + + Seat 115 + + + + entryAndExit + shut + true + + + Seat 81 + + + Seat 115 + + + + + entryAndExit + shut + true + + + + entryAndExit + shut + true + + + + + + + 900 + 1 + 3.250 + true + false + + + 1400 + 2 + 4.415 + true + false + + + 1400 + 3 + 6.415 + true + false + + + + 80 + + + standingSpace + 20 + + + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + false + true + true + true + + + + + backwards + + + + + + + + false + true + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + backwards + + + + + + + + false + true + true + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + true + false + false + true + + + + forwards + + + + + + + + false + true + false + true + + + + + forwards + + + + + + + + false + true + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + true + false + true + true + + + + forwards + + + + + + + + false + true + true + true + + + + + backwards + + + + + + + + false + true + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + backwards + + + + + + + + true + false + true + true + + + + backwards + + + + + + + + false + true + true + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + backwards + + + + + + + + false + true + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + true + false + false + true + + + + backwards + + + + + + + + false + true + false + true + + + + + + WC + + + 1 + + + + true + true + false + 1 + + + + Luggage + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +                                                       +                                                       +                                                       +                                                       +                                                       \ No newline at end of file From 97d8f4caaf071ed5ca3212dc6ae17b45c595e23b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 12:49:57 +0000 Subject: [PATCH 062/144] Lint and update documentation tables --- .../deckPlans/DeckPlans-Example_train.xml | 3 --- .../DeckPlans-Example_train_simple.xml | 2 +- xsd/NeTEx_publication.xsd | 9 +++---- .../netex_path_support.xsd | 6 ++--- .../netex_path_version.xsd | 6 ++--- .../netex_deckPath_support.xsd | 3 +-- .../netex_environment_support.xsd | 3 +-- .../netex_environment_version.xsd | 3 +-- .../netex_vehicleType_versionOld.xsd | 24 +++++++------------ .../netex_ifopt_navigationPath_version.xsd | 6 ++--- .../part1_ifopt/netex_ifopt_path_support.xsd | 6 ++--- .../part1_ifopt/netex_ifopt_path_version.xsd | 6 ++--- .../netex_stopAssignment_version.xsd | 12 ++++------ .../netex_timetableFrame_version.xsd | 9 +++---- 14 files changed, 32 insertions(+), 66 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 224f1de4d..335b4ebf7 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -3781,12 +3781,9 @@ The train reverse in the station and departs, oriented backwards to the right false true true - noForce - true false - false true outside diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index c47b431c5..f0834fc3f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -1847,4 +1847,4 @@ - \ No newline at end of file + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 09036ea26..83b2fadca 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,15 +16,12 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-02-14Add PATH INSTRUCTION, ROUTE INSTRUCTION + 2024-02-14Add PATH INSTRUCTION, ROUTE INSTRUCTION - - 2024-02-07Add TRACTIVE TRAIN ELEMENT TYPE, TRAILING TRAIN ELEMENT TYPE, ROLLING STOCK INVENTORY, + 2024-02-07Add TRACTIVE TRAIN ELEMENT TYPE, TRAILING TRAIN ELEMENT TYPE, ROLLING STOCK INVENTORY, ROLLING STOCK TRACTIVE ITEM, ROLLLING STOCK TRAILING ITEM, etc - - 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT + 2024-01-14Add PASSENGER CAPACITY, PASSENGER VEHICLE CAPACITY, PASSENGER CARRYING REQUIREMENT FACILITY REQUIREMENT , VEHICLE MANOEVRING REQUIREMENT, PASSENGER BEACON 2021-09-02NewModes: Add BatteryEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index d504f3097..c6c5d26bc 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -11,11 +11,9 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-01-05Factored out of Ifopt path + 2024-01-05Factored out of Ifopt path - - 2024-02-15Add PATH INSTRUCTION, Rename NAVIGATION PATH to NAVIGATION + 2024-02-15Add PATH INSTRUCTION, Rename NAVIGATION PATH to NAVIGATION

                                                      NeTEx - Network Exchange. This subschema defines PATH types.

                                                      diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 3f982b4ab..7183d79be 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -15,11 +15,9 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - - 2024-02-05Factored out from ifopt_path_link + 2024-02-05Factored out from ifopt_path_link - - 2024-02-18Rename NAVIGATION PATH to NAVIGATION + 2024-02-18Rename NAVIGATION PATH to NAVIGATION NeTEx Network Exchange - Generic PATH types. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 2e9114591..05faf99dd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -12,8 +12,7 @@ 2024-01-18 - - 2024-01-18Move from Part1 Ifoft and bas on generic + 2024-01-18Move from Part1 Ifoft and bas on generic

                                                      NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                                      diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 7ffced04c..e0fc3c487 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -10,8 +10,7 @@ e-service developers Europe First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc + 2024-02-05PATH Factored generic enums out of Ifopt paths and other files ast to share with DECK PATH LINK etc 2024-02-05 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd index e0ea75b1f..3f3f7a055 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd @@ -17,8 +17,7 @@ Roger Slevin [Roger.Slevin@dft.gsi.gov.uk] Europe Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema - - 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK + 2024-01-06Factored ot soas to shaer common PTAH LINK featres with DECK PATH LINK 2024-01-06 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd index f3f032cc0..6422aa848 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_versionOld.xsd @@ -21,21 +21,16 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-27CR0001 - Vehicle Dimensions added. + 2017-03-27CR0001 - Vehicle Dimensions added. - - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -43,14 +38,11 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit - - 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her

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

                                                      diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 94af64ba1..67fbfa353 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd @@ -26,11 +26,9 @@ 2007-03-22 - - 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence + 2017-11-08 Move Description from Path in Sequence to supertype link in Sequence - - 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc + 2024-02-06 Refactor to share common path elements with new DECK PATH LINKs etc NeTEx Network Exchange - NAVIGATION PATH types. diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 34d196f10..c529a91b2 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd @@ -15,13 +15,11 @@ 2011-12-16 - - 2019-03-25FR49 CD #65 Accessibility changes + 2019-03-25FR49 CD #65 Accessibility changes CD add CodedTiltEnumeration with values _strongLeftTilt, mediumLeftTilt, nearlyFlat, mediumRightTilt, strongRightTilt, unknown_. Revise name of ___CodedTilt___ to ___TiltType___ to be consistent - - 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH. Rename NAVIGATH PATH to NAVIGATION + 2024-02-05Factor out common PATH LINK to generic file shared with DECK PATH. Rename NAVIGATH PATH to NAVIGATION

                                                      NeTEx - Network Exchange. This subschema defines PATH types.

                                                      diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd index f85f04402..05be44b8d 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd @@ -28,15 +28,13 @@ CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip NK Review: Reorder so as to place like elements toigether, add sub Groups to organize                                                       - - 2019-03-28FR49 CD #65 Accessibility changes + 2019-03-28FR49 CD #65 Accessibility changes NJSK Doc rewviewe Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___ Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___ - - 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink + 2024-02-05Revise to share common features with DECK PATH LINK, add OffSItePathLink NeTEx Network Exchange - PATH types. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 08306d96a..f1a9c1230 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -19,17 +19,13 @@ 2011-02-05 - - 2012-03-04Revise attributes of StopAssignment MODEL CHANGE + 2012-03-04Revise attributes of StopAssignment MODEL CHANGE - - 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) + 2017-06-03CR0040 Allow inlining of STOP POINT, STOP PLACE, QUAY etc so as to iimprove packaging (no semantic change) - - 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on SYNAMIC STOP ASSIGNMENT. - - 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments + 2024-02-08Add Directional attributes as per MS suggestions: ArrivesForwards, DpeartsForwards ArrivesFrom, Left DepartsToRight . corrected name of trainStopAssignments

                                                      NeTEx - Network Exchange. This subschema defines common STOP ASSIGNMENT types.

                                                      diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 380b4cb29..f8827a4cf 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -15,16 +15,13 @@ 2010-09-04 - - 2017-05-09 Add Header + 2017-05-09 Add Header - - 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. + 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. Also correct some documentation comments - - 2020-10-08New Modes: Widen VehicleType to TransportType + 2020-10-08New Modes: Widen VehicleType to TransportType

                                                      NeTEx - Network Exchange. This subschema defines TIMETABLE FRAME types.

                                                      From a618db4511eab11ace95297046b3d5ede616a32d Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 19:36:09 +0000 Subject: [PATCH 063/144] DEckPlan- AddPply norway commenst Minor revisions to SeatingPlan/DeckPlan (a) Use an enum rather that ByWindow ByAisle boolean (b) Revise PassengerSPot HasTable boolean to use ENum toinidcate type of table c) Add a DeckWindowType enum Examples updated --- NeTEx.spp | 2 +- .../deckPlans/DeckPlans-Example_bus.xml | 259 +++++----- .../deckPlans/DeckPlans-Example_train.xml | 396 +++++++++------ .../DeckPlans-Example_train_simple.xml | 472 ++++++++---------- .../netex_deckPath_support.xsd | 4 +- .../netex_deckPath_version.xsd | 2 +- .../netex_deckPlan_support.xsd | 52 +- .../netex_deckPlan_version.xsd | 11 +- .../netex_seatingPlan_support.xsd | 77 ++- .../netex_seatingPlan_version.xsd | 27 +- .../netex_spotEquipment_version.xsd | 11 +- 11 files changed, 710 insertions(+), 603 deletions(-) diff --git a/NeTEx.spp b/NeTEx.spp index 6b3b68064..1399e8b73 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -110,7 +110,7 @@                                                       - + diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 02185d07b..0daaf70a6 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -342,7 +342,7 @@ Lower deck Default to use. false 0.15 - 10 + 10.00 4 2000 @@ -500,6 +500,13 @@ Lower deck true + + + 1.50 + false + false + + 43 @@ -531,8 +538,7 @@ Lower deck - true - true + byAisleAndWindow @@ -544,8 +550,7 @@ Lower deck - true - true + byAisleAndWindow @@ -558,8 +563,7 @@ Lower deck - true - true + byAisleAndWindow @@ -571,8 +575,7 @@ Lower deck - true - true + byAisleAndWindow @@ -585,8 +588,7 @@ Lower deck - true - true + byAisleAndWindow @@ -603,8 +605,7 @@ Lower deck - true - true + byAisleAndWindow @@ -617,8 +618,7 @@ Lower deck - true - true + byAisleAndWindow @@ -631,8 +631,7 @@ Lower deck - true - true + byAisleAndWindow @@ -645,8 +644,7 @@ Lower deck - false - true + byAisleNoWindow @@ -658,8 +656,7 @@ Lower deck - true - false + byAisleNoWindow @@ -671,8 +668,7 @@ Lower deck - true - false + byAisleNoWindow @@ -684,8 +680,7 @@ Lower deck - false - true + byWindowNoAisle @@ -698,8 +693,7 @@ Lower deck - false - true + byWindowNoAisle @@ -711,8 +705,7 @@ Lower deck - true - false + byAisleNoWindow @@ -724,8 +717,7 @@ Lower deck - true - false + byAisleNoWindow @@ -737,8 +729,7 @@ Lower deck - false - true + byWindowNoAisle @@ -751,8 +742,7 @@ Lower deck - false - true + byWindowNoAisle @@ -764,8 +754,7 @@ Lower deck - true - false + byAisleNoWindow @@ -777,8 +766,7 @@ Lower deck - true - false + byAisleNoWindow @@ -790,8 +778,7 @@ Lower deck - false - true + byWindowNoAisle @@ -804,8 +791,7 @@ Lower deck - false - true + byWindowNoAisle @@ -817,8 +803,7 @@ Lower deck - false - false + inMiddle @@ -830,8 +815,7 @@ Lower deck - false - true + byAisleNoWindow @@ -843,8 +827,7 @@ Lower deck - true - false + inMiddle @@ -856,8 +839,7 @@ Lower deck - false - false + byWindowNoAisle @@ -997,6 +979,70 @@ Lower deck internal + + + Side windows continuous with thin strios + leftwards + 9.50 + 0.90 + 1.50 + continuous + false + false + + + LeftSide windows continuous with thin strips + leftwards + 9.50 + 0.90 + 1.50 + continuous + false + false + + + Right Side window in front of starirwells continuous with thin strios + rightwards + 4.0 + 0.90 + 1 + 1.50 + continuous + false + false + + + Right Side window in front of starirwells continuous with thin strips + rightwards + 4.0 + 0.90 + 2 + 1.50 + continuous + false + false + + + Front window window + forwards + 3.0 + 0.90 + 1.50 + continuous + false + false + + + Back window + forwards + 2.0 + 0.30 + 1.70 + continuous + false + false + + seat @@ -1024,8 +1070,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1042,8 +1087,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1060,8 +1104,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1078,8 +1121,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1097,8 +1139,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1115,8 +1156,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1133,8 +1173,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1151,8 +1190,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1170,8 +1208,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1188,8 +1225,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1206,8 +1242,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1224,8 +1259,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1243,8 +1277,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1261,8 +1294,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1280,8 +1312,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1298,8 +1329,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1317,8 +1347,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1335,8 +1364,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1353,8 +1381,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1371,8 +1398,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1390,8 +1416,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1408,8 +1433,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1426,8 +1450,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1444,8 +1467,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1463,8 +1485,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1481,8 +1502,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1499,8 +1519,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1517,8 +1536,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1536,8 +1554,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1554,8 +1571,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1572,8 +1588,7 @@ Lower deck - true - false + byAisleNoWindow @@ -1590,8 +1605,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1609,8 +1623,7 @@ Lower deck - false - true + byWindowNoAisle @@ -1627,8 +1640,7 @@ Lower deck - false - false + inMiddle @@ -1645,8 +1657,7 @@ Lower deck - false - true + byAisleNoWindow @@ -1663,8 +1674,7 @@ Lower deck - true - false + inMiddle @@ -1681,8 +1691,7 @@ Lower deck - false - false + byWindowNoAisle diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 335b4ebf7..0f719e524 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -99,21 +99,21 @@ Seats 13-36 Enter by forward door |@ [seats] @ @| |@[bed] bed][bed] @ @| |@ Compartment 3 \ @| |@ Compartment 3 \ @| |@ 2nd Class @ @| |@ 2nd Class @ @| -|@ 09 10 11 12 @ r06 @| |@ 09 10 11 xx @ @| r06 forwards +|@ 09 10 11 (12) @ r06 @| |@ 09 10 11 xx @ @| r06 forwards |@ [seats] @ @| |@[bed] bed][bed] @ @| |@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @| |@ 13 14 15 (16) @ r07 @| |@ 13 14 15 xx @ @| r07 backwards |@ [seats] @ @| |@[bed] bed][bed]@ @| |@ Compartment 4 \ @| |@ Compartment 4 \ @| |@ 2nd Class @ @| |@ 2nd Class @ @| -|@ 17 18 19 20 @ r08 @| |@ 17 18 19 xx @ @| r08 forwards +|@ 17 18 19 (20) @ r08 @| |@ 17 18 19 xx @ @| r08 forwards |@ [seats] @ @| |@[bed] bed][bed] @ @| |@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @| |@ 21 22 23 (24) @ r09 @| |@ 21 22 23 xx @ @| r09 backwards |@ [seats] @ @| |@[bed] bed][bed] @ @| |@ Compartment 5 \ @| |@ Compartment 5 \ @| |@ 2nd Class @ @| |@ 2nd Class @ @| -|@ 25 26 27 28 @ r10 @| |@ 25 26 27 xx @ @| r10 forwards +|@ 25 26 27 (28) @ r10 @| |@ 25 26 27 xx @ @| r10 forwards |@ [seats] @ @| |@[bed] bed][bed] @ @| |@@@@@@@@@@@@@@@@@@ @| |@@@@@@@@@@@@@@@@@@ @| |@ 29 30 31 (32) @ r11 @| |@ 29 30 31 xx @ @| r11 backwards @@ -1288,9 +1288,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow + fixedFlat true @@ -1310,9 +1309,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow + fixedFlat true @@ -1410,9 +1408,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow true @@ -1432,10 +1428,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true - true + byAisleAndWindow @@ -1517,8 +1510,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1541,7 +1534,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1564,7 +1557,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1581,8 +1574,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1605,8 +1597,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1628,7 +1620,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1650,7 +1642,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1667,8 +1659,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1747,8 +1738,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1770,7 +1761,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1792,7 +1783,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1809,8 +1800,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1833,8 +1823,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1856,8 +1846,7 @@ The train reverse in the station and departs, oriented backwards to the right - false - false + inMiddle true @@ -1879,8 +1868,7 @@ The train reverse in the station and departs, oriented backwards to the right - false - false + inMiddle true @@ -1897,8 +1885,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1977,8 +1964,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2000,7 +1987,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2022,7 +2009,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2039,8 +2026,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2063,8 +2049,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2086,7 +2072,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2108,7 +2094,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2125,8 +2111,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2205,8 +2190,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2228,7 +2213,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2250,7 +2235,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2267,8 +2252,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2291,8 +2275,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2314,7 +2298,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2336,7 +2320,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + byAisleNoWindow true @@ -2353,8 +2337,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -3124,7 +3107,7 @@ The train reverse in the station and departs, oriented backwards to the right true - + forwards @@ -3135,9 +3118,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + none true @@ -3150,9 +3132,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + none true @@ -3165,9 +3146,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + none true @@ -3180,12 +3160,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + none true - + forwards @@ -3196,9 +3175,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3211,9 +3189,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3226,9 +3203,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3241,12 +3217,11 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byWindowNoAisle + seatBackFolding true - + forwards @@ -3257,9 +3232,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3272,9 +3246,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3287,9 +3260,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3302,12 +3274,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + seatBackFolding true - + backwards @@ -3318,9 +3289,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3333,9 +3303,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3348,9 +3317,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3363,12 +3331,11 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byWindowNoAisle + fixedFlat true - + forwards @@ -3379,9 +3346,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3394,9 +3360,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3409,9 +3374,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3424,12 +3388,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true - + forwards @@ -3440,9 +3403,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3455,9 +3417,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3470,9 +3431,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3485,25 +3445,23 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true - + forwards - + - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3516,9 +3474,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3531,9 +3488,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3546,11 +3502,125 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding + true + + + + + backwards + + + + + + + + byWindowNoAisle + fixedFlat + true + + + + backwards + + + + + + + + byAisleNoWindow + fixedFlat + true + + + + backwards + + + + + + + + byAisleNoWindow + fixedFlat + true + + + + forwards + + + + + + + + byWindowNoAisle + fixedFlat + true + + + + + forwards + + + + + + + + byWindowNoAisle + fixedFlat + true + + + + forwards + + + + + + + + byAisleNoWindow + fixedFlat + true + + + + forwards + + + + + + + + byAisleNoWindow + fixedFlat + true + + + + forwards + + + + + + + + byWindowNoAisle + fixedFlat true + @@ -3563,9 +3633,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3587,9 +3656,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index f0834fc3f..50be5c478 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -569,9 +569,8 @@ - false - true - false + byWindowNoAisle + none true @@ -584,9 +583,8 @@ - true - false - false + byAisleNoWindow + none true @@ -599,9 +597,8 @@ - true - false - false + byAisleNoWindow + none true @@ -614,9 +611,8 @@ - false - true - false + byWindowNoAisle + none true @@ -630,9 +626,8 @@ - false - true - false + byWindowNoAisle + none true @@ -645,9 +640,8 @@ - true - false - false + byAisleNoWindow + none true @@ -660,9 +654,8 @@ - true - false - false + byAisleNoWindow + none true @@ -675,9 +668,8 @@ - true - true - false + byAisleAndWindow + none true @@ -691,9 +683,8 @@ - false - true - false + byWindowNoAisle + none true @@ -706,13 +697,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -721,13 +711,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -736,9 +725,8 @@ - false - true - false + byWindowNoAisle + none true @@ -752,9 +740,8 @@ - false - true - false + byWindowNoAisle + none true @@ -767,13 +754,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -782,13 +768,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -797,9 +782,8 @@ - false - true - false + byWindowNoAisle + none true @@ -813,9 +797,8 @@ - false - true - false + byWindowNoAisle + none true @@ -828,13 +811,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -843,13 +825,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -858,9 +839,8 @@ - false - true - false + byWindowNoAisle + none true @@ -874,9 +854,8 @@ - false - true - true + byWindowNoAisle + fixedFlat true @@ -889,13 +868,12 @@ - true - false - true + byAisleNoWindow + fixedFlat true - + forwards @@ -904,13 +882,12 @@ - true - false - true + byAisleNoWindow + fixedFlat true - + forwards @@ -919,9 +896,8 @@ - false - true - true + byWindowNoAisle + fixedFlat true @@ -935,9 +911,8 @@ - false - true - true + byWindowNoAisle + fixedFlat true @@ -950,13 +925,12 @@ - true - false - true + byAisleNoWindow + fixedFlat true - + backwards @@ -965,13 +939,12 @@ - true - false - true + byAisleNoWindow + fixedFlat true - + backwards @@ -980,9 +953,8 @@ - false - true - true + byWindowNoAisle + fixedFlat true @@ -996,9 +968,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1011,13 +982,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1026,13 +996,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1041,9 +1010,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1057,9 +1025,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1072,13 +1039,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1087,13 +1053,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1102,9 +1067,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1118,9 +1082,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1133,13 +1096,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1148,13 +1110,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1163,9 +1124,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1179,9 +1139,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1194,13 +1153,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1209,13 +1167,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1224,9 +1181,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1240,9 +1196,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1255,13 +1210,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1270,13 +1224,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1285,9 +1238,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1301,9 +1253,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1316,13 +1267,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1331,13 +1281,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1346,9 +1295,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1362,9 +1310,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1377,13 +1324,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -1392,13 +1338,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -1407,9 +1352,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1423,9 +1367,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1438,13 +1381,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -1453,13 +1395,12 @@ - true - false - false + byAisleNoWindow + none true - + forwards @@ -1468,9 +1409,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1484,9 +1424,8 @@ - false - true - true + byWindowNoAisle + seatBackFolding true @@ -1499,13 +1438,12 @@ - true - false - true + byAisleNoWindow + seatBackFolding true - + forwards @@ -1514,13 +1452,12 @@ - true - false - true + byAisleNoWindow + seatBackFolding true - + forwards @@ -1529,9 +1466,8 @@ - false - true - true + byWindowNoAisle + seatBackFolding true @@ -1545,9 +1481,8 @@ - false - true - true + byWindowNoAisle + seatBackFolding true @@ -1560,13 +1495,12 @@ - true - false - true + byAisleNoWindow + seatBackFolding true - + backwards @@ -1575,13 +1509,12 @@ - true - false - true + byAisleNoWindow + seatBackFolding true - + backwards @@ -1590,9 +1523,8 @@ - false - true - true + byWindowNoAisle + seatBackFolding true @@ -1606,9 +1538,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1621,13 +1552,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1636,13 +1566,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1651,9 +1580,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1667,13 +1595,12 @@ - false - true - false + byWindowNoAisle + none true - + backwards @@ -1682,13 +1609,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1697,9 +1623,8 @@ - true - false - false + byAisleNoWindow + none true @@ -1712,9 +1637,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1728,9 +1652,8 @@ - false - true - false + byWindowNoAisle + none true @@ -1743,13 +1666,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1758,13 +1680,12 @@ - true - false - false + byAisleNoWindow + none true - + backwards @@ -1773,9 +1694,8 @@ - false - true - false + byWindowNoAisle + none true diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 05faf99dd..e56493b3d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -12,7 +12,8 @@ 2024-01-18 - 2024-01-18Move from Part1 Ifoft and bas on generic + + 2024-01-18Move from Part1 Ifoft and bas on generic

                                                      NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                                      @@ -219,6 +220,7 @@ Rail transport, Roads and Road transport +                                                       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 6bdf0cc94..99a51595c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -23,7 +23,7 @@ 2024-01-17                                                       - 2024-01-17 + 2024-02-18Norway review comment - Add Window types. NeTEx Network Exchange - DECK PATH LINK types. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 89a3d887e..3446c6b42 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,8 +13,12 @@ 2023-01-30 - 2024-01-11Revise enum values + + 2024-01-11Revise enum values + + 2024-02-18Norway review comment - Add Window types. +

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

                                                      This sub-schema describes the DECK PLAN types.

                                                      @@ -314,37 +318,37 @@ - + Entrance is on left side of VEHICLE. - + Entrance is on right side of VEHICLE. - + Entrance is on front end of VEHICLE. - + Entrance is on back end of VEHICLE. - + Entrance is interior to VEHICLE. - + Entrance is above VEHICLE. - + Entrance is below VEHICLE. @@ -526,6 +530,38 @@ + + + Allowed values for TYPE OF DECK WINDOW. + + + + + Window is interspaced by solid separators. + + + + + Window is interspaced by solid separators. + + + + + Window is a large panorama window. + + + + + Window is a porthole shaped window. + + + + + WOther type of Window. + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index eb1656c43..70af83218 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,7 +16,11 @@ 2023-01-30 - 2024-02-09Add locatbale spot range for usage. + + 2024-02-09Add locatable spot range for usage. + + + 2024-02-18Norway review comment - Add Window types.

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

                                                      @@ -1259,6 +1263,11 @@ Height ofindow from floor of of DECK                                                       + + + Classification of DECK WINDOW. + + Whether window has blind. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 56e4fdf04..f73c344e7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,8 +13,12 @@ 2023-02-02 - 2024-01-17Add bed to locatable spot type enumerations + + 2024-01-17Add bed to locatable spot type enumerations + + 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration. +

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

                                                      This sub-schema describes the DECK PLAN types.

                                                      @@ -349,6 +353,77 @@ + + + + Allowed values for Seat Context. + + + + + Spot is next to an aisle (but not a window). + + + + + Spot is next to a window (but not an aisle). + + + + + Spot is next to an aisle and a window. + + + + + Spot is in middle, i.e. not next to aisle or a window. + + + + + + + + Allowed values for Type of Table. + + + + + No table. + + + + + Table is fixed horizontal in front of seat. + + + + + Table folds fown to be horizontal in front of seat. + + + + + Table folds down from seat back in front. + + + + + Table folds out from arm rest. + + + + + Table clips on to seat arm rests. + + + + + Other type of table. + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 924b9e23f..e94fa686e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -15,10 +15,10 @@ First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2023-01-30 + + + 2024-02-18Norway review comment - Revise AIsle /Window to use enumeration. Add TableType enum. - 2023-01-30 - Name Space changes -

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

                                                      This sub-schema describes the DECK PLAN types.

                                                      @@ -34,9 +34,8 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd - - Unclassified - CEN, Crown Copyright 2022-2023 + Unclassified + CEN, Crown Copyright 2022-204
                                                        @@ -378,17 +377,12 @@ Elements for a PASSENGER SPOT. - - - Whether PASSENGER SPOT is by Aisle. - - - + - Whether PASSENGER SPOT is by Window + Whether PASSENGER SPOT is by an Aisle, window, etc. - + Whether PASSENGER SPOT faces table. @@ -403,11 +397,6 @@ Leg space available.t - - - Whether PASSENGER SPOT has a tray - - Whether PASSENGER SPOT has a power socket. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index 4728b94b6..a9fc62c75 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -14,9 +14,9 @@ 2023-02-06 - 2023-02-06 - Definition of CycleStorage number of spaces corrected. Doc change only. - + + 2023-02-06Definition of CycleStorage number of spaces corrected. Doc change only. +

                                                        NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT base types.

                                                         @@ -28,9 +28,8 @@ {http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_spotEquipment_version.xsd [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX - - Unclassified - CEN, Crown Copyright 2009-2023 + Unclassified + CEN, Crown Copyright 2009-2024
                                                          From 271879f9aeb1597150d83369bf16feafff9b566a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:38:07 +0000 Subject: [PATCH 064/144] Lint and update documentation tables --- .../netex_reusableComponents/netex_deckPath_support.xsd | 5 ++--- .../netex_reusableComponents/netex_deckPath_version.xsd | 3 +-- .../netex_reusableComponents/netex_deckPlan_support.xsd | 8 +++----- .../netex_reusableComponents/netex_deckPlan_version.xsd | 6 ++---- .../netex_seatingPlan_support.xsd | 8 +++----- .../netex_seatingPlan_version.xsd | 5 ++--- .../netex_spotEquipment_version.xsd | 3 +-- 7 files changed, 14 insertions(+), 24 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index e56493b3d..0d064535e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -12,8 +12,7 @@ 2024-01-18 - - 2024-01-18Move from Part1 Ifoft and bas on generic + 2024-01-18Move from Part1 Ifoft and bas on generic

                                                          NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.

                                                          @@ -220,7 +219,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 99a51595c..15f3aee8c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -22,8 +22,7 @@ 2024-01-17 - - 2024-02-18Norway review comment - Add Window types. + 2024-02-18Norway review comment - Add Window types. NeTEx Network Exchange - DECK PATH LINK types. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 3446c6b42..179325097 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,12 +13,10 @@ 2023-01-30 - - 2024-01-11Revise enum values + 2024-01-11Revise enum values + + 2024-02-18Norway review comment - Add Window types. - - 2024-02-18Norway review comment - Add Window types. -

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

                                                          This sub-schema describes the DECK PLAN types.

                                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 70af83218..23a261f4b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,11 +16,9 @@ 2023-01-30 - - 2024-02-09Add locatable spot range for usage. + 2024-02-09Add locatable spot range for usage. - - 2024-02-18Norway review comment - Add Window types. + 2024-02-18Norway review comment - Add Window types.

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

                                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index f73c344e7..978905bf7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -13,12 +13,10 @@ 2023-02-02 - - 2024-01-17Add bed to locatable spot type enumerations + 2024-01-17Add bed to locatable spot type enumerations + + 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration. - - 2024-02-18Norway review comment - Revise Aisle /Window to use enumeration. -

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

                                                          This sub-schema describes the DECK PLAN types.

                                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index e94fa686e..248124e23 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -15,9 +15,8 @@ First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2023-01-30 - - - 2024-02-18Norway review comment - Revise AIsle /Window to use enumeration. Add TableType enum. + + 2024-02-18Norway review comment - Revise AIsle /Window to use enumeration. Add TableType enum.

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

                                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index a9fc62c75..05d2463b1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -14,8 +14,7 @@ 2023-02-06 - - 2023-02-06Definition of CycleStorage number of spaces corrected. Doc change only. + 2023-02-06Definition of CycleStorage number of spaces corrected. Doc change only.

                                                          NeTEx - Network Exchange. This subschema defines SPOT EQUIPMENT base types.

                                                          From c4bbec723a3ff80f7b7d05b19097ede4e5172ef4 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Fri, 1 Mar 2024 18:40:14 +0000 Subject: [PATCH 065/144] Ypdate with 641 addition of maximumvelocity --- .../netex_vehicleType_version.xsd | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 62a1c3391..22e73cfa5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -21,16 +21,21 @@ 2010-09-04 - 2011-02-05Name Space changes + + 2011-02-05Name Space changes - 2017-03-27CR0001 - Vehicle Dimensions added. + + 2017-03-27CR0001 - Vehicle Dimensions added. - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -38,11 +43,14 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit - 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her

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

                                                          @@ -208,6 +216,11 @@ Rail transport, Roads and Road transport Maximum range between refuelling. +v1.2.2 + + + Maximum velocity in m/s. +v2.0.0 + + From c22a947bf83aabcee99257cd0af9b808bfcd948b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:42:15 +0000 Subject: [PATCH 066/144] Lint and update documentation tables --- .../netex_vehicleType_version.xsd | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 22e73cfa5..56bafd435 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -21,21 +21,16 @@ 2010-09-04 - - 2011-02-05Name Space changes + 2011-02-05Name Space changes - - 2017-03-27CR0001 - Vehicle Dimensions added. + 2017-03-27CR0001 - Vehicle Dimensions added. - - 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. + 2019-03-25NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType. NJSK Review correct data types of new attributes to be of LengthType - - 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile + 2021-07-07NewModes-Power Description attribute to NVehicleEquipmentProfile - - 2020-10-05 New Modes: Add Vehicle mode to VehicleType + 2020-10-05 New Modes: Add Vehicle mode to VehicleType Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType Replace Vehicle OperatorRef with TransportOrganisationRef. Add VehicleModelRef to Vehicle. @@ -43,14 +38,11 @@ Add Description to Vehicle. Add PropulsionType . and MaximumRange to TransportType - - 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel + 2021-07-08NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel - - 2023-01-30TM CR: Enhancement Add Accepted Driver Permit + 2023-01-30TM CR: Enhancement Add Accepted Driver Permit - - 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her + 2024-02-07Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her

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

                                                          From 4399e3142c1af318408f8b9763f9140f7719e722 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Sun, 3 Mar 2024 00:19:54 +0000 Subject: [PATCH 067/144] DeckPlans Add missing VehicleSide for DeckWindow - Stefan Jugelt noted there was no way to set relative posiition of a DEckWindow, have corrected to use Vehicle side as for DEckENtrance --- .../netex_deckPlan_version.xsd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 23a261f4b..fb41ecdb4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,9 +16,11 @@ 2023-01-30 - 2024-02-09Add locatable spot range for usage. + + 2024-02-09Add locatable spot range for usage. - 2024-02-18Norway review comment - Add Window types. + + 2024-02-18Norway review comment - Add Window types.

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

                                                          @@ -1258,7 +1260,12 @@ - Height ofindow from floor of of DECK + Height of Window from floor of of DECK + + + + + Side of WINDOW relative to forward orientation of VEHICLE. From 780ab70a250f8bb94311b8d2fa0ee5e4e8a56c29 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Mar 2024 00:21:50 +0000 Subject: [PATCH 068/144] Lint and update documentation tables --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index fb41ecdb4..e5a0e3fb7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -16,11 +16,9 @@ 2023-01-30 - - 2024-02-09Add locatable spot range for usage. + 2024-02-09Add locatable spot range for usage. - - 2024-02-18Norway review comment - Add Window types. + 2024-02-18Norway review comment - Add Window types.

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

                                                          From 969db2ba2c29ea2376eb87e009d72fe5f2ddf0f2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:05:22 +0100 Subject: [PATCH 069/144] Apply suggestions from code review Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_genericFramework/netex_path_support.xsd | 2 +- .../netex_trainElementType_version.xsd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index c6c5d26bc..20b52c1b5 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -281,7 +281,7 @@ Rail transport, Roads and Road transport - Type for identifier of a PATH LINK VIEW.; + Type for identifier of a PATH LINK VIEW. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index e9398c325..1cea2eee9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -59,17 +59,17 @@ Rail transport, Roads and Road transport - Elements for TRAIN TYPEs in frame. + Elements for TRAIN TYPEs in frame. - + TRAIN ELEMENT TYPEs in frame _V2.0 in frame. - + Type for containment in frame of TRAIN ELEMENT TYPEs. From 82c0ef8a79572755696fe542ea4dc4759e172003 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:05:51 +0100 Subject: [PATCH 070/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index f46481c05..46dbeb21a 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1721,7 +1721,7 @@ - + Assign double decker bus to Journey - doors shut From f6f94da99e6879b28fd0c3fc7d517a8ea96cba67 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:05:59 +0100 Subject: [PATCH 071/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 0daaf70a6..d3e46eadd 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1,6 +1,6 @@ - 2020-12-17T09:30:47.0Z From c00cc2027334babc2c49bf6a687effaa42e36513 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:06:28 +0100 Subject: [PATCH 075/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index cddf4ed36..f726f5a6e 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -180,7 +180,7 @@ Lower deck - Operator timetable data + Operator timetable data creates From bdd648322e063765f3771be9822c438064fa4808 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:06:35 +0100 Subject: [PATCH 076/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index f726f5a6e..b05b8cf76 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -298,7 +298,7 @@ Lower deck 1 - Internal sensor on step + Internal sensor on step cable From 90300fcbb4d431ed5ab813ac8d5c39b18d8e03bc Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:06:41 +0100 Subject: [PATCH 077/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index b05b8cf76..fd8b82592 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -320,7 +320,7 @@ Lower deck steps freeSeating standing seating pushchair wheelchair - noCycles baggageStorage pushchairsAllowed + noCycles baggageStorage pushchairsAllowed noReservationsPossible From 05cb08c828716987d150cca824cbbd41f848c70b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:06:48 +0100 Subject: [PATCH 078/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index fd8b82592..f5c00eb31 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -486,7 +486,7 @@ Lower deck - With rear door set open so passengers can alight when stopped in town + With rear door set open so passengers can alight when stopped in town exit open From a230240ab63c1338ae45f167ac64a02a21fda22b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:07:01 +0100 Subject: [PATCH 079/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index f5c00eb31..0c9069ed7 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -257,7 +257,7 @@ Lower deck 0.80 1.0 - + 1.20 true From 7bcfd3d1b2c27bbd81f8f80a8042f6a00decad2a Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:07:08 +0100 Subject: [PATCH 080/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 0c9069ed7..fd0548d22 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -304,7 +304,7 @@ Lower deck true - cashAndCard contactlessPaymentCard travelCard + cashAndCard contactlessPaymentCard travelCard paperStamp From a995a8cc5c9489ebcc4004f0daa43cd868b19b6e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:07:15 +0100 Subject: [PATCH 081/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index fd0548d22..8d8528a59 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1751,7 +1751,7 @@ Lower deck - Basic Elements for map of bus + Basic Elements for map of a bus http:erebus.eu/plans/double_decker_floor_plan From 1586b6f23855000c9dfa72c788699c60e5364a77 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:07:22 +0100 Subject: [PATCH 082/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 8d8528a59..e40c54ed0 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -1784,7 +1784,7 @@ Lower deck - Deck Plan Assignment Example + Deck Plan Assignment Example This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on the platform . More sense for a train of ferry . From 431810610d41b39ee9c9941f26e19a9b35f779f8 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:07:30 +0100 Subject: [PATCH 083/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index e40c54ed0..18e99a8d1 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -973,7 +973,7 @@ Lower deck false - Entrance to top of stairs + Entrance to top of stairs 0.80 2.00 internal From fa1c0dad327910db9a4433276f10ceddcc72d694 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:10:46 +0100 Subject: [PATCH 084/144] Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 251fc833d..84633cd14 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd @@ -19,7 +19,7 @@                                                           2020-20-05New Modes Fix: add sportsm transport, government and culturalAttraction to SiteType enumeration - 2024-01-15PATH DECPLAN REmodularise - move PublicUseEnumeration CoveredEnumeration GatedEnumeration AccessSpaceTypeEnumeration PassageTypeEnumeration to netex_environment_support + 2024-01-15PATH DECKPLAN REmodularise - move PublicUseEnumeration CoveredEnumeration GatedEnumeration AccessSpaceTypeEnumeration PassageTypeEnumeration to netex_environment_support

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

                                                          From 771f7b47e19f90788d055c067a07a885e0c96ec9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:11:18 +0100 Subject: [PATCH 085/144] Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Matthias Günter --- .../netex_genericFramework/netex_zone_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 311d7ef6c..2ee2f6b34 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport - Presentation Elements of a ZONE+v1.1 + Presentation Elements of a ZONE. +v1.1 From 78b82f1526953d1853ae168263acc6ca1f1199af Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:15:00 +0100 Subject: [PATCH 086/144] Update xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part2_journeyTimes/netex_deckEntranceAlignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd index 05409c5ad..bd61eb0e5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -66,7 +66,7 @@ - + Type for containment in frame of DECK ENTRANCE ASSIGNMENTs From 6692ecaa1d12b4b730efd04619c3da90c90332a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 14:15:17 +0100 Subject: [PATCH 087/144] depreciated corrected --- .../netex_equipmentVehiclePassenger_support.xsd | 5 ++--- .../part1_ifopt/netex_ifopt_checkConstraint_support.xsd | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 12cde440d..cd7a5ac15 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -113,13 +113,12 @@ Rail transport, Roads and Road transport - Reference to a WHEELCHAIR VEHICLE EQUIPMENT. - DEPRECATED + Reference to a WHEELCHAIR VEHICLE EQUIPMENT. DEPRECATED -v2.0 - DEPRECATED + DEPRECATED -v2.0 diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd index d460e9c50..095b4ee9c 100644 --- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd +++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd @@ -179,7 +179,7 @@ Rail transport, Roads and Road transport - DEPRECATED + DEPRECATED. -v2.0 From e661229e3283a67153842dc77c35248c611975f9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:15:26 +0100 Subject: [PATCH 088/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 15f3aee8c..db2708c39 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -473,7 +473,7 @@ Rail transport, Roads and Road transport Classification of DECK NAVIGATION.. - + Ordered collection of References to STOP PLACE spaces Use for a branch path. From 5563cb2d172fb972af27e0c2df2799c1edb95a02 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:15:57 +0100 Subject: [PATCH 089/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index db2708c39..543d614b3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -478,7 +478,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. From a96cc7b41a8081849eb3b34c2918d6f2b31605df Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:17:34 +0100 Subject: [PATCH 090/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 543d614b3..301903f6e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -320,7 +320,7 @@ Rail transport, Roads and Road transport - + A collection of one or more PLACEs in SEQUENCE. From 102d347b4129aaedf2975448b887aaa5e7b2368f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:18:00 +0100 Subject: [PATCH 091/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 46dbeb21a..03a63678e 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1621,7 +1621,7 @@ - Basic Elements for map of bus + Basic Elements for map of a bus http:erebus.eu/plans/double_decker_floor_plan From 35cb038b306d4dc5922434083ea154295fa1df7f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:19:51 +0100 Subject: [PATCH 092/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index e5a0e3fb7..0ad62ec03 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -247,7 +247,7 @@ Rows on DECK.                                                           - + COLUMNs on DECK. From 9a1931d88ff105427e88880664f669373dd10143 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:20:07 +0100 Subject: [PATCH 093/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 03a63678e..e14e1384c 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -872,7 +872,7 @@ 0.80 2.00 - ENtrance to top of stairs + Entrance to top of stairs internal From fe17aefe13596f5dd8de0f08cd8fd1ada792fa74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 14:20:25 +0100 Subject: [PATCH 094/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 301903f6e..c29cc093c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport Presentation defaults for DECK ELEMENT - + Facilities available at SITe. From 930d0838575adf97d95d4173307d41cd4ca91d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 14:20:46 +0100 Subject: [PATCH 095/144] Update examples/functions/deckPlans/DeckPlans-Example_train.xml --- examples/functions/deckPlans/DeckPlans-Example_train.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 0f719e524..039469251 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -2520,7 +2520,7 @@ The train reverse in the station and departs, oriented backwards to the right left - Turn right into corridoor + Turn right into corridor From d2fd61aed7c60d8bc465ad842d778bd99d63da1b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:21:57 +0100 Subject: [PATCH 096/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 0ad62ec03..81aba67d2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -78,7 +78,7 @@ - + Type for containment in frame of DECK PLANs From 2e81043290365fa8f6bad51ef8720ee1d146d625 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:22:23 +0100 Subject: [PATCH 097/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 81aba67d2..516a7a1de 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -70,7 +70,7 @@ Deck Plans in Frame - + A List OF DECK PLANs From 65c01da9f3efab3bbf8dcd3dde6418f94ad0490c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:23:00 +0100 Subject: [PATCH 098/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index e14e1384c..686453190 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -225,7 +225,7 @@ true - cashAndCard contactlessPaymentCard travelCard + cashAndCard contactlessPaymentCard travelCard 1.00 From d111f8b80c493514895a69ae84f17bd927dff0dc Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:23:40 +0100 Subject: [PATCH 099/144] Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_genericFramework/netex_zone_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 2ee2f6b34..22caaa33f 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -183,7 +183,7 @@ Rail transport, Roads and Road transport - + Type for list of GROUP OF TARIFF ZONES. From 3b07813436ddfb61661b901e0743ee7f1635bded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 14:26:18 +0100 Subject: [PATCH 100/144] fixes --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- .../netex_reusableComponents/netex_trainElement_support.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index e5a0e3fb7..217728baa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -716,7 +716,7 @@ - Positional sequence of door from front (orr left side end) of VEHICLE. 1 - forward, + Positional sequence of door from front to end (or left side to right) of VEHICLE. Start with 1. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index fbd44ffb8..f7ff963e6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - The size of a train in relative terms. + Type of access between carriages. From d4d88547edefd9684f26370d0508f7312be30089 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:43:58 +0100 Subject: [PATCH 101/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index c42646151..8836e8a1f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -151,7 +151,7 @@ Description of DECK PLAN. - + VALIDITY CONDITIONs used to configure DECK PLAN From 49e330ffc835985f0267b52a38b8d26f4ff401ed Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:44:37 +0100 Subject: [PATCH 102/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 8836e8a1f..6c5db6687 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -156,7 +156,7 @@ VALIDITY CONDITIONs used to configure DECK PLAN - + DECK LEVELs in DECK PLAN. From dab748b333962c27ed78a3e23108ca8bbb34e03e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:45:02 +0100 Subject: [PATCH 103/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 6c5db6687..a62d997b2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -161,7 +161,7 @@ DECK LEVELs in DECK PLAN. - + DECKs in DECK PLAN. From d5bb84baa9af8dba97fcbf7c7127cc28c578ddd8 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:45:33 +0100 Subject: [PATCH 104/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index a62d997b2..1dc3ec06d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -169,7 +169,7 @@ - + Type for a list ofDECKs. From df56d21f6c95d0efc98657e63d199fd74f9c942f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:46:05 +0100 Subject: [PATCH 105/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index c29cc093c..a75354c3a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -77,7 +77,7 @@ Rail transport, Roads and Road transport PATH JUNCTIONs for DECK - + PATH LINKs for DECK From 4feca0d05e56873af0af6699c1fce0f92ef0ff25 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:46:27 +0100 Subject: [PATCH 106/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index a75354c3a..76d4c755b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -90,7 +90,7 @@ Rail transport, Roads and Road transport - + Type for a list of DECK PATH LINKs. From 84175cff039d84032792aa82c1d9c34a9882278d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:47:15 +0100 Subject: [PATCH 107/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 686453190..cdc1bb165 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1637,7 +1637,7 @@ - Stairs + Stairs From e823b173ee42b1c5494dcee884dc9d9dfc288a9b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:47:36 +0100 Subject: [PATCH 108/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 76d4c755b..de5bc5dcb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport - + Impediments to navigation from processes or barriers. For example security, check in etc. From 3ac4d42fe947d9f8188f172e627f5fba8fee54bf Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:48:02 +0100 Subject: [PATCH 109/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 1dc3ec06d..d16bd2169 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -237,7 +237,7 @@ - + DECK SPACEs in DECK PLAN. From 5a09c4b65d664b677eccd0a853437c200caed54c Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:48:42 +0100 Subject: [PATCH 110/144] Update xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part2_journeyTimes/netex_deckPlanAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index d74ccf519..36cf8aec7 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -66,7 +66,7 @@ - + Type for containment in frame of DECK PLAN ASSIGNMENTs From 31b62ca199f75dde46e36648dbdc8dd689ae26a8 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:49:15 +0100 Subject: [PATCH 111/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index d16bd2169..77dbd298e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -242,7 +242,7 @@ DECK SPACEs in DECK PLAN. - + Rows on DECK. From 8ac26175b92100c863e963995d957172918a0597 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:49:43 +0100 Subject: [PATCH 112/144] Update xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../part3_fares/netex_accessRightParameter_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 6ec5f2d9e..b2c9d6e23 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -591,7 +591,7 @@ Rail transport, Roads and Road transport - Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PAssengerSeatRef is DEPRECATED + Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PassengerSeatRef is DEPRECATED From 9631f27807ed9c83d133a03e3a3049ceb82b63e6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:50:25 +0100 Subject: [PATCH 113/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 77dbd298e..1d6223138 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -298,7 +298,7 @@ - + Type for a list of DECK SPACEs. From e1b6cd49f047f11e586f8bf705aea7176e8e2c26 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:50:48 +0100 Subject: [PATCH 114/144] Update xsd/NeTEx_publication.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- 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 83b2fadca..a767fc265 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -4705,7 +4705,7 @@ Correct COnstraints for PointOnRoute - + From 2fc75d9f08bb565e89a3f4bf7de5fed151046018 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:51:18 +0100 Subject: [PATCH 115/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 1d6223138..2cd1e7ce9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -401,7 +401,7 @@ The total capacity of people for the DECK SPACE. - + Capacities of DECK SPACE. From 523110f72dc7a2eeceb8bda049d64d417d9b6b3d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:51:46 +0100 Subject: [PATCH 116/144] Update xsd/netex_framework/netex_genericFramework/netex_path_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_genericFramework/netex_path_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 20b52c1b5..510c8e408 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -285,7 +285,7 @@ Rail transport, Roads and Road transport - + Allowed values for flow direction. From 520c5eef1520d18b8bbab6472a5c2ca137b68f2b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:52:17 +0100 Subject: [PATCH 117/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index de5bc5dcb..162361df6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -69,7 +69,7 @@ Rail transport, Roads and Road transport - Deck Path elemenst fro DECK + Deck Path elements from DECK. From b5de0fa3d7d185095799a2fb117c854fd6eb502d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:52:44 +0100 Subject: [PATCH 118/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index cdc1bb165..008e5fad5 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1649,7 +1649,7 @@ - Deck Plan Assignment Example + Deck Plan Assignment Example This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry . From 7b4b2fed0526c5480bc85474e5a6ebc95c0a14b5 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:53:10 +0100 Subject: [PATCH 119/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 008e5fad5..831f89088 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1650,7 +1650,7 @@ Deck Plan Assignment Example - This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry . + This is an example showing how one might assign a Deck Entrance to a journey to state which entrance will be at which boarding position on the platform. Most relevant for a train or a ferry. To a particalr stopt From bea87e47a749c98d3e354e9eea3462f33b0ea92b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:53:58 +0100 Subject: [PATCH 120/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 18e99a8d1..022266a8f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -103,7 +103,7 @@ Lower deck --> From 67bf9dcb58fb3509cfd416b64baec5a02df7de73 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:54:43 +0100 Subject: [PATCH 121/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 022266a8f..d12e289ef 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -14,7 +14,7 @@ Lower deck The back area seats can be labelled as Columns A, B, C, D and rows 5 to 8. There is a wheel chair space at 4D There is a button to request a stop by the exit door and at the top of the staircase - The Stair case has Stair equipment describing th step height and handrail. + The staircase has Stair equipment describing the step height and handrail. There is a luggage storage area under the stairs with 2 shelves for suitcases, pushchairs etc Passengers may stand on the lower deck but not on the stairs From c71f9e27e9e250ca2873539ad6e6a88c8bbb6f1d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:55:26 +0100 Subject: [PATCH 122/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index d12e289ef..f9caee14f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -9,7 +9,7 @@ Lower deck The Entrances have sensors The lower deck has a compartment for the driver by the entrance door at the front and an exit door towards the rear - The lower deck has fold 3 up seats facing inwards either side at the front, and 4 rows of bench seats at the back, as 2 either side of the aisle) and with an extra seat in the back middle. + The lower deck has fold 3 up seats facing inwards on either side at the front, and 4 rows of bench seats at the back, 2 on either side of the aisle) and with an extra seat in the back middle. The front area seats can be labelled a Columns A and D and rows 1 to 4 The back area seats can be labelled as Columns A, B, C, D and rows 5 to 8. There is a wheel chair space at 4D From 33c1250fbd0d7eb37a52aaed2ec8da10a9666968 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:56:14 +0100 Subject: [PATCH 123/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 162361df6..f17da17b1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -64,7 +64,7 @@ Rail transport, Roads and Road transport Standard - DECK PATH LINK and NAVIGATION PATH Model. + DECK PATH LINK and NAVIGATION PATH Model. From 4b1b80f9e703af6a4ac57b227ce6d2605e3737f7 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:57:09 +0100 Subject: [PATCH 124/144] Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example_bus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index f9caee14f..7b73ee21c 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -7,7 +7,7 @@ Lower deck The Entrances have sensors - The lower deck has a compartment for the driver by the entrance door at the front and an exit door towards the rear + The lower deck has a compartment for the driver by the entrance door at the front and an exit door towards the rear The lower deck has fold 3 up seats facing inwards on either side at the front, and 4 rows of bench seats at the back, 2 on either side of the aisle) and with an extra seat in the back middle. The front area seats can be labelled a Columns A and D and rows 1 to 4 From c45cbb447d5ecafc5ecda82adf2e387044b34120 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:57:47 +0100 Subject: [PATCH 125/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 831f89088..4d880a92f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1739,7 +1739,7 @@ - Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY + Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY From bcf953db0f9d1a315c9aafcb8ae92679cc98ddf6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:58:27 +0100 Subject: [PATCH 126/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index f17da17b1..702c8a2f3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -60,7 +60,7 @@ Rail transport, Roads and Road transport CEN TC278 WG3 SG9. - NeTEx Network Exchange DECK PATH LINK Types . + NeTEx Network Exchange DECK PATH LINK Types. Standard From 119b0dbdcdba90b991605811f43238bb01b2f9a4 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:58:59 +0100 Subject: [PATCH 127/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 2cd1e7ce9..bc24f3d31 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -413,7 +413,7 @@ Elements for a DECK SPACE. - + DECK ENTRANCEs to DECK SPACE. From c44618d650b694cd24c74d6a28b1dc2e6057b541 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 14:59:32 +0100 Subject: [PATCH 128/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index bc24f3d31..660acb830 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -418,7 +418,7 @@ DECK ENTRANCEs to DECK SPACE. - + DECK ENTRANCE COUPLEs for DECK SPACE. From 6a6974e3a542d4e612dab87cff359b93b1be84d6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:00:02 +0100 Subject: [PATCH 129/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 660acb830..9dc02c9b6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -423,7 +423,7 @@ DECK ENTRANCE COUPLEs for DECK SPACE. - + DECK ENTRANCE USAGEs for DECK SPACE. From 55d50581bb145e4c2bc10e9fb64a9a2e3523ecb6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:00:49 +0100 Subject: [PATCH 130/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 702c8a2f3..8b6e98f93 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -506,7 +506,7 @@ Rail transport, Roads and Road transport - Detailed properties of a DECK ELEMENT, (These are simialr to properties of a SIT ELEMENT + Detailed properties of a DECK ELEMENT. They are similar to the properties of a SITE ELEMENT. From 20e8c33fd27c9eef0f41c575772a7a9c89227c86 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:01:14 +0100 Subject: [PATCH 131/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 8b6e98f93..6288b7055 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -517,7 +517,7 @@ Rail transport, Roads and Road transport - Facilities available at SITe. + Facilities available at SITE. From 9643336c6817f7159a35d3c70aca2c165afde9f1 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:01:35 +0100 Subject: [PATCH 132/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 9dc02c9b6..efaf849a2 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -291,7 +291,7 @@ - Edit care class for which capacity is specifyed. Default is any, i.e. capacity is for all classes. + Fare class for which capacity is specifyed. Default is any, i.e. capacity is for all classes. From 26ca567a09288817470a58b25e096385db4b7404 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:02:08 +0100 Subject: [PATCH 133/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index efaf849a2..39fb3e2b6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -428,7 +428,7 @@ DECK ENTRANCE USAGEs for DECK SPACE. - + DECK WINDOWs on DECK SPACE. From 50bb00c8333680729547b84bcdf8136636a2b0b5 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:02:32 +0100 Subject: [PATCH 134/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 39fb3e2b6..9251fc84a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -451,7 +451,7 @@ - A specialisation of DECK SPACE defining an area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT for use by passengers. _2.0 + A specialisation of DECK SPACE defining an area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT for use by passengers. +2.0 +v2.0 From 3bacf9d87006c6fc9500e1332a3020021ef48b73 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:02:58 +0100 Subject: [PATCH 135/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 9251fc84a..a0749345b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -452,7 +452,7 @@ A specialisation of DECK SPACE defining an area within a VEHICLE (i.e. bus, boat, coach, car) or TRAIN ELEMENT for use by passengers. +2.0 -+v2.0 + From 4d97f17a31aad969ebe4217a36a3f2da2ba8eeff Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:03:32 +0100 Subject: [PATCH 136/144] Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index a0749345b..b13899d13 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -728,7 +728,7 @@ - EClassification lements for a DECK ENTRANCE. + Classification elements for a DECK ENTRANCE. From 5c91dace474c34b296dca499378f63f32b1623b0 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:04:20 +0100 Subject: [PATCH 137/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 4d880a92f..e8b472927 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1710,7 +1710,7 @@ 10:30:00 - Across centre - doors open + Passing through the city centre with open doors From f962a502f9ffe08b38dd0ef188e41d7cb169335a Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:04:45 +0100 Subject: [PATCH 138/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index e8b472927..751ce3296 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1653,7 +1653,7 @@ This is an example showing how one might assign a Deck Entrance to a journey to state which entrance will be at which boarding position on the platform. Most relevant for a train or a ferry. - To a particalr stopt + To a particular stop From d8c95f7a66ca33337ae996ff3dd03ff93767b383 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:05:10 +0100 Subject: [PATCH 139/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 751ce3296..22cdd68dd 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1676,7 +1676,7 @@ true 1 - exit at rear + exit at rear From ecfd1dac1d5827d08cbc43f6e00d128a14fbb898 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:05:57 +0100 Subject: [PATCH 140/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 22cdd68dd..b023fdc09 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1702,7 +1702,7 @@ - In to centre + Heading in to the city centre From 2d2a2caf1dac11ffed7c2718a087d71d4d80e9b4 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 7 Mar 2024 15:06:33 +0100 Subject: [PATCH 141/144] Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> --- examples/functions/deckPlans/DeckPlans-Example.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index b023fdc09..f68c8f909 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -1689,7 +1689,7 @@ - Deck Plan Example + Deck Plan Example This is an example showing how one might assign a deck plan to a journey. From e2309e0ae68f9cc422710d2c5effaac5881f4f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 16:44:16 +0100 Subject: [PATCH 142/144] Ref/Rel structures back to before --- .../netex_zone_support.xsd | 21 ++++--------------- .../netex_deckPath_support.xsd | 2 +- .../netex_deckPath_version.xsd | 6 +++--- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 88b100364..e2ae35c9f 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -29,8 +29,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2023 - + CEN, Crown Copyright 2009-2023
                                                          • Derived from the Transmodel, VDV, TransXChange, NaPTAN, NOPTIS, BISON and Trident standards.
                                                            • @@ -100,9 +99,9 @@ Rail transport, Roads and Road transport Reference to a TARIFF ZONE. - + - + @@ -189,17 +188,5 @@ Rail transport, Roads and Road transport - - - Type for a list of GROUP OF TARIFF ZONEs. - - - - - - - - - - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 0d064535e..950e3e95c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -52,7 +52,7 @@ Rail transport, Roads and Road transport DECK PATH LINK identifier types for NeTEx. - + Type for a list of references to a DECK PATH LINK. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 6288b7055..1b100d1e7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -198,7 +198,7 @@ Rail transport, Roads and Road transport - + Impediments to navigation from processes or barriers. For example security, check in etc. @@ -478,7 +478,7 @@ Rail transport, Roads and Road transport Ordered collection of References to STOP PLACE spaces Use for a branch path. - + Ordered collection of References to PATH LINKs. @@ -515,7 +515,7 @@ Rail transport, Roads and Road transport Presentation defaults for DECK ELEMENT - + Facilities available at SITE. From 670ce6c85fc81f239785b7907ae6ed55057c031a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 7 Mar 2024 23:34:37 +0100 Subject: [PATCH 143/144] fixing refs --- .../deckPlans/DeckPlans-Example_bus.xml | 2 +- .../netex_deckPlan_version.xsd | 26 +++++++++---------- .../part1_frames/netex_siteFrame_version.xsd | 7 +++-- .../netex_stopAssignment_version.xsd | 7 +++-- .../netex_timetableFrame_version.xsd | 7 +++-- .../netex_deckEntranceAlignment_support.xsd | 2 +- .../netex_deckPlanAssignment_support.xsd | 2 +- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml index 7b73ee21c..bc524ada2 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml @@ -139,7 +139,7 @@ Lower deck 2023-12-31T12:00:00 Deck Plan Example for DOuble DEcker Bus - This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. + This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seat an, entrance and sensor equipment. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index b13899d13..7200e3dd0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -70,7 +70,7 @@ Deck Plans in Frame - + A List OF DECK PLANs @@ -78,7 +78,7 @@ - + Type for containment in frame of DECK PLANs @@ -151,17 +151,17 @@ Description of DECK PLAN. - + VALIDITY CONDITIONs used to configure DECK PLAN - + DECK LEVELs in DECK PLAN. - + DECKs in DECK PLAN. @@ -169,7 +169,7 @@ - + Type for a list ofDECKs. @@ -242,12 +242,12 @@ DECK SPACEs in DECK PLAN. - + Rows on DECK. - + COLUMNs on DECK. @@ -401,7 +401,7 @@ The total capacity of people for the DECK SPACE. - + Capacities of DECK SPACE. @@ -413,22 +413,22 @@ Elements for a DECK SPACE. - + DECK ENTRANCEs to DECK SPACE. - + DECK ENTRANCE COUPLEs for DECK SPACE. - + DECK ENTRANCE USAGEs for DECK SPACE. - + DECK WINDOWs on DECK SPACE. diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index 3349e94e0..c9d22c766 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -42,8 +42,7 @@ http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd Unclassified - CEN, Crown Copyright 2009-2023 - + CEN, Crown Copyright 2009-2023
                                                            • Evolved from NaPTAN, SIRI and other schemas.
                                                              • @@ -217,7 +216,7 @@ Rail transport, Roads and Road transport TARIFF ZONE related elements in frame. - + GROUPS OF TARIFF ZONEs in frame. +v2.0 @@ -242,4 +241,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index f1a9c1230..05c296120 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -39,8 +39,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2024 - + CEN, Crown Copyright 2009-2024
                                                              • Derived from the Transmodel, VDV, TransXChange, NaPTAN, NOPTIS, BISON and Trident standards.
                                                                • @@ -410,7 +409,7 @@ Rail transport, Roads and Road transport Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. - + Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION @@ -527,4 +526,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index f8827a4cf..7694702bc 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -35,8 +35,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2020 - + CEN, Crown Copyright 2009-2020
                                                                • Derived from the Transmodel, VDV, TransXChange, NaPTAN, NOPTIS, BISON and Trident standards.
                                                                  • @@ -205,7 +204,7 @@ Rail transport, Roads and Road transport SERVICE FACILITies in frame. - + DECK PLAN ASSIGNMENTs in frame. @@ -228,4 +227,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd index 7ec2b0d29..b3db79863 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd @@ -61,7 +61,7 @@ DECK ENTRANCE ALIGNMENT identifier types - + Type for a list of DECK ENTRANCE ASSIGNMENTs. diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd index b7cc4e4d7..4192ebffc 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -61,7 +61,7 @@ DECK PLAN ASSIGNMENT identifier types - + Type for a list of DECK PLAN ASSIGNMENTs. From d1f7d9549fb900581fd47ab58db0475e8196def8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 22:36:43 +0000 Subject: [PATCH 144/144] Lint and update documentation tables --- .../netex_genericFramework/netex_zone_support.xsd | 2 +- .../netex_reusableComponents/netex_deckPlan_version.xsd | 2 +- xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd | 2 +- .../part1_tacticalPlanning/netex_stopAssignment_version.xsd | 2 +- xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index e2ae35c9f..8f1b879e2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -189,4 +189,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 7200e3dd0..5c9d8d039 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -161,7 +161,7 @@ DECK LEVELs in DECK PLAN. - + DECKs in DECK PLAN. diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index c9d22c766..0dee33faa 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -241,4 +241,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd index 05c296120..ef6b847f2 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -526,4 +526,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd index 7694702bc..db216ea5c 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -227,4 +227,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file +