Merge pull request #83 from BISONNL/extra_kenmerken_vehicletype

Extra elementen toegevoegd aan vehicleType conform CEN XSD

Author: hilcokats

xsd/netex-nl-basic.xsd

@@ -47,6 +47,12 @@
 	<xsd:simpleType name="DistanceType">
 		<xsd:restriction base="xsd:decimal"/>
 	</xsd:simpleType>
+	<xsd:simpleType name="SpeedType">
+		<xsd:annotation>
+			<xsd:documentation>Speed type for velocity. System for units can be specified on frame. Normal default is metres per second as defined by http://www.ordnancesurvey.co.uk/xml/resource/units.xml#metres.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="xsd:decimal"/>
+	</xsd:simpleType>
 	<xsd:simpleType name="WeightType">
 		<xsd:restriction base="xsd:decimal"/>
 	</xsd:simpleType>
@@ -123,6 +129,19 @@
 			</xsd:pattern>
 		</xsd:restriction>
 	</xsd:simpleType>
+	<xsd:simpleType name="PropulsionTypeEnumeration">
+		<xsd:annotation>
+			<xsd:documentation>Allowed values for type of power  +v1/2/2</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="xsd:normalizedString">
+			<xsd:enumeration value="combustion"/>
+			<xsd:enumeration value="electric"/>
+			<xsd:enumeration value="electricAssist"/>
+			<xsd:enumeration value="hybrid"/>
+			<xsd:enumeration value="human"/>
+			<xsd:enumeration value="other"/>
+		</xsd:restriction>
+	</xsd:simpleType>
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 	<!-- ABSTRACTE TYPEN                                                                 -->
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

xsd/netex-nl-data.xsd

@@ -1130,18 +1130,12 @@
 							<xsd:documentation>Zie Wikipedia voor de mogelijke waarden</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:choice>
-						<xsd:element name="FuelType" type="FuelTypeEnumeration">
-							<xsd:annotation>
-								<xsd:documentation>Het type brandstof dat voor het voertuig in gebruik is voor het voertuig soort.</xsd:documentation>
-							</xsd:annotation>
-						</xsd:element>
-						<xsd:element name="TypeOfFuel" type="FuelTypeEnumeration">
-							<xsd:annotation>
-								<xsd:documentation>DEPRECATED NAME: Use FuelType instead. Will be removed: 2025-01-09.</xsd:documentation>
-							</xsd:annotation>
-						</xsd:element>
-					</xsd:choice>
+					<xsd:element name="ReversingDirection" type="xsd:boolean" default="true" minOccurs="0"/>
+					<xsd:element name="SelfPropelled" type="xsd:boolean" default="true" minOccurs="0"/>
+					<xsd:element name="PropulsionType" type="PropulsionTypeEnumeration" minOccurs="0"/>
+					<xsd:element name="FuelType" type="FuelTypeEnumeration" />
+					<xsd:element name="MaximumRange" type="DistanceType" minOccurs="0"/>
+					<xsd:element name="MaximumVelocity" type="SpeedType" minOccurs="0"/>
 					<xsd:element name="TransportMode" type="TransportmodeEnum"/>
 					<xsd:element name="capacities" type="passengerCapacities_RelStructure" minOccurs="0">
 						<xsd:annotation>
@@ -1157,6 +1151,7 @@
 					<xsd:element name="Width" type="LengthType" minOccurs="0"/>
 					<xsd:element name="Height" type="LengthType" minOccurs="0"/>
 					<xsd:element name="Weight" type="WeightType" minOccurs="0"/>
+					<xsd:element name="FirstAxleHeight" type="LengthType" minOccurs="0"/>
 					<xsd:element name="facilities" type="facilities"/>
 				</xsd:sequence>
 			</xsd:extension>