Skip to content

Commit

Permalink
Deck plan examples and fixes (NeTEx-CEN#656)
Browse files Browse the repository at this point in the history
* recreated  commit  532c9b

* recreated commit 29ee965

* rebuild commit 0eddb08

* incluse NeTEx-CEN#574. but had to comments things out

* implements commit fa43f0f

* Lint and update documentation tables

* redo of NeTEx-CEN#625

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Enhancee Seeting plan 615 Add child beds

Add extra enum values to bed ty[e

* Update netex_spotEquipment_version.xsd

* Deck Plan examples and fixes

Add bus and train examples  for deck plans. Fix various equipment issues. Revise DEckPlanassignment

* LiftCallEquipment added

* Updated deckplan  examples

Add deck plane xamples and update deck path

* 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

* fixing import

* Update netex_ifopt_path_support.xsd

* fixing validation errors

same way Nick fixed stuff in the new examples

* Lint and update documentation tables

* 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

* DECK Plan Examples add constraints

Add Constraints to publication

* DECK Plan example - fix broken examples

Tidy up to fix broken exampels - correction to constraing

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd

* Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd

* Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

* Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

* Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

* fixing merge problems

* more problems fixed

* fixing PathLinks

* Update EPIAP_Accessibility_Chur_V08_vehicletypes.xml

* more errors

* Lint and update documentation tables

* DEck Plan - revise to use generic path Link

In order to support DECK PATH LINKS, factor out common PATH LINK and NAVIGATION elements into a Generic framework component
Move copmmonon environmental properties toa Reusuble component  ENVIRONMENT properties in a new package
Revise DECK PATH LINKS and DECK NVAIGATION to sepcaialise generic elements
Revise Add SITE NAVIGATION , and revise IFOPT SITE PATH LINKS and PATH LINK ENDs to specialise generic components
Rename  NAVIGATHION PATH to NAVIGATION but retain  (Site) NAVIGATION PATH as a deprecated element that is an alisa for SITE NAVIGATION

* DEck Plan Path links

Integrate with other changes

* DEckPlans Add in Stefan Jugelts simplified train deck plan example

Add in  simplified train deck plan example. thanks stefan

* Lint and update documentation tables

* 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

* Lint and update documentation tables

* Ypdate with 641 addition of maximumvelocity

* Lint and update documentation tables

* 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

* Lint and update documentation tables

* Apply suggestions from code review

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd

* Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd

Co-authored-by: Matthias Günter <[email protected]>

* Update xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* depreciated corrected

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_train.xml

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd

Co-authored-by: trurlurl <[email protected]>

* fixes

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/NeTEx_publication.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_path_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example_bus.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Update examples/functions/deckPlans/DeckPlans-Example.xml

Co-authored-by: Johan Wiklund <[email protected]>

* Ref/Rel structures back to before

* fixing refs

* Lint and update documentation tables

---------

Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <[email protected]>
Co-authored-by: Stefan de Konink <[email protected]>
Co-authored-by: Johan Wiklund <[email protected]>
  • Loading branch information
6 people authored Mar 8, 2024
1 parent 3ab5249 commit 6801947
Show file tree
Hide file tree
Showing 87 changed files with 24,430 additions and 2,419 deletions.
153 changes: 105 additions & 48 deletions NeTEx.spp

Large diffs are not rendered by default.

1,751 changes: 1,751 additions & 0 deletions examples/functions/deckPlans/DeckPlans-Example.xml

Large diffs are not rendered by default.

1,906 changes: 1,906 additions & 0 deletions examples/functions/deckPlans/DeckPlans-Example_bus.xml

Large diffs are not rendered by default.

5,084 changes: 5,084 additions & 0 deletions examples/functions/deckPlans/DeckPlans-Example_train.xml

Large diffs are not rendered by default.

1,770 changes: 1,770 additions & 0 deletions examples/functions/deckPlans/DeckPlans-Example_train_simple.xml

Large diffs are not rendered by default.

30 changes: 29 additions & 1 deletion examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ v1.1 revised ids
<vehicleTypes>
<VehicleType version="1.0" created="2010-12-17T09:30:47.0Z" id="hde:VT001">
<Name>Big red bus</Name>
<PassengerCapacity>
<PassengerCapacity version="1.0" id="hde:VT001">
<SeatingCapacity>50</SeatingCapacity>
<StandingCapacity>20</StandingCapacity>
<WheelchairPlaceCapacity>2</WheelchairPlaceCapacity>
Expand Down Expand Up @@ -606,10 +606,38 @@ v1.1 revised ids
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0001">
<ScheduledStopPointRef version="032" ref="hde:SSP0001A"/>
<OnwardRouteLinkRef version="any" ref="hde:hde:RL_001o@SSP0001A+RteP021"/>
<routeInstructions>
<RouteInstruction version="any" id="mybus:RPIS_001o-001" order="1">
<Instruction>Bear left uphill along Grub Street for 600 metres</Instruction>
<PathHeading>left</PathHeading>
<Heading>E</Heading>
<Distance>600</Distance>
<Transition>up</Transition>
<RoadName>Grub Street</RoadName>
</RouteInstruction>
<RouteInstruction version="any" id="mybus:RPIS_001o-001" order="2">
<Instruction>Continue along Tin pan avenue for 200 metres</Instruction>
<PathHeading>forward</PathHeading>
<Heading>E</Heading>
<Distance>200</Distance>
<Transition>level</Transition>
<RoadName>TinPan Alley</RoadName>
</RouteInstruction>
</routeInstructions>
</PointOnRoute>
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0002">
<RoutePointRef version="any" ref="hde:RteP021"/>
<OnwardRouteLinkRef version="any" ref="hde:RL_001o@RteP021+SSP0002B_a"/>
<routeInstructions>
<RouteInstruction version="any" id="mybus:RPIS_001o-002" order="1">
<Instruction>Turn Right Into Carey Street</Instruction>
<PathHeading>right</PathHeading>
<Heading>N</Heading>
<Distance>100</Distance>
<Transition>level</Transition>
<RoadName>Carey Street</RoadName>
</RouteInstruction>
</routeInstructions>
</PointOnRoute>
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0003">
<ScheduledStopPointRef version="032" ref="hde:SSP0002B_a"/>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ The example comprises
<PlaceRef version="any" ref="tbd:POI_23_A1-E1"/>
<onwardLinks>
<PathLinkInSequence version="any" order="1" id="tbd:POI_23_N2_A1-E1_to_A3_p01_01">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="tbd:POI_23_pl_A1-E1_to_A1-J1"/>
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_A1-E1_to_A1-J1"/>
<Description>Entrance A</Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
Expand Down Expand Up @@ -1062,7 +1062,7 @@ The example comprises
<PlaceRef version="any" xsi:type="PointOfInterestEntranceRefStructure" ref="tbd:POI_23_B1-E1"/>
<onwardLinks>
<PathLinkInSequence version="any" order="1" id="tbd:POI_23_N2_B1-E1_to_B3_p01_01">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="tbd:POI_23_pl_B1-E1_to_B1-J1"/>
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_B1-E1_to_B1-J1"/>
<Description>Entrance A</Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
Expand Down
36 changes: 18 additions & 18 deletions examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2163,63 +2163,63 @@ that defines a number of
</TransferDuration>
<pathLinksInSequence>
<PathLinkInSequence version="any" order="1" id="naptPoi:8100OPK_N1_l01">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_E1_to_pj1"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
<Description>Entrance to aquatics vicinity</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="2" id="naptPoi:8100OPK_N1_l02">
<PathLinkRef xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<Description>quatics vicinity to bridge 4</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="3" id="naptPoi:8100OPK_N1_l03">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<Description>from bridge 4 to Stadium vicinity </Description>
<Reverse>false</Reverse>
<Heading>right</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="4" id="naptPoi:8100OPK_N1_l04">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<Description>Stadium vicinity to Stadium vicinity </Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="5" id="naptPoi:8100OPK_N1_l05">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<Description>Stadium vicinity to handball area vicinity ea</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="6" id="naptPoi:8100OPK_N1_l06">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<Description>Handball vicinity to haHockey arvicinity ea</Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="7" id="naptPoi:8100OPK_N1_l07">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<Description>hockey vicinity to bridge 2</Description>
<Reverse>false</Reverse>
<Heading>right</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="8" id="naptPoi:8100OPK_N1_l08">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<Description>bridge2 to velo vicinity </Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="9" id="naptPoi:8100OPK_N1_l09">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<Description>to BMX</Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
Expand Down Expand Up @@ -2414,63 +2414,63 @@ that defines a number of
</TransferDuration>
<pathLinksInSequence>
<PathLinkInSequence version="any" order="1" id="naptPoi:8100OPK_N2_l01">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<Description>to BMX</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="2" id="naptPoi:8100OPK_N2_l02">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<Description>bridge2 to velo vicinity </Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="3" id="naptPoi:8100OPK_N2_l03">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<Description>hockey vicinity to bridge 2</Description>
<Reverse>true</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="4" id="naptPoi:8100OPK_N2_l04">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<Description>Handball vicinity to haHockey arvicinity ea</Description>
<Reverse>true</Reverse>
<Heading>left</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="5" id="naptPoi:8100OPK_N2_l05">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<Description>Stadium vicinity to handball arvicinity ea</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="6" id="naptPoi:8100OPK_N2_l06">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<Description>Stadium vicinity to Stadium vicinity </Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="7" id="naptPoi:8100OPK_N2_l07">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<Description>from bridge 4 to Stadium vicinity </Description>
<Reverse>false</Reverse>
<Heading>left</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="8" id="naptPoi:8100OPK_N2_l08">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<Description>quatics vicinity to bridge 4</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
<Transition>level</Transition>
</PathLinkInSequence>
<PathLinkInSequence version="any" order="9" id="naptPoi:8100OPK_N2_l09">
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_E1_to_pj1"/>
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
<Description>Entrance to aquatics vicinity</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
Expand Down
86 changes: 85 additions & 1 deletion examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
A COMPOSITE FRAME is used to group the other frames as a single version
(C) CEN Copyright 2010
(C) CEN Copyright 2010, 2023
-->
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>
Expand Down Expand Up @@ -491,6 +491,28 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
<CountryRef ref="gb">ENG</CountryRef>
</TopographicPlace>
</topographicPlaces>
<groupsOfSites>
<GroupOfSites version="any" id="Olympic_park">
<Name>Sites in Olympic Park</Name>
<members>
<StopPlaceRef version="any" ref="naptStop:910GSTRFD"/>
<StopPlaceRef version="any" ref="naptStop:940GZZLUSTD"/>
<StopPlaceRef version="any" ref="naptStop:940GZZCRSTD"/>
<StopPlaceRef version="any" ref="naptStop:940GZZLUWHM"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V1_STDM"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V2_HOCK"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V3_HAND"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V4_AQUA"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V5_WPOL"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V6_BKTB"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V7_VELO"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V8_BMXT"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V9_EMAN"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V10_PRSC"/>
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V11_WARM"/>
</members>
</GroupOfSites>
</groupsOfSites>
<!--- ==== Gateway Stations === -->
<stopPlaces>
<!-- ========== Rail========= -->
Expand Down Expand Up @@ -4224,6 +4246,52 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
<Lighting>wellLit</Lighting>
<PersonCapacity>80000</PersonCapacity>
<ParentSiteRef version="any" ref="naptPoi:8100OPK"/>
<levels>
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L1">
<Name>Level 1</Name>
<PublicUse>true</PublicUse>
</Level>
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L2">
<Name>Level 2</Name>
<PublicUse>true</PublicUse>
</Level>
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L3">
<Name>Level 3</Name>
<PublicUse>true</PublicUse>
</Level>
</levels>
<siteStructures>
<SiteStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1">
<Name>East Access Block</Name>
<levelsInStructure>
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="1">
<FloorLabel>1</FloorLabel>
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
</LevelInStructure>
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="2">
<FloorLabel>2</FloorLabel>
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
</LevelInStructure>
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="3">
<FloorLabel>3</FloorLabel>
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
</LevelInStructure>
</levelsInStructure>
</SiteStructure>
<SiteStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2">
<Name>West Access Block</Name>
<levelsInStructure>
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2" order="1">
<FloorLabel>1</FloorLabel>
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
</LevelInStructure>
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2" order="2">
<FloorLabel>2</FloorLabel>
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
</LevelInStructure>
</levelsInStructure>
</SiteStructure>
</siteStructures>
</PointOfInterest>
<PointOfInterest version="any" id="naptPoi:8100OPK_V2_HOCK">
<Name>Hockey Centre</Name>
Expand Down Expand Up @@ -4734,6 +4802,22 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
<ParentSiteRef version="any" ref="naptPoi:8100OPK"/>
</PointOfInterest>
</pointsOfInterest>
<groupsOfTariffZones>
<GroupOfTariffZones version="any" id="lul_zones">
<members>
<TariffZoneRef version="any" ref="Zone3"/>
<TariffZoneRef version="any" ref="Zone4"/>
</members>
</GroupOfTariffZones>
</groupsOfTariffZones>
<tariffZones>
<TariffZone version="any" id="Zone3">
<ShortName>Zone3</ShortName>
</TariffZone>
<TariffZone version="any" id="Zone4">
<ShortName>Zone4</ShortName>
</TariffZone>
</tariffZones>
</SiteFrame>
<!-- - ==== UK Code values used === -->
<ResourceFrame version="001" created="2011-02-23T10:00:00Z" id="nptg:Types">
Expand Down
Loading

0 comments on commit 6801947

Please sign in to comment.