Merge pull request #776 from NeTEx-CEN/CHARGING-PLAN-Review

Review of the CHARGING PLAN
NeTEx-CEN · Sep 25, 2024 · 764cc6d · 764cc6d
2 parents 8bfc8df + eea0d45
commit 764cc6d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml
@@ -110641,7 +110641,9 @@
 							<FinalisationDuration>PT1M</FinalisationDuration>
 							<DeadRunRef version="1" ref="VJ_16960"/>
 							<PointInJourneyPatternRef version="any" ref="jp_charge1" order="1"/>
-							<VehicleRef version="1" ref="VEH_1"/>
+							<vehicles>
+								<VehicleRef version="1" ref="VEH_1"/>
+							</vehicles>
 						</RechargingStep>
 						<RechargingStep id="CRP_01" version="any" order="2">
 							<ChargeEnergy>100</ChargeEnergy>
@@ -110651,7 +110653,9 @@
 							<FinalisationDuration>PT1M</FinalisationDuration>
 							<DeadRunRef version="1" ref="DR_40147924"/>
 							<PointInJourneyPatternRef version="any" ref="jp_charge1" order="2"/>
-							<VehicleRef version="1" ref="VEH_1"/>
+							<vehicles>
+								<VehicleRef version="1" ref="VEH_1"/>
+							</vehicles>
 						</RechargingStep>
 					</rechargingSteps>
 					<blockRefs>

diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleRechargingPlan_version.xsd
@@ -5,6 +5,7 @@
 	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_support.xsd"/>
 	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -140,7 +141,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="RechargingProcessType" type="RechargingProcessEnumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Description of RECHARGING PLAN.</xsd:documentation>
+					<xsd:documentation>Type of recharching process</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="TotalChargeEnergy" type="WattHoursType" minOccurs="0">
@@ -216,8 +217,16 @@ Rail transport, Roads and Road transport
 							<xsd:group ref="RechargingDurationGroup"/>
 							<xsd:element ref="JourneyRef" minOccurs="0"/>
 							<xsd:element ref="PointInJourneyPatternRef" minOccurs="0"/>
-							<xsd:element ref="VehicleTypeRef" minOccurs="0"/>
-							<xsd:element ref="VehicleRef" minOccurs="0"/>
+							<xsd:element name="vehicleTypes" type="vehicleTypeRefs_RelStructure" minOccurs="0">
+								<xsd:annotation>
+									<xsd:documentation>TYPES OF VEHICLE possibly compatible with this recharging plan and step.</xsd:documentation>
+								</xsd:annotation>
+							</xsd:element>
+							<xsd:element name="vehicles" type="vehicleRefs_RelStructure" minOccurs="0">
+								<xsd:annotation>
+									<xsd:documentation>VEHICLEs possibly compatible with this recharging plan and step.</xsd:documentation>
+								</xsd:annotation>
+							</xsd:element>
 						</xsd:sequence>
 					</xsd:sequence>
 					<xsd:attribute name="id" type="RechargingStepIdType"/>
@@ -264,8 +273,16 @@ Rail transport, Roads and Road transport
 			<xsd:group ref="RechargingDurationGroup"/>
 			<xsd:element ref="JourneyRef" minOccurs="0"/>
 			<xsd:element ref="PointInJourneyPatternRef" minOccurs="0"/>
-			<xsd:element ref="VehicleTypeRef" minOccurs="0"/>
-			<xsd:element ref="VehicleRef" minOccurs="0"/>
+			<xsd:element name="vehicleTypes" type="vehicleTypeRefs_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>TYPES OF VEHICLE possibly compatible with this recharging plan and step.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="vehicles" type="vehicleRefs_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>VEHICLEs possibly compatible with this recharging plan and step.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="RechargingDurationGroup">