Skip to content

Commit dfc4ee7

Browse files
skinkieskinkie
authored
Revert "Deck plan examples and fixes (#656)"
This reverts commit 6801947.
1 parent 6801947 commit dfc4ee7

File tree

87 files changed

+2420
-24431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2420
-24431
lines changed

‎NeTEx.spp‎

Lines changed: 48 additions & 105 deletions
Large diffs are not rendered by default.

‎examples/functions/deckPlans/DeckPlans-Example.xml‎

Lines changed: 0 additions & 1751 deletions
This file was deleted.

‎examples/functions/deckPlans/DeckPlans-Example_bus.xml‎

Lines changed: 0 additions & 1906 deletions
This file was deleted.

‎examples/functions/deckPlans/DeckPlans-Example_train.xml‎

Lines changed: 0 additions & 5084 deletions
This file was deleted.

‎examples/functions/deckPlans/DeckPlans-Example_train_simple.xml‎

Lines changed: 0 additions & 1770 deletions
This file was deleted.

‎examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ v1.1 revised ids
465465
<vehicleTypes>
466466
<VehicleType version="1.0" created="2010-12-17T09:30:47.0Z" id="hde:VT001">
467467
<Name>Big red bus</Name>
468-
<PassengerCapacity version="1.0" id="hde:VT001">
468+
<PassengerCapacity>
469469
<SeatingCapacity>50</SeatingCapacity>
470470
<StandingCapacity>20</StandingCapacity>
471471
<WheelchairPlaceCapacity>2</WheelchairPlaceCapacity>
@@ -606,38 +606,10 @@ v1.1 revised ids
606606
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0001">
607607
<ScheduledStopPointRef version="032" ref="hde:SSP0001A"/>
608608
<OnwardRouteLinkRef version="any" ref="hde:hde:RL_001o@SSP0001A+RteP021"/>
609-
<routeInstructions>
610-
<RouteInstruction version="any" id="mybus:RPIS_001o-001" order="1">
611-
<Instruction>Bear left uphill along Grub Street for 600 metres</Instruction>
612-
<PathHeading>left</PathHeading>
613-
<Heading>E</Heading>
614-
<Distance>600</Distance>
615-
<Transition>up</Transition>
616-
<RoadName>Grub Street</RoadName>
617-
</RouteInstruction>
618-
<RouteInstruction version="any" id="mybus:RPIS_001o-001" order="2">
619-
<Instruction>Continue along Tin pan avenue for 200 metres</Instruction>
620-
<PathHeading>forward</PathHeading>
621-
<Heading>E</Heading>
622-
<Distance>200</Distance>
623-
<Transition>level</Transition>
624-
<RoadName>TinPan Alley</RoadName>
625-
</RouteInstruction>
626-
</routeInstructions>
627609
</PointOnRoute>
628610
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0002">
629611
<RoutePointRef version="any" ref="hde:RteP021"/>
630612
<OnwardRouteLinkRef version="any" ref="hde:RL_001o@RteP021+SSP0002B_a"/>
631-
<routeInstructions>
632-
<RouteInstruction version="any" id="mybus:RPIS_001o-002" order="1">
633-
<Instruction>Turn Right Into Carey Street</Instruction>
634-
<PathHeading>right</PathHeading>
635-
<Heading>N</Heading>
636-
<Distance>100</Distance>
637-
<Transition>level</Transition>
638-
<RoadName>Carey Street</RoadName>
639-
</RouteInstruction>
640-
</routeInstructions>
641613
</PointOnRoute>
642614
<PointOnRoute version="any" id="mybus:RPIS_001o" order="0003">
643615
<ScheduledStopPointRef version="032" ref="hde:SSP0002B_a"/>

‎examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ The example comprises
906906
<PlaceRef version="any" ref="tbd:POI_23_A1-E1"/>
907907
<onwardLinks>
908908
<PathLinkInSequence version="any" order="1" id="tbd:POI_23_N2_A1-E1_to_A3_p01_01">
909-
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_A1-E1_to_A1-J1"/>
909+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="tbd:POI_23_pl_A1-E1_to_A1-J1"/>
910910
<Description>Entrance A</Description>
911911
<Reverse>true</Reverse>
912912
<Heading>forward</Heading>
@@ -1062,7 +1062,7 @@ The example comprises
10621062
<PlaceRef version="any" xsi:type="PointOfInterestEntranceRefStructure" ref="tbd:POI_23_B1-E1"/>
10631063
<onwardLinks>
10641064
<PathLinkInSequence version="any" order="1" id="tbd:POI_23_N2_B1-E1_to_B3_p01_01">
1065-
<SitePathLinkRef version="any" ref="tbd:POI_23_pl_B1-E1_to_B1-J1"/>
1065+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="tbd:POI_23_pl_B1-E1_to_B1-J1"/>
10661066
<Description>Entrance A</Description>
10671067
<Reverse>true</Reverse>
10681068
<Heading>forward</Heading>

‎examples/functions/site/Netex_10_Sites_OlympicPark_2_basic.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,63 +2163,63 @@ that defines a number of
21632163
</TransferDuration>
21642164
<pathLinksInSequence>
21652165
<PathLinkInSequence version="any" order="1" id="naptPoi:8100OPK_N1_l01">
2166-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
2166+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_E1_to_pj1"/>
21672167
<Description>Entrance to aquatics vicinity</Description>
21682168
<Reverse>false</Reverse>
21692169
<Heading>forward</Heading>
21702170
<Transition>level</Transition>
21712171
</PathLinkInSequence>
21722172
<PathLinkInSequence version="any" order="2" id="naptPoi:8100OPK_N1_l02">
2173-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
2173+
<PathLinkRef xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
21742174
<Description>quatics vicinity to bridge 4</Description>
21752175
<Reverse>false</Reverse>
21762176
<Heading>forward</Heading>
21772177
<Transition>level</Transition>
21782178
</PathLinkInSequence>
21792179
<PathLinkInSequence version="any" order="3" id="naptPoi:8100OPK_N1_l03">
2180-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
2180+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
21812181
<Description>from bridge 4 to Stadium vicinity </Description>
21822182
<Reverse>false</Reverse>
21832183
<Heading>right</Heading>
21842184
<Transition>level</Transition>
21852185
</PathLinkInSequence>
21862186
<PathLinkInSequence version="any" order="4" id="naptPoi:8100OPK_N1_l04">
2187-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
2187+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj3_to_pj5"/>
21882188
<Description>Stadium vicinity to Stadium vicinity </Description>
21892189
<Reverse>false</Reverse>
21902190
<Heading>forward</Heading>
21912191
<Transition>level</Transition>
21922192
</PathLinkInSequence>
21932193
<PathLinkInSequence version="any" order="5" id="naptPoi:8100OPK_N1_l05">
2194-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
2194+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj5_to_pj8"/>
21952195
<Description>Stadium vicinity to handball area vicinity ea</Description>
21962196
<Reverse>false</Reverse>
21972197
<Heading>forward</Heading>
21982198
<Transition>level</Transition>
21992199
</PathLinkInSequence>
22002200
<PathLinkInSequence version="any" order="6" id="naptPoi:8100OPK_N1_l06">
2201-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
2201+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_pj8"/>
22022202
<Description>Handball vicinity to haHockey arvicinity ea</Description>
22032203
<Reverse>true</Reverse>
22042204
<Heading>forward</Heading>
22052205
<Transition>level</Transition>
22062206
</PathLinkInSequence>
22072207
<PathLinkInSequence version="any" order="7" id="naptPoi:8100OPK_N1_l07">
2208-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
2208+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
22092209
<Description>hockey vicinity to bridge 2</Description>
22102210
<Reverse>false</Reverse>
22112211
<Heading>right</Heading>
22122212
<Transition>level</Transition>
22132213
</PathLinkInSequence>
22142214
<PathLinkInSequence version="any" order="8" id="naptPoi:8100OPK_N1_l08">
2215-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
2215+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
22162216
<Description>bridge2 to velo vicinity </Description>
22172217
<Reverse>false</Reverse>
22182218
<Heading>forward</Heading>
22192219
<Transition>level</Transition>
22202220
</PathLinkInSequence>
22212221
<PathLinkInSequence version="any" order="9" id="naptPoi:8100OPK_N1_l09">
2222-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
2222+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
22232223
<Description>to BMX</Description>
22242224
<Reverse>true</Reverse>
22252225
<Heading>forward</Heading>
@@ -2414,63 +2414,63 @@ that defines a number of
24142414
</TransferDuration>
24152415
<pathLinksInSequence>
24162416
<PathLinkInSequence version="any" order="1" id="naptPoi:8100OPK_N2_l01">
2417-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
2417+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_V8-E1"/>
24182418
<Description>to BMX</Description>
24192419
<Reverse>false</Reverse>
24202420
<Heading>forward</Heading>
24212421
<Transition>level</Transition>
24222422
</PathLinkInSequence>
24232423
<PathLinkInSequence version="any" order="2" id="naptPoi:8100OPK_N2_l02">
2424-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
2424+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
24252425
<Description>bridge2 to velo vicinity </Description>
24262426
<Reverse>true</Reverse>
24272427
<Heading>forward</Heading>
24282428
<Transition>level</Transition>
24292429
</PathLinkInSequence>
24302430
<PathLinkInSequence version="any" order="3" id="naptPoi:8100OPK_N2_l03">
2431-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
2431+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_SPC_4"/>
24322432
<Description>hockey vicinity to bridge 2</Description>
24332433
<Reverse>true</Reverse>
24342434
<Heading>forward</Heading>
24352435
<Transition>level</Transition>
24362436
</PathLinkInSequence>
24372437
<PathLinkInSequence version="any" order="4" id="naptPoi:8100OPK_N2_l04">
2438-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj10_to_pj8"/>
2438+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj10_to_pj8"/>
24392439
<Description>Handball vicinity to haHockey arvicinity ea</Description>
24402440
<Reverse>true</Reverse>
24412441
<Heading>left</Heading>
24422442
<Transition>level</Transition>
24432443
</PathLinkInSequence>
24442444
<PathLinkInSequence version="any" order="5" id="naptPoi:8100OPK_N2_l05">
2445-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj5_to_pj8"/>
2445+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj5_to_pj8"/>
24462446
<Description>Stadium vicinity to handball arvicinity ea</Description>
24472447
<Reverse>false</Reverse>
24482448
<Heading>forward</Heading>
24492449
<Transition>level</Transition>
24502450
</PathLinkInSequence>
24512451
<PathLinkInSequence version="any" order="6" id="naptPoi:8100OPK_N2_l06">
2452-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj3_to_pj5"/>
2452+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj3_to_pj5"/>
24532453
<Description>Stadium vicinity to Stadium vicinity </Description>
24542454
<Reverse>false</Reverse>
24552455
<Heading>forward</Heading>
24562456
<Transition>level</Transition>
24572457
</PathLinkInSequence>
24582458
<PathLinkInSequence version="any" order="7" id="naptPoi:8100OPK_N2_l07">
2459-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
2459+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_SPC_4_to_pj3"/>
24602460
<Description>from bridge 4 to Stadium vicinity </Description>
24612461
<Reverse>false</Reverse>
24622462
<Heading>left</Heading>
24632463
<Transition>level</Transition>
24642464
</PathLinkInSequence>
24652465
<PathLinkInSequence version="any" order="8" id="naptPoi:8100OPK_N2_l08">
2466-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
2466+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_pj11_to_SPC_4"/>
24672467
<Description>quatics vicinity to bridge 4</Description>
24682468
<Reverse>false</Reverse>
24692469
<Heading>forward</Heading>
24702470
<Transition>level</Transition>
24712471
</PathLinkInSequence>
24722472
<PathLinkInSequence version="any" order="9" id="naptPoi:8100OPK_N2_l09">
2473-
<SitePathLinkRef version="any" ref="naptPoi:8100OPK_E1_to_pj1"/>
2473+
<PathLinkRef version="any" xsi:type="SitePathLinkRefStructure" ref="naptPoi:8100OPK_E1_to_pj1"/>
24742474
<Description>Entrance to aquatics vicinity</Description>
24752475
<Reverse>false</Reverse>
24762476
<Heading>forward</Heading>

‎examples/functions/site/Netex_11_Sites_OlympicPark_1.xml‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
149149
A COMPOSITE FRAME is used to group the other frames as a single version
150150
151151
152-
(C) CEN Copyright 2010, 2023
152+
(C) CEN Copyright 2010
153153
-->
154154
<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">
155155
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>
@@ -491,28 +491,6 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
491491
<CountryRef ref="gb">ENG</CountryRef>
492492
</TopographicPlace>
493493
</topographicPlaces>
494-
<groupsOfSites>
495-
<GroupOfSites version="any" id="Olympic_park">
496-
<Name>Sites in Olympic Park</Name>
497-
<members>
498-
<StopPlaceRef version="any" ref="naptStop:910GSTRFD"/>
499-
<StopPlaceRef version="any" ref="naptStop:940GZZLUSTD"/>
500-
<StopPlaceRef version="any" ref="naptStop:940GZZCRSTD"/>
501-
<StopPlaceRef version="any" ref="naptStop:940GZZLUWHM"/>
502-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V1_STDM"/>
503-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V2_HOCK"/>
504-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V3_HAND"/>
505-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V4_AQUA"/>
506-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V5_WPOL"/>
507-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V6_BKTB"/>
508-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V7_VELO"/>
509-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V8_BMXT"/>
510-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V9_EMAN"/>
511-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V10_PRSC"/>
512-
<PointOfInterestRef version="any" ref="naptPoi:8100OPK_V11_WARM"/>
513-
</members>
514-
</GroupOfSites>
515-
</groupsOfSites>
516494
<!--- ==== Gateway Stations === -->
517495
<stopPlaces>
518496
<!-- ========== Rail========= -->
@@ -4246,52 +4224,6 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
42464224
<Lighting>wellLit</Lighting>
42474225
<PersonCapacity>80000</PersonCapacity>
42484226
<ParentSiteRef version="any" ref="naptPoi:8100OPK"/>
4249-
<levels>
4250-
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L1">
4251-
<Name>Level 1</Name>
4252-
<PublicUse>true</PublicUse>
4253-
</Level>
4254-
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L2">
4255-
<Name>Level 2</Name>
4256-
<PublicUse>true</PublicUse>
4257-
</Level>
4258-
<Level version="any" id="naptPoi:8100OPK_V1_STDM-L3">
4259-
<Name>Level 3</Name>
4260-
<PublicUse>true</PublicUse>
4261-
</Level>
4262-
</levels>
4263-
<siteStructures>
4264-
<SiteStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1">
4265-
<Name>East Access Block</Name>
4266-
<levelsInStructure>
4267-
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="1">
4268-
<FloorLabel>1</FloorLabel>
4269-
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
4270-
</LevelInStructure>
4271-
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="2">
4272-
<FloorLabel>2</FloorLabel>
4273-
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
4274-
</LevelInStructure>
4275-
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S1" order="3">
4276-
<FloorLabel>3</FloorLabel>
4277-
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
4278-
</LevelInStructure>
4279-
</levelsInStructure>
4280-
</SiteStructure>
4281-
<SiteStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2">
4282-
<Name>West Access Block</Name>
4283-
<levelsInStructure>
4284-
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2" order="1">
4285-
<FloorLabel>1</FloorLabel>
4286-
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
4287-
</LevelInStructure>
4288-
<LevelInStructure version="any" id="naptPoi:8100OPK_V1_STDM-S2" order="2">
4289-
<FloorLabel>2</FloorLabel>
4290-
<LevelRef ref="naptPoi:8100OPK_V1_STDM-L1"/>
4291-
</LevelInStructure>
4292-
</levelsInStructure>
4293-
</SiteStructure>
4294-
</siteStructures>
42954227
</PointOfInterest>
42964228
<PointOfInterest version="any" id="naptPoi:8100OPK_V2_HOCK">
42974229
<Name>Hockey Centre</Name>
@@ -4802,22 +4734,6 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
48024734
<ParentSiteRef version="any" ref="naptPoi:8100OPK"/>
48034735
</PointOfInterest>
48044736
</pointsOfInterest>
4805-
<groupsOfTariffZones>
4806-
<GroupOfTariffZones version="any" id="lul_zones">
4807-
<members>
4808-
<TariffZoneRef version="any" ref="Zone3"/>
4809-
<TariffZoneRef version="any" ref="Zone4"/>
4810-
</members>
4811-
</GroupOfTariffZones>
4812-
</groupsOfTariffZones>
4813-
<tariffZones>
4814-
<TariffZone version="any" id="Zone3">
4815-
<ShortName>Zone3</ShortName>
4816-
</TariffZone>
4817-
<TariffZone version="any" id="Zone4">
4818-
<ShortName>Zone4</ShortName>
4819-
</TariffZone>
4820-
</tariffZones>
48214737
</SiteFrame>
48224738
<!-- - ==== UK Code values used === -->
48234739
<ResourceFrame version="001" created="2011-02-23T10:00:00Z" id="nptg:Types">

0 commit comments

Comments
 (0)