Skip to content

Commit c0acced

Browse files
nick-knowlesnick-knowles
committed
Stash of broken bits
1 parent e447669 commit c0acced

File tree

8 files changed

+167
-164
lines changed

8 files changed

+167
-164
lines changed

‎examples/functions/site/Netex_01_Sites_SimpleStadium_1.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ The example comprises
363363
</PointOfInterestEntrance>
364364
</entrances>
365365
<classifications>
366-
<PointOfInterestClassificationRef versionRef="EXTERNAL" ref="tbd:Class_476">EXTERNAL</PointOfInterestClassificationRef>
366+
<PointOfInterestClassificationRef ref="tbd:Class_476">EXTERNAL</PointOfInterestClassificationRef>
367367
</classifications>
368368
<spaces>
369369
<PointOfInterestSpace version="any" id="tbd:POI_23_A1">
@@ -544,7 +544,7 @@ The example comprises
544544
<Name>From entrance A to main concourse J1</Name>
545545
<Distance>20</Distance>
546546
<From>
547-
<PlaceRef version="any" ref="tbd:POI_23"/>
547+
<PointOfInterestRef version="any" ref="tbd:POI_23"/>
548548
<LevelRef version="any" ref="tbd:POI_23_Lvl_01_lower"/>
549549
<EntranceRef version="any" ref="tbd:POI_23_A1-E1"/>
550550
</From>
@@ -655,7 +655,7 @@ The example comprises
655655
<Name>From entrance A to main concourse J1</Name>
656656
<Distance>20</Distance>
657657
<From>
658-
<PlaceRef version="any" ref="tbd:POI_23"/>
658+
<PointOfInterestRef version="any" ref="tbd:POI_23"/>
659659
<LevelRef version="any" ref="tbd:POI_23_Lvl_01_lower"/>
660660
<EntranceRef version="any" ref="tbd:POI_23_B1-E1"/>
661661
</From>
@@ -697,7 +697,7 @@ The example comprises
697697
<LevelRef version="any" ref="tbd:POI_23_Lvl_01_lower"/>
698698
</From>
699699
<To>
700-
<PlaceRef version="any" xsi:type="PointOfInterestSpaceRefStructure" ref="tbd:POI_23_B2"/>
700+
<PointOfInterestSpaceRef version="any" xsi:type="PointOfInterestSpaceRefStructure" ref="tbd:POI_23_B2"/>
701701
<LevelRef version="any" ref="tbd:POI_23_Lvl_01_lower"/>
702702
</To>
703703
<AccessibilityAssessment version="any" id="tbd:POI_23_pl_B1-J1_to_B2">

‎examples/functions/site/Netex_11_Sites_OlympicPark_1.xml‎

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

‎examples/functions/site/Netex_21_Sites_Parking_1.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ Overview
162162
<BothWays>true</BothWays>
163163
<From>
164164
<TransportMode>rail</TransportMode>
165-
<PlaceRef versionRef="EXTERNAL" ref="napt:9100:00476"/>
165+
<StopPlaceRef versionRef="EXTERNAL" ref="napt:9100:00476"/>
166166
</From>
167167
<To>
168168
<TransportMode>selfDrive</TransportMode>
169-
<PlaceRef version="any" ref="pkg:PP01" xsi:type="ParkingRefStructure"/>
169+
<ParkingRef version="any" ref="pkg:PP01" xsi:type="ParkingRefStructure"/>
170170
</To>
171171
</Access>
172172
</accesses>
@@ -259,11 +259,11 @@ Overview
259259
<BothWays>true</BothWays>
260260
<From>
261261
<TransportMode>rail</TransportMode>
262-
<PlaceRef versionRef="EXTERNAL" ref="napt:9100:00476"/>
262+
<StopPlaceRef versionRef="EXTERNAL" ref="napt:9100:00476"/>
263263
</From>
264264
<To>
265265
<TransportMode>selfDrive</TransportMode>
266-
<PlaceRef version="any" ref="pkg:PS22" xsi:type="ParkingRefStructure"/>
266+
<ParkingRef version="any" ref="pkg:PS22" xsi:type="ParkingRefStructure"/>
267267
</To>
268268
</Access>
269269
</accesses>

‎xsd/netex_framework/netex_genericFramework/netex_path_support.xsd‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<Audience>e-service developers</Audience>
1212
<Coverage>Europe</Coverage>
1313
<Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
14-
<Date><Created>2024-01-05</Created>Factored out of Ifopt path
14+
<Date>
15+
<Created>2024-01-05</Created>Factored out of Ifopt path
1516
</Date>
1617
<Date>
1718
<Modified>2024-01-05</Modified>
@@ -129,10 +130,15 @@ Rail transport, Roads and Road transport
129130
</xsd:annotation>
130131
<xsd:restriction base="PlaceIdType"/>
131132
</xsd:simpleType>
132-
<xsd:element name="GenericPathJunctionRef" type="GenericPathJunctionRefStructure" substitutionGroup="PlaceRef_">
133+
<xsd:element name="GenericPathJunctionRef" substitutionGroup="PlaceRef_">
133134
<xsd:annotation>
134135
<xsd:documentation>Reference to a PATH JUNCTION.</xsd:documentation>
135136
</xsd:annotation>
137+
<xsd:complexType>
138+
<xsd:simpleContent>
139+
<xsd:restriction base="GenericPathJunctionRefStructure"/>
140+
</xsd:simpleContent>
141+
</xsd:complexType>
136142
</xsd:element>
137143
<xsd:complexType name="GenericPathJunctionRefStructure">
138144
<xsd:annotation>

‎xsd/netex_framework/netex_genericFramework/netex_path_version.xsd‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
<Contributor>Roger Slevin [Roger.Slevin@dft.gsi.gov.uk]</Contributor>
1616
<Coverage>Europe</Coverage>
1717
<Creator>Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema </Creator>
18-
<Date><Created>2024-02-05</Created>Factored out from ifopt_path_link
18+
<Date>
19+
<Created>2024-02-05</Created>Factored out from ifopt_path_link
1920
</Date>
20-
<Date><Modified>2024-02-18</Modified>Rename NAVIGATION PATH to NAVIGATION
21+
<Date>
22+
<Modified>2024-02-18</Modified>Rename NAVIGATION PATH to NAVIGATION
2123
</Date>
2224
<Description>
2325
<Title>NeTEx Network Exchange - Generic PATH types.</Title>
@@ -127,11 +129,7 @@ Rail transport, Roads and Road transport
127129
<xsd:documentation>Type for a PATH LINK END.</xsd:documentation>
128130
</xsd:annotation>
129131
<xsd:choice>
130-
<xsd:element name="PlaceRef" type="PlaceRefStructure">
131-
<xsd:annotation>
132-
<xsd:documentation>Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE.</xsd:documentation>
133-
</xsd:annotation>
134-
</xsd:element>
132+
<xsd:element ref="PlaceRef"/>
135133
<xsd:element ref="GenericPathJunctionRef"/>
136134
</xsd:choice>
137135
</xsd:complexType>

‎xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<Date>
1919
<Modified>2011-02-05</Modified>
2020
</Date>
21-
<Date><Modified>2020-10-05</Modified> New Modes, Change to allow allmodes for access end
21+
<Date>
22+
<Modified>2020-10-05</Modified> New Modes, Change to allow allmodes for access end
2223
</Date>
2324
<Description>
2425
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -153,16 +154,9 @@ Rail transport, Roads and Road transport
153154
<xsd:documentation>Identifier of MODE of end point of ACCESS link. Default is all modes.</xsd:documentation>
154155
</xsd:annotation>
155156
</xsd:element>
156-
<xsd:element name="PlaceRef" type="PlaceRefStructure" minOccurs="0">
157-
<xsd:annotation>
158-
<xsd:documentation>Identifier of a PLACE at end point of ACCESS link.</xsd:documentation>
159-
</xsd:annotation>
160-
</xsd:element>
161-
<xsd:element name="PointRef" type="PointRefStructure" minOccurs="0">
162-
<xsd:annotation>
163-
<xsd:documentation>Identifier of end point of ACCESS link.</xsd:documentation>
164-
</xsd:annotation>
165-
</xsd:element>
157+
<xsd:element ref="PlaceRef" minOccurs="0"/>
158+
159+
<xsd:element ref="PointRef" minOccurs="0"/>
166160
</xsd:sequence>
167161
</xsd:complexType>
168162
<!-- ======================================================================= -->

‎xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<Date>
1313
<Created>2024-01-18</Created>
1414
</Date>
15-
<Date><Modified>2024-01-18</Modified>Move from Part1 Ifoft and bas on generic
15+
<Date>
16+
<Modified>2024-01-18</Modified>Move from Part1 Ifoft and bas on generic
1617
</Date>
1718
<Description>
1819
<p>NeTEx - Network Exchange. This subschema defines DECK NAVIGATH PATH types.</p>
@@ -84,18 +85,23 @@ Rail transport, Roads and Road transport
8485
</xsd:annotation>
8586
<xsd:restriction base="GenericPathJunctionIdType"/>
8687
</xsd:simpleType>
87-
<xsd:element name="DeckPathJunctionRef" type="GenericPathJunctionRefStructure" substitutionGroup="GenericPathJunctionRef">
88+
<xsd:element name="DeckPathJunctionRef" substitutionGroup="PlaceRef_">
8889
<xsd:annotation>
8990
<xsd:documentation>Reference to a DECK PATH JUNCTION.</xsd:documentation>
9091
</xsd:annotation>
92+
<xsd:complexType>
93+
<xsd:simpleContent>
94+
<xsd:restriction base="GenericPathJunctionRefStructure"/>
95+
</xsd:simpleContent>
96+
</xsd:complexType>
9197
</xsd:element>
9298
<xsd:complexType name="DeckPathJunctionRefStructure">
9399
<xsd:annotation>
94100
<xsd:documentation>Type for a reference to a DECK PATH JUNCTION.</xsd:documentation>
95101
</xsd:annotation>
96102
<xsd:simpleContent>
97103
<xsd:restriction base="GenericPathJunctionRefStructure">
98-
<xsd:attribute name="ref" type="GenericPathJunctionIdType" use="required">
104+
<xsd:attribute name="ref" type="DeckPathJunctionIdType" use="required">
99105
<xsd:annotation>
100106
<xsd:documentation>Identifier of a PATH JUNCTION.</xsd:documentation>
101107
</xsd:annotation>

‎xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@
2323
<Date>
2424
<Modified>2007-03-22</Modified>
2525
</Date>
26-
<Date><Modified>2019-03-25</Modified>FR49 CD #65 Accessibility changes
26+
<Date>
27+
<Modified>2019-03-25</Modified>FR49 CD #65 Accessibility changes
2728
CD add new attributes to PathLink : Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip
2829
NK Review: Reorder so as to place like elements toigether, add sub Groups to organize
2930
</Date>
30-
<Date><Modified>2019-03-28</Modified>FR49 CD #65 Accessibility changes
31+
<Date>
32+
<Modified>2019-03-28</Modified>FR49 CD #65 Accessibility changes
3133
NJSK Doc rewviewe
3234
Revise name of ___PathLink___ ___Width___ to ___MinimumWidth__, add enw attribute ___MinimumHeight___
3335
Revise name of ___PathLink___ new attribute ___CodedTilt___ to ___TiltType___ to be consistent
3436
Also add new attributes ___MaximumGradient___ and MaximumGradientType___ to ___PathLink___
3537
</Date>
36-
<Date><Modified>2024-02-05</Modified>Revise to share common features with DECK PATH LINK, add OffSItePathLink
38+
<Date>
39+
<Modified>2024-02-05</Modified>Revise to share common features with DECK PATH LINK, add OffSItePathLink
3740
</Date>
3841
<Description>
3942
<Title>NeTEx Network Exchange - PATH types.</Title>
@@ -99,11 +102,7 @@ Rail transport, Roads and Road transport
99102
<xsd:sequence>
100103
<xsd:choice>
101104
<xsd:element ref="SiteElementRef"/>
102-
<xsd:element name="PlaceRef" type="PlaceRefStructure">
103-
<xsd:annotation>
104-
<xsd:documentation>DEPRECATED: Reference to a PLACE, including QUAY, ACCESS SPACE, BOARDING POSITION or other node of a SITE. Use more specifc SITE COMPONENT. -v2.0 </xsd:documentation>
105-
</xsd:annotation>
106-
</xsd:element>
105+
<xsd:element ref="PlaceRef"/>
107106
</xsd:choice>
108107
<xsd:element name="LevelRef" type="LevelRefStructure" minOccurs="0">
109108
<xsd:annotation>

0 commit comments

Comments
 (0)