From be64880656066fd20e885512aee8ddd32e3c21b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Fri, 10 May 2024 21:24:06 +0200
Subject: [PATCH] RouteInstructionRef reintroduced (#588)

* fix 466

with including also the stuff that Christophe wrote.

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* example, fixed choice, added constraints

* Lint and update documentation tables

* fix carrdinalties and a typo

* sequences in choice

* Lint and update documentation tables

* Apply suggestions from code review

* typos and simplification

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
---
 .../simpleNetwork/Netex_SimpleNetwork_1.xml   | 14 +++++++++++
 xsd/NeTEx_publication.xsd                     | 21 +++++++++++++++++
 .../netex_routeInstruction_version.xsd        | 23 +++++++++++--------
 .../netex_route_version.xsd                   |  2 +-
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml
index 220f11d41..a200169c8 100644
--- a/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml
+++ b/examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml
@@ -606,10 +606,24 @@ 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 id="ri1" version="any">
+											<Instruction>3rd road to the left</Instruction>
+											<Distance>100</Distance>
+										</RouteInstruction>
+										<RouteInstruction id="ri3" version="any">
+											<PathHeading>back</PathHeading>
+											<Transition>down</Transition>
+											<RoadName>false</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>
+										<RouteInstructionRef ref="ri1" version="any"/>
+									</routeInstructions>
 								</PointOnRoute>
 								<PointOnRoute version="any" id="mybus:RPIS_001o" order="0003">
 									<ScheduledStopPointRef version="032" ref="hde:SSP0002B_a"/>
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 3e081a836..623f67344 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -12318,6 +12318,27 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====RouteInstruction ============================== -->
+		<!-- =====RouteInstruction Key ========================== -->
+		<xsd:unique name="RouteInstruction_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [RouteInstruction Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:RouteInstruction"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====RouteInstruction Key ========================== -->
+		<xsd:keyref name="RouteInstruction_KeyRef" refer="netex:RouteInstruction_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:RouteInstructionRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="RouteInstruction_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:RouteInstruction"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 	</xsd:element>
 	<!-- =====END OF CONSTRAINTS================= -->
 	<xsd:complexType name="PublicationDeliveryStructure">
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
index 7d3ce33ab..7428885cd 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
@@ -74,13 +74,18 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="strictContainmentAggregationStructure">
-				<xsd:sequence>
+				<xsd:choice>
+					<xsd:element ref="RouteInstructionRef" maxOccurs="unbounded">
+						<xsd:annotation>
+							<xsd:documentation>A reference to an instruction on how to follow a ROUTE through the network.</xsd:documentation>
+						</xsd:annotation>
+					</xsd:element>
 					<xsd:element ref="RouteInstruction" maxOccurs="unbounded">
 						<xsd:annotation>
-							<xsd:documentation>An Instruction on how to follow a ROUTE through the network.</xsd:documentation>
+							<xsd:documentation>An instruction on how to follow a ROUTE through the network.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-				</xsd:sequence>
+				</xsd:choice>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -132,27 +137,27 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="PointOnRouteRef" minOccurs="0"/>
 			<xsd:element name="Instruction" type="MultilingualString" default="false" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Directions for following path step.  </xsd:documentation>
+					<xsd:documentation>Directions for following path step.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="PathHeading" type="PathHeadingEnumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Relative heading for Instruction</xsd:documentation>
+					<xsd:documentation>Relative heading for Instruction.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Heading" type="CompassBearing16Enumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Heading for Instructioni nternational boundary between two countries may be crossed.</xsd:documentation>
+					<xsd:documentation>Heading for instruction.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Bearing" type="AbsoluteBearingType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Compass Bearing for Instruction</xsd:documentation>
+					<xsd:documentation>Compass Bearing for Instruction.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Distance" type="DistanceType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Distance for step.  </xsd:documentation>
+					<xsd:documentation>Distance for step.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Transition" type="TransitionEnumeration" minOccurs="0">
@@ -162,7 +167,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="RoadName" type="MultilingualString" default="false" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Directions for following path staep.  </xsd:documentation>
+					<xsd:documentation>Directions for following path step.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="SimpleFeatureRef" minOccurs="0"/>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
index f0b599701..321e24d00 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
@@ -356,7 +356,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="routeInstructions" type="routeInstructions_RelStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Instructins for following route. +v1.1</xsd:documentation>
+					<xsd:documentation>Instructions for following a route. +v1.1</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>