Skip to content

Commit

Permalink
Feature deckplan (#681)
Browse files Browse the repository at this point in the history
* DEckPlan changes Revised rebased

Rbaseddeck plane ready to fix

* Lint and update documentation tables

* 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

* Lint and update documentation tables

* Lint and update documentation tables

* Lint and update documentation tables

* Fix typo

* Fix examples

* 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 <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

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

---------

Co-authored-by: ue71603 <[email protected]>
Co-authored-by: Christophe Duquesne <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <[email protected]>

* Update fix validation

* 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

* Fix examples

* LiftCallEquipment added

* Updated deckplan  examples

Add deck plane xamples and update deck path

* fix xml example

* 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

* Update

* 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

* Update

* DECK Plan Examples add constraints

Add Constraints to publication

* DECK Plan example - fix broken examples

Tidy up to fix broken exampels - correction to constraing

* Fix branch

Notice that the examples still miss RelativeLevelOrder.

* 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.

* DEck Plan Path links

Integrate with other changes

* update

* DEckPlans Add in Stefan Jugelts simplified train deck plan example

Add in  simplified train deck plan example. thanks stefan

* 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

* 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

* Progress

* Update examples

* trying to fix some (or undo it, if it does not help...

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd

* I don't like windows users

* Add netex:EquipmentPlace to SitePathLink_Place_KeyRef

* Extension back to restriction

* fix train validation

* Deckplan examples "validate", look for commented out sections.

* Add version/id to PassengerCapacity

* Reintroduce FlooringStatus

* Add TactileWarningStrip, TactileWarningStripContract back

* linting only

* Make the SensorEquipment_ dummy abstract

* redoneccb6e2f from °674

introducinng spotaffinity

* remove wrongfiles

* redo

* redo  of 48618f0 from#695

* redo of 7f89c10 from #695

DECK PLAN ASSIGNMENT revision

* DEckPlan further correction  redo of a3d4fa8 from #695

* fix include problem

* Things to review by Nick

* check all other examples

* swithing removal of parentzoneref

* Lint and update documentation tables

* reestablish complexest Deckplan example.

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: Christophe Duquesne <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: Christophe Duquesne <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

Co-authored-by: Christophe Duquesne <[email protected]>

* fixed some typos

* fix missing  PathInstructions in SitePathJunction

* Lint and update documentation tables

* fix duplicate elements and an order="0"

* Update xsd/netex_framework/netex_genericFramework/netex_place_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Typo's

* More typo's

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

* More typo's

* Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* remove removed parts completly.

* 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.

* description relvovling door

* Lint and update documentation tables

* Update netex_accessRightParameter_version.xsd

added inlcude so that VehicleRef is known

* Lint and update documentation tables

---------

Co-authored-by: Nicholas Knowles <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ue71603 <[email protected]>
Co-authored-by: Christophe Duquesne <[email protected]>
Co-authored-by: trurlurl <[email protected]>
  • Loading branch information
6 people authored Apr 10, 2024
1 parent 6b0fbe1 commit c7f5064
Show file tree
Hide file tree
Showing 86 changed files with 22,371 additions and 2,098 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/validate-examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
154 changes: 106 additions & 48 deletions NeTEx.spp

Large diffs are not rendered by default.

1,753 changes: 1,753 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,058 changes: 5,058 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.

2 changes: 1 addition & 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
12 changes: 6 additions & 6 deletions examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -763,14 +763,14 @@ The example comprises
</SitePathLink>
</pathLinks>
<pathJunctions>
<PathJunction version="any" id="tbd:POI_23_A1-J1">
<SitePathJunction version="any" id="tbd:POI_23_A1-J1">
<Name>Branch in Entrance Hall A</Name>
<ParentZoneRef version="any" ref="tbd:POI_23_A1"/>
</PathJunction>
<PathJunction version="any" id="tbd:POI_23_B1-J1">
</SitePathJunction>
<SitePathJunction version="any" id="tbd:POI_23_B1-J1">
<Name>Branch in Entrance Hall B</Name>
<ParentZoneRef version="any" ref="tbd:POI_23_B1"/>
</PathJunction>
</SitePathJunction>
</pathJunctions>
<accesses>
<Access version="any" id="tbd:Access:POI_23_N1">
Expand Down 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
89 changes: 88 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,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
-->
<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 +494,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 +4249,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 +4805,22 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
<ParentSiteRef version="any" ref="naptPoi:8100OPK"/>
</PointOfInterest>
</pointsOfInterest>
<tariffZones>
<TariffZone version="any" id="Zone3">
<ShortName>Zone3</ShortName>
</TariffZone>
<TariffZone version="any" id="Zone4">
<ShortName>Zone4</ShortName>
</TariffZone>
</tariffZones>
<groupsOfTariffZones>
<GroupOfTariffZones version="any" id="lul_zones">
<members>
<TariffZoneRef version="any" ref="Zone3"/>
<TariffZoneRef version="any" ref="Zone4"/>
</members>
</GroupOfTariffZones>
</groupsOfTariffZones>
</SiteFrame>
<!-- - ==== UK Code values used === -->
<ResourceFrame version="001" created="2011-02-23T10:00:00Z" id="nptg:Types">
Expand Down
Loading

0 comments on commit c7f5064

Please sign in to comment.