Minor fixes to pathLinks and pathviews

Author: nick-knowles

examples/functions/deckPlans/DeckPlans-Example_train.xml

@@ -2541,16 +2541,40 @@ The train reverse in  the station and departs, oriented backwards to the right
 													<DeckPathLinkRef version="any" ref="rc:DPL-slw_deck_1@PE-rear_external_right+DPJ-rear_middle"/>
 													<Heading>left</Heading>
 													<Instruction>Turn  right  into corridor</Instruction>
+													<views>
+														<PathLinkView > <!-- control appearence of link in UI -->
+														<HideDestination>true</HideDestination>
+														<ShowEntranceSeparately>true</ShowEntranceSeparately>
+														<ShowExitSeparately>true</ShowExitSeparately>
+														<ShowHeadingSeparately>true</ShowHeadingSeparately>
+														</PathLinkView>
+													</views>
 												</PathLinkInSequence>
 												<PathLinkInSequence version="any" id="rc:PLIS-slw_deck_1@PE-rear_external_right+PE-compartment_3-2">
 													<DeckPathLinkRef version="any" ref="rc:DPL-slw_deck_1@DPJ-rear_middle+PE-compartment_3"/>
 													<Heading>forward</Heading>
 													<Instruction>Go down corridor third compartment from end on leftt</Instruction>
+															<views>
+														<PathLinkView > <!-- control appearence of link in UI -->
+														<HideDestination>true</HideDestination>
+														<ShowEntranceSeparately>true</ShowEntranceSeparately>
+														<ShowExitSeparately>true</ShowExitSeparately>
+														<ShowHeadingSeparately>true</ShowHeadingSeparately>
+														</PathLinkView>
+													</views>
 												</PathLinkInSequence>
 												<PathLinkInSequence version="any" id="rc:PLIS-slw_deck_1@PE-rear_external_right+PE-compartment_3-3">
 													<DeckPathLinkRef version="any" ref="rc:DPL-slw_deck_1@PE-compartment_3+PSp-compartment_3@row_05_col_A"/>
 													<Heading>left</Heading>
 													<Instruction>Seat  9is on far side by window on left</Instruction>
+															<views>
+														<PathLinkView > <!-- control appearence of link in UI -->
+														<HideDestination>false</HideDestination>
+														<ShowEntranceSeparately>false</ShowEntranceSeparately>
+														<ShowExitSeparately>true</ShowExitSeparately>
+														<ShowHeadingSeparately>false</ShowHeadingSeparately>
+														</PathLinkView>
+													</views>
 												</PathLinkInSequence>
 											</pathLinksInSequence>
 										</DeckNavigationPath>

xsd/netex_framework/netex_genericFramework/netex_path_version.xsd

@@ -15,9 +15,11 @@
 				<Contributor>Roger Slevin [Roger.Slevin@dft.gsi.gov.uk]</Contributor>
 				<Coverage>Europe</Coverage>
 				<Creator>Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema </Creator>
-				<Date><Created>2024-02-05</Created>Factored out from ifopt_path_link
+				<Date>
+					<Created>2024-02-05</Created>Factored out from ifopt_path_link
 				</Date>
-				<Date><Modified>2024-02-18</Modified>Rename NAVIGATION PATH to NAVIGATION
+				<Date>
+					<Modified>2024-02-18</Modified>Rename NAVIGATION PATH to NAVIGATION
 				</Date>
 				<Description>
 					<Title>NeTEx Network Exchange - Generic PATH types.</Title>
@@ -222,9 +224,9 @@ Rail transport, Roads and Road transport
 				<xsd:restriction base="GenericPathLink_DerivedViewStructure">
 					<xsd:sequence>
 						<xsd:sequence>
-							<xsd:sequence>
-								<xsd:group ref="DerivedViewGroup"/>
-							</xsd:sequence>
+							<xsd:group ref="DerivedViewGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
 							<xsd:element name="HideLink" type="xsd:boolean" minOccurs="0">
 								<xsd:annotation>
 									<xsd:documentation>Whether link should be hidden in the PATH LINK VIEW.</xsd:documentation>
@@ -247,7 +249,7 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 							<xsd:element name="ShowHeadingSeparately" type="xsd:boolean" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Whether heading element should be shown as separate step in view e.g. turn left right.</xsd:documentation>
+									<xsd:documentation>Whether Heading element should be shown as separate step in view e.g. turn left right.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>
@@ -565,7 +567,7 @@ The same PATH LINK may occur in different sequences in different NAVIGATION PATH
 		</xsd:sequence>
 	</xsd:group>
 	<!-- =======NAVIGATION=============================================== -->
-	<xsd:element name="GenericNavigation" abstract="true" substitutionGroup="LinkSequence">
+	<xsd:element name="GenericNavigationPath" abstract="true" substitutionGroup="LinkSequence">
 		<xsd:annotation>
 			<xsd:documentation>A designated path between two places. May include an ordered sequence of PATH LINKs. +v2.0</xsd:documentation>
 		</xsd:annotation>

xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

@@ -407,7 +407,7 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="DeckNavigationPath">
+	<xsd:element name="DeckNavigationPath" substitutionGroup="LinkSequence">
 		<xsd:annotation>
 			<xsd:documentation>A designated path between two places within a DECK PLAN. May include an ordered sequence of DECK PATH LINKs. +v2.0</xsd:documentation>
 		</xsd:annotation>

xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd

@@ -26,9 +26,11 @@
 				<Date>
 					<Modified>2007-03-22</Modified>
 				</Date>
-				<Date><Modified>2017-11-08</Modified> Move Description from Path in Sequence to supertype link in Sequence
+				<Date>
+					<Modified>2017-11-08</Modified> Move Description from Path in Sequence to supertype link in Sequence
 				</Date>
-				<Date><Modified>2024-02-06</Modified> Refactor  to share  common path elements with new DECK PATH LINKs etc
+				<Date>
+					<Modified>2024-02-06</Modified> Refactor  to share  common path elements with new DECK PATH LINKs etc
 				</Date>
 				<Description>
 					<Title>NeTEx Network Exchange - NAVIGATION PATH types.</Title>