GBFSMapping - mustPickUpandDRopOffToSameStop #716 (#730)

* GBFSMapping - mustPickUpandDRopOffToSameStop #716 * fixing validation and update example * Lint and update documentation tables * Update xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd * Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd * Update xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd Co-authored-by: trurlurl <[email protected]> * Update examples/standards/gbfs/Netex_gbfs_exm1.xml Co-authored-by: trurlurl <[email protected]> * fixing errors * Lint and update documentation tables * Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd Co-authored-by: Stefan de Konink <[email protected]> --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <[email protected]> Co-authored-by: Stefan de Konink <[email protected]>
NeTEx-CEN · May 15, 2024 · 448692b · 448692b
1 parent be64880
commit 448692b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml
@@ -365,6 +365,10 @@ GBFS file: geofencing_zones.json.
 									<SimpleVehicleTypeRef ref="car1"/>
 									<!-- GBFS vehicle_type_id -->
 								</VehicleTypeZoneRestriction>
+								<VehicleTypeZoneRestriction>
+									<ZoneUse>mustPickUpAndDropOffAtSameStop</ZoneUse>
+									<FloatingVehicles>true</FloatingVehicles>
+								</VehicleTypeZoneRestriction>
 							</vehicleRestrictions>
 						</MobilityServiceConstraintZone>
 					</mobilityServiceConstraintZones>

diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
@@ -145,7 +145,7 @@ Rail transport, Roads and Road transport
 	</xsd:simpleType>
 	<xsd:simpleType name="ZoneUseEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>Allowed values for Zone Use.</xsd:documentation>
+			<xsd:documentation>Allowed values for zone use.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="forbiddenZone"/>

diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd
@@ -150,6 +150,11 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="mustPickUpAndDropOffInSameZone"/>
 			<xsd:enumeration value="noPassThrough"/>
 			<xsd:enumeration value="passThroughUseOnly"/>
+			<xsd:enumeration value="mustPickUpAndDropOffAtSameStop">
+				<xsd:annotation>
+					<xsd:documentation>Zones where vehicles must be returned to the same stop. +v2.0</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>

diff --git a/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd
@@ -4,6 +4,7 @@
 	<xsd:include schemaLocation="../part5_rc/netex_nm_mobilityService_support.xsd"/>
 	<xsd:include schemaLocation="netex_nm_mobilityServiceConstraintZone_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
 	<xsd:annotation>
@@ -199,6 +200,11 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="TransportTypeRef" minOccurs="0"/>
+			<xsd:element name="FloatingVehicles" type="xsd:boolean" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>If false, a vehicle must be picked up / dropped off at a station rather than anywhere in the ZONE. +v2.0</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->