Enh driver permit (#545)

* Update netex_nm_vehicleMeetingPointAssignment_support.xsd (#506) Co-authored-by: ue71603 <[email protected]> * Fix improve mode (#507) * First draft of the clean up of MODE * Better explanations in VEHICLE MODE * AccessMode now works TRANSFERs and OTHER LEG (for OJP) * Some depreciations * added a mode to Connection * Update netex_mode_support.xsd Deprecated not Depreciated ;-) * Update netex_submode_version.xsd Deprecated not Depreciated ;-) * Apply suggestions from code review * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <[email protected]> --------- Co-authored-by: ue71603 <[email protected]> Co-authored-by: Christophe Duquesne <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <[email protected]> * Fix passenger information equipment list (#510) * The connection exists in the documentation, but was not done in the xsd NeTEx part 1, figure 628 * Fixed according to Christophe's proposal * Apply suggestions from code review * Update xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd * Lint and update documentation tables --------- Co-authored-by: ue71603 <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * Fix typo's (#511) * Introduce VAT (#516) * Introduce VAT number * Removing duplicate enumeration (thanks to David) (#509) * Removing duplicate enumeration (thanks to David) btw something is wrong with xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_support.xsd in next * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd Co-authored-by: Matthias Günter <[email protected]> --------- Co-authored-by: ue71603 <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * enhancement-TMTC-add ACCEPTED DRIVER PERMITs Add ACCEPTED DRIVER PERMITS to VEHICEL TYpe * lint * revert non-changes * revert non-changes * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: trurlurl <[email protected]> * Apply suggestions from code review * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd Co-authored-by: Christophe Duquesne <[email protected]> --------- Co-authored-by: ue71603 <[email protected]> Co-authored-by: Christophe Duquesne <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <[email protected]> Co-authored-by: Nicholas Knowles <[email protected]>
NeTEx-CEN · Nov 21, 2023 · 80abd49 · 80abd49
1 parent d63cfa4
commit 80abd49
Show file tree

Hide file tree

Showing 14 changed files with 306 additions and 51 deletions.
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -216,6 +216,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Company registration number including Country prefix.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="VATNumber" type="xsd:normalizedString" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Company registered tax number including Country prefix.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="ExternalOperatorRef" type="ExternalObjectRefStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>An alternative  code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>

diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
@@ -2,6 +2,7 @@
 <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="1.1" id="netex_place_version">
 	<xsd:include schemaLocation="netex_place_support.xsd"/>
 	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -158,6 +159,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Whether timings and validity applies to both directions (true) or just to the from-to direction of the TRANSFER.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="TransferMode" type="AccessModeEnumeration" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:element name="TransferDuration" type="TransferDurationStructure">

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -496,7 +496,6 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="childfreeArea"/>
 			<xsd:enumeration value="animalsAllowed"/>
 			<xsd:enumeration value="noAnimals"/>
-			<xsd:enumeration value="animalsAllowed"/>
 			<xsd:enumeration value="breastfeedingFriendly"/>
 			<xsd:enumeration value="mobilePhoneUseZone"/>
 			<xsd:enumeration value="mobilePhoneFreeZone"/>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
@@ -196,7 +196,7 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="MobilityFacilityList" minOccurs="0"/>
 			<xsd:element ref="NuisanceFacilityList" minOccurs="0"/>
 			<xsd:element ref="PassengerCommsFacilityList" minOccurs="0"/>
-			<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentEnumeration" minOccurs="0">
+			<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>List of PASSENGER INFORMATION Equipments.</xsd:documentation>
 				</xsd:annotation>
@@ -245,7 +245,7 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="MobilityFacilityList" minOccurs="0"/>
 			<xsd:element ref="NuisanceFacilityList" minOccurs="0"/>
 			<xsd:element ref="PassengerCommsFacilityList" minOccurs="0"/>
-			<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentEnumeration" minOccurs="0">
+			<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>List of PASSENGER INFORMATION Equipments.</xsd:documentation>
 				</xsd:annotation>
@@ -1099,6 +1099,13 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:list itemType="NuisanceFacilityEnumeration"/>
 	</xsd:simpleType>
+	<!-- ===PASSENGER INFORMATION EQUIPMENT ====================================== -->
+	<xsd:simpleType name="PassengerInformationEquipmentListOfEnumerations">
+		<xsd:annotation>
+			<xsd:documentation>List of values for PASSENGER INFORMATION EQUIPMENT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:list itemType="PassengerInformationEquipmentEnumeration"/>
+	</xsd:simpleType>
 	<!-- ===Parking FACILITY====================================== -->
 	<xsd:element name="ParkingFacility" type="ParkingFacilityEnumeration">
 		<xsd:annotation>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
@@ -68,19 +68,23 @@ Rail transport, Roads and Road transport
 	<!--======Out of Vehicle==================================================================================-->
 	<xsd:element name="AccessMode" type="AccessModeEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Access MODE for SITEs.</xsd:documentation>
+			<xsd:documentation>Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if in OTHER LEG of the TRIP a monomodal non-public transport is used.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:simpleType name="AccessModeEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for Access MODEs for SITEs.</xsd:documentation>
+			<xsd:documentation>Allowed values for Access MODEs for SITEs, VEHICLE MEETING POINTS and TRANSFER and for monomodal non-public transport OTHER LEG in TRIP.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="foot"/>
 			<xsd:enumeration value="bicycle"/>
 			<xsd:enumeration value="boat"/>
 			<xsd:enumeration value="car"/>
-			<xsd:enumeration value="taxi"/>
+			<xsd:enumeration value="taxi">
+				<xsd:annotation>
+					<xsd:documentation>Taxi can now be modeled as VEHICLE MODE as well.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="shuttle"/>
 			<xsd:enumeration value="ski"/>
 			<xsd:enumeration value="skate"/>
@@ -211,36 +215,98 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:simpleType name="AllVehicleModesOfTransportEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for MODES of Transport : TPEG pti_table 01.</xsd:documentation>
+			<xsd:documentation>Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="all"/>
-			<xsd:enumeration value="unknown"/>
+			<xsd:enumeration value="all">
+				<xsd:annotation>
+					<xsd:documentation>If all modes are meant.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="unknown">
+				<xsd:annotation>
+					<xsd:documentation>Use only when no other entry applies.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="bus"/>
-			<xsd:enumeration value="trolleyBus"/>
+			<xsd:enumeration value="trolleyBus">
+				<xsd:annotation>
+					<xsd:documentation>Special type of bus with two overhead wires using spring-loaded trolley poles.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="tram"/>
-			<xsd:enumeration value="coach"/>
+			<xsd:enumeration value="coach">
+				<xsd:annotation>
+					<xsd:documentation>Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="rail"/>
-			<xsd:enumeration value="intercityRail"/>
-			<xsd:enumeration value="urbanRail"/>
-			<xsd:enumeration value="metro"/>
-			<xsd:enumeration value="air"/>
-			<xsd:enumeration value="water"/>
-			<xsd:enumeration value="cableway"/>
-			<xsd:enumeration value="funicular"/>
-			<xsd:enumeration value="snowAndIce"/>
+			<xsd:enumeration value="intercityRail">
+				<xsd:annotation>
+					<xsd:documentation>Deprecated. Use Mode rail with RailSubmode longDistance.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="urbanRail">
+				<xsd:annotation>
+					<xsd:documentation>Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). </xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="metro">
+				<xsd:annotation>
+					<xsd:documentation>Within an urban area. For underground and railway.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="air">
+				<xsd:annotation>
+					<xsd:documentation>All air related Mode. No special distinction is done.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="water">
+				<xsd:annotation>
+					<xsd:documentation>Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="cableway">
+				<xsd:annotation>
+					<xsd:documentation>Can be only two cabines or multiple.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="funicular">
+				<xsd:annotation>
+					<xsd:documentation>cable railway on steep slope using two counterbalanced carriages.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="snowAndIce">
+				<xsd:annotation>
+					<xsd:documentation>A collection for all Mode involving snow and ice.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="taxi"/>
-			<xsd:enumeration value="ferry"/>
-			<xsd:enumeration value="lift"/>
+			<xsd:enumeration value="ferry">
+				<xsd:annotation>
+					<xsd:documentation>Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="lift">
+				<xsd:annotation>
+					<xsd:documentation>General Mode for elevators and for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="selfDrive">
 				<xsd:annotation>
-					<xsd:documentation>See pti12_x.</xsd:documentation>
+					<xsd:documentation>For all alternative modes where a vehicle is driven by the user. See pti12_x.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="anyMode">
+				<xsd:annotation>
+					<xsd:documentation>To be avoided.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="other">
+				<xsd:annotation>
+					<xsd:documentation>Use only when no other entry applies.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
-			<xsd:enumeration value="anyMode"/>
-			<xsd:enumeration value="other"/>
-			<!-- NOT IN tpeg -->
-			<!-- NOT IN tpeg -->
 		</xsd:restriction>
 	</xsd:simpleType>
 	<!--========================================================================================-->

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd
@@ -214,8 +214,13 @@ Rail transport, Roads and Road transport
 		<xsd:restriction base="xsd:NMTOKEN">
 			<xsd:enumeration value="undefined"/>
 			<xsd:enumeration value="plug"/>
-			<xsd:enumeration value="pantographABove"/>
-			<xsd:enumeration value="pantographABove"/>
+			<xsd:enumeration value="pantographAbove">
+				<xsd:annotation>
+					<xsd:documentation>depreciated. Will be panthograph.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="pantograph">
+			</xsd:enumeration>
 			<xsd:enumeration value="induction"/>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
@@ -261,8 +261,16 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
 			<xsd:enumeration value="unknown"/>
 			<xsd:enumeration value="undefined"/>
 			<xsd:enumeration value="metro"/>
-			<xsd:enumeration value="tube"/>
-			<xsd:enumeration value="urbanRailway"/>
+			<xsd:enumeration value="tube">
+				<xsd:annotation>
+					<xsd:documentation>Deprecated. Use metro</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="urbanRailway">
+				<xsd:annotation>
+					<xsd:documentation>Replaces the Mode urbanRail.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 		</xsd:restriction>
 	</xsd:simpleType>
 	<!-- ======================================================================= -->

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -35,6 +35,8 @@
 				</Date>
 				<Date><Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
 				</Date>
+				<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
+				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
 					<p>This sub-schema describes the VEHICLE TYPE identifier Types.</p>
@@ -449,7 +451,7 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:simpleType name="PropulsionTypeEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for type of power  +v1/2/2</xsd:documentation>
+			<xsd:documentation>Allowed values for type of power +v1/2/2</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:normalizedString">
 			<xsd:enumeration value="combustion"/>
@@ -483,7 +485,7 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:simpleType name="SimpleVehicleCategoryEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for Personal Vehicle Categories  _v1.2.2</xsd:documentation>
+			<xsd:documentation>Allowed values for Personal Vehicle Categories _v1.2.2</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:normalizedString">
 			<xsd:enumeration value="scooter"/>
@@ -557,5 +559,57 @@ Rail transport, Roads and Road transport
 			</xsd:restriction>
 		</xsd:simpleContent>
 	</xsd:complexType>
+	<!--====  ACCEPTED DRIVER PERMIT  ========================================================-->
+	<xsd:simpleType name="AcceptedDriverPermitIdType">
+		<xsd:annotation>
+			<xsd:documentation>Type for identifier of an ACCEPTED DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="TypeOfValueIdType"/>
+	</xsd:simpleType>
+	<xsd:element name="AcceptedDriverPermitRef" type="AcceptedDriverPermitRefStructure" abstract="false" substitutionGroup="TypeOfValueRef">
+		<xsd:annotation>
+			<xsd:documentation>Reference to an ACCEPTED DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:complexType name="AcceptedDriverPermitRefStructure" abstract="false">
+		<xsd:annotation>
+			<xsd:documentation>Type for a reference to an ACCEPTED DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:restriction base="TypeOfValueRefStructure">
+				<xsd:attribute name="ref" type="AcceptedDriverPermitIdType" use="required">
+					<xsd:annotation>
+						<xsd:documentation>Reference to an ACCEPTED DRIVER PERMIT.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<!--==== TYPE OF DRIVER PERMIT  =========================================================-->
+	<xsd:simpleType name="TypeOfDriverPermitIdType">
+		<xsd:annotation>
+			<xsd:documentation>Type for identifier of a TYPE OF DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="TypeOfValueIdType"/>
+	</xsd:simpleType>
+	<xsd:element name="TypeOfDriverPermitRef" type="TypeOfDriverPermitRefStructure" abstract="false" substitutionGroup="TypeOfValueRef">
+		<xsd:annotation>
+			<xsd:documentation>Reference to a TYPE OF DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:complexType name="TypeOfDriverPermitRefStructure" abstract="false">
+		<xsd:annotation>
+			<xsd:documentation>Type for a reference to a TYPE OF DRIVER PERMIT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:restriction base="TypeOfValueRefStructure">
+				<xsd:attribute name="ref" type="TypeOfDriverPermitIdType" use="required">
+					<xsd:annotation>
+						<xsd:documentation>Reference to a TYPE OF DRIVER PERMIT.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>
 	<!-- ======================================================================= -->
 </xsd:schema>