From 448692b932ff4a489d770b6b238bc58288facba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 15 May 2024 14:13:41 +0200
Subject: [PATCH] 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 <82838870+trurlurl@users.noreply.github.com>

* Update xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/standards/gbfs/Netex_gbfs_exm1.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* 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 <stefan@konink.de>

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
---
 examples/standards/gbfs/Netex_gbfs_exm1.xml                 | 4 ++++
 .../netex_routingConstraint_support.xsd                     | 2 +-
 .../netex_nm_mobilityServiceConstraintZone_support.xsd      | 5 +++++
 .../netex_nm_mobilityServiceConstraintZone_version.xsd      | 6 ++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml
index 23dca6e1d..ecddf96a6 100644
--- 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
index 511e8faa7..f7d77d882 100644
--- 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
index ae2f4e18d..c04275ad3 100644
--- 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
index f36bbcd57..94189933d 100644
--- 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>
 	<!-- ======================================================================= -->