Sync gbfs from Christophe (#804)

* adding additional GBFS stuff to NeTEx #795 * typo * Lint and update documentation tables * Update Netex_gbfs_exm1.xml * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd Co-authored-by: Stefan de Konink <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd Co-authored-by: trurlurl <[email protected]> * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd * GBFS-form comment right. * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christophe Duquesne <[email protected]> Co-authored-by: Stefan de Konink <[email protected]> Co-authored-by: trurlurl <[email protected]>
NeTEx-CEN · Dec 11, 2024 · f77c9b4 · f77c9b4
1 parent 7b0a7a3
commit f77c9b4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/examples/standards/gbfs/Netex_gbfs_exm1.xml b/examples/standards/gbfs/Netex_gbfs_exm1.xml
@@ -175,6 +175,21 @@ GBFS file: vehicle_types.json:
 							<!-- NeTEX maximum velocity in m/s. -->
 							<VehicleCategory>scooter</VehicleCategory>
 							<!-- GBFS form_factor -->
+							<NumberOfWheels>2</NumberOfWheels>
+						</SimpleVehicleType>
+						<SimpleVehicleType version="any" id="cargo2">
+							<!-- GBFS vehicle_type_id -->
+							<Name>Cargo bike</Name>
+							<!-- GBFS name -->
+							<PropulsionType>electric</PropulsionType>
+							<!-- GBFS propulsion_type -->
+							<MaximumRange>12345</MaximumRange>
+							<!-- GBFS max_range_meters -->
+							<MaximumVelocity>30</MaximumVelocity>
+							<!-- NeTEX maximum velocity in m/s. -->
+							<VehicleCategory>cargoCycle</VehicleCategory>
+							<!-- GBFS form_factor -->
+							<NumberOfWheels>2</NumberOfWheels>
 						</SimpleVehicleType>
 						<SimpleVehicleType version="any" id="car1">
 							<!-- GBFS vehicle_type_id -->

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -500,13 +500,26 @@ Rail transport, Roads and Road transport
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="scooter"/>
 			<xsd:enumeration value="eScooter"/>
-			<xsd:enumeration value="cycle"/>
+			<xsd:enumeration value="cycle">
+				<xsd:annotation>
+					<xsd:documentation>All bicycles.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="pedalCycle">
 				<xsd:annotation>
-					<xsd:documentation/>
+					<xsd:documentation>Non-motorised (without any kind of pedalling aid) cycle.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="eCycle">
+				<xsd:annotation>
+					<xsd:documentation>Electric cycle.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="cargoCycle">
+				<xsd:annotation>
+					<xsd:documentation>Cycle for cargo transportation. +v2.0</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
-			<xsd:enumeration value="eCycle"/>
 			<xsd:enumeration value="tricycle"/>
 			<xsd:enumeration value="tandem"/>
 			<xsd:enumeration value="moped"/>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -479,6 +479,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Category of vehicle.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="NumberOfWheels" type="xsd:nonNegativeInteger" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Number of wheels of the vehicle. +v2.0</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="MinimumAge" type="xsd:nonNegativeInteger" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Minumum age to use TRANSPORT TYPE.</xsd:documentation>