From 6e01f90475df4b0a421cb59b363f63c1976b1479 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 14 Feb 2023 18:51:04 +0000 Subject: [PATCH 01/87] DEckPlan changes Revised rebased Rbaseddeck plane ready to fix --- NeTEx.spp | 126 +- .../functions/deckPlans/DeckPlans-Example.xml | 1751 +++++++++++++++++ xsd/NeTEx_publication.xsd | 679 ++++++- .../netex_resourceFrame_version.xsd | 25 +- .../netex_all_objects_reusableComponents.xsd | 10 +- .../netex_deckPlan_support.xsd | 576 ++++++ .../netex_deckPlan_version.xsd | 1348 +++++++++++++ ...etex_equipmentVehiclePassenger_support.xsd | 47 +- ...etex_equipmentVehiclePassenger_version.xsd | 49 +- ...ex_nm_chargingEquipmentProfile_version.xsd | 3 +- .../netex_seatingPlan_support.xsd | 327 +++ .../netex_seatingPlan_version.xsd | 638 ++++++ .../netex_sensorEquipment_support.xsd | 199 ++ .../netex_sensorEquipment_version.xsd | 368 ++++ .../netex_spotEquipment_support.xsd | 163 ++ .../netex_spotEquipment_version.xsd | 356 ++++ .../netex_vehicleType_support.xsd | 56 +- .../netex_vehicleType_version.xsd | 92 +- .../netex_stopAssignment_version.xsd | 43 +- .../netex_all_objects_part2_journeyTimes.xsd | 6 +- .../netex_deckEntranceAlignment_support.xsd | 102 + .../netex_deckEntranceAlignment_version.xsd | 134 ++ .../netex_deckPlanAssignment_support.xsd | 102 + .../netex_deckPlanAssignment_version.xsd | 137 ++ 24 files changed, 7196 insertions(+), 141 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 c45064784..6c7a07d12 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -78,55 +78,77 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,6 +203,7 @@ + @@ -272,6 +295,10 @@ + + + + @@ -745,6 +772,9 @@ + + + diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml new file mode 100644 index 000000000..f46481c05 --- /dev/null +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -0,0 +1,1751 @@ + + + + 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 + + + + + + + + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index a09d95056..960792d0b 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -1136,7 +1136,7 @@ Correct COnstraints for PointOnRoute - + @@ -3454,6 +3454,636 @@ 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. + + + + + + + + + + + + + + + + @@ -3496,6 +4126,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [VehicleEquipmentProfileMember Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -6349,24 +7000,24 @@ Correct COnstraints for PointOnRoute - - - + + + - Every [VehicleTypeStopAssignment Id + Version] must be unique within document. + Every [VehicleJourneyStopAssignment Id + Version] must be unique within document. - + - - - + + + - - + + @@ -6673,18 +7324,18 @@ Correct COnstraints for PointOnRoute Every [ServicePattern 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 133759228..0b2b9f969 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 @@ - + @@ -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.

 @@ -37,7 +39,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-2014
    @@ -47,13 +49,15 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach + services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime + transport, Public transport, + Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - RESOURCE FRAME types. @@ -113,6 +117,7 @@ Rail transport, Roads and Road transport + @@ -148,7 +153,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..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 @@ - + @@ -21,6 +21,10 @@ + + + + @@ -55,4 +59,8 @@ + + + + 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..27496153f --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -0,0 +1,576 @@ + + + + + + + + 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 a PASSENGER 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 a vehicle 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. + + + + + + +     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..7b442970a --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -0,0 +1,1348 @@ + + + + + + + + + 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 PLANs 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 of DECKs. + + + + + + + + + + + + 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 PROFILE. + + + + + + + + + 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 airconditioned. + + + + + 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. + + + + + + + + + + + + + All OTHER type of 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. + + + + + 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 + + + + + + + + + + + + + + + + + + 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. + + + + + + +     diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 6fd864d3e..4d064f374 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -14,8 +14,10 @@ 2007-06-12 + 2023-02-12 Correct reference to WheelchairEquipmenRef to WheelchairVehicleEquipmentRef. Deprecate WheelchairEquipmenRef + -

    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 +28,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
      @@ -36,13 +38,15 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach + services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime + transport, Public transport, + Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - VEHICLE EQUIPMENT identifier types. @@ -113,10 +117,29 @@ Rail transport, Roads and Road transport - Reference to a WHEELCHAIR VEHICLE EQUIPMENT. + Reference to a WHEELCHAIR VEHICLE EQUIPMENT. DEPRECATED -v2.0 + + DEPRECATED -v2.0 + + + + + + Identifier of a POINT. + + + + + + + + Reference to a WHEELCHAIR VEHICLE EQUIPMENT. + + + Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT. @@ -133,7 +156,7 @@ Rail transport, Roads and Road transport - Allowed values for assisted boarding locations. + Allowed values for assisted boarding locations. @@ -143,7 +166,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 e9efcf081..e0a080cac 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -1,12 +1,12 @@ - + main schema e-service developers Europe - First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 @@ -18,13 +18,16 @@ 2021-01-29BUG Issue #143: Correct data type on GapToPlatform + 2023-02-07Add actual Vehicle Equipment list. Make Actual + + 2019-03-25Fix #41 by Skinkie from 2019.01.07. Fix typo on MobilityList. +

      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. - 001/XMLSchema + 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_equipmentVehiclePassenger_version.xsd @@ -41,13 +44,15 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach + services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime + transport, Public transport, + Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - TICKETING EQUIPMENT types. @@ -85,7 +90,19 @@ Rail transport, Roads and Road transport       - + + + List of ACTUAL VEHICLE EQUIPMENT. + + + + + + + + + + An item of EQUIPMENT of a particular type actually available in an individual VEHICLE. @@ -178,7 +195,7 @@ Rail transport, Roads and Road transport - Borading Elements for an ACCESS VEHICLE EQUIPMENT type. + Boarding Elements for an ACCESS VEHICLE EQUIPMENT type. @@ -193,12 +210,12 @@ Rail transport, Roads and Road transport - VEHICLE Hoist can be used at VEHICLE has a hoist or lift for wheelchairs. + VEHICLE has a hoist or lift for wheelchairs. - Whether a ramp may be used to access VEHICLE. + Whether a ramp may be used to access VEHICLE. @@ -272,7 +289,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..fdaacaf73 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,7 @@ 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..38650e6e4 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -0,0 +1,327 @@ + + + + + + + + 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 an EQUIPABLE 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 passenger space. + + + + + + + + + + + + + + + Allowed values for Component Orientation. + + + + + + + + + + + + + + +       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..bf3f79a13 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -0,0 +1,638 @@ + + + + + + + + + + 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 Columns 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. +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 an aisle. + + + + + Whether PASSENGER SPOT is by a window + + + + + Whether PASSENGER SPOT faces table. + + + + + Whether PASSENGER SPOT has an armrest + + + + + Leg space available. + + + + + Whether PASSENGER SPOT has a tray. + + + + + Whether PASSENGER SPOT has a power socket. + + + + + + + + A specified seat or other space for a passenger within a given DECK SPACE. +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 from floor. + + + + + + + + Classification for LOCATABLE SPOT. +v2.0. + + + + + + + + + + + + + + + + + + Identifier of TYPE OF LOCATABLE SPOT. + + + + + + + + + Type for a TYPE OF LOCATABLE SPOT. + + + + + + +       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..243ccf5e0 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -0,0 +1,199 @@ + + + + + + + + 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 Communications. + + + + + + + + + + + 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. + + + + + + +       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..75936ba3b --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -0,0 +1,368 @@ + + + + + + + + + + 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. + + + + + + +       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..93b33c970 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_support.xsd @@ -0,0 +1,163 @@ + + + + + + + + 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. + + + + + + +       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..50c296fbf --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -0,0 +1,356 @@ + + + + + + + + + + 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 floor. + + + + + 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 bed 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 a bay has a door. + + + + +       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index b39972ef9..d06d1d311 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 @@ - + @@ -463,7 +463,7 @@ Rail transport, Roads and Road transport - Allowed values for type of power +v1/2/2 + Allowed values for type of power. +v1.2.2 @@ -497,7 +497,7 @@ Rail transport, Roads and Road transport - Allowed values for Personal Vehicle Categories _v1.2.2 + Allowed values for Personal Vehicle Categories. +v1.2.2 @@ -571,33 +571,33 @@ Rail transport, Roads and Road transport - - + + - Type for identifier of an ACCEPTED DRIVER PERMIT. + Type for identifier of a VEHICLE EQUIPMENT PROFILE MEMBER. - + - + - Reference to an ACCEPTED DRIVER PERMIT. + Reference to a VEHICLE EQUIPMENT PROFILE MEMBER - + - Type for a reference to an ACCEPTED DRIVER PERMIT. + Type for a reference to a VEHICLE EQUIPMENT PROFILE MEMBER. - - + + - Reference to an ACCEPTED DRIVER PERMIT. + Identifier of referenced VEHICLE EQUIPMENT PROFILE MEMBER - + Type for identifier of a TYPE OF DRIVER PERMIT. @@ -623,5 +623,31 @@ Rail transport, Roads and Road transport + + + + Type for identifier of an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + Type for a reference to an ACCEPTED DRIVER PERMIT. + + + + + + Reference to an ACCEPTED DRIVER PERMIT. + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 22abdd143..c590a0041 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 @@ - + @@ -162,7 +162,7 @@ Rail transport, Roads and Road transport       - DEPRECATED - use privateCodes + DEPRECATED - use privateCodes. -v2.0 @@ -541,6 +541,11 @@ Rail transport, Roads and Road transport       + + + Types of Driver Licence that are accepted for Simple Vehicle Type. +v2.0 + + @@ -642,6 +647,7 @@ Rail transport, Roads and Road transport + Type for a list of PASSENGER CAPACITY REQUIREMENTs. @@ -1090,7 +1096,7 @@ Rail transport, Roads and Road transport - DEPRECATED - use privateCodes + DEPRECATED - use privateCodes. -v2.0 @@ -1226,6 +1232,82 @@ 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. + + + @@ -1249,7 +1331,7 @@ Rail transport, Roads and Road transport - Identifier of PURPOSE OF EQUIMENT PROFILE. + Identifier of PURPOSE OF EQUIPMENT PROFILE. @@ -1258,7 +1340,7 @@ Rail transport, Roads and Road transport - Type for a PURPOSE OF EQUIPMENT. + Type for a PURPOSE OF EQUIPMENT PROFILE. 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..46c474e95 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,10 @@ - + - + @@ -12,7 +12,7 @@ main schema e-service developers Europe - First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 @@ -21,9 +21,11 @@ 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 DYNAMIC STOP ASSIGNMENT. + + 2023-12-12Add DECK ENTRANCE ASSIGNMENT

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

      @@ -47,13 +49,15 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - + Air transport, Airports, + Ports and maritime transport, Ferries (marine), + Public transport, Bus services, Coach + services, Bus stops and stations, + Rail transport, Railway stations and track, Train services, Underground trains, + Business and industry, Transport, Air transport , Ports and maritime + transport, Public transport, + Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - STOP ASSIGNMENT types. @@ -131,7 +135,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 +193,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 +207,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. @@ -264,7 +268,7 @@ Rail transport, Roads and Road transport - Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. + Elements for a DYNAMIC PASSENGER STOP ASSIGNMENT. Original PASSENGER STOP ASSIGNMENT for which this is a change. @@ -360,7 +364,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_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd index b0871ebe4..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,5 +1,5 @@ - + @@ -7,6 +7,10 @@ + + + + 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..7ec2b0d29 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd @@ -0,0 +1,102 @@ + + + + + + + + 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. + + + + + + +       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..585a39341 --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd @@ -0,0 +1,134 @@ + + + + + + + + + + + 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. + + + + + + + +       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..1062823ca --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -0,0 +1,102 @@ + + + + + + + + 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. + + + + + + +       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..ffc442dfb --- /dev/null +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -0,0 +1,137 @@ + + + + + + + + + + + + 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. + + + + + + + + + +       From 45942b96f1437a68064c7a3fe7227c5af6153494 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:27:52 +0000 Subject: [PATCH 02/87] Lint and update documentation tables --- .../netex_deckPlan_support.xsd | 28 +++++++ .../netex_deckPlan_version.xsd | 74 +++++++++++++++++-- ...etex_equipmentVehiclePassenger_version.xsd | 5 ++ .../netex_seatingPlan_support.xsd | 28 +++++++ .../netex_seatingPlan_version.xsd | 64 ++++++++++++++++ .../netex_sensorEquipment_support.xsd | 4 + .../netex_sensorEquipment_version.xsd | 2 + .../netex_vehicleType_support.xsd | 8 +- .../netex_vehicleType_version.xsd | 6 +- .../netex_timetableFrame_version.xsd | 30 +++++--- .../netex_deckPlanAssignment_support.xsd | 2 + .../netex_deckPlanAssignment_version.xsd | 4 +- 12 files changed, 233 insertions(+), 22 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 27496153f..eeb76d6f9 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -16,6 +16,8 @@ 2023-02-01 Name Space changes + 2023-12-08Move SENSOR IN ENTRANCE to here +

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

      This sub-schema describes the DECK PLAN types.

      @@ -572,5 +574,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. + + + + +       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 7b442970a..537da4d24 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -17,6 +17,8 @@ 2023-01-30 Name Space changes + 2023-12-08Move SENSOR IN ENTRANCE to here +

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

      This sub-schema describes the DECK PLAN types.

      @@ -534,7 +536,7 @@ - All OTHER type of DECK SPACEs +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 @@ -1029,6 +1031,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. + + + + + + @@ -1045,7 +1109,7 @@ - A window onto a DECK SPACE. +v2.0 + A window onto a DECK SPACE. +v2.0 @@ -1138,7 +1202,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 @@ -1217,7 +1281,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 @@ -1275,7 +1339,7 @@ - Classification for DECK SPACE, e.g. as WC, Restaurant, luggage area, etc. +v2.0 + Classification for DECK SPACE, e.g. as WC, Restaurant, luggage area, etc. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index e0a080cac..b5bb86403 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -213,6 +213,11 @@ VEHICLE has a hoist or lift for wheelchairs. + + + Distance from VEHICLE needed to operate hoist. + + Whether a ramp may be used to access VEHICLE. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 38650e6e4..aa6ca5dae 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -16,6 +16,8 @@ 2023-02-05 Name Space changes + 2023-12-08Move SENSOR IN SPOT declarations to here +

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

      This sub-schema describes the DECK PLAN types.

      @@ -323,5 +325,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. + + + + +       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index bf3f79a13..2712fb658 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 @@ + @@ -18,6 +19,8 @@ 2023-01-30 Name Space changes + 2023-12-08Move SENSOR IN SPOT declarations to here +

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

      This sub-schema describes the DECK PLAN types.

      @@ -634,5 +637,66 @@ + + + + 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. + + + + + +       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd index 243ccf5e0..40513d45d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_support.xsd @@ -15,6 +15,10 @@ 2023-02-08 Split out from Charging Equipoment + 2023-02-08Split out from Charging Equipoment + + 2023-12-08Move SENSOR IN SPOT declarations to DECK PLAN, adn SEATING PLAN +

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

       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd index 75936ba3b..14fdbb7cd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -17,6 +17,8 @@ 2023-02-06 Definition of CycleStorage number of spaces corrected. Doc change only. + 2023-12-08Move SENSOR IN SPOT declarations to DECK PLAN, adn SEATING PLAN +

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

       diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index d06d1d311..91ef2efcd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -14,13 +14,13 @@ 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 - 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. @@ -650,4 +650,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index c590a0041..fe4e98ed1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -24,12 +24,12 @@ 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 - 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. @@ -1254,7 +1254,7 @@ Rail transport, Roads and Road transport - A element within a VEHICLE EQUIPMENT PROFILE specifying the number of units of a given TYPE OF EQUIPMENT. + A element within a VEHICLE EQUIPMENT PROFILE specifying the number of units of a given TYPE OF EQUIPMENT. 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..add07fe8a 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -4,6 +4,7 @@ + @@ -17,11 +18,17 @@ 2017-05-09 Add Header 2019-03-25CR 51 CD Add VehicleJourneyStop Assignment. - NJSK Review make vehicleJourneyStopAssignmentsInFrame_RelStructure lower camel case consistent with NeTEx conventions. + 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 + First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2010-09-04 + + 2023-02-12Add DECK PLAN ASSIGNMENTs +

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

       @@ -106,7 +113,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. @@ -119,7 +126,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. @@ -166,7 +173,7 @@ Rail transport, Roads and Road transport - Properties of journeys in TIMETABLE FRAME. + Properties of journeys in TIMETABLE FRAME. @@ -176,7 +183,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. @@ -191,17 +198,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. @@ -222,4 +234,4 @@ Rail transport, Roads and Road transport - + \ 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 1062823ca..f3cae5ea4 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_support.xsd @@ -16,6 +16,8 @@ 2023-02-312 Name Space changes + 2023-12-08Revise documentation +

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

      This sub-schema describes the DECK PLAN ASSIGNMENT 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 ffc442dfb..dc92bac98 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -20,6 +20,8 @@ 2023-01-30 Name Space changes + 2023-12-08Revise documentation +

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

      This sub-schema describes the DECK PLAN ASSIGNMENT types.

      @@ -80,7 +82,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 + 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 From 4ea57ef42d5c0c9fdb5cceb10890d7082172cc67 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 12 Dec 2023 03:54:27 +0000 Subject: [PATCH 03/87] enhancement-SIte levels, SIteStructure, LevelInStructure GroupOfSItes Adds SIteStructure to allow alternative labelling of levels within a site. Also GroupOfSItes and GroupOfTariffZones added to SiteFrame. Test example also provided --- .../site/Netex_11_Sites_OlympicPark_1.xml | 89 ++++++- xsd/NeTEx_publication.xsd | 66 +++++ .../netex_zone_support.xsd | 51 +++- .../netex_zone_version.xsd | 8 +- .../part1_frames/netex_siteFrame_version.xsd | 19 +- .../part1_ifopt/netex_ifopt_site_support.xsd | 127 ++++++++-- .../part1_ifopt/netex_ifopt_site_version.xsd | 234 +++++++++++++++++- .../netex_accessRightParameter_version.xsd | 55 +++- 8 files changed, 599 insertions(+), 50 deletions(-) diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml index af2d7d05a..ca437c7d8 100644 --- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml +++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml @@ -149,7 +149,10 @@ 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 + +Updated to give exampel of group of SItes + --> 2001-12-17T09:30:47.0Z @@ -491,6 +494,28 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram ENG + + + Sites in Olympic Park + + + + + + + + + + + + + + + + + + + @@ -4224,6 +4249,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 +4805,22 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram + + + + + + + + + + + Zone3 + + + Zone4 + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 960792d0b..66b5a1243 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -4478,6 +4478,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [GroupOfSites Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + Every [SiteStructure Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [LevelInStructure Id + Version _ order] must be unique within document. + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 327247dcd..10b2ffb8a 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 @@ - + @@ -15,7 +15,7 @@ 2011-02-05       - 2010-11-05 + 2023-13-11Add GROUPP OF TARIFF ZONES

      NeTEx - Network Exchange. This subschema defines ZONE types.

      @@ -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,7 @@ Rail transport, Roads and Road transport - - + @@ -85,7 +84,7 @@ Rail transport, Roads and Road transport - + Dummy type Reference to a TARIFF ZONE. @@ -165,5 +164,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 51c94f315..34698de57 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 @@ - + @@ -92,7 +92,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 +144,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. @@ -395,4 +395,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file 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..553c5665c 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 @@ - + @@ -26,6 +26,9 @@ 2017-05-27 CR0031 Add Countries to Places in Frame + + 2023-12-10 ENhancement: Add GROUP OF SITEs and GROUP OF TARIFF ZONEs to frame +

        NeTEx Network Exchange Site Frame.

        @@ -42,7 +45,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 +156,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,9 +217,14 @@ Rail transport, Roads and Road transport - Service related elements in frame. + TARIFF ZONE related elements in frame. + + + 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 f5a340c94..20014137b 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,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 + + + 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE

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

          @@ -35,7 +41,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2023
            @@ -58,8 +64,35 @@ 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. @@ -85,7 +118,7 @@ Rail transport, Roads and Road transport - + Identifier for a SITE. @@ -123,7 +156,7 @@ Rail transport, Roads and Road transport - + Identifier for a SERVICE SITE. @@ -149,7 +182,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a SITE COMPONENT. @@ -175,7 +208,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a LEVEL. @@ -201,7 +234,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 +318,7 @@ Rail transport, Roads and Road transport - Identifier of a PLACE. + Identifier of an ENTRANCE. @@ -239,7 +336,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a VEHICLE ENTRANCE. @@ -259,13 +356,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 b99642a1d..81e604867 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,14 @@ 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 + + + 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE

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

            @@ -68,6 +74,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 +195,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 +261,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 +294,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. @@ -334,7 +346,7 @@ Rail transport, Roads and Road transport - + Type for a list of ENTRANCEs. @@ -439,7 +451,7 @@ Rail transport, Roads and Road transport - + Type for a list of VEHICLE ENTRANCEs. @@ -522,7 +534,7 @@ Rail transport, Roads and Road transport - + Type for a list of LEVELs. @@ -623,7 +635,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. @@ -702,7 +914,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_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index c014d06ff..e50a4d63f 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -1,14 +1,19 @@ + + + + + @@ -19,9 +24,12 @@ + + + @@ -105,6 +113,17 @@ 2021-09-01FIX - Post newmodes merge Remove ambigous use of VehicleModes (drop from Organisation validity parameters). Add MobilityServiceConstraintZone to Network validity parameters. + + 2023-12-09 + Fix add ServiceCalendarRef, TimebandRef to Temporal parameter refs + Fix add TarifffRef , TypeOfMediumAccessDeviceRef to Fare Usage Parameter refs + Enhancement add TypeOfProof to Usage Parameter refs. + Enhancement Deck plans - Add DEckPlanRef DeckSpaceRef to Service Parameter refs + Enhancement Seating plans - Add SpotRoweRef, SpotColumnRef, LocatableSPotRef, TypeOfLocatableSpotRef to Service Parameter refs + + + 2023-12-10Enhancement add GroupOfSitesRef, GroupOfTariffZonesRef to site parameter refs + 2023-12-14FIX - Rename RoutingValidityParametersGroup to align with Transmodel. Add missing TransferRestriction, ServiceExclusion, RoutingRestrictionnZone and Border Point parametrers. @@ -146,7 +165,7 @@ Rail transport, Roads and Road transport Standard - NeTEx ACCESS RIGHT ASSIGNMENT types. + NeTEx ACCESS RIGHT ASSIGNMENT types. @@ -186,8 +205,7 @@ Rail transport, Roads and Road transport - A sequence or set of CONTROLLABLE ELEMENTs to which rules for limitation of access rights and calculation of prices (fare structure) are applied. - + A sequence or set of CONTROLLABLE ELEMENTs to which rules for limitation of access rights and calculation of prices (fare structure) are applied. @@ -196,14 +214,12 @@ Rail transport, Roads and Road transport - The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). - + The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). - The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). - + The assignment of a fare parameter (referring to geography, time, quality or usage) to an element of a fare system (access right, validated access, control mean, etc.). @@ -327,7 +343,7 @@ Rail transport, Roads and Road transport - + One to many Relationship for temporal validity parameters. @@ -345,6 +361,7 @@ Rail transport, Roads and Road transport Temporal validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. + @@ -354,6 +371,7 @@ Rail transport, Roads and Road transport + One to many Relationship for scoping validity parameters. @@ -453,7 +471,9 @@ Rail transport, Roads and Road transport SITE validity parametersfor ACCESS RIGHT PARAMETER ASSIGNMENT. + + @@ -567,15 +587,29 @@ Rail transport, Roads and Road transport - Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. + Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. PassengerSeatRef is DEPRECATED -v2.0 + + + + + + Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PAssengerSeatRef is DEPRECATED + + + + + + + + CLASS OF USE validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. @@ -616,6 +650,7 @@ Rail transport, Roads and Road transport + @@ -629,6 +664,7 @@ Rail transport, Roads and Road transport + @@ -639,6 +675,7 @@ Rail transport, Roads and Road transport + From 8e57f820716ae2277c3443d5daa02066dc848a40 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:55:58 +0000 Subject: [PATCH 04/87] Lint and update documentation tables --- .../netex_genericFramework/netex_zone_support.xsd | 3 +-- .../part1_ifopt/netex_ifopt_site_support.xsd | 12 ++++-------- .../part1_ifopt/netex_ifopt_site_version.xsd | 9 +++------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 10b2ffb8a..66f6977ce 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -14,8 +14,7 @@ 2011-02-05 - - 2023-13-11Add GROUPP OF TARIFF ZONES + 2023-13-11Add GROUPP OF TARIFF ZONES

            NeTEx - Network Exchange. This subschema defines ZONE 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 20014137b..86b1a0c50 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 - - 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE + 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE

            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_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 81e604867..4a0aa4873 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,14 +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 - - 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE + 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE

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

            From 19ba342a8c7a82595e4e2353aca7813023589468 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 10 Dec 2023 23:29:10 +0000 Subject: [PATCH 05/87] Lint and update documentation tables --- .../part3_fares/netex_accessRightParameter_version.xsd | 1 + 1 file changed, 1 insertion(+) 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 e50a4d63f..9911212f1 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -363,6 +363,7 @@ Rail transport, Roads and Road transport + From 065c33d1e07015dfb1cc91eef9c76c6a7b151726 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:52:35 +0000 Subject: [PATCH 06/87] Lint and update documentation tables --- xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd index 4a0aa4873..3992064bf 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,11 @@ 2010-09-04 - 2011-02-05Name Space changes + 2011-02-05Name Space changes 2020-10-10New Modes : Add PRESENTATGION To Site ELement - 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE + 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE

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

            From e12edd897df0ed8b0c0644eefd0397d54e6507b2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 00:12:14 +0100 Subject: [PATCH 07/87] Fix typo --- 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..64284e900 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -187,7 +187,7 @@ false - Pulldown seat> + Pulldown seat 0.48 0.40 0.40 From 0bbdabc61048b0ee859be7250214727bad5b4170 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 00:13:14 +0100 Subject: [PATCH 08/87] Fix examples --- .../site/Netex_11_Sites_OlympicPark_1.xml | 16 +- .../netex_resourceFrame_version.xsd | 18 +-- .../netex_zone_support.xsd | 22 +-- .../netex_zone_version.xsd | 8 +- .../netex_deckPlan_support.xsd | 26 ---- .../netex_deckPlan_version.xsd | 62 -------- ...etex_equipmentVehiclePassenger_support.xsd | 18 +-- ...etex_equipmentVehiclePassenger_version.xsd | 18 +-- ...ex_nm_chargingEquipmentProfile_version.xsd | 7 +- .../netex_seatingPlan_support.xsd | 26 ---- .../netex_seatingPlan_version.xsd | 61 -------- .../netex_vehicleType_support.xsd | 48 +++--- .../netex_vehicleType_version.xsd | 138 +++++++++--------- .../part1_frames/netex_siteFrame_version.xsd | 7 +- .../part1_ifopt/netex_ifopt_site_support.xsd | 4 +- .../netex_stopAssignment_version.xsd | 16 +- .../netex_timetableFrame_version.xsd | 2 +- .../netex_accessRightParameter_version.xsd | 8 +- 18 files changed, 142 insertions(+), 363 deletions(-) diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml index ca437c7d8..c95d5239c 100644 --- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml +++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml @@ -4805,14 +4805,6 @@ Updated to give exampel of group of SItes - - - - - - - - Zone3 @@ -4821,6 +4813,14 @@ Updated to give exampel of group of SItes Zone4 + + + + + + + + diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index 0b2b9f969..ac3011f64 100644 --- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd @@ -39,7 +39,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-2014
              @@ -49,15 +49,13 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach - services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime - transport, Public transport, - Rail transport, Roads and Road transport - +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - RESOURCE FRAME types. diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 66f6977ce..b9119eedf 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -28,7 +28,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-2014
                @@ -74,7 +74,6 @@ Rail transport, Roads and Road transport - @@ -164,25 +163,6 @@ 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. diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd index 34698de57..7d8af01a2 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd @@ -328,12 +328,6 @@ Rail transport, Roads and Road transport - - - Type for identifier of a GROUP OF TARIFF ZONEs. - - - @@ -395,4 +389,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index eeb76d6f9..4248b89fa 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -574,31 +574,5 @@ - - - - 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. - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 537da4d24..d236f5e1f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -1031,68 +1031,6 @@ - - - - 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. - - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd index 4d064f374..d08210ed4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd @@ -28,7 +28,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-2014
                  @@ -38,15 +38,13 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach - services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime - transport, Public transport, - Rail transport, Roads and Road transport - +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - VEHICLE EQUIPMENT identifier types. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index b5bb86403..7812ef81d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -6,7 +6,7 @@ main schema e-service developers Europe - First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk 2010-09-04 @@ -44,15 +44,13 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach - services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime - transport, Public transport, - Rail transport, Roads and Road transport - +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - TICKETING EQUIPMENT types. 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 fdaacaf73..46d248ea0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd @@ -134,15 +134,12 @@ Rail transport, Roads and Road transport - CHarging voltage in Volts. - + Charging voltage in Volts. - Maximum charging power in Watts, available, determining how long charging willtake - - + Maximum charging power in Watts, available, determining how long charging will take. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index aa6ca5dae..02c5c8b2b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -325,31 +325,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. - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 2712fb658..28d9e5573 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -637,66 +637,5 @@ - - - - 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. - - - - - - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 91ef2efcd..05defb4b7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -545,7 +545,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a PURPOSE OF EQUIPMENT PROFILE. @@ -571,27 +571,27 @@ Rail transport, Roads and Road transport - - + + - Type for identifier of a VEHICLE EQUIPMENT PROFILE MEMBER. + Type for identifier of an ACCEPTED DRIVER PERMIT. - + - + - Reference to a VEHICLE EQUIPMENT PROFILE MEMBER + Reference to an ACCEPTED DRIVER PERMIT. - + - Type for a reference to a VEHICLE EQUIPMENT PROFILE MEMBER. + Type for a reference to an ACCEPTED DRIVER PERMIT. - - + + - Identifier of referenced VEHICLE EQUIPMENT PROFILE MEMBER + Reference to an ACCEPTED DRIVER PERMIT. @@ -623,31 +623,31 @@ Rail transport, Roads and Road transport - - + + - Type for identifier of an ACCEPTED DRIVER PERMIT. + Type for identifier of a VEHICLE EQUIPMENT PROFILE MEMBER. - + - + - Reference to an ACCEPTED DRIVER PERMIT. + Reference to a VEHICLE EQUIPMENT PROFILE MEMBER - + - Type for a reference to an ACCEPTED DRIVER PERMIT. + Type for a reference to a VEHICLE EQUIPMENT PROFILE MEMBER. - - + + - Reference to an ACCEPTED DRIVER PERMIT. + Identifier of referenced VEHICLE EQUIPMENT PROFILE MEMBER - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index fe4e98ed1..bea37f7ca 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1239,85 +1239,50 @@ Rail transport, Roads and Road transport - - - - 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. + 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 VEHICLE EQUIPMENT PROFILE MEMBER. + Identifier of PURPOSE OF EQUIPMENT PROFILE. - + - Type for a VEHICLE EQUIPMENT PROFILE MEMBER. + Type for a PURPOSE OF EQUIPMENT PROFILE. - - - + - - - 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. + A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence ). +V2.0 - + @@ -1329,58 +1294,93 @@ Rail transport, Roads and Road transport - + - Identifier of PURPOSE OF EQUIPMENT PROFILE. + Identifier of the TYPE OF DRIVER PERMIT. - + - Type for a PURPOSE OF EQUIPMENT PROFILE. + Type for a TYPE OF DRIVER PERMIT. - - + + - A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence ). +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 the TYPE OF DRIVER PERMIT. + Identifier of VEHICLE EQUIPMENT PROFILE MEMBER. - + - Type for a TYPE OF DRIVER PERMIT. + 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. + + + + + 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 553c5665c..35157373a 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -45,7 +45,7 @@ http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd Unclassified - CEN, Crown Copyright 2009-2023 + CEN, Crown Copyright 2009-2017
                    @@ -220,11 +220,6 @@ Rail transport, Roads and Road transport TARIFF ZONE related elements in frame. - - - 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 86b1a0c50..c8fc3fec6 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 @@ -37,7 +37,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2009-2023 + CEN, Crown Copyright 2009-2020
                      @@ -178,7 +178,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a SITE COMPONENT. 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 46c474e95..be3e433d3 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -49,15 +49,13 @@ Version 1.0 Arts, recreation and travel, Tourism, Travel (tourism), Transport, - Air transport, Airports, - Ports and maritime transport, Ferries (marine), - Public transport, Bus services, Coach - services, Bus stops and stations, - Rail transport, Railway stations and track, Train services, Underground trains, - Business and industry, Transport, Air transport , Ports and maritime - transport, Public transport, - Rail transport, Roads and Road transport - +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + CEN TC278 WG3 SG9. NeTEx Network Exchange - 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 add07fe8a..f1307a22f 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -234,4 +234,4 @@ Rail transport, Roads and Road transport - \ 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 9911212f1..2f7e677ff 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -113,16 +113,14 @@ 2021-09-01FIX - Post newmodes merge Remove ambigous use of VehicleModes (drop from Organisation validity parameters). Add MobilityServiceConstraintZone to Network validity parameters. - - 2023-12-09 + 2023-12-09 Fix add ServiceCalendarRef, TimebandRef to Temporal parameter refs Fix add TarifffRef , TypeOfMediumAccessDeviceRef to Fare Usage Parameter refs Enhancement add TypeOfProof to Usage Parameter refs. Enhancement Deck plans - Add DEckPlanRef DeckSpaceRef to Service Parameter refs Enhancement Seating plans - Add SpotRoweRef, SpotColumnRef, LocatableSPotRef, TypeOfLocatableSpotRef to Service Parameter refs - - 2023-12-10Enhancement add GroupOfSitesRef, GroupOfTariffZonesRef to site parameter refs + 2023-12-10Enhancement add GroupOfSitesRef, GroupOfTariffZonesRef to site parameter refs 2023-12-14FIX - Rename RoutingValidityParametersGroup to align with Transmodel. Add missing TransferRestriction, ServiceExclusion, RoutingRestrictionnZone and Border Point parametrers. @@ -361,9 +359,7 @@ Rail transport, Roads and Road transport Temporal validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. - - From b6a4c28e3e8bb03ad2acd3c70528e00b19d2b500 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 27 Sep 2023 22:46:32 +0200 Subject: [PATCH 09/87] Fix improve mode (#507) * First draft of the clean up of MODE * Better explanations in VEHICLE MODE * AccessMode now works TRANSFERs and OTHER LEG (for OJP) * Some depreciations * added a mode to Connection * Update netex_mode_support.xsd Deprecated not Depreciated ;-) * Update netex_submode_version.xsd Deprecated not Depreciated ;-) * Apply suggestions from code review * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: ue71603 Co-authored-by: Christophe Duquesne Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> From 180149ef5d7765fa190276990eb84eccf20c5431 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 01:53:34 +0100 Subject: [PATCH 10/87] Update fix validation --- .github/scripts/validate-examples.sh | 2 +- .../netex_equipmentVehiclePassenger_version.xsd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index d2be5eb89..93bb351a9 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 7812ef81d..6f594cd12 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -105,7 +105,8 @@ Rail transport, Roads and Road transport An item of EQUIPMENT of a particular type actually available in an individual VEHICLE. - + + Abstract Type for an ACTUAL VEHICLE EQUIPMENT. From e0684fdd1100e78d61e46c467b2eab97a3daa5e9 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 17 Jan 2024 10:55:01 +0000 Subject: [PATCH 11/87] 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 93b33c970..c3e7e96a5 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 03458a90223661104a6e098c792c82247f19f241 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 17 Jan 2024 11:07:19 +0000 Subject: [PATCH 12/87] 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 50c296fbf..592b723cf 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. @@ -137,6 +138,11 @@ Width of seat bottom. + + + Length of bedt back from seat bottom. + + Height from floor. @@ -278,7 +284,7 @@ Elements for BED EQUIPMENT. - + Length of bed back from seat bottom. @@ -288,6 +294,11 @@ Whether bed can be stowed away when not in use. + + + Length of bedt back from seat bottom. + + From 391332a3490aa9e668d71e169a5befd673366df3 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Sat, 20 Jan 2024 23:37:04 +0000 Subject: [PATCH 13/87] 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 | 146 +- .../netex_deckPlan_support.xsd | 85 +- .../netex_deckPlan_version.xsd | 126 +- .../netex_facility_support.xsd | 10 +- .../netex_facility_version.xsd | 6 +- .../netex_seatingPlan_version.xsd | 24 +- .../netex_serviceRestrictions_support.xsd | 4 + .../netex_spotEquipment_support.xsd | 33 +- .../netex_spotEquipment_version.xsd | 58 +- .../netex_trainElement_version.xsd | 30 +- .../netex_vehicleType_support.xsd | 137 +- .../netex_vehicleType_version.xsd | 70 +- .../netex_ifopt_equipmentAccess_support.xsd | 64 +- .../netex_ifopt_equipmentAccess_version.xsd | 28 +- ...netex_ifopt_equipmentPassenger_support.xsd | 5 +- ...netex_ifopt_equipmentPassenger_version.xsd | 14 +- .../netex_deckPlanAssignment_version.xsd | 26 +- 20 files changed, 5969 insertions(+), 131 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 6c7a07d12..c75b9ca0d 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -773,7 +773,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 66b5a1243..bda3e18e1 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -2480,6 +2480,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [PassengerBeaconEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -3454,6 +3475,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. + + + + + + + + + + + + + + + + @@ -3958,24 +4084,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 4248b89fa..5bba770fc 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 2023-12-08Move SENSOR IN ENTRANCE to here @@ -218,16 +218,30 @@ - Allowed values for type of a PASSENGER SPACE. + Allowed values for TYPE OF PASSENGER SPACE. - - + + + + + + + + + + Allowed values for TYPE OF OTHER OTHER SPACE. + + + + + + @@ -287,20 +301,55 @@ Allowed values for type of DECK ENTRANCE. - + + + Door gives external access to VEHICLE. + + +                         - Allowed values for Relation to a vehicle entrance. + Allowed values for Relation to vehicle of Entrance. - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,7 +458,7 @@ - Allowed values for type of entrance usage. + Allowed values for type of DECK ENTRANCE Usage.. @@ -418,6 +467,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 d236f5e1f..ff7dee5f8 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 @@ + @@ -91,7 +92,7 @@ - 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 + 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 @@ -143,6 +144,11 @@ Description of DECK PLAN. + + + VALIDTY CONDITIONs used to configure DECK PLAN + + DECK LEVELs in DECK PLAN. @@ -267,16 +273,6 @@ Elements for a DECK COMPONENT. - - - Name of DECK COMPONENT. - - - - - Description of DECK COMPONENT. - - Whether DECK COMPONENT is for public use. Default is true. @@ -325,6 +321,13 @@ + + + + Elements for a EQUIPABLE SPACE. + + + @@ -439,7 +442,7 @@ - +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. +v2.0 @@ -639,7 +642,7 @@ - Elements for a PASSENGER CARRYING REQUIREMENT TYPE. + Elements for a DECK COMPONENT. @@ -673,30 +676,70 @@ 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. + Side of ENTRANCE relative to forward orientation of VEHICLE. - Distance of forward edge of door from front of VEHICLE. + 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. @@ -825,7 +868,18 @@ Elements for a DECK VEHICLE ENTRANCE. - + + + + TYPES OF VEHICLE that may use VEHICLE ENTRANCE. + + + + + Vehicle categories that may use VEHICLE ENTRANCE. + + + @@ -953,9 +1007,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. @@ -1110,7 +1174,12 @@ - SDistance of Window from front of DECK + Distance of Window from front of DECK + + + + + Height ofindow from floor of of DECK @@ -1261,6 +1330,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_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 7a5441d97..05c7c0dbf 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 @@ - + @@ -309,9 +309,11 @@ Rail transport, Roads and Road transport Allowed values for Berth Facility: - + + + @@ -411,9 +413,9 @@ Rail transport, Roads and Road transport - + - Allowed values for lighing control Facility. + 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 e7b7246ab..96fcdee48 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 @@ - + @@ -916,12 +916,12 @@ Rail transport, Roads and Road transport - List of climate control FACILITies. + List of CLIMATE CONTROL FACILITies. - List of values for climate control SERVICE. + List of values for CLIMATE 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 28d9e5573..4c5db4942 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 2023-12-08Move SENSOR IN SPOT declarations to here @@ -231,6 +232,16 @@ + + Lavel of EQUIPABLE SPACE. e.g. seat number. + + + + + Name of DECK COMPONENT. + + + Description of EQUIPABLE SPACE. @@ -519,7 +530,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 04ebae032..95baf50f6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -37,6 +37,9 @@ 2023-12-18FIX: Correct the #525 implementation of BOOKING ARRANGEMENT and SERVICE BOOKING ARRANGEMENT, SERVICE BOOKING ARRANGEMENT should inherit from BOOKING ARRANGEMENT and should have its own structure. + + 2024-01-17DECKPLANS dd washbasin to sanitary facilities +

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

                         @@ -684,6 +687,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 c3e7e96a5..0a6fa9d60 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 592b723cf..b431a406c 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd @@ -135,12 +135,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. @@ -148,12 +153,12 @@ Height from floor. - + Whether spot has power supply socket. - + Whether Spot has UsbPowerSockets. @@ -228,7 +233,7 @@ - Whether seat reclines. Deafult sis false. + Whether seat reclines. Default sis false. @@ -296,19 +301,24 @@ - Length of bedt back from seat bottom. + Length of bed 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 - + @@ -323,10 +333,10 @@ - + - + Identifier of ENTITY. @@ -335,31 +345,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 a bay 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 05defb4b7..9734a3fdd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -37,6 +37,9 @@ 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.

                          This sub-schema describes the VEHICLE TYPE identifier Types.

                          @@ -269,6 +272,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 +524,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 bea37f7ca..e2808750e 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -650,20 +650,21 @@ 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. @@ -690,7 +691,7 @@ Rail transport, Roads and Road transport - Capacity for a VEHICLE TYPE and Class. + Type for a PASSENGER CAPACITY. @@ -702,12 +703,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. @@ -715,7 +716,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. @@ -748,6 +749,63 @@ Rail transport, Roads and Road transport 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 + + The number of places on the vehicle that are suitable for prams. 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 7723faa00..ba94928b5 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,7 +1,6 @@ - - - + + @@ -25,7 +24,10 @@ 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.

                          @@ -116,6 +118,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 1f03f061e..514ba5a44 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
                            @@ -1290,6 +1298,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. 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 c56cdf9c7..ebffda338 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 @@ - + @@ -17,6 +17,9 @@ 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.

                             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 b0d467841..8953355fc 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 @@ - + @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport                             - + A SANITARY FACILITY , e.g. WC, Shower, baby change. @@ -123,7 +123,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. @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport - + Specialisation of PASSENGER EQUIPMENT for passenger safety features, e.g. panic button, SOS phone. @@ -272,7 +272,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. @@ -354,7 +354,7 @@ Rail transport, Roads and Road transport - + Specialisation of PASSENGER EQUIPMENT for HELP POINT. @@ -533,7 +533,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 dc92bac98..d7335d645 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 @@ + @@ -82,7 +83,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 @@ -130,7 +131,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 6a466d9ba4b71aa4aa0013ab77abb471dd7bd2a9 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 02:27:04 +0100 Subject: [PATCH 14/87] Fix examples --- .../deckPlans/DeckPlans-Example_train.xml | 10 ++++----- ...AP_Accessibility_Chur_V08_vehicletypes.xml | 8 +++---- .../netex_deckPlan_support.xsd | 3 +-- .../netex_facility_support.xsd | 2 +- .../netex_seatingPlan_version.xsd | 3 +-- .../netex_serviceRestrictions_support.xsd | 3 +-- .../netex_spotEquipment_support.xsd | 6 ++---- .../netex_spotEquipment_version.xsd | 3 +-- .../netex_trainElement_version.xsd | 21 +++++++------------ .../netex_vehicleType_support.xsd | 3 +-- .../netex_ifopt_equipmentAccess_support.xsd | 3 +-- .../netex_ifopt_equipmentAccess_version.xsd | 18 ++++++---------- ...netex_ifopt_equipmentPassenger_support.xsd | 3 +-- .../netex_deckPlanAssignment_version.xsd | 2 +- 14 files changed, 33 insertions(+), 55 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index aa38f2820..58f1a680d 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -987,7 +987,7 @@ C) CEN 2023 - + Compartment 1: Seats 01-02 First class compartment with two beds @@ -1118,7 +1118,7 @@ C) CEN 2023 - + Compartment 2: Seats 02-03 Rirst class with two beds @@ -1470,7 +1470,7 @@ C) CEN 2023 - + Compartment 4 : Seats 12-20 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths @@ -1698,7 +1698,7 @@ C) CEN 2023 - + Compartment 5 : Seats 21-28 2nd class configurable as 2 x 4 seats or 2 x 3 bunk berths @@ -2282,7 +2282,7 @@ C) CEN 2023 - >Passenger access Right External Door + Passenger access Right External Door 1.00 1.90 diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index c8d6beac9..a1c9d24c8 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 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index 5bba770fc..e461c1da0 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 2023-12-08Move SENSOR IN ENTRANCE to here diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd index 05c7c0dbf..95b19b198 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd @@ -413,7 +413,7 @@ Rail transport, Roads and Road transport - + Allowed 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 4c5db4942..b1a6ee4a8 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 2023-12-08Move SENSOR IN SPOT declarations to here diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd index 95baf50f6..ee2a03a35 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd @@ -37,8 +37,7 @@ 2023-12-18FIX: Correct the #525 implementation of BOOKING ARRANGEMENT and SERVICE BOOKING ARRANGEMENT, SERVICE BOOKING ARRANGEMENT should inherit from BOOKING ARRANGEMENT and should have its own structure. - - 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 0a6fa9d60..308a206c0 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 b431a406c..e930169f2 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 9734a3fdd..08d2d63bd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -37,8 +37,7 @@                             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_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd index ba94928b5..096ecd91f 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 @@ -26,8 +26,7 @@                             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

                            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 514ba5a44..6851f83f6 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 @@ -21,11 +21,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 attributeLightingMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other NJSK Review: correct typo on stepDetector @@ -44,21 +42,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 ebffda338..4ec360b86 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 @@ -17,8 +17,7 @@ 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_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd index d7335d645..ed254e5d5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -146,7 +146,7 @@                             - + From 282ea70bbefdc9c92f603b52c5f8623537d5dcdb 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 15/87] LiftCallEquipment added --- .../part1_ifopt/netex_ifopt_equipmentAccess_version.xsd | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 6851f83f6..c13b5dae5 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 @@ -46,11 +46,11 @@ 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 @@ -1294,8 +1294,7 @@ Rail transport, Roads and Road transport                             - Type of door; hinged, sliding, etc. v2.0 - + Type of door; hinged, sliding, etc. +v2.0 From 4a7cb3b138ae86065e009d6d924d2e3a406e9fb3 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Mon, 5 Feb 2024 17:23:02 +0000 Subject: [PATCH 16/87] Updated deckplan examples Add deck plane xamples and update deck path --- NeTEx.spp | 2 + .../deckPlans/DeckPlans-Example_train.xml | 168 ++++++++ .../netex_deckPlan_support.xsd | 12 +- .../netex_seatingPlan_support.xsd | 1 + .../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 | 6 +- 10 files changed, 806 insertions(+), 15 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 c75b9ca0d..b7fd89336 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -230,6 +230,8 @@ + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 58f1a680d..537a64649 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 e461c1da0..9c764fa06 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -434,9 +434,9 @@ Type for identifier of a DECK ENTRANCE USAGE. - + - + Reference to a DECK ENTRANCE USAGE. +v2.0 @@ -446,7 +446,7 @@ Type for a reference to a DECK ENTRANCE USAGE. - + Identifier of a DECK ENTRANCE USAGE. @@ -481,9 +481,9 @@ Type for identifier of a DECK ENTRANCE COUPLE. - + - + Reference to a DECK ENTRANCE COUPLE. +v2.0 @@ -493,7 +493,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 02c5c8b2b..d329f7763 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -300,6 +300,7 @@ + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 08d2d63bd..b3cf6ba71 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 696091e3c..2a7b2f7b3 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 @@ -72,7 +72,7 @@ Rail transport, Roads and Road transport Standard - IFOPT STOP PLACE Model. + IFOPT PATH LINK Model. @@ -286,7 +286,7 @@ Rail transport, Roads and Road transport - Type for a PATH LINK ENd. + Type for a PATH LINK END. @@ -443,7 +443,7 @@ Rail transport, Roads and Road transport - Type for a PATH LINK VIEW. + Type for a PATH JUNCTION. From 194360f2e28c00405017e5d31eb0d7581af4ef2f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 02:36:19 +0100 Subject: [PATCH 17/87] fix xml example --- examples/functions/deckPlans/DeckPlans-Example_train.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 537a64649..65d888353 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -3353,14 +3353,14 @@ C) CEN 2023 10 - - Ticket Hall Entrance to Platforms 1 and 2 - top of staires"> + + Ticket Hall Entrance to Platforms 1 and 2 - top of staires - Ticket Hall Entrance to Platforms 1 and 2 - top of staires"/> + Ticket Hall Entrance to Platforms 1 and 2 - top of staires 10 From 112c5328104eccb2f337bf22929feab11e778e94 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 7 Feb 2024 03:18:19 +0000 Subject: [PATCH 18/87] 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 | 366 ++++++++++---- .../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 | 7 +- .../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 | 349 +++----------- .../part1_ifopt/netex_ifopt_path_version.xsd | 372 ++++----------- .../part1_ifopt/netex_ifopt_site_support.xsd | 102 +--- .../part1_ifopt/netex_ifopt_site_version.xsd | 37 +- .../netex_ifopt_stopPlace_support.xsd | 17 +- .../netex_routeInstruction_version.xsd | 17 +- 40 files changed, 2277 insertions(+), 1376 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 b7fd89336..0cc46cf1b 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 @@ + @@ -776,7 +781,6 @@ - @@ -792,6 +796,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 65d888353..f7dc16209 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 + + + + @@ -2283,7 +2415,7 @@ C) CEN 2023 - Passenger access Right External Door + Passenger access Right External Door 1.00 1.90 @@ -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 8fcb0807a..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 @@ -2872,7 +2872,7 @@ Changes - + Branch from main entrance to DL stairs 1-4 -180 @@ -2880,8 +2880,8 @@ Changes indoors - - + + Branch from main entrance to Rail stairs to 5 and 6 -180 @@ -2889,8 +2889,8 @@ Changes indoors - - + + Branch from path junction 2 to Rail stairs to 7 and 8 -180 @@ -2898,8 +2898,8 @@ Changes indoors - - + + Branch from path junction 3 to Rail stairs to 9 and 10 -180 @@ -2907,8 +2907,8 @@ Changes indoors - - + + Branch from lift area internal entrance 5 to Lift 1 and Lift 2 -180 @@ -2916,8 +2916,8 @@ Changes indoors - - + + Branch from lift area internal entrance 6 to Lift 3 and Lift 4 -180 @@ -2925,8 +2925,8 @@ Changes indoors - - + + Branch in front foreCourt Near entrance -180 @@ -2934,8 +2934,8 @@ Changes outdoors - - + + Branch in front foreCourt near street -180 @@ -2943,7 +2943,7 @@ Changes outdoors - + @@ -5280,7 +5280,7 @@ Changes - + Landing on Stairs 1 on way to DL -180 @@ -5288,7 +5288,7 @@ Changes indoors - + @@ -6082,7 +6082,7 @@ Changes - + Branch in way to Stop D and Stop P -180 @@ -6090,8 +6090,8 @@ Changes outdoors - - + + Branch on way from main entrance to Stop P -180 @@ -6099,8 +6099,8 @@ Changes outdoors - - + + Branch on way from Stop P to Stop L -180 @@ -6108,8 +6108,8 @@ Changes outdoors - - + + Branch on way from Stop D and Stop L to centre Court -180 @@ -6117,8 +6117,8 @@ Changes outdoors - - + + Branch on way to Stop L from Centre Court -180 @@ -6126,7 +6126,7 @@ Changes outdoors - + @@ -6573,7 +6573,7 @@ Changes - + first Branch on way from main entrance to Alexandra Road 1 -180 @@ -6581,8 +6581,8 @@ Changes outdoors - - + + second Branch on way to Alexandra Road 1 -180 @@ -6590,7 +6590,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 554d20d74..765724eba 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -2984,7 +2984,7 @@ Changes - + Branch from main entrance to DL stairs 1-4 -180 @@ -2992,8 +2992,8 @@ Changes indoors - - + + Branch from main entrance to Rail stairs to 5 and 6 -180 @@ -3001,8 +3001,8 @@ Changes indoors - - + + Branch from path junction 2 to Rail stairs to 7 and 8 -180 @@ -3010,8 +3010,8 @@ Changes indoors - - + + Branch from path junction 3 to Rail stairs to 9 and 10 -180 @@ -3019,8 +3019,8 @@ Changes indoors - - + + Branch from lift area internal entrance 5 to Lift 1 and Lift 2 -180 @@ -3028,8 +3028,8 @@ Changes indoors - - + + Branch from lift area internal entrance 6 to Lift 3 and Lift 4 -180 @@ -3037,8 +3037,8 @@ Changes indoors - - + + Branch in front foreCourt Near entrance -180 @@ -3046,8 +3046,8 @@ Changes outdoors - - + + Branch in front foreCourt near street -180 @@ -3055,7 +3055,7 @@ Changes outdoors - + @@ -5377,7 +5377,7 @@ Changes - + Landing on Stairs 1 on way to DL -180 @@ -5385,7 +5385,7 @@ Changes indoors - + @@ -6189,7 +6189,7 @@ Changes - + Branch in way to Stop D and Stop P -180 @@ -6197,8 +6197,8 @@ Changes outdoors - - + + Branch on way from main entrance to Stop P -180 @@ -6206,8 +6206,8 @@ Changes outdoors - - + + Branch on way from Stop P to Stop L -180 @@ -6215,8 +6215,8 @@ Changes outdoors - - + + Branch on way from Stop D and Stop L to centre Court -180 @@ -6224,8 +6224,8 @@ Changes outdoors - - + + Branch on way to Stop L from Centre Court -180 @@ -6233,7 +6233,7 @@ Changes outdoors - + @@ -6710,7 +6710,7 @@ Changes - + first Branch on way from main entrance to Alexandra Road 1 -180 @@ -6718,8 +6718,8 @@ Changes outdoors - - + + second Branch on way to Alexandra Road 1 -180 @@ -6727,7 +6727,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 4925fa834..04a408851 100644 --- a/examples/standards/norway/vehicles/submodel-VehicleType.xml +++ b/examples/standards/norway/vehicles/submodel-VehicleType.xml @@ -1,11 +1,12 @@ example - V + V + Euro 6 true diesel - + firstClass 100 80 @@ -14,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 340201069..33459587e 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -111,7 +111,7 @@ 11m_Schumacher 11-SU 40 - + 42 42 0 @@ -122,7 +122,7 @@ 11m_Dressmann 11-DR 45 - + 34 42 0 @@ -133,7 +133,7 @@ Strab GT 8 K Überf1 3 - + 91 112 0 @@ -144,7 +144,7 @@ Strab GT 8 Z Überf2 4 - + 84 121 0 @@ -155,7 +155,7 @@ GT8 N GT8 N 5 - + 84 115 0 @@ -166,7 +166,7 @@ GT8 K GT8 K 6 - + 91 112 0 @@ -177,7 +177,7 @@ GT 4/ Oldtimer Old 7 - + 31 31 0 @@ -188,7 +188,7 @@ Setra Überlandbus VAG uel-va 18 - + 49 27 0 @@ -199,7 +199,7 @@ Taxi_Taxizentrale TA-TZ 65 - + 4 0 0 @@ -210,7 +210,7 @@ 8Sitzer_Hercher 8S-HE 60 - + 8 0 0 @@ -221,7 +221,7 @@ 11m_GFR 11-GF 55 - + 34 42 0 @@ -232,7 +232,7 @@ 11 m_SBG 11-SBG 70 - + 42 42 0 @@ -243,7 +243,7 @@ GT8 Z Schülerkurse GT8Z 92 - + 84 121 0 @@ -254,7 +254,7 @@ GT8 N Schülerkurse GT8N 93 - + 84 115 0 @@ -265,7 +265,7 @@ Gelenk_Schülerkurse Gelenk 99 - + 46 49 0 @@ -276,7 +276,7 @@ 11m_Schülerkurse 11_M 98 - + 34 74 0 @@ -287,7 +287,7 @@ 11m_Rast 11-RA 35 - + 42 42 0 @@ -298,7 +298,7 @@ GT8 A GT8 A 8 - + 91 112 0 @@ -309,7 +309,7 @@ 11m_VAG_Citaro citaro 27 - + 34 64 0 @@ -320,7 +320,7 @@ 11m Winterhalter 11-WIN 80 - + 38 42 0 @@ -331,7 +331,7 @@ Schienenschleifer schlei 9 - + 1 1 0 @@ -342,7 +342,7 @@ Combino Combin 1 - + 79 166 0 @@ -353,7 +353,7 @@ GT8 Z GT8 Z 2 - + 84 121 0 @@ -364,7 +364,7 @@ Sprinter_VAG-Freiburg 10-VA 10 - + 14 7 0 @@ -375,7 +375,7 @@ Schienen-Reiniger reinig 12 - + 1 1 0 @@ -386,7 +386,7 @@ Partywagen Party 13 - + 20 20 0 @@ -397,7 +397,7 @@ 11m_Schwarz 11-SW 50 - + 45 54 0 @@ -408,7 +408,7 @@ Sputnik sputni 14 - + 20 20 0 @@ -419,7 +419,7 @@ Diesel-Lok dielok 19 - + 1 1 0 @@ -430,7 +430,7 @@ 11m_Binninger 11-BI 31 - + 49 42 0 @@ -441,7 +441,7 @@ Taxi Groß Taxis 17 - + 12 0 0 @@ -452,7 +452,7 @@ Breisgau-S-Bahn ZUG 20 - + 0 0 0 @@ -463,7 +463,7 @@ Breisgau-S-Bahn ZUG1 21 - + 0 0 0 @@ -474,7 +474,7 @@ Breisgau-S-Bahn ZUG2 22 - + 0 0 0 @@ -485,7 +485,7 @@ Breisgau-S-Bahn ZUG3 23 - + 0 0 0 @@ -496,7 +496,7 @@ Breisgau-S-Bahn ZUG4 24 - + 0 0 0 @@ -507,7 +507,7 @@ Breisgau-S-Bahn ZUG5 25 - + 0 0 0 @@ -518,7 +518,7 @@ Gelenk_Schwarz 18-SW 51 - + 61 93 0 @@ -529,7 +529,7 @@ 11m-Hohwihler 11-HO 30 - + 34 32 0 @@ -540,7 +540,7 @@ Gelenk_Schumacher 15schu 41 - + 46 53 0 @@ -551,7 +551,7 @@ Gelenk_Rast 18-RA 36 - + 55 85 0 @@ -562,7 +562,7 @@ Gelenk_Dresmann 18-DR 46 - + 46 53 0 @@ -573,7 +573,7 @@ Gelenk_GFR 18-GF 56 - + 46 53 0 @@ -584,7 +584,7 @@ Taxi_GFR TA-GF 57 - + 4 0 0 @@ -595,7 +595,7 @@ Taxi_Hercher TA-HE 61 - + 4 0 0 @@ -606,7 +606,7 @@ 8Sitzer_Taxizentrale 8S-TZ 66 - + 8 0 0 @@ -617,7 +617,7 @@ Gelenk_SBG 18-SBG 71 - + 55 85 0 @@ -628,7 +628,7 @@ Gelenk_Winterhalter 18-WIN 81 - + 46 53 0 @@ -639,7 +639,7 @@ GT8K_Schülerkurse GT8K 91 - + 91 112 0 @@ -650,7 +650,7 @@ Combino_Schülerkurse Comb 94 - + 79 171 0 @@ -661,7 +661,7 @@ Test-Einrichtung test 29 - + 1 1 0 @@ -672,7 +672,7 @@ Gelenk_VAG-Freiburg 15-VA 15 - + 46 53 0 @@ -683,7 +683,7 @@ 11m_VAG-Freiburg 11-VA 11 - + 34 32 0 @@ -694,7 +694,7 @@ Taxi Klein Klein 16 - + 4 0 0 @@ -705,7 +705,7 @@ Bus_Läufer 11-LÄ 26 - + 46 22 0 @@ -716,7 +716,7 @@ Pseudo-Zählfahrzeug Zähl_F 32 - + 34 32 0 @@ -727,7 +727,7 @@ Sprinter-Winterhalter Sp-WIN 82 - + 14 7 0 @@ -738,7 +738,7 @@ Sprinter_Sutter Sp-SUT 67 - + 26 10 1 @@ -749,7 +749,7 @@ Turmwagen Turm 48 - + 4 0 0 diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index bda3e18e1..5660d7703 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -4189,6 +4189,48 @@ Correct COnstraints for PointOnRoute + + + + + Every [DeckPathLink Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + + + + + Every [DeckPathJunction Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -5703,12 +5745,12 @@ Correct COnstraints for PointOnRoute - + - + @@ -5718,18 +5760,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 9c764fa06..a4e0dbea3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -80,7 +80,7 @@ - + Reference to a DECK PLAN. +v2.0 @@ -144,7 +144,7 @@ - + Reference to a DECK COMPONENT. +v2.0 @@ -196,7 +196,7 @@ - + Reference to a PASSENGER SPACE. +v2.0 @@ -358,7 +358,7 @@ - + Reference to a PASSENGER ENTRANCE. +v2.0 @@ -384,7 +384,7 @@ - + Reference to a DECK VEHICLE ENTRANCE. +v2.0 @@ -410,7 +410,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 ff7dee5f8..0a1cdc774 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 @@ + @@ -244,6 +245,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 d329f7763..fdf361698 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -145,7 +145,7 @@ - + Reference to an EQUIPABLE SPACE. +v2.0 @@ -171,7 +171,7 @@ - + Reference to a LOCATABLE SPOT. +v2.0 @@ -197,7 +197,7 @@ - + Reference to a PASSENGER SPOT. +v2.0 @@ -223,7 +223,7 @@ - + Reference to a PASSENGER VEHICLE SPOT. +v2.0 @@ -249,7 +249,7 @@ - + Reference to a LUGGAGE SPOT. +v2.0 @@ -312,7 +312,7 @@ - Allowed values for Component Orientation. + Allowed values for Spot Orientation. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index b3cf6ba71..e774f4bf8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -565,6 +565,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 096ecd91f..5e0feac00 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 @@ -28,6 +28,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.

                                 @@ -406,18 +409,6 @@ Rail transport, Roads and Road transport - - - Allowed values for TactileWarningStrip - - - - - - - - - @@ -453,18 +444,6 @@ Rail transport, Roads and Road transport - - - Allowed value for Lighting. - - - - - - - - - Allowed values for lighting method. @@ -516,18 +495,6 @@ Rail transport, Roads and Road transport - - - Allowed values for Gradient steepness. - - - - - - - - - Allowed values for entrance attention device. @@ -565,20 +532,6 @@ Rail transport, Roads and Road transport - - - Allowed values for lighting method - - - - - - - - - - - Allowed values for the status of the ground marking 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 c13b5dae5..90ceaeeee 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 @@ + @@ -25,7 +26,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 23263b8f8..56929d326 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,8 @@ - - - - + + + + @@ -21,6 +21,9 @@ 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.

                                   @@ -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,349 +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. + Type for a list of references to a SITE NAVIGATION PATH. - - - - - - - - - - - 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. - - - - - - - - - - - - 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. - - - - - - - - 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. + 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 2a7b2f7b3..97aa35194 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 @@ - + + @@ -32,10 +33,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 @@ -75,147 +77,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 - - - - - 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. - - - - - Indicates whether there are guiding strips. +v1.1 - - - + + + + + - Provides additional details on possible guiding strip. + 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 - + @@ -229,101 +153,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. @@ -331,7 +204,7 @@ Rail transport, Roads and Road transport - + PATH LINK for a SITE. @@ -362,11 +235,10 @@ Rail transport, Roads and Road transport - - + @@ -378,7 +250,6 @@ Rail transport, Roads and Road transport - @@ -386,27 +257,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. @@ -415,13 +302,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. - + @@ -433,7 +320,7 @@ Rail transport, Roads and Road transport - + @@ -441,21 +328,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. @@ -478,89 +365,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 c8fc3fec6..36ddc76e6 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 @@ -17,9 +17,12 @@ 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 - 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE + 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE + + + 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.

                                  @@ -379,40 +382,6 @@ Rail transport, Roads and Road transport                                   - - - Allowed values for public use. - - - - - - - - - - - - Allowed values for covered. - - - - - - - - - - - - Allowed values for gated. - - - - - - - Allowed values for ENTRANCE type. @@ -429,66 +398,7 @@ Rail transport, Roads and Road transport - - - Allowed values for ENTRANCE purpose. - - - - - - - - Indirect access, e.g., via a shop or restaurant. - - - - - An ENTRANCE for which IsExternal is false. - - - - - - - - - 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 3992064bf..4910fdd6f 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 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE @@ -133,36 +135,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 217c0f14d..a320b8c2d 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 6e5aa491a29e06b9e4c59eac51d5c7727eba1b44 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 12:10:33 +0100 Subject: [PATCH 19/87] Update --- .../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 +- .../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_environment_support.xsd | 3 +- .../netex_environment_version.xsd | 3 +- .../netex_ifopt_checkConstraint_support.xsd | 11 +++--- .../netex_ifopt_checkConstraint_version.xsd | 9 ++--- .../netex_ifopt_equipmentAccess_support.xsd | 3 +- .../netex_ifopt_navigationPath_version.xsd | 6 ++-- .../part1_ifopt/netex_ifopt_path_support.xsd | 6 ++-- .../part1_ifopt/netex_ifopt_path_version.xsd | 3 +- .../part1_ifopt/netex_ifopt_site_support.xsd | 27 ++++++++++++-- .../part1_ifopt/netex_ifopt_site_version.xsd | 6 ++-- .../netex_ifopt_stopPlace_support.xsd | 9 ++--- 23 files changed, 77 insertions(+), 80 deletions(-) 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 33459587e..4e2d0b0a6 100644 --- a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml +++ b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml @@ -177,7 +177,7 @@ GT 4/ Oldtimer Old 7 - + 31 31 0 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_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_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 5e0feac00..984ad87c0 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 @@ -28,8 +28,7 @@                                     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_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 56929d326..b08b54ad8 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 @@ - - + @@ -21,8 +20,7 @@ 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 97aa35194..8e84f9246 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 @@ -33,8 +33,7 @@ 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 36ddc76e6..4f5033352 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 @@ -21,8 +21,7 @@ 2023-12-10TM v6.2: Add GROUP OF SITES, SITE STRUCUCTURE and LEVEL IN STRUCTURE - - 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.

                                    @@ -398,7 +397,29 @@ Rail transport, Roads and Road transport                                     - + + + Allowed values for ENTRANCE purpose. + + + + + + + + Indirect access, e.g., via a shop or restaurant. + + + + + An ENTRANCE for which IsExternal is false. + + + + + + + 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 4910fdd6f..2339075f2 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 2023-12-10Enhancement TM v6.2: Add GROUP OF SITES, SITE STRUCTURE and LEVEL IN STRUCTURE 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 a320b8c2d..163c73f1a 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.

                                    From c8f29b69278e0ae04b75d9d314fad5cbff8933b7 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 00:39:43 +0000 Subject: [PATCH 20/87] 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 | 7 + .../netex_deckPath_version.xsd | 5 +- .../netex_deckPlan_support.xsd | 4 +- .../netex_deckPlan_version.xsd | 18 +- .../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 | 357 +- .../netex_vehicleType_support.xsd | 38 - .../netex_vehicleType_version.xsd | 283 +- .../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 | 74 +- .../netex_timetableFrame_version.xsd | 2 +- .../netex_deckEntranceAlignment_version.xsd | 10 +- .../netex_deckPlanAssignment_version.xsd | 2 +- .../netex_vehicleJourney_version.xsd | 21 +- 29 files changed, 4995 insertions(+), 2327 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 0cc46cf1b..02f78c8c4 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -110,7 +110,7 @@ - + @@ -119,10 +119,18 @@ + + + + + + + + @@ -135,6 +143,8 @@ + + @@ -781,6 +791,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 f7dc16209..796bd427b 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 + + + Ticket Hall middle to Lift entrance street level + 20 + + + + + + + + + + 0 + twoWay + level + concrete + true + + + + Stairs to platform level top of stairs Entrance to Platforms 1 and 2 - bottom of stairs + 15 - - + + + - - - + + + 0 + downAndUp + + + - - top of stairs Entrance to Platforms 1 and 2 - bottom of stairs + + Lift to platform level: Lift entrance street level to Lift entrance platform level + 20 - - - + + + - - - + + + - 10 + 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 56ee3596b..6dbfff700 100644 --- a/examples/functions/versioning/Netex_Uniqueness_01.xml +++ b/examples/functions/versioning/Netex_Uniqueness_01.xml @@ -112,7 +112,7 @@ This is part 1 of a multistep example on versioning - + @@ -123,7 +123,7 @@ This is part 1 of a multistep example on versioning - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 5660d7703..6eb239fbb 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -2480,6 +2480,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [HelpPointEquipment Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -3811,6 +3832,18 @@ Correct COnstraints for PointOnRoute + + + + + + + + + + + + @@ -3865,7 +3898,7 @@ Correct COnstraints for PointOnRoute - + @@ -4447,18 +4480,18 @@ Correct COnstraints for PointOnRoute Every [Train Id + Version] must be unique within document. - + - + - + @@ -4484,26 +4517,27 @@ Correct COnstraints for PointOnRoute - - + + - Every [TrainElement Id + Version] must be unique within document. + Every [TrainElementType Id + Version] must be unique within document. - + - - - + + + - - + + + @@ -4592,6 +4626,18 @@ Correct COnstraints for PointOnRoute + + + + + + + + + + + + @@ -4863,7 +4909,7 @@ Correct COnstraints for PointOnRoute - + @@ -5754,6 +5800,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 ac3011f64..fbc5cf85b 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 ccfc0b5c4..ade29180f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -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 a4e0dbea3..50b5bc735 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -13,10 +13,10 @@ 2023-01-30 - 2024-01-11Revise enum values - 2023-12-08Move SENSOR IN ENTRANCE to here + 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 0a1cdc774..5bed5fa37 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -21,6 +21,9 @@ 2023-12-08Move SENSOR IN ENTRANCE to here + + 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.

                                    @@ -71,14 +74,15 @@ Elements for a DECK PLAN in Frame.                                     - + - DECK PLANs in FRAME. + A List OF DECK PLANs - + + Type for containment in frame of DECK PLANs. @@ -90,7 +94,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 @@ -147,7 +150,7 @@ - VALIDTY CONDITIONs used to configure DECK PLAN + VALIDITY CONDITIONs used to configure DECK PLAN @@ -1019,12 +1022,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 fdf361698..e309ada37 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -190,6 +190,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 b1a6ee4a8..890040a0f 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 bda722add..a22af6a0f 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. - - - - - @@ -51,6 +31,11 @@ 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.

                                        @@ -91,8 +76,29 @@ 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. + + + + + @@ -106,9 +112,21 @@ Rail transport, Roads and Road transport                                         - + - Elements for a VEHICLEs in frame. + Type for containment in frame of VEHICLE TYPEs. + + + + + + + + + + + + Elements for VEHICLE TYPEs, VEHICLE MODELS, etc in frame. @@ -131,56 +149,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. @@ -230,7 +232,7 @@ Rail transport, Roads and Road transport - + Requirements for TRAIN SIZe. @@ -253,8 +255,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. @@ -303,14 +305,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 - + @@ -319,78 +345,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. @@ -465,11 +531,8 @@ Rail transport, Roads and Road transport - - - Reference to a TRAIN ELEMENT. - - + + @@ -477,46 +540,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. @@ -557,7 +605,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. + + + + + + @@ -602,7 +686,7 @@ Rail transport, Roads and Road transport Description of TRAIN COMPONENT. - + Elements for a TRAIN ELEMENT derived. @@ -610,23 +694,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 e774f4bf8..a6804b59f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -349,44 +349,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 e2808750e..c4bce107f 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 @@ + @@ -40,6 +41,11 @@ 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

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

                                        @@ -83,25 +89,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. @@ -172,6 +166,7 @@ Rail transport, Roads and Road transport                                         + @@ -224,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, ...). @@ -403,7 +398,7 @@ Rail transport, Roads and Road transport - + A classification of personal use vehicles according to their properties, +v1.2.2 @@ -1043,122 +1038,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. -v2.0 - - - - @@ -1297,50 +1176,86 @@ Rail transport, Roads and Road transport - - + + - 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. + 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 PURPOSE OF EQUIPMENT PROFILE. + Identifier of VEHICLE EQUIPMENT PROFILE MEMBER. - + - Type for a PURPOSE OF EQUIPMENT PROFILE. + Type for a VEHICLE EQUIPMENT PROFILE MEMBER. - + + + - - + - A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence ). +V2.0 + 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. - + @@ -1352,93 +1267,59 @@ Rail transport, Roads and Road transport - + - Identifier of the TYPE OF DRIVER PERMIT. + Identifier of PURPOSE OF EQUIPMENT PROFILE. - + - Type for a TYPE OF DRIVER PERMIT. + Type for a PURPOSE OF EQUIPMENT PROFILE. - - - - 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. + 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 VEHICLE EQUIPMENT PROFILE MEMBER. + Identifier of TYPE OF DRIVER PERMIT. - + - Type for a VEHICLE EQUIPMENT PROFILE MEMBER. + Type for a TYPE OF DRIVER PERMIT. - - - + - - - Elements for a VEHICLE EQUIPMENT PROFILE MEMBER. - - - - - Name of VEHICLE EQUIPMENT PROFILE MEMBER. - - - - - Description of VEHICLE EQUIPMENT PROFILE MEMBER. - - - - - Number of units of EQUIPMENT. - - - - - 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 8e84f9246..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 @@ -97,11 +97,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 be3e433d3..ec681c82f 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -21,11 +21,13 @@ 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 DYNAMIC STOP ASSIGNMENT. + 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. - 2023-12-12Add DECK ENTRANCE ASSIGNMENT + 2023-12-12Add DECK ENTRANCE 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.

                                        @@ -138,6 +140,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 + + @@ -210,16 +245,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 + + + + + + + +                                         @@ -373,7 +420,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 f1307a22f..fe39fc61d 100644 --- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd @@ -1,5 +1,5 @@ - + 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 585a39341..f32d6a8b7 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 @@ -128,6 +130,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 ed254e5d5..c0c968421 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd @@ -147,7 +147,7 @@ - +                                         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 58a0e75c69174dc699a8c6359d3cf00f5bf2b762 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 12:33:42 +0100 Subject: [PATCH 21/87] Update --- .../deckPlans/DeckPlans-Example_bus.xml | 25 +++++------ .../netex_resourceFrame_version.xsd | 17 +++---- .../netex_deckPlan_version.xsd | 3 +- .../netex_nm_fleet_version.xsd | 13 +++--- .../netex_seatingPlan_version.xsd | 1 - .../netex_trainElementType_support.xsd | 3 +- .../netex_trainElementType_version.xsd | 6 +-- .../netex_trainElement_support.xsd | 6 +-- .../netex_trainElement_version.xsd | 8 ++-- .../netex_vehicleType_version.xsd | 5 +-- .../netex_vehicle_support.xsd | 6 +-- .../netex_vehicle_version.xsd | 24 ++++------ .../part1_ifopt/netex_ifopt_site_support.xsd | 44 +++++++++---------- .../netex_stopAssignment_version.xsd | 4 +- .../netex_deckEntranceAlignment_version.xsd | 3 +- .../netex_vehicleJourney_version.xsd | 21 +++------ 16 files changed, 75 insertions(+), 114 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/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd index fbc5cf85b..b30ac2f3b 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_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 5bed5fa37..c5984ceed 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -21,8 +21,7 @@                                         2023-12-08Move SENSOR IN ENTRANCE to here - - 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_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 890040a0f..b1a6ee4a8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -348,7 +348,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 ae7662771..e9398c325 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.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-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 a22af6a0f..44acc760c 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 @@ - @@ -31,11 +30,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 + 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.

                                        diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index c4bce107f..dff1cddd0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -41,11 +41,8 @@ 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_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_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd index 4f5033352..b1bee8829 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 @@ -397,28 +397,28 @@ Rail transport, Roads and Road transport                                         - - - Allowed values for ENTRANCE purpose. - - - - - - - - Indirect access, e.g., via a shop or restaurant. - - - - - An ENTRANCE for which IsExternal is false. - - - - - - + + + Allowed values for ENTRANCE purpose. + + + + + + + + Indirect access, e.g., via a shop or restaurant. + + + + + An ENTRANCE for which IsExternal is false. + + + + + + Types of SITE. 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 ec681c82f..ea25bf7c7 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -26,8 +26,8 @@ 2017-06-03CR0051 CD Allow reference to JOURNEY PATTERN on DYNAMIC STOP ASSIGNMENT. 2023-12-12Add DECK ENTRANCE 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_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd index f32d6a8b7..e9f9e3d1f 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 6338ce217914daf5c34bce8f9e33c0c95b9c252f Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 01:02:32 +0000 Subject: [PATCH 22/87] DECK Plan Examples add constraints Add Constraints to publication --- .../deckPlans/DeckPlans-Example_train.xml | 6 +- xsd/NeTEx_publication.xsd | 97 ++++++++++++++++--- 2 files changed, 88 insertions(+), 15 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 796bd427b..06b5aea36 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 6eb239fbb..cdb5edcc2 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -3411,19 +3411,6 @@ Correct COnstraints for PointOnRoute - - @@ -3496,6 +3483,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 97b92e10e850a76b6d0563f74397f5b1ebc64a42 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Tue, 13 Feb 2024 09:07:37 +0000 Subject: [PATCH 23/87] 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 74c479c23..8ef18186a 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/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml index 6dbfff700..56ee3596b 100644 --- a/examples/functions/versioning/Netex_Uniqueness_01.xml +++ b/examples/functions/versioning/Netex_Uniqueness_01.xml @@ -112,7 +112,7 @@ This is part 1 of a multistep example on versioning - + @@ -123,7 +123,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 cdb5edcc2..125064693 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -5886,7 +5886,7 @@ Correct COnstraints for PointOnRoute - + From b209a425fcae7d445ca05fb51f99c859a15d3e42 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 2 Mar 2023 07:10:02 +0100 Subject: [PATCH 24/87] Fix branch Notice that the examples still miss RelativeLevelOrder. --- .../part1_ifopt/netex_ifopt_path_support.xsd | 299 ++++++++++++++---- .../netex_ifopt_stopPlace_support.xsd | 14 + .../netex_servicePattern_version.xsd | 13 +- .../netex_usageParameterTravel_version.xsd | 2 +- 4 files changed, 260 insertions(+), 68 deletions(-) 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 b08b54ad8..91d8c7e4a 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 @@ -59,10 +59,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 SITE PATH LINK. + Type for a list of references to a PATH LINK. @@ -73,133 +73,310 @@ Rail transport, Roads and Road transport - + - Type for identifier of a SITE PATH LINK. + Type for identifier of a PATH LINK. - + - + - Reference to a SITE PATH LINK. + Reference to a PATH LINK. - + - Type for a reference to a SITE PATH LINK. + Type for a reference to a PATH LINK. - - + + - Identifier of a SITE 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 SITE PATH JUNCTION. + Type for identifier of a PATH JUNCTION. - + - + - Reference to a SITE PATH JUNCTION. + Reference to a PATH JUNCTION. - + - Type for a reference to a SITE PATH JUNCTION. + Type for a reference to a PATH JUNCTION. - - + + - Identifier of a SITE PATH JUNCTION. + Identifier of a PATH JUNCTION. - - + + + + - Type for a list of references to a OFF SITE PATH LINK. + Type for a list of references to a NAVIGATION PATH. - - - - + + + - + - Type for identifier of a OFF SITE PATH LINK. + Type for identifier of a NAVIGATION PATH. - + - + - Reference to a OFF SITE PATH LINK. + Reference to a NAVIGATION PATH. - + - Type for a reference to a OFF SITE PATH LINK. + Type for reference to a NAVIGATION PATH. - - + + - Identifier of a OFF SITE PATH LINK. + Identifier of a NAVIGATION PATH. - - + + - Type for a list of references to a SITE NAVIGATION PATH. + 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. + + + + + + Identifier of a PLACE IN SEQUENCE. + + + + - + + - Type for identifier of a SITE NAVIGATION PATH. + Type for identifier of link step in a PATH LINK IN SEQUENCE. - + - + - Reference to a SITE NAVIGATION PATH. + Reference to a PATH LINK IN SEQUENCE. If given by context does not need to be stated. - + - Type for reference to a SITE NAVIGATION PATH. + Type for Reference to a PATH LINK IN SEQUENCE. - - + + - Identifier of a SITE NAVIGATION PATH. + Identifier of a PATH LINK IN SEQUENCE. + + + Type for identifier of a PATH LINK VIEW> + + + 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 163c73f1a..b6d679907 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 @@ -297,6 +297,14 @@ Rail transport, Roads and Road transport + + + Type for Unique Reference to SITE PATH LINK. + + + + + Type for reference to a SITE PATH LINK. @@ -312,6 +320,12 @@ Rail transport, Roads and Road transport + + + Unique identifier of a stop for SMS and other customer facing delivery channels. + + + The plate identifier placed on the stop. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 008a0cdf4..85aaf24ea 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -20,7 +20,7 @@ 2010-09-04 - 2011-02-05Name Space changes + 2011-02-05Name Space changes 2017-05-19CRT040 Allow type attribute on Public and ShortCode. Backwards compatible. Add NameSuffix to SchedueldStopPoint @@ -31,7 +31,7 @@ 2019-02-21Remove commented out old Section code - 2019-03-25Merge in Corrections to comments as per SBB20 #55 Correct camel case on StopPoinInXXX groups. + 2019-03-25Merge in Corrections to comments as per SBB20 #55 Correct camel case on StopPoinInXXX groups. 2019-03-25 NL48 CD #64 Add new attributes for advertising of stop; Print and Dynamic to StopPointInPattern. @@ -42,7 +42,7 @@ 2019-03-01Comment SBB20 Extension of ConnectionEnd (submode and transportOrganisation) - 2023-12-18FIX: revise the #525 implementation of BOOKING ARRANGEMENT and SERVICE BOOKING ARRANGEMENT, + 2023-12-18FIX: revise the #525 implementation of BOOKING ARRANGEMENT and SERVICE BOOKING ARRANGEMENT,

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

                                        @@ -166,9 +166,10 @@ Rail transport, Roads and Road transport                                         - - - + + + +                                         diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd index d40c5dcdf..9ba1dc8bd 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -433,7 +433,7 @@ Rail transport, Roads and Road transport                                         - Means of activatiing start of period. + Means of activating start of period. From 2ec48d23cd48e6a4960998fc4ea371c5f51c3be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 13 Mar 2023 19:20:53 +0100 Subject: [PATCH 25/87] examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional and a small validity problem (#430) Examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional. We otherwise have examples that break. And it might be that people don't wish to use them. From 40778902b7497ded217b3859382e05427ca12a12 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 10:48:48 +0000 Subject: [PATCH 26/87] DEck Plan Path links Integrate with other changes --- .../deckPlans/DeckPlans-Example_train.xml | 12 +- .../netex_path_support.xsd | 12 + .../netex_deckPath_version.xsd | 67 ++-- .../part1_ifopt/netex_ifopt_path_support.xsd | 302 ++++-------------- .../netex_stopAssignment_version.xsd | 3 +- 5 files changed, 127 insertions(+), 269 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 06b5aea36..8333922e8 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -3784,8 +3784,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 @@ -3861,7 +3869,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 e91f6fd29..edb77dce3 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -222,6 +222,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_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 1bbe7b297..f0c0a0bb3 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 @@ -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 + @@ -223,7 +235,7 @@ Rail transport, Roads and Road transport                                         - + Type for a list of DECK PATH JUNCTIONs. @@ -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 - + @@ -376,27 +391,22 @@ Rail transport, Roads and Road transport Branching level of place.                                         - + Onward links from this point. - - - - - - + Type for a list of DECK NAVIGATION PATHs. - + DECK NAVIGATION PATH for a SITE. @@ -405,13 +415,13 @@ Rail transport, Roads and Road transport - + A designated path between two places within a DECK PLAN. May include an ordered sequence of DECK PATH LINKs. +v2.0 - + @@ -423,10 +433,10 @@ Rail transport, Roads and Road transport - + - + Identifier of ENTITY. @@ -435,24 +445,24 @@ Rail transport, Roads and Road transport - + - Type for DECK NAVIGATION PATH. + Type for DECK NAVIGATION path. - + - + - + Elements of a DECK NAVIGATION PATH. - + @@ -469,31 +479,32 @@ 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. - + - 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 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 91d8c7e4a..5332bb8ff 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 @@ - @@ -17,7 +16,7 @@ 2011-12-16 2019-03-25FR49 CD #65 Accessibility changes - CD add CodedTiltEnumeration with values _strongLeftTilt, mediumLeftTilt, nearlyFlat, mediumRightTilt, strongRightTilt, unknown_. + 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 @@ -59,10 +58,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. @@ -73,310 +72,139 @@ 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. + Type for identifier of a SITE PATH JUNCTION. - - - - - 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. + 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. + Type for a list of references to a SITE 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. + Type for identifier of a SITE NAVIGATION path. - + - + - Reference to a PLACE IN SEQUENCE. If given by context does not need to be stated. + Reference to a SITE NAVIGATION path. - + - Type for reference to a PLACE IN SEQUENCE. + Type for reference to a SITE NAVIGATION path. - - + + - Identifier of a PLACE IN SEQUENCE. + Identifier of a SITE NAVIGATION path. - - - - 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. + DEPRECATED use Reference to a SITE NAVIGATION path. - - - Type for Reference to a PATH LINK IN SEQUENCE. - - - - - - Identifier of a PATH LINK IN SEQUENCE. - - - - - - - - Type for identifier of a PATH LINK VIEW> - - - 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 ea25bf7c7..eda86f067 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -169,8 +169,7 @@ Rail transport, Roads and Road transport - 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 + 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 From 6c1578975aa5aedea9c4b576a56c72c7e2177f50 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 13:18:31 +0100 Subject: [PATCH 27/87] update --- .../deckPlans/DeckPlans-Example_train.xml | 7 +-- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 58 ------------------- .../netex_ifopt_stopPlace_support.xsd | 6 -- 4 files changed, 2 insertions(+), 71 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 8333922e8..f19d7ddd8 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 @@ -3784,12 +3782,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/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_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd index 5332bb8ff..ff4a6a966 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 @@ -83,20 +83,6 @@ Rail transport, Roads and Road transport Reference to a SITE PATH LINK. - - - Type for a reference to a SITE PATH LINK. - - - - - - Identifier of a SITE PATH LINK. - - - - - @@ -162,49 +148,5 @@ Rail transport, Roads and Road transport                                         - - - - Type for a list of references to a SITE NAVIGATION path. - - - - - - - - - - - - - Type for identifier of a SITE NAVIGATION path. - - - - - - Reference to a SITE NAVIGATION path. - - - - - Type for reference to 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_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd index b6d679907..217c0f14d 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 @@ -320,12 +320,6 @@ Rail transport, Roads and Road transport                                         - - - Unique identifier of a stop for SMS and other customer facing delivery channels. - - - The plate identifier placed on the stop. From 687e7ff40ba37cbdf844b81af038683b12848bb1 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 12:47:57 +0000 Subject: [PATCH 28/87] 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 9ef6bcce624b04d8ce1e105a2f07939a39538af9 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Thu, 22 Feb 2024 19:36:09 +0000 Subject: [PATCH 29/87] 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 | 49 +- .../netex_deckPlan_version.xsd | 15 +- .../netex_seatingPlan_support.xsd | 77 +++ .../netex_seatingPlan_version.xsd | 31 +- .../netex_spotEquipment_version.xsd | 11 +- 11 files changed, 720 insertions(+), 598 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 f19d7ddd8..35f8e55c8 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -100,21 +100,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 @@ -1289,9 +1289,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow + fixedFlat true @@ -1311,9 +1310,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow + fixedFlat true @@ -1411,9 +1409,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true + byAisleAndWindow true @@ -1433,10 +1429,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - true - true - true + byAisleAndWindow @@ -1518,8 +1511,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1542,7 +1535,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1565,7 +1558,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1582,8 +1575,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1606,8 +1598,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1629,7 +1621,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1651,7 +1643,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1668,8 +1660,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1748,8 +1739,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1771,7 +1762,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1793,7 +1784,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -1810,8 +1801,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1834,8 +1824,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -1857,8 +1847,7 @@ The train reverse in the station and departs, oriented backwards to the right - false - false + inMiddle true @@ -1880,8 +1869,7 @@ The train reverse in the station and departs, oriented backwards to the right - false - false + inMiddle true @@ -1898,8 +1886,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -1978,8 +1965,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2001,7 +1988,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2023,7 +2010,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2040,8 +2027,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2064,8 +2050,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2087,7 +2073,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2109,7 +2095,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2126,8 +2112,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2206,8 +2191,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2229,7 +2214,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2251,7 +2236,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2268,8 +2253,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -2292,8 +2276,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true + byWindowNoAisle + fixedFlat true @@ -2315,7 +2299,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + inMiddle true @@ -2337,7 +2321,7 @@ The train reverse in the station and departs, oriented backwards to the right - false + byAisleNoWindow true @@ -2354,8 +2338,7 @@ The train reverse in the station and departs, oriented backwards to the right - true - false + byAisleNoWindow true @@ -3125,7 +3108,7 @@ The train reverse in the station and departs, oriented backwards to the right true - + forwards @@ -3136,9 +3119,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + none true @@ -3151,9 +3133,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + none true @@ -3166,9 +3147,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + none true @@ -3181,12 +3161,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + none true - + forwards @@ -3197,9 +3176,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3212,9 +3190,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3227,9 +3204,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3242,12 +3218,11 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byWindowNoAisle + seatBackFolding true - + forwards @@ -3258,9 +3233,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3273,9 +3247,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3288,9 +3261,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - false + byAisleNoWindow + seatBackFolding true @@ -3303,12 +3275,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - false + byWindowNoAisle + seatBackFolding true - + backwards @@ -3319,9 +3290,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3334,9 +3304,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3349,9 +3318,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3364,12 +3332,11 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byWindowNoAisle + fixedFlat true - + forwards @@ -3380,9 +3347,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3395,9 +3361,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3410,9 +3375,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + fixedFlat true @@ -3425,12 +3389,11 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true - + forwards @@ -3441,9 +3404,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + seatBackFolding true @@ -3456,9 +3418,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3471,9 +3432,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3486,25 +3446,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 @@ -3517,9 +3475,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3532,9 +3489,8 @@ The train reverse in the station and departs, oriented backwards to the right - true - false - true + byAisleNoWindow + seatBackFolding true @@ -3547,11 +3503,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 + @@ -3564,9 +3634,8 @@ The train reverse in the station and departs, oriented backwards to the right - false - true - true + byWindowNoAisle + fixedFlat true @@ -3588,9 +3657,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 c47b431c5..c86de3157 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 8acb54e86..35d4ed9d6 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 f0c0a0bb3..f7101c6ec 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 50b5bc735..c7a6d61a4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -17,6 +17,9 @@ 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.

                                        @@ -316,37 +319,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. @@ -528,6 +531,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 c5984ceed..e7fa23cef 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -23,6 +23,9 @@ 2024-02-09Add locatbale 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.

                                        This sub-schema describes the DECK PLAN types.

                                        @@ -147,6 +150,11 @@ Description of DECK PLAN.                                         + + + Description of DECK PLAN. + + VALIDITY CONDITIONs used to configure DECK PLAN @@ -715,7 +723,7 @@ - Height of ENtrance from ground. + Height of ENTRANCE from ground. @@ -1187,6 +1195,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 e309ada37..86d9acbd5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -18,6 +18,12 @@ 2023-12-08Move SENSOR IN SPOT declarations to here + + 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.

                                        @@ -354,4 +360,75 @@                                         + + + 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 b1a6ee4a8..5ebc9232d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -21,6 +21,9 @@ 2023-12-08Move SENSOR IN SPOT declarations to here + + 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.

                                        This sub-schema describes the DECK PLAN types.

                                        @@ -80,7 +83,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 @@ -149,7 +152,8 @@ - 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 + @@ -206,7 +210,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 @@ -247,7 +251,7 @@ - Orientation of EQUIPABLE SPACE. Default is forwards. + Orientation of EQUIPABLE SPACE . Default is forwards. @@ -379,17 +383,12 @@ Elements for a PASSENGER SPOT. - - - Whether PASSENGER SPOT is by an aisle. - - - + - Whether PASSENGER SPOT is by a window + Whether PASSENGER SPOT is by an Aisle, window, etc. - + Whether PASSENGER SPOT faces table. @@ -419,7 +418,7 @@ - A specified seat or other space for a passenger within a given DECK SPACE. +v2.0 + A designated seat or other space for a passenger within a given DECK SPACE. +v2.0. @@ -473,7 +472,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. @@ -557,7 +556,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. @@ -623,7 +622,7 @@ - Classification for LOCATABLE SPOT. +v2.0. + Classification for LOCATABLE 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 e930169f2..5d6539633 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 496f37be27ca8ae0588824694b53696d5db87afc 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 30/87] Lint and update documentation tables --- .../netex_reusableComponents/netex_deckPath_support.xsd | 5 ++--- .../netex_reusableComponents/netex_deckPath_version.xsd | 3 +-- .../netex_reusableComponents/netex_spotEquipment_version.xsd | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 35d4ed9d6..b082d741c 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 f7101c6ec..d59349b18 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_spotEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd index 5d6539633..096bb2644 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 bcbb1bfb8106edaa762302b97f66f0edab0dc929 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Fri, 1 Mar 2024 18:40:14 +0000 Subject: [PATCH 31/87] Ypdate with 641 addition of maximumvelocity --- .../netex_vehicleType_version.xsd | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index dff1cddd0..7c327be9d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -741,6 +741,16 @@ Rail transport, Roads and Road transport The number of wheelchairs places on vehicles of the type. For a requirement this is the minimum needed. + + + The number of places on the vehicle that are suitable for prams. + + + + + The number of bicycle racks on the vehicle. Also non-rack places should be counted here. The name might change in future to BicycleCapacity. + + @@ -798,16 +808,6 @@ Rail transport, Roads and Road transport The total capacity of passenger VEHICLES of the type. F - - - The number of places on the vehicle that are suitable for prams. - - - - - The number of bicycle racks on the vehicle. Also non-rack places should be counted here. The name might change in future to BicycleCapacity. - - From a311bf1bac0633ab3c81d53b8b9a58d7c542a2b6 Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Sun, 3 Mar 2024 00:19:54 +0000 Subject: [PATCH 32/87] 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_reusableComponents/netex_deckPlan_version.xsd | 9 +++++++-- 1 file changed, 7 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 e7fa23cef..23d5acc3f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -1026,7 +1026,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. @@ -1192,7 +1192,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 8bad356ad7ed0ce699167af539bba765a7254f0d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 14:28:15 +0100 Subject: [PATCH 33/87] Progress --- .../DeckPlans-Example_train_simple.xml | 2 +- .../netex_path_support.xsd | 20 ++ .../netex_path_version.xsd | 252 ++++++++++++++++-- .../netex_deckPath_support.xsd | 6 +- .../netex_deckPath_version.xsd | 10 +- .../netex_deckPlan_support.xsd | 3 +- .../netex_deckPlan_version.xsd | 3 +- .../netex_seatingPlan_support.xsd | 6 +- .../netex_seatingPlan_version.xsd | 3 +- .../netex_ifopt_navigationPath_version.xsd | 82 ------ 10 files changed, 271 insertions(+), 116 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml index c86de3157..50be5c478 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train_simple.xml @@ -1767,4 +1767,4 @@ - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index edb77dce3..03ab6556b 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -148,6 +148,26 @@ 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. + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 263331160..d112809ad 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -17,8 +17,7 @@ Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema 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 +102,13 @@ Rail transport, Roads and Road transport Elements of a PATH LINK. - + + + + Instructiions for following PATH LINK. +v2.0 + + + @@ -121,27 +126,26 @@ 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. - - - - - - + + + + - + Type for a list of PATH JUNCTIONs. @@ -206,6 +210,11 @@ Rail transport, Roads and Road transport Parent ZONE that contains this PATH JUNCTION. + + + Instructiions for following PATH LINK. +v2.0 + + @@ -240,7 +249,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. @@ -290,6 +299,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. + + + + @@ -305,7 +400,7 @@ Rail transport, Roads and Road transport - A step in a Navigation PATH. + A step in a NAVIGATION PATH. @@ -378,7 +473,7 @@ Rail transport, Roads and Road transport - Label On step. + Label on step. @@ -393,5 +488,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_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index b082d741c..102f169c8 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -125,9 +125,9 @@ Rail transport, Roads and Road transport Type for identifier of a DECK PATH JUNCTION. - + - + Reference to a DECK PATH JUNCTION. @@ -137,7 +137,7 @@ Rail transport, Roads and Road transport Type for a reference to a DECK PATH JUNCTION. - + Identifier of a PATH JUNCTION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index d59349b18..d8d7f77f3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -435,7 +435,7 @@ Rail transport, Roads and Road transport - + Identifier of ENTITY. @@ -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. @@ -500,19 +500,19 @@ Rail transport, Roads and Road transport 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 + Detailed properties of a DECK ELEMENT, these are simialr to properties of a SITE ELEMENT. - Presentation defaults for SITE ELEMENT. +V1.2.2 + Presentation defaults for DECK ELEMENT. +V2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index c7a6d61a4..c8b674a17 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -17,8 +17,7 @@                                           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.

                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 23d5acc3f..36dca0430 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -23,8 +23,7 @@                                           2024-02-09Add locatbale 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 86d9acbd5..59983e154 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -18,11 +18,9 @@                                           2023-12-08Move SENSOR IN SPOT declarations to here - - 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.

                                          diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 5ebc9232d..7ecd152d6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -21,8 +21,7 @@                                           2023-12-08Move SENSOR IN SPOT declarations to here - - 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_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd index 21affb572..960e4115a 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 @@ -290,87 +290,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. - - - - - - - - - From 68bfda73a04d2be6d6e458a404dfb195a267ed21 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Fri, 15 Mar 2024 14:32:00 +0100 Subject: [PATCH 34/87] Update examples --- .../deckPlans/DeckPlans-Example_train.xml | 55 ++++++++++++++----- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 35f8e55c8..762028f5f 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. @@ -36,7 +35,7 @@ It also describes --> Ticket Hall Entrance to middle junction point - 20 + 15 + + + forward + 15 + level + Proceed though door to middle of ticket hall + + @@ -4557,13 +4564,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 @@ -4575,7 +4582,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 @@ -4587,8 +4594,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 + From b9a4050054d3c54356a04ebe41fa5ebd4c47e683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 15 Mar 2024 16:41:06 +0100 Subject: [PATCH 35/87] trying to fix some (or undo it, if it does not help... --- .../netex_genericFramework/netex_zone_support.xsd | 11 ++++++----- .../netex_deckPath_version.xsd | 12 ++++++------ .../part1_ifopt/netex_ifopt_path_support.xsd | 2 ++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index b9119eedf..04cf6b0f3 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -1,6 +1,8 @@ + + @@ -28,8 +30,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-2014
                                          • Derived from the Transmodel, VDV, TransXChange, NaPTAN, NOPTIS, BISON and Trident standards.
                                            • @@ -99,9 +100,9 @@ Rail transport, Roads and Road transport Reference to a TARIFF ZONE. - + - + @@ -182,4 +183,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index d8d7f77f3..8731fe92f 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -7,7 +7,7 @@ - + @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + @@ -138,18 +138,18 @@ 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 ff4a6a966..b7f80d206 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,6 +1,8 @@ + + From f3d31beb3b563691ba76ca08f6ebeac8a1435acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 13:58:48 +0100 Subject: [PATCH 36/87] 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 44acc760c..390a61699 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -392,7 +392,7 @@ Rail transport, Roads and Road transport - Facilities in TRAIN ELEMENT TYPE + Facilities in TRAIN ELEMENT TYPE. From 1fa2d578a083c939b54060a58e6305ff26d6abdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 13:58:54 +0100 Subject: [PATCH 37/87] 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 390a61699..084a0d2ea 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - SERVICE REQUIEMENTS for SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT. + SERVICE REQUIREMENTS for SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT. From 5f20e8920ad7b266eb9da4b56dbd120aa82df9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 13:59:00 +0100 Subject: [PATCH 38/87] 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 084a0d2ea..79a3cc35d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -124,7 +124,7 @@ Rail transport, Roads and Road transport - Elements for VEHICLE TYPEs, VEHICLE MODELS, etc in frame. + Elements for VEHICLE TYPEs, VEHICLE MODELS, etc. in frame. From 092a4705e899a5698b11e0b9e99599c8d4d2963a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 13:59:07 +0100 Subject: [PATCH 39/87] 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 79a3cc35d..e0e1a303b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport - Required Minimum capacity for service. Note actual Capacity is given by vehicle type. + Required minimum capacity for service. Note actual capacity is given by vehicle type. From 014a68f099f03bc5330e0836b7d9849a8ff2ba03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 13:59:14 +0100 Subject: [PATCH 40/87] 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 e0e1a303b..00bb471c5 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -365,7 +365,7 @@ Rail transport, Roads and Road transport - Elements for a TRAIN ELEMENT TPE. + Elements for a TRAIN ELEMENT TYPE. From d5053314d76a7d08de4e910cf33aab2cc195102a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sun, 17 Mar 2024 14:09:23 +0100 Subject: [PATCH 41/87] 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 00bb471c5..dc7e716db 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -405,7 +405,7 @@ Rail transport, Roads and Road transport - Dimension Elements for a TRAIN ELEMENT TPE. + Dimension Elements for a TRAIN ELEMENT TYPE. From 912663f078b89ae04919a418e95b5e0c9c23e64e Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sun, 17 Mar 2024 20:50:11 +0100 Subject: [PATCH 42/87] I don't like windows users --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd | 2 +- 1 file changed, 1 insertion(+), 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 b7f80d206..5fea533e8 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,7 @@ - + From 3b8a1c6d46bbcd62283f5536c2eebfc0f05d62a6 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sun, 17 Mar 2024 21:33:28 +0100 Subject: [PATCH 43/87] Add netex:EquipmentPlace to SitePathLink_Place_KeyRef --- 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 125064693..b86fa3faa 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -5886,7 +5886,7 @@ Correct COnstraints for PointOnRoute - + From 2b4d3b6b7d60ad3c1e95f4e598053a27a265d44d Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 00:08:46 +0100 Subject: [PATCH 44/87] Extension back to restriction --- .../netex_reusableComponents/netex_deckPath_version.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 8731fe92f..0c6b4b114 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -114,7 +114,7 @@ Rail transport, Roads and Road transport - + @@ -144,12 +144,12 @@ Rail transport, Roads and Road transport - - + + From 3419f9d0359f761cff1244a521e025a15fff4cb2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 00:23:16 +0100 Subject: [PATCH 45/87] fix train validation --- .../deckPlans/DeckPlans-Example_train.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 762028f5f..eab6fd880 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -4596,20 +4596,6 @@ 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 From 81bf2ef130977ddc5857cb84d0ebf0c80b5590d5 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 01:33:56 +0100 Subject: [PATCH 46/87] Deckplan examples "validate", look for commented out sections. --- .../functions/deckPlans/DeckPlans-Example.xml | 282 +++++++++--------- .../Netex_simpleVehicleSchedule_01.xml | 32 +- 2 files changed, 158 insertions(+), 156 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml index 64284e900..f3758c163 100644 --- a/examples/functions/deckPlans/DeckPlans-Example.xml +++ b/examples/functions/deckPlans/DeckPlans-Example.xml @@ -220,9 +220,9 @@ 2.00 true - + true cashAndCard contactlessPaymentCard travelCard @@ -250,7 +250,7 @@ freeWifi purchase - noCycles + noCycles @@ -292,19 +292,19 @@ + Driver seat 1 - Driver seat false 1 - Lower Deck seating area + true standardClass @@ -322,6 +322,7 @@ + Front Door 1.00 1.90 @@ -334,9 +335,8 @@ - Front Door external - left + true @@ -346,6 +346,7 @@ + Rear Door 0.95 1.90 @@ -360,9 +361,8 @@ - Rear Door external - left + true @@ -372,6 +372,7 @@ + Entrance to stairs 0.80 1.90 @@ -379,7 +380,6 @@ - Entrance to stairs internal @@ -390,10 +390,10 @@ - entry + entry - exit + exit 43 @@ -427,8 +427,8 @@ - true - true + @@ -440,8 +440,8 @@ - true - true + @@ -454,8 +454,8 @@ - true - true + @@ -467,8 +467,8 @@ - true - true + @@ -481,8 +481,8 @@ - true - true + @@ -495,8 +495,8 @@ - true - true + @@ -509,8 +509,8 @@ - true - true + @@ -523,8 +523,8 @@ - false - true + @@ -536,8 +536,8 @@ - true - false + @@ -549,8 +549,8 @@ - true - false + @@ -562,8 +562,8 @@ - false - true + @@ -576,8 +576,8 @@ - false - true + @@ -589,8 +589,8 @@ - true - false + @@ -602,8 +602,8 @@ - true - false + @@ -615,8 +615,8 @@ - false - true + @@ -629,8 +629,8 @@ - false - true + @@ -642,8 +642,8 @@ - true - false + @@ -655,8 +655,8 @@ - true - false + @@ -668,8 +668,8 @@ - false - true + @@ -682,8 +682,8 @@ - false - true + @@ -695,8 +695,8 @@ - false - false + @@ -708,8 +708,8 @@ - false - true + @@ -721,8 +721,8 @@ - true - false + @@ -734,8 +734,8 @@ - false - false + @@ -743,17 +743,20 @@ leftwards + + Stairwell to upper deck @@ -765,22 +768,21 @@ - Stairwell to upper deck false + Bottom of stairwell 1.00 1.90 - Bottom of stairwell internal true + Top of Stairwell 1.00 1.90 - Top of Stairwell internal true @@ -797,10 +799,10 @@ - entryAndExit + entryAndExit - entryAndExit + entryAndExit @@ -870,9 +872,9 @@ false + ENtrance to top of stairs 0.80 2.00 - ENtrance to top of stairs internal @@ -903,8 +905,8 @@ - false - true + @@ -921,8 +923,8 @@ - true - false + @@ -939,8 +941,8 @@ - true - false + @@ -957,8 +959,8 @@ - false - true + @@ -976,8 +978,8 @@ - false - true + @@ -994,8 +996,8 @@ - true - false + @@ -1012,8 +1014,8 @@ - true - false + @@ -1030,8 +1032,8 @@ - false - true + @@ -1049,8 +1051,8 @@ - false - true + @@ -1067,8 +1069,8 @@ - true - false + @@ -1085,8 +1087,8 @@ - true - false + @@ -1103,8 +1105,8 @@ - false - true + @@ -1122,8 +1124,8 @@ - false - true + @@ -1140,8 +1142,8 @@ - true - false + @@ -1159,8 +1161,8 @@ - false - true + @@ -1177,8 +1179,8 @@ - true - false + @@ -1196,8 +1198,8 @@ - false - true + @@ -1214,8 +1216,8 @@ - true - false + @@ -1232,8 +1234,8 @@ - true - false + @@ -1250,8 +1252,8 @@ - false - true + @@ -1269,8 +1271,8 @@ - false - true + @@ -1287,8 +1289,8 @@ - true - false + @@ -1305,8 +1307,8 @@ - true - false + @@ -1323,8 +1325,8 @@ - false - true + @@ -1342,8 +1344,8 @@ - false - true + @@ -1360,8 +1362,8 @@ - true - false + @@ -1378,8 +1380,8 @@ - true - false + @@ -1396,8 +1398,8 @@ - false - true + @@ -1415,8 +1417,8 @@ - false - true + @@ -1433,8 +1435,8 @@ - true - false + @@ -1451,8 +1453,8 @@ - true - false + @@ -1469,8 +1471,8 @@ - false - true + @@ -1488,8 +1490,8 @@ - false - true + @@ -1506,8 +1508,8 @@ - false - false + @@ -1524,8 +1526,8 @@ - false - true + @@ -1542,8 +1544,8 @@ - true - false + @@ -1560,8 +1562,8 @@ - false - false + diff --git a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml index 1bd0acd2c..937d2c23f 100644 --- a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml +++ b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml @@ -899,11 +899,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 11:00:00.0Z - + 11:10:00.0Z PT5M @@ -1074,11 +1074,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 12:50:00.0Z - + 12:55:00.0Z @@ -1103,11 +1103,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 13:00:00.0Z - + 13:05:00.0Z @@ -1324,11 +1324,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:25:00.0Z - + 16:30:00.0Z @@ -1353,11 +1353,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:50:00.0Z - + 16:55:00.0Z @@ -1528,11 +1528,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:35:00.0Z - + 16:45:00.0Z @@ -1557,11 +1557,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 16:25:00.0Z - + 16:30:00.0Z @@ -1683,11 +1683,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS - + 21:15:00.0Z - + 21:25:00.0Z From 95fd0c11078609d732f5603012478530e2c2275b Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 12:06:15 +0100 Subject: [PATCH 47/87] Add version/id to PassengerCapacity --- .../vehicleSchedule/Netex_simpleVehicleSchedule_01.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml index 937d2c23f..a83adce7d 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 25c1a681b2b472632148f2cfd8a319ceb67d29d0 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 12:16:02 +0100 Subject: [PATCH 48/87] Reintroduce FlooringStatus --- .../netex_environment_support.xsd | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index f01f1c034..72ce9544b 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 the flooring. + + Type of border on the right side (in the direction of the PATH LINK). @@ -310,6 +315,18 @@ Rail transport, Roads and Road transport + + + Allowed values for the status of the flooring. + + + + + + + + + Allowed values for TactileWarningStrip From 2efb492c54dae06200d8b31d431155b8309979ae Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 12:24:10 +0100 Subject: [PATCH 49/87] Add TactileWarningStrip, TactileWarningStripContract back --- .../netex_environment_support.xsd | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd index 72ce9544b..f95608cd4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd @@ -168,7 +168,12 @@ Rail transport, Roads and Road transport - Nature of the tactile warning strips (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. @@ -176,6 +181,11 @@ Rail transport, Roads and Road transport Indicates whether there are guiding strips. +v1.1 + + + Provides additional details on possible guiding strip. + + @@ -329,7 +339,7 @@ Rail transport, Roads and Road transport - Allowed values for TactileWarningStrip + Allowed values for TactileWarningStrip. @@ -339,6 +349,33 @@ Rail transport, Roads and Road transport + + + 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 07386d2b109156e173b9362defa48e871918c5fa Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 13:06:10 +0100 Subject: [PATCH 50/87] linting only --- .../netex_path_support.xsd | 40 +++++++++---------- .../netex_zone_support.xsd | 3 +- .../netex_deckPath_version.xsd | 2 +- .../part1_ifopt/netex_ifopt_path_support.xsd | 1 - 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd index 03ab6556b..d500393fb 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -148,26 +148,26 @@ 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 identifier of a PATH INSTRUCTION. + + + + + + Reference to a PATH INSTRUCTION. + + + + + Type for a reference to a PATH INSTRUCTION. + + + + + diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd index 04cf6b0f3..51a42a83a 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd @@ -2,7 +2,6 @@ - @@ -183,4 +182,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 0c6b4b114..a450972f7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -138,7 +138,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 5fea533e8..34fc7c832 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 @@ -2,7 +2,6 @@ - From dddc874dc875499854634801061c9c99e66b1d20 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Mon, 18 Mar 2024 17:30:29 +0100 Subject: [PATCH 51/87] Make the SensorEquipment_ dummy abstract --- .../netex_reusableComponents/netex_sensorEquipment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd index 14fdbb7cd..cc3f80588 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_sensorEquipment_version.xsd @@ -60,7 +60,7 @@ SENSOR EQUIPMENT types for NeTEx. - + Dummy type for +V2.0 From cfb9eb692d7ac5a8c93e182bcf31c8ea5d7aa617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 18:45:00 +0100 Subject: [PATCH 52/87] =?UTF-8?q?redoneccb6e2f=20from=20=C2=B0674?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit introducinng spotaffinity --- NeTEx.spp | 2 + .../deckPlans/DeckPlans-Example_train.xml | 57 +++++ xsd/NeTEx_publication.xsd | 194 +++++++++--------- .../netex_SpotAffinity_support.xsd | 142 +++++++++++++ .../netex_SpotAffinity_version.xsd | 132 ++++++++++++ .../netex_all_objects_reusableComponents.xsd | 2 + .../netex_deckPlan_version.xsd | 6 + .../netex_seatingPlan_support.xsd | 14 +- .../netex_seatingPlan_version.xsd | 4 +- 9 files changed, 453 insertions(+), 100 deletions(-) create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd diff --git a/NeTEx.spp b/NeTEx.spp index 1399e8b73..338eed4a5 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -117,6 +117,8 @@ + + diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index eab6fd880..12aa78746 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -1314,6 +1314,63 @@ The train reverse in the station and departs, oriented backwards to the right true + + + Seats around table + sharedTable + 4 + + + + + + + + + Seats around table + sharedTable + 4 + + + + + + + + + + Seats around table + sharedTable + 4 + + + + + + + + + Seats around table + sharedTable + 4 + + + + + + + + + + Companion seat for wheelchairr + wheelchairCompanionSeat + 2 + + + + + + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index b86fa3faa..c1494763c 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -22,7 +22,7 @@ 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment 2020-11-16NewModes: Drop AlternativeTransportOperator 2020-11-06NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints. - 2020-10-14NewModes Add Constraints (NM) + 2020-10-14NewModes Add Constraints Add MobilityServiceFrame, MobilityJourneyFrame. TypeOfProof, TaxiRank, TaxiStand. TypeOfParking ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling. @@ -717,7 +717,7 @@ Correct COnstraints for PointOnRoute - + @@ -748,7 +748,7 @@ Correct COnstraints for PointOnRoute - + @@ -1501,7 +1501,7 @@ Correct COnstraints for PointOnRoute - + @@ -1522,7 +1522,7 @@ Correct COnstraints for PointOnRoute - + @@ -1543,7 +1543,7 @@ Correct COnstraints for PointOnRoute - + @@ -1564,7 +1564,7 @@ Correct COnstraints for PointOnRoute - + @@ -1585,7 +1585,7 @@ Correct COnstraints for PointOnRoute - + @@ -1606,7 +1606,7 @@ Correct COnstraints for PointOnRoute - + @@ -1627,7 +1627,7 @@ Correct COnstraints for PointOnRoute - + @@ -1648,7 +1648,7 @@ Correct COnstraints for PointOnRoute - + @@ -1712,7 +1712,7 @@ Correct COnstraints for PointOnRoute - + @@ -2627,7 +2627,7 @@ Correct COnstraints for PointOnRoute - + @@ -2648,7 +2648,7 @@ Correct COnstraints for PointOnRoute - + @@ -2669,7 +2669,7 @@ Correct COnstraints for PointOnRoute - + @@ -2690,7 +2690,7 @@ Correct COnstraints for PointOnRoute - + @@ -2711,7 +2711,7 @@ Correct COnstraints for PointOnRoute - + @@ -2732,7 +2732,7 @@ Correct COnstraints for PointOnRoute - + @@ -3027,8 +3027,8 @@ Correct COnstraints for PointOnRoute - - + + @@ -3049,7 +3049,7 @@ Correct COnstraints for PointOnRoute - + @@ -3070,7 +3070,7 @@ Correct COnstraints for PointOnRoute - + @@ -3091,7 +3091,7 @@ Correct COnstraints for PointOnRoute - + @@ -3112,7 +3112,7 @@ Correct COnstraints for PointOnRoute - + @@ -3133,7 +3133,7 @@ Correct COnstraints for PointOnRoute - + @@ -3462,7 +3462,7 @@ Correct COnstraints for PointOnRoute - + @@ -3483,7 +3483,7 @@ Correct COnstraints for PointOnRoute - + @@ -3504,7 +3504,7 @@ Correct COnstraints for PointOnRoute - + @@ -3525,7 +3525,7 @@ Correct COnstraints for PointOnRoute - + @@ -3546,7 +3546,7 @@ Correct COnstraints for PointOnRoute - + @@ -3651,7 +3651,7 @@ Correct COnstraints for PointOnRoute - + @@ -3672,7 +3672,7 @@ Correct COnstraints for PointOnRoute - + @@ -3693,7 +3693,7 @@ Correct COnstraints for PointOnRoute - + @@ -3714,7 +3714,7 @@ Correct COnstraints for PointOnRoute - + @@ -3735,7 +3735,7 @@ Correct COnstraints for PointOnRoute - + @@ -3756,7 +3756,7 @@ Correct COnstraints for PointOnRoute - + @@ -3777,7 +3777,7 @@ Correct COnstraints for PointOnRoute - + @@ -3798,7 +3798,7 @@ Correct COnstraints for PointOnRoute - + @@ -3819,7 +3819,7 @@ Correct COnstraints for PointOnRoute - + @@ -3840,7 +3840,7 @@ Correct COnstraints for PointOnRoute - + @@ -3861,7 +3861,7 @@ Correct COnstraints for PointOnRoute - + @@ -3882,7 +3882,7 @@ Correct COnstraints for PointOnRoute - + @@ -3903,7 +3903,7 @@ Correct COnstraints for PointOnRoute - + @@ -3915,7 +3915,7 @@ Correct COnstraints for PointOnRoute - + @@ -3936,7 +3936,7 @@ Correct COnstraints for PointOnRoute - + @@ -3957,7 +3957,7 @@ Correct COnstraints for PointOnRoute - + @@ -3978,7 +3978,7 @@ Correct COnstraints for PointOnRoute - + @@ -3999,7 +3999,7 @@ Correct COnstraints for PointOnRoute - + @@ -4020,7 +4020,7 @@ Correct COnstraints for PointOnRoute - + @@ -4041,7 +4041,7 @@ Correct COnstraints for PointOnRoute - + @@ -4062,7 +4062,7 @@ Correct COnstraints for PointOnRoute - + @@ -4083,7 +4083,7 @@ Correct COnstraints for PointOnRoute - + @@ -4104,7 +4104,7 @@ Correct COnstraints for PointOnRoute - + @@ -4125,7 +4125,7 @@ Correct COnstraints for PointOnRoute - + @@ -4146,7 +4146,7 @@ Correct COnstraints for PointOnRoute - + @@ -4167,7 +4167,7 @@ Correct COnstraints for PointOnRoute - + @@ -4188,7 +4188,7 @@ Correct COnstraints for PointOnRoute - + @@ -4209,7 +4209,7 @@ Correct COnstraints for PointOnRoute - + @@ -4230,7 +4230,7 @@ Correct COnstraints for PointOnRoute - + @@ -4251,7 +4251,7 @@ Correct COnstraints for PointOnRoute - + @@ -4272,7 +4272,7 @@ Correct COnstraints for PointOnRoute - + @@ -4335,7 +4335,7 @@ Correct COnstraints for PointOnRoute - + @@ -4461,7 +4461,7 @@ Correct COnstraints for PointOnRoute - + @@ -4482,7 +4482,7 @@ Correct COnstraints for PointOnRoute - + @@ -4503,7 +4503,7 @@ Correct COnstraints for PointOnRoute - + @@ -4524,7 +4524,7 @@ Correct COnstraints for PointOnRoute - + @@ -5010,7 +5010,7 @@ Correct COnstraints for PointOnRoute - + @@ -5031,7 +5031,7 @@ Correct COnstraints for PointOnRoute - + @@ -5415,7 +5415,7 @@ Correct COnstraints for PointOnRoute - + @@ -5436,7 +5436,7 @@ Correct COnstraints for PointOnRoute - + @@ -5457,7 +5457,7 @@ Correct COnstraints for PointOnRoute - + @@ -5478,7 +5478,7 @@ Correct COnstraints for PointOnRoute - + @@ -5544,7 +5544,7 @@ Correct COnstraints for PointOnRoute - + @@ -5565,7 +5565,7 @@ Correct COnstraints for PointOnRoute - + @@ -5608,7 +5608,7 @@ Correct COnstraints for PointOnRoute - + @@ -5692,7 +5692,7 @@ Correct COnstraints for PointOnRoute - + @@ -5713,7 +5713,7 @@ Correct COnstraints for PointOnRoute - + @@ -5737,7 +5737,7 @@ Correct COnstraints for PointOnRoute - + @@ -5761,7 +5761,7 @@ Correct COnstraints for PointOnRoute - + @@ -7021,7 +7021,7 @@ Correct COnstraints for PointOnRoute - + @@ -7042,7 +7042,7 @@ Correct COnstraints for PointOnRoute - + @@ -7391,7 +7391,7 @@ Correct COnstraints for PointOnRoute - + @@ -7415,7 +7415,7 @@ Correct COnstraints for PointOnRoute - + @@ -7938,7 +7938,7 @@ Correct COnstraints for PointOnRoute - + @@ -7959,7 +7959,7 @@ Correct COnstraints for PointOnRoute - + @@ -7983,7 +7983,7 @@ Correct COnstraints for PointOnRoute - + @@ -8004,7 +8004,7 @@ Correct COnstraints for PointOnRoute - + @@ -10584,7 +10584,7 @@ Correct COnstraints for PointOnRoute - + @@ -10978,7 +10978,7 @@ Correct COnstraints for PointOnRoute - + @@ -10999,7 +10999,7 @@ Correct COnstraints for PointOnRoute - + @@ -11020,7 +11020,7 @@ Correct COnstraints for PointOnRoute - + @@ -11041,7 +11041,7 @@ Correct COnstraints for PointOnRoute - + @@ -11065,7 +11065,7 @@ Correct COnstraints for PointOnRoute - + @@ -11086,7 +11086,7 @@ Correct COnstraints for PointOnRoute - + @@ -11476,7 +11476,7 @@ Correct COnstraints for PointOnRoute - + @@ -11823,7 +11823,7 @@ Correct COnstraints for PointOnRoute - + @@ -11844,7 +11844,7 @@ Correct COnstraints for PointOnRoute - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd new file mode 100644 index 000000000..94f263394 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd @@ -0,0 +1,142 @@ + + + + + + + + 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 + + 2024-03-01Create from TM Spec + + + 2024-03-01 + + +

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

                                            +

                                            This sub-schema describes the SPOT AFFINITY 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_spotAffinity_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-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 SPOT AFFINITY types. + Standard +                                             +                                             + NeTEx: SPOT AFFINITY identifier types +                                             + + + + Type for identifier of a SPOT AFFINITY. + + + + + + Reference to a SPOT AFFINITY. +v2.0 + + + + + Type for a reference to a SPOT AFFINITY. + + + + + + Identifier of referenced entity. + + + + + + + + + Allowed values for SpotAffinityType + + + + + Spot is facing another spot in the affinity. + + + + + Spot is next to another spot in the affinity. + + + + + Spot is in a contigous row making up the spots in the affinity. + + + + + Spot is around a table. + + + + + Spot is around a table. + + + + + Spot is in alower berth adjacent to another lower berth.. + + + + + Spot is in teh ame compartment as another spota . + + + + + Spot is a companion seat beside a wheelchair space . + + + + + OtherAFfinity. + + + + + +                                             \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd new file mode 100644 index 000000000..059dd0093 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd @@ -0,0 +1,132 @@ + + + + + + + + + + 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-03-01 + + + 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.

                                            +

                                            This sub-schema describes the SPOT AFFINITY 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_spotffinity_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-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 SPOT AFFINITY types. + Standard +                                             +                                             + NeTEx: SPOT AFFINITY types. +                                             + + + + Type for a list of SPOT AFFINITies + + + + + + + + + + + + A group of proximate seats suitable for selection for use by a group of travellers, for example, as being side by side, face to face, around a table, near a wheelchair spot, etc. + +v2.0 + + + + + Type for a SPOT AFFINITY. + + + + + + + Elements for a SPOT AFFINITY. + + + + + + + + + Elements for an SPOT AFFINITY. + + + + + Name of SPOT AFFINITY.. + + + + + Description of SPOT AFFINITY. + + + + + Type of SPotAFfinity + + + + + Maximum number of spots in affinity + + + + + :ocatable SPOTs for element. + + + + + +                                             \ No newline at end of file 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..c8b1b8a8a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -64,6 +64,8 @@ + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index 36dca0430..a5b9abde7 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 @@ + @@ -532,6 +533,11 @@ PASSENGER VEHICLE SPOTs in PASSENGER SPACE.                                             + + + SPOT AFFINITies in PASSENGER SPACE. + +                                             diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 59983e154..d02397abd 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -24,7 +24,7 @@

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

                                            -

                                            This sub-schema describes the DECK PLAN types.

                                            +

                                            This sub-schema describes the SEATING PLAN types.

                                             text/xml @@ -169,6 +169,18 @@ + + + Type for a list of references to LOCATABLE SPOTs + + + + + + + + + Type for identifier of a LOCATABLE SPOT. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd index 7ecd152d6..e040873be 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd @@ -25,7 +25,7 @@

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

                                            -

                                            This sub-schema describes the DECK PLAN types.

                                            +

                                            This sub-schema describes the SEATING PLAN types.

                                             text/xml @@ -61,7 +61,7 @@ CEN TC278 WG3 SG9. - NeTEx DECK PLAN types. + SEATING PLAN types. Standard From a4d1bdf15d447fc8c5909c6e61115d0e4933dc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 18:52:25 +0100 Subject: [PATCH 53/87] remove wrongfiles --- .../netex_SpotAffinity_support.xsd | 142 ------------------ .../netex_SpotAffinity_version.xsd | 132 ---------------- 2 files changed, 274 deletions(-) delete mode 100644 xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd delete mode 100644 xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd diff --git a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd deleted file mode 100644 index 94f263394..000000000 --- a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_support.xsd +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - 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 - - 2024-03-01Create from TM Spec - - - 2024-03-01 - - -

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

                                            -

                                            This sub-schema describes the SPOT AFFINITY 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_spotAffinity_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-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 SPOT AFFINITY types. - Standard -                                             -                                             - NeTEx: SPOT AFFINITY identifier types -                                             - - - - Type for identifier of a SPOT AFFINITY. - - - - - - Reference to a SPOT AFFINITY. +v2.0 - - - - - Type for a reference to a SPOT AFFINITY. - - - - - - Identifier of referenced entity. - - - - - - - - - Allowed values for SpotAffinityType - - - - - Spot is facing another spot in the affinity. - - - - - Spot is next to another spot in the affinity. - - - - - Spot is in a contigous row making up the spots in the affinity. - - - - - Spot is around a table. - - - - - Spot is around a table. - - - - - Spot is in alower berth adjacent to another lower berth.. - - - - - Spot is in teh ame compartment as another spota . - - - - - Spot is a companion seat beside a wheelchair space . - - - - - OtherAFfinity. - - - - - -                                             \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd deleted file mode 100644 index 059dd0093..000000000 --- a/xsd/netex_framework/netex_reusableComponents/netex_SpotAffinity_version.xsd +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - 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-03-01 - - - 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.

                                            -

                                            This sub-schema describes the SPOT AFFINITY 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_spotffinity_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-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 SPOT AFFINITY types. - Standard -                                             -                                             - NeTEx: SPOT AFFINITY types. -                                             - - - - Type for a list of SPOT AFFINITies - - - - - - - - - - - - A group of proximate seats suitable for selection for use by a group of travellers, for example, as being side by side, face to face, around a table, near a wheelchair spot, etc. - +v2.0 - - - - - Type for a SPOT AFFINITY. - - - - - - - Elements for a SPOT AFFINITY. - - - - - - - - - Elements for an SPOT AFFINITY. - - - - - Name of SPOT AFFINITY.. - - - - - Description of SPOT AFFINITY. - - - - - Type of SPotAFfinity - - - - - Maximum number of spots in affinity - - - - - :ocatable SPOTs for element. - - - - - -                                             \ No newline at end of file From 4c9be56450d1cb82d19c642e50c34f85bc9ea341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 18:52:55 +0100 Subject: [PATCH 54/87] redo --- .../netex_spotAffinity_support.xsd | 142 ++++++++++++++++++ .../netex_spotAffinity_version.xsd | 132 ++++++++++++++++ 2 files changed, 274 insertions(+) create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd new file mode 100644 index 000000000..94f263394 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd @@ -0,0 +1,142 @@ + + + + + + + + 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 + + 2024-03-01Create from TM Spec + + + 2024-03-01 + + +

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

                                            +

                                            This sub-schema describes the SPOT AFFINITY 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_spotAffinity_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-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 SPOT AFFINITY types. + Standard +                                             +                                             + NeTEx: SPOT AFFINITY identifier types +                                             + + + + Type for identifier of a SPOT AFFINITY. + + + + + + Reference to a SPOT AFFINITY. +v2.0 + + + + + Type for a reference to a SPOT AFFINITY. + + + + + + Identifier of referenced entity. + + + + + + + + + Allowed values for SpotAffinityType + + + + + Spot is facing another spot in the affinity. + + + + + Spot is next to another spot in the affinity. + + + + + Spot is in a contigous row making up the spots in the affinity. + + + + + Spot is around a table. + + + + + Spot is around a table. + + + + + Spot is in alower berth adjacent to another lower berth.. + + + + + Spot is in teh ame compartment as another spota . + + + + + Spot is a companion seat beside a wheelchair space . + + + + + OtherAFfinity. + + + + + +                                             \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd new file mode 100644 index 000000000..059dd0093 --- /dev/null +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd @@ -0,0 +1,132 @@ + + + + + + + + + + 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-03-01 + + + 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.

                                            +

                                            This sub-schema describes the SPOT AFFINITY 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_spotffinity_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-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 SPOT AFFINITY types. + Standard +                                             +                                             + NeTEx: SPOT AFFINITY types. +                                             + + + + Type for a list of SPOT AFFINITies + + + + + + + + + + + + A group of proximate seats suitable for selection for use by a group of travellers, for example, as being side by side, face to face, around a table, near a wheelchair spot, etc. + +v2.0 + + + + + Type for a SPOT AFFINITY. + + + + + + + Elements for a SPOT AFFINITY. + + + + + + + + + Elements for an SPOT AFFINITY. + + + + + Name of SPOT AFFINITY.. + + + + + Description of SPOT AFFINITY. + + + + + Type of SPotAFfinity + + + + + Maximum number of spots in affinity + + + + + :ocatable SPOTs for element. + + + + + +                                             \ No newline at end of file From 335226c301b8a380dbfd2ba8bd0e4502d3fa14d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 22:22:23 +0100 Subject: [PATCH 55/87] redo of 48618f0 from#695 --- .../site/Netex_01_Sites_SimpleStadium_1.xml | 8 +- xsd/NeTEx_publication.xsd | 94 +++++++++++++----- xsd/NeTEx_publication_timetable.xsd | 74 +++++--------- .../netex_path_support.xsd | 52 +++++----- .../netex_path_version.xsd | 92 ++++++++--------- .../netex_deckPath_support.xsd | 73 +++----------- .../netex_deckPath_version.xsd | 54 +++++----- .../netex_deckPlan_support.xsd | 2 +- .../netex_seatingPlan_support.xsd | 14 +-- .../netex_ifopt_navigationPath_version.xsd | 85 +++++++++++----- .../part1_ifopt/netex_ifopt_path_support.xsd | 99 ++++++++++++++++--- .../part1_ifopt/netex_ifopt_path_version.xsd | 59 ++++++++--- .../netex_ifopt_stopPlace_support.xsd | 29 +----- .../netex_pathAssignment_version.xsd | 5 +- .../netex_stopAssignment_version.xsd | 12 ++- 15 files changed, 424 insertions(+), 328 deletions(-) diff --git a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml index b2737a280..8223650d2 100644 --- a/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml +++ b/examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml @@ -763,14 +763,14 @@ The example comprises - + Branch in Entrance Hall A - - + + Branch in Entrance Hall B - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index c1494763c..4f03facee 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -115,10 +115,17 @@ Correct COnstraints for PointOnRoute CR0038 revise constraints on ResponsibilityRole 2011-01-17V0.94 Revised 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.
                                            -

                                            text/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd}netex_publication.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/netex_filters.xsdhttp://www.netex.org.uk/schemas/1.0/netex_all_objects.xsdUnclassified + +

                                            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/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd}netex_publication.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/netex_filters.xsdhttp://www.netex.org.uk/schemas/1.0/netex_all_objects.xsdUnclassified 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 @@ -4335,6 +4342,27 @@ Correct COnstraints for PointOnRoute + + + + + Every [DeckNavigationPath Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -5849,44 +5877,38 @@ Correct COnstraints for PointOnRoute - - - - + + + + - Every [PathLink Id + Version] must be unique within document. + Every [sitePathLink Id + Version] must be unique within document. - + - + - + - - + + - - - - - - - - - + + + @@ -5896,7 +5918,7 @@ Correct COnstraints for PointOnRoute Every [PathJunction Id + Version] must be unique within document. - + @@ -5911,6 +5933,30 @@ Correct COnstraints for PointOnRoute + + + + + Every [PathInstruction Id + Version + order] must be unique within document. + + + + + + + + + + + + + + + + + + + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index ced85fc3d..f1c7ea632 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1030,27 +1030,7 @@ Provides a general purose wrapper for NeTEx data content. - - - - - Every [FareZone Id + Version] must be unique within document. - - - - - - - - - - - - - - - - + @@ -3739,67 +3719,67 @@ Provides a general purose wrapper for NeTEx data content. - - - - + + + + - Every [PathLink Id + Version] must be unique within document. + Every [SitePathLink Id + Version] must be unique within document. - + - + - + - - - + + + Every [PathJunction Id + Version] must be unique within document. - + - - + + - - + + - - - + + + - Every [NavigationPath Id + Version] must be unique within document. + Every [SiteNavigationPath Id + Version] 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 d500393fb..090a45d15 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_support.xsd @@ -51,40 +51,40 @@ Rail transport, Roads and Road transport Standard - PATH identifier types for Generic Fixed Objects in Public Transport. + NeTEx: Generic PATH identifiertypes.                                             - + - Type for a list of references to a PATH LINK. + Type for a list of references to a GENERIC PATH LINK. - + - + - Type for identifier of a PATH LINK. + Type for identifier of a GENERIC PATH LINK. - + - Reference to a PATH LINK. + Reference to a GENERIC PATH LINK. - + - Type for a reference to a PATH LINK. + Type for a reference to a GENERIC PATH LINK. - + Identifier of a PATH LINK. @@ -123,24 +123,24 @@ Rail transport, Roads and Road transport - + - Type for identifier of a PATH JUNCTION. + Type for identifier of a GENERIC PATH JUNCTION. - + Reference to a PATH JUNCTION. - + Type for a reference to a PATH JUNCTION. - + Identifier of a PATH JUNCTION. @@ -171,36 +171,36 @@ Rail transport, Roads and Road transport - + - Type for a list of references to a NAVIGATION PATH. + Type for a list of references to a GENERIC NAVIGATION PATH. - + - + - Type for identifier of a NAVIGATION PATH. + Type for identifier of a GENERIC NAVIGATION PATH. - + Reference to a NAVIGATION PATH. - + - Type for reference to a NAVIGATION PATH. + Type for reference to a GENERIC NAVIGATION PATH. - + Identifier of a NAVIGATION PATH. @@ -218,7 +218,7 @@ Rail transport, Roads and Road transport - Type for identifier of place step in a NAVIGATION PATH. + Type for identifier of place step in a GENERIC 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 d112809ad..8ebc1fd65 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -57,16 +57,16 @@ Rail transport, Roads and Road transport Standard - IFOPT PATH LINK Model. + NeTEx: GENERIC 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. + A link between any two places that represents a step in a possible route for pedestrians, cyclists or other out of vehicle passengers . Note: a place may be fixed PLACE, that is STOP PLACEs, ACCESS SPACE or QUAY, BOARDING POSITION, POINTs OF INTEREST etc or PATH JUNCTIONs, or a place within a DECK, e.g. DECK, SPACE, DECK ENTRANCE, DECK PATH JUNCTION etc. - + @@ -78,41 +78,41 @@ Rail transport, Roads and Road transport - + - + - + - Type for a PATH LINK. + Type for a GENERIC PATH LINK. - + - + - Elements of a PATH LINK. + Elements of a GENERIC PATH LINK. - Instructiions for following PATH LINK. +v2.0 + Instructions for following PATH LINK. +v2.0 - + - Duration properties of a LINK. + Duration properties of a GENERIC PATH LINK. NB Cant be move up to on PATH LINK without breakage. revise in V3.0 @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. - + @@ -144,16 +144,16 @@ Rail transport, Roads and Road transport - - + + Type for a list of PATH JUNCTIONs. - - + + PATH JUNCTION for a SITE. @@ -162,13 +162,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. - + @@ -180,29 +180,29 @@ Rail transport, Roads and Road transport - + - + - + - Type for a PATH JUNCTION. + Type for a GENERIC PATH JUNCTION. - + - + - Elements of a PATH JUNCTION. + Elements of a GENERIC PATH JUNCTION. @@ -224,9 +224,12 @@ Rail transport, Roads and Road transport - + + + + Whether link should be hidden in the PATH LINK VIEW. @@ -254,7 +257,7 @@ Rail transport, Roads and Road transport - + Identifier of Object of which this is a view. @@ -263,7 +266,7 @@ Rail transport, Roads and Road transport - + Type for a PATH LINK VIEW. @@ -362,7 +365,7 @@ Rail transport, Roads and Road transport Elements of a PATH INSTRUCTION. - + Heding used in Instruction. @@ -400,7 +403,8 @@ Rail transport, Roads and Road transport - A step in a NAVIGATION PATH. + A step of a NAVIGATION PATH indicating traversal of a particular PATH LINK as part of a recommended route. +The same PATH LINK may occur in different sequences in different NAVIGATION PATHs. @@ -445,7 +449,7 @@ Rail transport, Roads and Road transport Elements of a PATH LINK IN SEQUENCE. - + Description of reference. @@ -571,13 +575,13 @@ Rail transport, Roads and Road transport - + - A designated path between two places. May include an ordered sequence of PATH LINKs. + A designated path between two places. May include an ordered sequence of PATH LINKs. +v2.0 - + @@ -589,29 +593,29 @@ Rail transport, Roads and Road transport - + - + - + Type for NAVIGATION. - + - + - Elements of a NAVIGATION path. + Elements of a GENERIC NAVIGATION PATH. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd index 102f169c8..5c86af512 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd @@ -49,29 +49,16 @@ Rail transport, Roads and Road transport Standard - DECK PATH LINK identifier types for NeTEx. + NeTEx: 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. @@ -81,8 +68,8 @@ Rail transport, Roads and Road transport Type for a reference to a DECK PATH LINK. - - + + Identifier of a DECK PATH LINK. @@ -90,44 +77,14 @@ Rail transport, Roads and Road transport - - - - 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. @@ -137,8 +94,8 @@ Rail transport, Roads and Road transport Type for a reference to a DECK PATH JUNCTION. - - + + Identifier of a PATH JUNCTION. @@ -189,9 +146,9 @@ Rail transport, Roads and Road transport Type for identifier of a DECK NAVIGATION PATH. - + - + Reference to a DECK NAVIGATION PATH. @@ -201,7 +158,7 @@ Rail transport, Roads and Road transport Type for reference to a DECK NAVIGATION PATH. - + Identifier of a DECK NAVIGATION PATH. @@ -210,9 +167,9 @@ Rail transport, Roads and Road transport - + - Allowed values for Deck Navigation type. + Allowed values for DECK NAVIGATION PATH type. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index a450972f7..65bbd8ea4 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. + NeTEx: DECK PATH LINK and NAVIGATION PATH Model. @@ -77,12 +77,12 @@ Rail transport, Roads and Road transport PATH JUNCTIONs for DECK - + PATH LINKs for DECK - + NAVIGATION PATHs for DECK @@ -90,14 +90,14 @@ Rail transport, Roads and Road transport                                             - + Type for a list of DECK PATH LINKs. - + PATH LINK for a DECK @@ -126,7 +126,7 @@ Rail transport, Roads and Road transport - + @@ -138,13 +138,13 @@ Rail transport, Roads and Road transport - + - + Identifier of ENTITY. @@ -158,7 +158,7 @@ Rail transport, Roads and Road transport Type for a DECK PATH LINK. - + @@ -268,7 +268,7 @@ Rail transport, Roads and Road transport - + @@ -284,7 +284,7 @@ Rail transport, Roads and Road transport Type for a DECK PATH JUNCTION - + @@ -398,29 +398,29 @@ Rail transport, Roads and Road transport                                             - + Type for a list of DECK NAVIGATION PATHs. - + - DECK NAVIGATION PATH for a SITE. + DECK NAVIGATION PATH for a DECK. - + A designated path between two places within a DECK PLAN. May include an ordered sequence of DECK PATH LINKs. +v2.0 - + @@ -432,7 +432,7 @@ Rail transport, Roads and Road transport - + @@ -444,31 +444,31 @@ Rail transport, Roads and Road transport - + - Type for DECK NAVIGATION path. + Type for DECK NAVIGATION PATH. - + - + - + Elements of a DECK NAVIGATION PATH. - + Classification of Overall Accessibility of NAVIGATION PATH. - + Classification of DECK NAVIGATION.. @@ -485,9 +485,9 @@ 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. @@ -497,7 +497,7 @@ Rail transport, Roads and Road transport - 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. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd index c8b674a17..b55a3e12a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd @@ -414,7 +414,7 @@ - Reference to a OTHER DECK ENTRANCE. +v2.0 + Reference to an OTHER DECK ENTRANCE. +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 d02397abd..21931fe5b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -211,25 +211,15 @@ A Range of LOCATABLE SPOTs. - + Start of range of LOCATABLE SPOTs. - - - - - - + End of range of LOCATABLE SPOTs. - - - - - 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 960e4115a..eba81c316 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 @@ -81,14 +81,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 +99,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 within a SITE. 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 +194,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 +240,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. @@ -258,7 +291,7 @@ Rail transport, Roads and Road transport - + Elements of a NAVIGATION PATH. 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 34fc7c832..ed0f76c0c 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 @@ -57,7 +57,7 @@ Rail transport, Roads and Road transport Standard - PATH identifier types for IFOPT Fixed Objects in Public Transport. + NeTEx: PATH identifier types for IFOPT Fixed Objects in Public Transport. @@ -67,31 +67,50 @@ Rail transport, Roads and Road transport - + - + Type for identifier of a SITE PATH LINK. - + - + Reference to a SITE PATH LINK. - + + + + Type for a reference to a SITE PATH LINK. + + + + + + Identifier of a SITE PATH LINK. + + + + + + + + Reference to a SITE PATH LINK. DEPRECATED use SitePathLinkRef+v2.0 + + Type for identifier of a SITE PATH JUNCTION. - + - + Reference to a SITE PATH JUNCTION. @@ -101,7 +120,7 @@ Rail transport, Roads and Road transport Type for a reference to a SITE PATH JUNCTION. - + Identifier of a SITE PATH JUNCTION. @@ -110,6 +129,11 @@ Rail transport, Roads and Road transport + + + Depreceated - use SitePathJunctionRef +v2.0 + + @@ -118,19 +142,19 @@ Rail transport, Roads and Road transport - + - + Type for identifier of a OFF SITE PATH LINK. - + - + Reference to a OFF SITE PATH LINK. @@ -140,8 +164,8 @@ Rail transport, Roads and Road transport Type for a reference to a OFF SITE PATH LINK. - - + + Identifier of a OFF SITE PATH LINK. @@ -150,4 +174,49 @@ Rail transport, Roads and Road transport + + + + Type for a list of references to a SITE NAVIGATION PATH. + + + + + + + + + + + + + Type for identifier of a SITE NAVIGATION PATH. + + + + + + Reference to a SITE NAVIGATION PATH. + + + + + Type for reference to a SITE NAVIGATION PATH. + + + + + + Identifier of a SITE NAVIGATION PATH. + + + + + + + + DEPRECATED use Reference to a SIteNavigationPath v.20 + + + 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 e63ea9c56..994cd7e84 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 @@ -89,7 +89,7 @@ Rail transport, Roads and Road transport - + @@ -153,13 +153,13 @@ Rail transport, Roads and Road transport - + - + Identifier of ENTITY. @@ -173,7 +173,7 @@ Rail transport, Roads and Road transport Type for an OFF SITE PATH LINK. - + @@ -234,13 +234,13 @@ Rail transport, Roads and Road transport - + - + @@ -250,7 +250,7 @@ Rail transport, Roads and Road transport Type for a SITE PATH LINK. - + @@ -293,13 +293,17 @@ Rail transport, Roads and Road transport - - + PATH JUNCTION for a SITE. + + + Preferably use SITE PATH JUNCTION in future. + + @@ -325,7 +329,7 @@ Rail transport, Roads and Road transport - + @@ -335,7 +339,7 @@ Rail transport, Roads and Road transport Type for a SITE PATH JUNCTION. - + @@ -347,11 +351,11 @@ Rail transport, Roads and Road transport Elements of a SITE PATH JUNCTION. - + Elements of a SITE ELEMENTs. @@ -374,5 +378,34 @@ Rail transport, Roads and Road transport                                             + + + DEPRECATED - use SITE PATH JUNCTION. v 3.0esignated point, inside a SITE ie STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + + + + + + + + + + + + + + + + + + + + + + + + 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 217c0f14d..3690b6b5d 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 @@ -38,8 +38,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-2019
                                            • Derived from the SIRI standards.
                                              • @@ -296,30 +295,6 @@ Rail transport, Roads and Road transport - - - - Type for Unique Reference to SITE PATH LINK. - - - - - - - - Type for reference to a SITE PATH LINK. - - - - - - Identifier of a PATH LINK. - - - - - - The plate identifier placed on the stop. @@ -509,4 +484,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd index 36db8ea1f..b0f3c1279 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd @@ -106,7 +106,10 @@ Rail transport, Roads and Road transport - + + + + 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 eda86f067..106af5767 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -403,19 +403,25 @@ Rail transport, Roads and Road transport - BOARDING POSITION to which SCHEDULED STOP POINT is to be assigned. + BOARDING POSITION to which TRAIN COMPONENT at SCHEDULED STOP POINT is to be assigned. + + + Whether assigment permits or forbids any use of TRAIN COMPONENT at specifed stop. Default is true. +V2.0 + + - Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. + Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. NB DECK ENTRANCE ASSIGNMENT can be used to make structured reference. - Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION + Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION. +V2.0 + From 13d857dc1153924802091cf2a590a0eda22f0c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 22:31:09 +0100 Subject: [PATCH 56/87] redo of 7f89c10 from #695 DECK PLAN ASSIGNMENT revision --- NeTEx.spp | 1 - .../deckPlans/DeckPlans-Example_train.xml | 169 ++++++------------ .../netex_all_objects_part2_journeyTimes.xsd | 4 +- ... netex_deckEntranceAssignment_support.xsd} | 6 +- ... netex_deckEntranceAssignment_version.xsd} | 13 +- 5 files changed, 64 insertions(+), 129 deletions(-) rename xsd/netex_part_2/part2_journeyTimes/{netex_deckEntranceAlignment_support.xsd => netex_deckEntranceAssignment_support.xsd} (95%) rename xsd/netex_part_2/part2_journeyTimes/{netex_deckEntranceAlignment_version.xsd => netex_deckEntranceAssignment_version.xsd} (92%) diff --git a/NeTEx.spp b/NeTEx.spp index 338eed4a5..82300de00 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -221,7 +221,6 @@ - diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 12aa78746..8142ba3c4 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -315,8 +315,8 @@ NAVIGATION PATH + DECK NAVIGATION PATH to reach a seat |= (Lower LEVEL) QUAY 2 (SSP_0015E) | v DECK NAVIGATION PATH =|=| |=...........................|..................................|......v................................=|=| |= Boarding Position A | Boarding Position B | v Boarding Position C =|=| -|======================================================================X===================================| SHORT PLATFORM! - to 01-12 :::: to 13-36 :::: to 01-36 no Access +|======================================================================X===================================| SHORT PLATFORM! SHORT PLATFORM! + to 01-12 :::: to 13-36 :::: to 01-36 no Access no Access @@@@@@@@@@@ |@@@@@/::\@@@@@@@@@@@@@@@@@@@@@@@. . . @@@@@@@@@@@/:x\@@@@| |@@@@/::\@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. . @@@@@@___@@| |@@. . . ++++++@| #1 @ |@ right TRAIN ELEMENT #2 F01 . . . V @|==|@ TRAIN ELEMENT#3 -F02 . . . right @|==|@ . . + + @| @==|| DECK PLAN Sleeper Corridor x<<<..<<<<<<<<<<<< - + Compartment 1: Seats 01-02 First class compartment with two beds @@ -1314,66 +1314,9 @@ The train reverse in the station and departs, oriented backwards to the right true - - - Seats around table - sharedTable - 4 - - - - - - - - - Seats around table - sharedTable - 4 - - - - - - - - - - Seats around table - sharedTable - 4 - - - - - - - - - Seats around table - sharedTable - 4 - - - - - - - - - - Companion seat for wheelchairr - wheelchairCompanionSeat - 2 - - - - - - - + Compartment 2: Seats 02-03 Rirst class with two beds @@ -1722,7 +1665,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 @@ -1948,7 +1891,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 @@ -2562,8 +2505,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 @@ -2577,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 @@ -2590,8 +2533,8 @@ The train reverse in the station and departs, oriented backwards to the right Seat 9is on far side by window on left - - + + @@ -2651,7 +2594,7 @@ The train reverse in the station and departs, oriented backwards to the right - Passenger access Right External Door + >Passenger access Right External Door 1.00 1.90 @@ -4533,7 +4476,7 @@ The train reverse in the station and departs, oriented backwards to the right - + From Station main entrance to QUAY 2 Boarding point C - via stairs 70 @@ -4587,8 +4530,8 @@ The train reverse in the station and departs, oriented backwards to the right Turn right and Walk along platform to boarding point C - - + + From Station main entrance to QUAY 2 Boarding point C - via lift 65 @@ -4648,11 +4591,25 @@ The train reverse in the station and departs, oriented backwards to the right Walk along platform to boarding point C - + 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 @@ -4964,6 +4921,7 @@ The train reverse in the station and departs, oriented backwards to the right + Assignment for train at particular stop Erewhon 015E Short platform so only front three doors accessible. Train reverses in station @@ -4976,6 +4934,8 @@ The train reverse in the station and departs, oriented backwards to the right + Front half of Carriage F01 + Carriage F01 Seats 01-12 can use Boarding Position A true true @@ -4985,6 +4945,7 @@ The train reverse in the station and departs, oriented backwards to the right 2 + true Board at front @@ -5000,6 +4961,8 @@ The train reverse in the station and departs, oriented backwards to the right + Rear half of Carriage F01 + Carriage F01 Seats 03-26 can use Boarding Position B true true @@ -5009,10 +4972,11 @@ The train reverse in the station and departs, oriented backwards to the right 2 - exit at rear + true + Exit by rear doors - Entrance to F01 at Boarding Position B via rear door on right hand side of train + Entrance to F01 seats 13-26 at Boarding Position B via rear door on right hand side of train shut @@ -5026,6 +4990,8 @@ The train reverse in the station and departs, oriented backwards to the right + Carriage F02 front + Carriage F02 All seats must use forward door to Boarding Position C. Rear door shut true true @@ -5035,10 +5001,11 @@ The train reverse in the station and departs, oriented backwards to the right 3 - exit at front + true + Exit through front carriages - Entrance to F02 at Boarding Position A via forward door on right hand side of train + Entrance to F03 at Boarding Position A via forward door on right hand side of train shut @@ -5048,20 +5015,6 @@ The train reverse in the station and departs, oriented backwards to the right 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 @@ -5069,7 +5022,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Short platform means F03 (buffet car) doors cannot be used false false @@ -5079,19 +5032,8 @@ The train reverse in the station and departs, oriented backwards to the right 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 - - + false + Move to front 2 carriages to access platfrom Short platform means F04 (sleeper wagon) doors cannot be used @@ -5103,19 +5045,8 @@ The train reverse in the station and departs, oriented backwards to the right 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 - - + false + Move to front 2 carriages to access platfrom @@ -5124,4 +5055,4 @@ The train reverse in the station and departs, oriented backwards to the right - + \ No newline at end of file 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 7d444c31c..3569e5d90 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 @@ -7,8 +7,8 @@ - - + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd similarity index 95% rename from xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd rename to xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd index 7ec2b0d29..ed07641da 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_support.xsd @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@

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

                                              -

                                              This sub-schema describes the DECK ENTRANCE ALIGNMENT types.

                                              +

                                              This sub-schema describes the DECK ENTRANCE ASSIGNMENT types.

                                               text/xml @@ -58,7 +58,7 @@ Standard - DECK ENTRANCE ALIGNMENT identifier types + NeTEx: DECK ENTRANCE ASSIGNMENT identifier types                                               diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd similarity index 92% rename from xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd rename to xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd index e9f9e3d1f..bae05751f 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd @@ -1,7 +1,7 @@ - + - + @@ -58,11 +58,11 @@ CEN TC278 WG3 SG9. - NeTEx DECKENTRANCE ALIGNMENT types. + NeTEx DECK ENTRANCE ASSIGNMENT types. Standard - DECK ENTRANCE ALIGNMENT data types + NeTE: DECK ENTRANCE ASSIGNMENT data types @@ -129,6 +129,11 @@ + + + Whether assigment permits or forbids use of TRAIN COMPONENT and / or specified DECK ENTRANCE at specifed stop. + + Default setting for doors when while at stop - are the doors held open, shut or locked shut. From 0f7f3c563d9e346bae2c78ea81864b01c6815abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 22:35:06 +0100 Subject: [PATCH 57/87] DEckPlan further correction redo of a3d4fa8 from #695 --- .../netex_ifopt_navigationPath_version.xsd | 1 + .../part1_ifopt/netex_ifopt_path_version.xsd | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) 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 eba81c316..e982653fe 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 @@ -123,6 +123,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 994cd7e84..7a9709fe7 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 @@ -285,6 +285,35 @@ Rail transport, Roads and Road transport + + + DEPRECATED - use SITE PATH LINK + + + + + + + + + + + + + + + + + + + + + + + + + + From 9b01de44e0d98cb6336a73ea8f97a0040f27b2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 22:39:56 +0100 Subject: [PATCH 58/87] fix include problem --- .../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 106af5767..5bf9e5d16 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -4,7 +4,7 @@ - + From 9bef04200330677493208c1f280a4f7f43f2bec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 22:55:56 +0100 Subject: [PATCH 59/87] Things to review by Nick --- .../netex_reusableComponents/netex_deckPath_version.xsd | 8 ++++---- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 65bbd8ea4..c94d910b3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport - + @@ -267,9 +267,9 @@ 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 7a9709fe7..5c9a7657e 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 @@ -380,7 +380,7 @@ Rail transport, Roads and Road transport Elements of a SITE PATH JUNCTION. - From 861c64a9f60fd8a2bd090be97f5caeb8e0d31eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 23:00:53 +0100 Subject: [PATCH 60/87] check all other examples --- .../{DeckPlans-Example_train.xml => DeckPlans-Example_train.xxx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/functions/deckPlans/{DeckPlans-Example_train.xml => DeckPlans-Example_train.xxx} (100%) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xxx similarity index 100% rename from examples/functions/deckPlans/DeckPlans-Example_train.xml rename to examples/functions/deckPlans/DeckPlans-Example_train.xxx From 993999409d2fd48d6eb8475e53fe5a17c4024f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 23:06:20 +0100 Subject: [PATCH 61/87] swithing removal of parentzoneref --- .../netex_genericFramework/netex_path_version.xsd | 4 ++-- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 8ebc1fd65..be44b5cbe 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -205,11 +205,11 @@ Rail transport, Roads and Road transport Elements of a GENERIC PATH JUNCTION. - + Instructiions for following PATH LINK. +v2.0 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 5c9a7657e..ffd3572e1 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 @@ -380,11 +380,11 @@ Rail transport, Roads and Road transport Elements of a SITE PATH JUNCTION. - + Elements of a SITE ELEMENTs. From ee4adfe18c9f59b4af17bca9aeae2688c6b3ec14 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:08:44 +0000 Subject: [PATCH 62/87] Lint and update documentation tables --- xsd/NeTEx_publication.xsd | 18 +++++------------- xsd/NeTEx_publication_timetable.xsd | 1 - .../netex_all_objects_reusableComponents.xsd | 2 +- .../netex_deckPath_version.xsd | 4 ++-- .../netex_deckPlan_version.xsd | 2 +- .../netex_seatingPlan_support.xsd | 2 +- .../netex_spotAffinity_support.xsd | 5 ++--- .../netex_spotAffinity_version.xsd | 5 ++--- .../part1_ifopt/netex_ifopt_path_support.xsd | 8 ++++---- .../part1_ifopt/netex_ifopt_path_version.xsd | 6 +++--- .../netex_ifopt_stopPlace_support.xsd | 2 +- .../netex_stopAssignment_version.xsd | 7 +++---- .../netex_deckEntranceAssignment_version.xsd | 2 +- 13 files changed, 26 insertions(+), 38 deletions(-) diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 4f03facee..5a20a20c5 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -115,17 +115,10 @@ Correct COnstraints for PointOnRoute CR0038 revise constraints on ResponsibilityRole 2011-01-17V0.94 Revised 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.
                                                • -
                                              -

                                              -                                               text/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd}netex_publication.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/netex_filters.xsdhttp://www.netex.org.uk/schemas/1.0/netex_all_objects.xsdUnclassified +

                                              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/xmlhttp://www.w3.org/2001/XMLSchemaXML schema, W3C Recommendation 2001{http://www.netex.org.uk/schemas/1.0/xsd}netex_publication.xsd[ISO 639-2/B] ENGKizoom Software Ltd, 16 High Holborn, London WC1V 6BX http://www.netex.org.uk/schemas/1.0/netex_filters.xsdhttp://www.netex.org.uk/schemas/1.0/netex_all_objects.xsdUnclassified 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 @@ -4362,7 +4355,7 @@ Correct COnstraints for PointOnRoute - + @@ -5906,7 +5899,6 @@ Correct COnstraints for PointOnRoute - diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index f1c7ea632..8556f1ee9 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1030,7 +1030,6 @@ Provides a general purose wrapper for NeTEx data content. - 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 c8b1b8a8a..9aa003d21 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd @@ -65,7 +65,7 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index c94d910b3..42778a879 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -139,7 +139,7 @@ Rail transport, Roads and Road transport -                                               + @@ -267,7 +267,7 @@ Rail transport, Roads and Road transport - diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd index a5b9abde7..59846e129 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd @@ -3,7 +3,7 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd index 21931fe5b..c7cb3afb7 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd @@ -180,7 +180,7 @@ -                                               +                                               Type for identifier of a LOCATABLE SPOT. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd index 94f263394..f7894a3d0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_support.xsd @@ -10,8 +10,7 @@ V1.0 Nicholas Knowles Europe First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2024-03-01Create from TM Spec + 2024-03-01Create from TM Spec 2024-03-01 @@ -139,4 +138,4 @@ -                                               \ No newline at end of file +                                               diff --git a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd index 059dd0093..0591bb29b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_spotAffinity_version.xsd @@ -15,8 +15,7 @@ 2023-03-01 - - 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.

                                              @@ -129,4 +128,4 @@ - \ No newline at end of file + 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 ed0f76c0c..0c4e59eee 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 @@ -83,7 +83,7 @@ Rail transport, Roads and Road transport Reference to a SITE PATH LINK. - + Type for a reference to a SITE PATH LINK. @@ -102,7 +102,7 @@ Rail transport, Roads and Road transport Reference to a SITE PATH LINK. DEPRECATED use SitePathLinkRef+v2.0 - + @@ -133,7 +133,7 @@ Rail transport, Roads and Road transport Depreceated - use SitePathJunctionRef +v2.0 - + @@ -218,5 +218,5 @@ Rail transport, Roads and Road transport DEPRECATED use Reference to a SIteNavigationPath v.20 - + 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 ffd3572e1..a3ef9c46e 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 @@ -313,7 +313,7 @@ Rail transport, Roads and Road transport - + @@ -407,7 +407,7 @@ Rail transport, Roads and Road transport - + DEPRECATED - use SITE PATH JUNCTION. v 3.0esignated point, inside a SITE ie STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. @@ -424,7 +424,7 @@ Rail transport, Roads and Road transport - 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 3690b6b5d..92bd9129e 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 @@ -484,4 +484,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 5bf9e5d16..5cbfbe785 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -408,9 +408,9 @@ Rail transport, Roads and Road transport - Whether assigment permits or forbids any use of TRAIN COMPONENT at specifed stop. Default is true. +V2.0 - - + Whether assigment permits or forbids any use of TRAIN COMPONENT at specifed stop. Default is true. +V2.0 + + Text description of A specific ENTRANCE to the VEHICLE. E.g. Front, rear. NB DECK ENTRANCE ASSIGNMENT can be used to make structured reference. @@ -421,7 +421,6 @@ Rail transport, Roads and Road transport Explicit assignment of a DECK ENTRANCE to a BOARDING POSITION. +V2.0 - diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd index bae05751f..b5ec2fa17 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAssignment_version.xsd @@ -133,7 +133,7 @@ Whether assigment permits or forbids use of TRAIN COMPONENT and / or specified DECK ENTRANCE at specifed stop. - + Default setting for doors when while at stop - are the doors held open, shut or locked shut. From e6f39c1b5e44aba74b439cd63fbacd2f6f2873a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 27 Mar 2024 23:09:21 +0100 Subject: [PATCH 63/87] reestablish complexest Deckplan example. --- .../{DeckPlans-Example_train.xxx => DeckPlans-Example_train.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/functions/deckPlans/{DeckPlans-Example_train.xxx => DeckPlans-Example_train.xml} (100%) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xxx b/examples/functions/deckPlans/DeckPlans-Example_train.xml similarity index 100% rename from examples/functions/deckPlans/DeckPlans-Example_train.xxx rename to examples/functions/deckPlans/DeckPlans-Example_train.xml From b837538f650108cd6ffa73c1d13a80e26069e5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 28 Mar 2024 22:09:00 +0100 Subject: [PATCH 64/87] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne --- .../netex_reusableComponents/netex_deckPath_version.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 42778a879..efff71bb0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -1,6 +1,7 @@ + From a4d83d6b603905787c9f91e6d6e793911ca3ecbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 28 Mar 2024 22:09:06 +0100 Subject: [PATCH 65/87] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne --- .../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 efff71bb0..64a5f578d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - + From bfee2c8a138cc89db61bda3474389a7978ce1900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 28 Mar 2024 22:09:14 +0100 Subject: [PATCH 66/87] Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne --- .../netex_deckPath_version.xsd | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 64a5f578d..28345a3fe 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -130,17 +130,7 @@ Rail transport, Roads and Road transport - - - - Description of PATH LINK. - - - - - - - + From 8a9c51ad5313198b0dc7aa9175347b4a506d3141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 28 Mar 2024 22:28:05 +0100 Subject: [PATCH 67/87] fixed some typos --- examples/functions/deckPlans/DeckPlans-Example_train.xml | 4 ++-- .../netex_genericFramework/netex_path_version.xsd | 2 +- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 8142ba3c4..5cfb750ae 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -4603,11 +4603,11 @@ The train reverse in the station and departs, oriented backwards to the right left - Turn left to go to ticket machine + Turn left to go to ticket machine. forward - Cmtinue forward for stairs to platforms + Continue forward for stairs to platforms.                                               diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index be44b5cbe..7ee1e050c 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -212,7 +212,7 @@ Rail transport, Roads and Road transport --> - Instructiions for following PATH LINK. +v2.0 + Instructions for following PATH LINK. +v2.0 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 a3ef9c46e..4a7fe4e33 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 @@ -404,7 +404,7 @@ Rail transport, Roads and Road transport Items of fixed EQUIPMENT that may be lused at the spot 0 in particular SIGN EQUIPMENT and BAECON EQUIPMENT +V2.0 - + From e0be1a33f5e1c5dd7f5d4a9b42ef68f38eb5aae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 28 Mar 2024 22:34:08 +0100 Subject: [PATCH 68/87] fix missing PathInstructions in SitePathJunction --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 3 +++ 1 file changed, 3 insertions(+) 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 4a7fe4e33..3a27ea238 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 @@ -354,6 +354,9 @@ Rail transport, Roads and Road transport + + + From 7e34981e909f67fc432fb20271cd34a70ea3f15f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 21:36:16 +0000 Subject: [PATCH 69/87] Lint and update documentation tables --- examples/functions/deckPlans/DeckPlans-Example_train.xml | 2 +- .../netex_reusableComponents/netex_deckPath_version.xsd | 2 +- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index 5cfb750ae..e47db55f9 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -5055,4 +5055,4 @@ The train reverse in the station and departs, oriented backwards to the right - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index 28345a3fe..e827fd6a6 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -151,7 +151,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 3a27ea238..f05d4f24e 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 @@ -407,7 +407,7 @@ Rail transport, Roads and Road transport Items of fixed EQUIPMENT that may be lused at the spot 0 in particular SIGN EQUIPMENT and BAECON EQUIPMENT +V2.0 - + From bf0a120c07d17b6dc91118c847155b41f32a83ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 2 Apr 2024 15:30:29 +0200 Subject: [PATCH 70/87] fix duplicate elements and an order="0" --- .../deckPlans/DeckPlans-Example_train.xml | 6 ++--- .../netex_vehicleType_support.xsd | 26 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml index e47db55f9..0691f097f 100644 --- a/examples/functions/deckPlans/DeckPlans-Example_train.xml +++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml @@ -4636,7 +4636,7 @@ The train reverse in the station and departs, oriented backwards to the right - + Day Configuration as seats @@ -4645,7 +4645,7 @@ The train reverse in the station and departs, oriented backwards to the right 20:30:00 true - + Night configuration as bunk beds @@ -4657,7 +4657,7 @@ The train reverse in the station and departs, oriented backwards to the right false - + Buffet Service betwen 18:30 and 11:45 18:30:00 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index e710f0178..5ad066f10 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -730,31 +730,5 @@ 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 - - - - - From 11fcdb4a0089d24e3492e299f8237b28db88f258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 14:25:02 +0200 Subject: [PATCH 71/87] Update xsd/netex_framework/netex_genericFramework/netex_place_support.xsd Co-authored-by: Stefan de Konink --- .../netex_genericFramework/netex_place_support.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd index abfe9bbc8..aefc0ffae 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd @@ -58,7 +58,6 @@ Rail transport, Roads and Road transport Standard - Identifer types for PLACE From 07083c84241cd4c9169e1988159050c184ad69b3 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 3 Apr 2024 15:18:46 +0200 Subject: [PATCH 72/87] Typo's --- .../netex_trainElementType_version.xsd | 14 ++++---------- .../netex_ifopt_equipmentAccess_support.xsd | 2 +- .../netex_ifopt_navigationPath_version.xsd | 4 ++-- .../part1_ifopt/netex_ifopt_path_version.xsd | 12 ++++++------ .../part1_ifopt/netex_ifopt_site_version.xsd | 16 +++++++--------- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd index e9398c325..485cce17a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElementType_version.xsd @@ -86,9 +86,7 @@ Rail transport, Roads and Road transport - A TRAIN that is able to move under its own power, - -+v2.0 + A TRAIN that is able to move under its own power. +v2.0 @@ -133,9 +131,7 @@ Rail transport, Roads and Road transport - A TRAIN that is able to move under its own power, - -+v2.0 + A TRAIN that is able to move under its own power. +v2.0 @@ -184,8 +180,7 @@ Rail transport, Roads and Road transport - A TRAIN ELEMENT TYPE that is self-propelled, e.g., a locomotive or powered railcar. -+v2.0 + A TRAIN ELEMENT TYPE that is self-propelled, e.g., a locomotive or powered railcar. +v2.0 @@ -230,8 +225,7 @@ Rail transport, Roads and Road transport - A TRAIN ELEMENT TYPE that cannot propel itself, e.g. a railway carriage, luggage van, passenger vehicle wagon, etc -. +v2.0 + A TRAIN ELEMENT TYPE that cannot propel itself, e.g. a railway carriage, luggage van, passenger vehicle wagon, etc. +v2.0 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 984ad87c0..2d2bcb4e4 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 @@ -126,7 +126,7 @@ Rail transport, Roads and Road transport - Single door hinged at one side. + Single door, hinged at one side. 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 e982653fe..23f87dc61 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 @@ -151,7 +151,7 @@ Rail transport, Roads and Road transport - Group of ACCESS and PATH related elements related elements. for a site + Group of ACCESS and PATH related elements for a site. @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport - DEPRECATED use SITE NAVIGATION instead + DEPRECATED use SITE NAVIGATION instead 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 f05d4f24e..dd7ee3892 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 @@ -78,7 +78,7 @@ Rail transport, Roads and Road transport - Elements of a OFF SITE PATH LINK. + Elements of an OFF SITE PATH LINK. @@ -94,14 +94,14 @@ Rail transport, Roads and Road transport - Type for an OFF SITE P PATH LINK END. + Type for an OFF SITE PATH LINK END. - Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. DEPRECATED 2.0 use more specifc SITE COMPONENT + DEPRECATED: Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. Use more specifc SITE COMPONENT. -v2.0 @@ -259,7 +259,7 @@ Rail transport, Roads and Road transport - Elements of a SITE PATH LINK. + Elements of a SITE PATH LINK. @@ -405,14 +405,14 @@ Rail transport, Roads and Road transport - Items of fixed EQUIPMENT that may be lused at the spot 0 in particular SIGN EQUIPMENT and BAECON EQUIPMENT +V2.0 + Items of fixed EQUIPMENT that may be lused at the spot 0 in a particular SIGN EQUIPMENT and BEACON EQUIPMENT. +v2.0 - DEPRECATED - use SITE PATH JUNCTION. v 3.0esignated point, inside a SITE ie STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. + DEPRECATED: Use SITE PATH JUNCTION. Designated point, inside a SITE ie STOP PLACE or POINT OF INTEREST, at which two or more PATH LINKs may connect or branch. -v2.0 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 2339075f2..f9b8f35d2 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 @@ -229,7 +229,7 @@ Rail transport, Roads and Road transport - ENTRANCEs to and within SITE. + ENTRANCEs to and within SITE. @@ -690,7 +690,7 @@ Rail transport, Roads and Road transport - Projections of SITE onto another layer. + Projections of SITE onto another layer. @@ -710,8 +710,7 @@ Rail transport, Roads and Road transport - A building or a separate part thereof within a SITE. +v2.0 - + A building or a separate part thereof within a SITE. +v2.0 @@ -744,7 +743,7 @@ Rail transport, Roads and Road transport - LEVELs found within SITe. + LEVELs found within a SITE. @@ -764,8 +763,7 @@ Rail transport, Roads and Road transport - 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 - + 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 @@ -792,12 +790,12 @@ Rail transport, Roads and Road transport - Label associated with LEVEL within SITE STRUCTURE. + Label associated with LEVEL within SITE STRUCTURE. - Name of Level in SITE STRUCTURE + Name of Level in SITE STRUCTURE. From 01bf25c173a88ac4efad9b5f7d53c45f50f90619 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 3 Apr 2024 15:21:16 +0200 Subject: [PATCH 73/87] More typo's MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Matthias Günter --- .../netex_trainElement_version.xsd | 12 +++++------- .../part1_frames/netex_siteFrame_version.xsd | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index 0f7c1d021..d0eb385a4 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -380,7 +380,7 @@ Rail transport, Roads and Road transport - Type of TRAIN ELEMENT TYPE. NB THere is a name class with the suppertype. Fix in v2.0 + Type of TRAIN ELEMENT TYPE. NB There is a name class with the supertype. Fix in v2.0 @@ -428,7 +428,7 @@ Rail transport, Roads and Road transport - Elements for a TRAIN ELEMENT VIEW. + Elements for a TRAIN ELEMENT TYPE VIEW. @@ -448,7 +448,7 @@ Rail transport, Roads and Road transport - Type of TRAIN ELEMENT. DEPRECATED 2.0 Renamed to TYPE OF TRAIN ELEMENG TYPE + Type of TRAIN ELEMENT. DEPRECATED 2.0 Renamed to TYPE OF TRAIN ELEMENG TYPE @@ -552,7 +552,7 @@ Rail transport, Roads and Road transport - Whether the component can be split in normal usage + Whether the component can be split in normal usage. @@ -632,9 +632,7 @@ Rail transport, Roads and Road transport - - Order of TRAIN IN COMPOUND TRAIN within TRAIN. - + Order of TRAIN IN COMPOUND TRAIN within TRAIN. 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 b0a05ece6..bc0a7592a 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - GROUPS of SITESs in frame. +v.0 + GROUPS of SITESs in frame. +v2.0 @@ -225,7 +225,7 @@ Rail transport, Roads and Road transport - TARIFF ZONE related elements in frame. + TARIFF ZONE related elements in frame. From cc21f26f4e43e83631c4e1aeb3839188d4ecde24 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Wed, 3 Apr 2024 15:23:50 +0200 Subject: [PATCH 74/87] More typo's --- .../netex_reusableComponents/netex_trainElement_support.xsd | 2 +- .../netex_reusableComponents/netex_vehicleType_version.xsd | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd index fbd44ffb8..1fd779e47 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd @@ -156,7 +156,7 @@ Rail transport, Roads and Road transport - DEPRECATED v2.0 - renamed to TRAIN ELEMENT TYPE. + DEPRECATED: renamed to TRAIN ELEMENT TYPE. -v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 7925d5fb7..17dcc3407 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -1294,8 +1294,7 @@ Rail transport, Roads and Road transport - A type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licenceA type of driving license (e.g. https://en.wikipedia.org/wiki/European_driving_licence).", +V2.0 - + A type of driving license e.g. https://en.wikipedia.org/wiki/European_driving_licence +V2.0 From a62e46b6eaad7fde7ce3fe4cb6aa8cfc613944a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:31:21 +0200 Subject: [PATCH 75/87] Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Co-authored-by: Stefan de Konink --- .../part1_networkDescription/netex_routeInstruction_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 acbdf0eea..7d3ce33ab 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -64,7 +64,7 @@ Rail transport, Roads and Road transport Standard - NeTEx ROUTE INSTRUCTION types. + NeTEx ROUTE INSTRUCTION types. From 9e953740d091acb684d06845eb47163839d33a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:31:30 +0200 Subject: [PATCH 76/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 424cc60fb..10cf2c1f3 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -159,7 +159,7 @@ Rail transport, Roads and Road transport - 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 departs from stop travelling in a forwards direction, i.e. operational orientation. Default is true.. Default is true. +v2.0 From 6d12d4b985c039a861cdff3d0b5f4f7ac8ef1a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:31:39 +0200 Subject: [PATCH 77/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 10cf2c1f3..417257ac9 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -403,7 +403,7 @@ Rail transport, Roads and Road transport - BOARDING POSITION to which TRAIN COMPONENT at SCHEDULED STOP POINT is to be assigned. + BOARDING POSITION to which TRAIN COMPONENT at SCHEDULED STOP POINT is to be assigned. From f8bffe6470f06056a75aa0411fbe58fb110b2f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:31:51 +0200 Subject: [PATCH 78/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 417257ac9..20c733a08 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -149,7 +149,7 @@ Rail transport, Roads and Road transport - EDirectional lements for a STOP ASSIGNMENT. + Directional elements for a STOP ASSIGNMENT. From ed589c454f40145389cfa6afb7c08eabe3d5c666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:31:59 +0200 Subject: [PATCH 79/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 20c733a08..0dd3d194d 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -247,7 +247,7 @@ Rail transport, Roads and Road transport - Train stop assignemnts elements to use for which SCHEDULED STOP POINT + Train stop assignments elements to use for which SCHEDULED STOP POINT is to be assigned. +v2.0 From b64af4963e43e258f4baadec06550ada68c3e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:32:08 +0200 Subject: [PATCH 80/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 0dd3d194d..92e4a4ce2 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -257,7 +257,7 @@ Rail transport, Roads and Road transport - Train elements to which SCHEDULED STOP POINT is to be assigned. DEPRECATED 2.0 + Train elements to which SCHEDULED STOP POINT is to be assigned. DEPRECATED -v2.0 From a6cf995e41033b1313fe60dffe6b8cb9b1d6a002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 15:32:17 +0200 Subject: [PATCH 81/87] Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink --- .../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 92e4a4ce2..5610a25ca 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd @@ -142,7 +142,7 @@ Rail transport, Roads and Road transport - Directional elements for a STOP ASSIGNMENT. +v2.0 + Directional elements for a STOP ASSIGNMENT. +v2.0 From 327373a25e231ae7f3a04ecfff63d0154b06edf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 20:59:03 +0200 Subject: [PATCH 82/87] remove removed parts completly. --- .../netex_genericFramework/netex_path_version.xsd | 5 ----- .../netex_reusableComponents/netex_deckPath_version.xsd | 3 --- xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd | 3 --- 3 files changed, 11 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd index 7ee1e050c..b653b31dd 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_path_version.xsd @@ -205,11 +205,6 @@ Rail transport, Roads and Road transport Elements of a GENERIC PATH JUNCTION. - Instructions for following PATH LINK. +v2.0 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd index e827fd6a6..956d4ec45 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd @@ -258,9 +258,6 @@ 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 dd7ee3892..a657555a0 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 @@ -427,9 +427,6 @@ Rail transport, Roads and Road transport - From 1ed6717a2d27acc0f2bdddf67f5de520ca22c8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 21:05:52 +0200 Subject: [PATCH 83/87] Update netex_trainElement_version.xsd I would like to see this element to be 'moved up'. For example above TrainInCompoundTrainGroup, so it does not look to be removed and added. --- .../netex_trainElement_version.xsd | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd index d0eb385a4..ce9637b9a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -563,6 +563,41 @@ 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. + + + + + Elements for a TRAIN IN COMPOUND TRAIN. @@ -603,41 +638,6 @@ 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. - - - - - From 39b1cc9540eaaf5ee9a3c1cde8363f82d6d28f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 21:11:24 +0200 Subject: [PATCH 84/87] description relvovling door --- .../part1_ifopt/netex_ifopt_equipmentAccess_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d2bcb4e4..430284650 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 @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport - Revolving Door. + Revolving door. Which might be an obstacle for wheelchairs. From 0fb983bf8aa4a3035efa11c64e4a69b79caf6ac3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:17:02 +0000 Subject: [PATCH 85/87] Lint and update documentation tables --- .../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 ce9637b9a..865551c32 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd @@ -597,7 +597,7 @@ Rail transport, Roads and Road transport - + Elements for a TRAIN IN COMPOUND TRAIN. From d13560d496f02bbe90741dd737134cf6ae8eb176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 3 Apr 2024 21:19:54 +0200 Subject: [PATCH 86/87] Update netex_accessRightParameter_version.xsd added inlcude so that VehicleRef is known --- .../part3_fares/netex_accessRightParameter_version.xsd | 1 + 1 file changed, 1 insertion(+) 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 2f7e677ff..c581b2649 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -7,6 +7,7 @@ + From 595a613967560a16d65c92940550de0280d3615d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:22:40 +0000 Subject: [PATCH 87/87] Lint and update documentation tables --- .../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 c581b2649..f36ed75f3 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -7,7 +7,7 @@ - +