Epiap tsi prm (#21)

* 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]> * Fix epiap example validation (NeTEx-CEN#547) * Make sure the EPIAP examples actually get validated Split up until new release of libxml2 is available. * Fix NeTEx-CEN#539 (NeTEx-CEN#540) * Ramp equipment with maximal load and an explanation for Length for mobile ramps. (NeTEx-CEN#366) * Update netex_ifopt_equipmentAccess_version.xsd * Update netex_ifopt_equipmentAccess_version.xsd * fix ident1 * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <[email protected]> --------- Co-authored-by: trurlurl <[email protected]> * Lint and update documentation tables * Delfiplus extensions (NeTEx-CEN#388) * Changes needed from the mapping table on DELFI+ * changes to ramp/hoist * more information in stationMap removal of an element that we could not find out, what it does (replaced with a length and width) * Update netex_ifopt_stopPlace_support.xsd * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <[email protected]> --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <[email protected]> * Enhance door control element height (Fix NeTEx-CEN#541) (NeTEx-CEN#542) * Fix NeTEx-CEN#541 * adds example for door control element height Co-authored-by: Christophe Duquesne <[email protected]> * Fix NeTEx-CEN#541 updates documentation for door control element height * Fix NeTEx-CEN#541 adds example for door control element height --------- Co-authored-by: Christophe Duquesne <[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: Christophe Duquesne <[email protected]>
dbinfrago · Dec 27, 2023 · 123d103 · 123d103
1 parent 98c38a3
commit 123d103
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
@@ -1017,6 +1017,7 @@ Changes
 										<EntranceEquipment version="any" id="nptg:9100WIMBLDN_A2b-EI5_e1">
 											<Door>true</Door>
 											<KeptOpen>true</KeptOpen>
+											<DoorControlElementHeight>0.8</DoorControlElementHeight>
 											<WheelchairPassable>true</WheelchairPassable>
 										</EntranceEquipment>
 									</placeEquipments>
@@ -1035,6 +1036,7 @@ Changes
 										<EntranceEquipment version="any" id="nptg:9100WIMBLDN_A2b-EI6">
 											<Door>true</Door>
 											<KeptOpen>true</KeptOpen>
+											<DoorControlElementHeight>0.8</DoorControlElementHeight>
 											<WheelchairPassable>true</WheelchairPassable>
 										</EntranceEquipment>
 									</placeEquipments>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -196,19 +196,14 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>VEHICLE Hoist can be used at VEHICLE has a hoist or lift  for wheelchairs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="HoistOperatingRadius" type="LengthType" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>Distance from VEHICLE needed to operate hoist.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
 			<xsd:element name="Ramp" type="xsd:boolean" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Whether  a ramp may be used to access VEHICLE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="RampBearingCapacity" type="WeightType" minOccurs="0">
+			<xsd:element name="BearingCapacity" type="WeightType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Maximum weight that ramp can bear.</xsd:documentation>
+					<xsd:documentation>Maximum weight that the EQUIPMENT can bear.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="NumberOfSteps" type="xsd:nonNegativeInteger" minOccurs="0">
@@ -221,6 +216,16 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Maximum step height to board.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="EquipmentLength" type="LengthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Length of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="EquipmentWidth" type="LengthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Width of the EQUIPMENT be it hoist or ramp. When fully extended and only the part outside the VEHICLE.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="GapToPlatform" type="LengthType" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Normal gap between VEHICLE and platform.</xsd:documentation>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
@@ -115,7 +115,7 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:element name="TypeOfEquipmentRef" type="TypeOfEquipmentRefStructure" substitutionGroup="TypeOfEntityRef">
 		<xsd:annotation>
-			<xsd:documentation>Reference to a TYPE OF EQUIPMENT.</xsd:documentation>
+			<xsd:documentation>Reference to a TYPE OF EQUIPMENT. Some values are defined for EPIAP: "mobileRamp" for mobile Ramps, "permanentRamp" for permanent installation and "wheelchairLift" for a hoist.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:complexType name="TypeOfEquipmentRefStructure">

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -595,6 +595,9 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="networkStatus"/>
 			<xsd:enumeration value="realTimeDisruptions"/>
 			<xsd:enumeration value="realTimeDepartures"/>
+			<xsd:enumeration value="stationMap"/>
+			<xsd:enumeration value="acousticStationMap"/>
+			<xsd:enumeration value="tactileStationMap"/>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>

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
@@ -1011,7 +1011,12 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="Length" type="LengthType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Length of ramp in metres.</xsd:documentation>
+					<xsd:documentation>Length of ramp in metres. In the case of a mobile ramp associated with a vehicle this element is used to convey the length the ramp needs to be extended from the vehicle. This indicates the minimally necessary width of the Quay.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="MaximumLoad" type="WeightType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Maximum load in kilograms. Mainly used for mobile ramps.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Gradient" type="xsd:positiveInteger" minOccurs="0">
@@ -1204,7 +1209,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="DoorControlElementHeight" type="LengthType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Indicates door control element height (in centimeter)</xsd:documentation>
+					<xsd:documentation>Indicates door control element height. This could be e.g. a door handle or a door button.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="GlassDoor" type="xsd:boolean" minOccurs="0">

diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
@@ -403,6 +403,16 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="vehicleLoadingPlace"/>
 			<xsd:enumeration value="handicappedLevelBoardingSector"/>
 			<xsd:enumeration value="multimodal"/>
+			<xsd:enumeration value="busOnStreetBoarding">
+				<xsd:annotation>
+					<xsd:documentation>Bus stop directly on street. This means people waiting to board will literally be standing on the street.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="tramOnStreetBoarding">
+				<xsd:annotation>
+					<xsd:documentation>Tram stop directly on street. This means people waiting to board will literally be standing on the street.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>