EPIAP into tsi-prm (#8)

* Remove unused xsd files. (NeTEx-CEN#498) * Fix issue NeTEx-CEN#469 (NeTEx-CEN#483) * Update netex_routeInstruction_version.xsd (NeTEx-CEN#468) * Fix typo (NeTEx-CEN#499) Fix NeTEx-CEN#389 * Fixing enum problems (NeTEx-CEN#500) Co-authored-by: ue71603 <[email protected]> * Doc version status enumeration (NeTEx-CEN#501) * Update netex_version_support.xsd Added annotations to the VersionStatusEnumeration enums. Documentation has been updated as well. PR NeTEx-CEN#180. * Update netex_version_support.xsd Correction... --------- Co-authored-by: trurlurl <[email protected]> * BeaconEquipment added and example VehicleType modeling for EPIAP (NeTEx-CEN#365) * First part of Beacon Equipment * second part of BeaconEquipment * BeaconEquipment -> PassengerBeaconEquipment There are also technical Beacons with BeaconPoint. As they are different currently no ref is added in either element. * XML Spy removed * fixed example and added examples to project * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review --------- Co-authored-by: Stefan de Konink <[email protected]> * Lint and update documentation tables * Fix railIslandPlatform (NeTEx-CEN#524) Fix NeTEx-CEN#523 * Fix NeTEx-CEN#533 (NeTEx-CEN#534) * Fix NeTEx-CEN#533 * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: DWillDB <[email protected]> --------- Co-authored-by: DWillDB <[email protected]> --------- Co-authored-by: Stefan de Konink <[email protected]> Co-authored-by: Matthias Günter <[email protected]> Co-authored-by: trurlurl <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DWillDB <[email protected]>
dbinfrago · Nov 1, 2023 · 8968eb6 · 8968eb6
1 parent 4d15a77
commit 8968eb6
Show file tree

Hide file tree

Showing 14 changed files with 2,678 additions and 292 deletions.
diff --git a/NeTEx.spp b/NeTEx.spp
@@ -947,6 +947,11 @@
 				<Folder FolderName="gbfs">
 					<File FilePath="examples\standards\gbfs\Netex_gbfs_exm1.xml" HomeFolder="Yes"/>
 				</Folder>
+				<Folder FolderName="epiap">
+					<File FilePath="examples\standards\epiap\Chur_Equipment_Pathlink_V1.0.xml" HomeFolder="Yes"/>
+					<File FilePath="examples\standards\epiap\eiap_test1_ramp.xml" HomeFolder="Yes"/>
+					<File FilePath="examples\standards\epiap\EPIAP_Accessibility_Chur_V08_vehicletypes.xml" HomeFolder="Yes"/>
+				</Folder>
 			</Folder>
 		</Folder>
 		<Folder FolderName="netex_siri_requests">

diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml
diff --git a/xsd/NX.xsd b/xsd/NX.xsd
@@ -136,7 +136,7 @@
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
-						<xsd:element name="fareStructureFactor" minOccurs="0">
+						<xsd:element name="fareStructureFactors" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
 									<xsd:element ref="FareStructureFactor"/>
@@ -251,7 +251,7 @@
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
-						<xsd:element name="fareStructure" minOccurs="0">
+						<xsd:element name="fareStructures" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
 									<xsd:element name="fareStructureFactors" minOccurs="0">
@@ -406,7 +406,7 @@
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="parkingTariff" minOccurs="0">
+			<xsd:element name="parkingTariffs" minOccurs="0">
 				<xsd:complexType>
 					<xsd:sequence>
 						<xsd:element ref="ParkingTariff" minOccurs="0" maxOccurs="unbounded"/>

diff --git a/xsd/netex_framework/netex_genericFramework/netex_contact_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_contact_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
@@ -128,11 +128,31 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Allowed values for Statuses of VERSION.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="draft"/>
-			<xsd:enumeration value="proposed"/>
-			<xsd:enumeration value="versioned"/>
-			<xsd:enumeration value="deprecated"/>
-			<xsd:enumeration value="other"/>
+			<xsd:enumeration value="draft">
+				<xsd:annotation>
+					<xsd:documentation>This version is a draft: it is currently under construction and should not be used for operational purposes.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="proposed">
+				<xsd:annotation>
+					<xsd:documentation>This version is comprehensive but not yet validated.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="versioned">
+				<xsd:annotation>
+					<xsd:documentation>This is a finalised version frozen from further modifications.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="deprecated">
+				<xsd:annotation>
+					<xsd:documentation>This is an old version: it should not be used for operational purposes any more.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="other">
+				<xsd:annotation>
+					<xsd:documentation>Like draft, proposed, and deprecated, this version should not be used for operational purposes (for other reasons, however). </xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:simpleType name="VersionTypeEnumeration">

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
 	</xsd:complexType>
 	<xsd:simpleType name="TrainElementTypeEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for TYPE OF TRAIIN ELEMENT.</xsd:documentation>
+			<xsd:documentation>Allowed values for TYPE OF TRAIN ELEMENT.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:NMTOKEN">
 			<xsd:enumeration value="buffetCar"/>
@@ -211,7 +211,7 @@ Rail transport, Roads and Road transport
 	<!-- ======================================================================= -->
 	<xsd:simpleType name="TrainSizeEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for TYPE OF TRAIIN ELEMENT.</xsd:documentation>
+			<xsd:documentation>The size of a train in relative terms.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:NMTOKEN">
 			<xsd:enumeration value="normal"/>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleSeating_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleSeating_support.xsd
@@ -85,7 +85,7 @@ Rail transport, Roads and Road transport
 	</xsd:complexType>
 	<xsd:simpleType name="SeatAllocationMethodEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for Seat Alllocation Method.</xsd:documentation>
+			<xsd:documentation>Allowed values for Seat Allocation Method.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:normalizedString">
 			<xsd:enumeration value="autoAssigned">

diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
@@ -1024,14 +1024,19 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Whether ramp is on a pedestal.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="HandrailType" type="HandrailEnumeration" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Type of handrail.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="HandrailHeight" type="LengthType" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Height of handrail.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="HandrailType" type="HandrailEnumeration" minOccurs="0">
+			<xsd:element name="LowerHandrailHeight" type="LengthType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Type of handrail.</xsd:documentation>
+					<xsd:documentation>Height of any additional lower handrail.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="TactileGuidanceStrips" type="xsd:boolean" minOccurs="0">