Make Equipable space a ZOne

xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd

@@ -29,7 +29,8 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
- <Copyright>CEN, Crown Copyright 2009-2023</Copyright></Rights>
+ <Copyright>CEN, Crown Copyright 2009-2023</Copyright>
+				</Rights>
 				<Source>
 					<ul>
 						<li>Derived from the Transmodel, VDV, TransXChange, NaPTAN, NOPTIS, BISON and Trident standards.</li>
@@ -60,12 +61,12 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="GroupOfPointsIdType"/>
 	</xsd:simpleType>
-	<xsd:element name="ZoneRef" type="ZoneRefStructure" substitutionGroup="GroupOfPointsRef_">
+	<xsd:element name="ZoneRef" type="ZoneRefStructure" abstract="true" substitutionGroup="GroupOfPointsRef_">
 		<xsd:annotation>
 			<xsd:documentation>Reference to a ZONE.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
-	<xsd:complexType name="ZoneRefStructure" abstract="false">
+	<xsd:complexType name="ZoneRefStructure" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation>Type for a reference to a ZONE.</xsd:documentation>
 		</xsd:annotation>

xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd

@@ -22,7 +22,8 @@
 				<Date>
 					<Created>2024-01-17</Created>
 				</Date>
-				<Date><Modified>2024-02-18</Modified>Norway review comment - Add Window types.
+				<Date>
+					<Modified>2024-02-18</Modified>Norway review comment - Add Window types.
 				</Date>
 				<Description>
 					<Title>NeTEx Network Exchange - DECK PATH LINK types.</Title>
@@ -431,6 +432,9 @@ Rail transport, Roads and Road transport
 						<xsd:sequence>
 							<xsd:group ref="LinkSequenceGroup"/>
 						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="GenericNavigationPathGroup"/>
+						</xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="DeckNavigationPathGroup"/>
 						</xsd:sequence>

xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_seatingPlan_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -13,9 +13,11 @@
 				<Date>
 					<Created>2023-02-02</Created>
 				</Date>
-				<Date><Modified>2024-01-17</Modified>Add bed to locatable spot type enumerations
+				<Date>
+					<Modified>2024-01-17</Modified>Add bed to locatable spot type enumerations
 				</Date>
-				<Date><Modified>2024-02-18</Modified>Norway review comment - Revise Aisle /Window to use enumeration.  
+				<Date>
+					<Modified>2024-02-18</Modified>Norway review comment - Revise Aisle /Window to use enumeration.  
 				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -141,7 +143,7 @@
 		<xsd:annotation>
 			<xsd:documentation>Type for identifier of a nEQUIPABLE SPACE.</xsd:documentation>
 		</xsd:annotation>
-		<xsd:restriction base="ObjectIdType"/>
+		<xsd:restriction base="ZoneIdType"/>
 	</xsd:simpleType>
 	<xsd:element name="EquipableSpaceRef" type="EquipableSpaceRefStructure" abstract="true" substitutionGroup="VersionOfObjectRef">
 		<xsd:annotation>

xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd

@@ -4,6 +4,7 @@
 	<xsd:include schemaLocation="netex_seatingPlan_support.xsd"/>
 	<xsd:include schemaLocation="netex_sensorEquipment_version.xsd"/>
 	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -16,7 +17,8 @@
 				<Date>
 					<Created>2023-01-30</Created>
 				</Date>
-				<Date><Modified>2024-02-18</Modified>Norway review comment - Revise AIsle /Window to use enumeration. Add  TableType enum.
+				<Date>
+					<Modified>2024-02-18</Modified>Norway review comment - Revise AIsle /Window to use enumeration. Add  TableType enum.
 				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -211,7 +213,7 @@
 			<xsd:documentation>Type for a EQUIPABLE SPACE.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
-			<xsd:extension base="DataManagedObjectStructure">
+			<xsd:extension base="Zone_VersionStructure">
 				<xsd:sequence>
 					<xsd:group ref="EquipableSpaceGroup">
 						<xsd:annotation>
@@ -232,16 +234,6 @@
 					<xsd:documentation>Lavel of EQUIPABLE SPACE. e.g. seat number.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="Name" type="MultilingualString" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>Name of DECK COMPONENT.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="Description" type="MultilingualString" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>Description of EQUIPABLE SPACE.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
 			<xsd:element name="Orientation" type="ComponentOrientationEnumeration" default="forwards" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Orientation of EQUIPABLE SPACE . Default is forwards.</xsd:documentation>