From 884fc918c85de644d42ab6e1403b645917be4920 Mon Sep 17 00:00:00 2001 From: haraldmartini <harald.martini@student.tugraz.at> Date: Thu, 18 Aug 2022 09:23:42 +0200 Subject: [PATCH] removed hybrid electric hdv from exempted completed bus mrf and cif schema --- .../Resources/XSD/VectoOutputCustomer.0.9.xsd | 1 - .../Resources/XSD/VectoOutputManufacturer.0.9.xsd | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd index 80987e87a2..8e51374ade 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd @@ -1115,7 +1115,6 @@ </xs:complexType> </xs:element> <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> - <xs:element name="HybridElectricHDV" type="xs:boolean"/> <xs:element name="ClassBus" type="xs:string"/> <xs:element name="TotalNumberOfPassengers" type="xs:int"/> <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd index 9c2449fc2b..ca3f0abd27 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd @@ -822,7 +822,15 @@ </xs:complexType> </xs:element> <xs:group ref="mrf:GeneralVehicleOutputGroup"/> - <xs:group ref="mrf:CompletedBusSequenceGroup"/> + <xs:sequence> + <xs:element name="CorrectedActualMass" type="v1.0:VehicleCurbMassChassisType"/> + <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> + <xs:element name="ClassBus" type="v2.4:RegisteredClassType"/> + <xs:element name="NumberPassengersUpperDeck" type="xs:int"/> + <xs:element name="NumberPassengersLowerDeck" type="xs:int"/> + <xs:element name="BodyworkCode" type="v2.4:VehicleCodeType"/> + <xs:element name="LowEntry" type="xs:boolean"/> + </xs:sequence> </xs:sequence> </xs:group> <xs:group name="LorryGeneralVehicleOutputGroup"> -- GitLab