Skip to content

Commit

Permalink
Revert "Deck plan examples and fixes (NeTEx-CEN#656)"
Browse files Browse the repository at this point in the history 
This reverts commit 6801947.
  • Loading branch information
@skinkie
skinkie authored Mar 12, 2024
1 parent 6801947 commit dfc4ee7
Show file tree
Hide file tree
Showing 87 changed files with 2,420 additions and 24,431 deletions.
153 changes: 48 additions & 105 deletions NeTEx.spp
View file

Large diffs are not rendered by default.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

30 changes: 1 addition & 29 deletions examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml
View file
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 version="1.0" id="hde:VT001">
<PassengerCapacity>
<SeatingCapacity>50</SeatingCapacity>
<StandingCapacity>20</StandingCapacity>
<WheelchairPlaceCapacity>2</WheelchairPlaceCapacity>
Expand Down Expand Up @@ -606,38 +606,10 @@ 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
View file
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">
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_A1-E1_to_A1-J1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_B1-E1_to_B1-J1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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
View file
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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<PathLinkRef xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" 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">
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_E1_to_pj1"/>
<Description>Entrance to aquatics vicinity</Description>
<Reverse>false</Reverse>
<Heading>forward</Heading>
Expand Down
86 changes: 1 addition & 85 deletions examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
View file
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, 2023
(C) CEN Copyright 2010
-->
<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,28 +491,6 @@ 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 @@ -4246,52 +4224,6 @@ 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 @@ -4802,22 +4734,6 @@ 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 dfc4ee7

Please sign in to comment.