From 3e56cbdb570577895430092c279d10dfd5ee5ffd Mon Sep 17 00:00:00 2001 From: haraldmartini <harald.martini@student.tugraz.at> Date: Thu, 18 Aug 2022 09:37:41 +0200 Subject: [PATCH] use separate elements for exempted completed bus instead of completed bus group --- .../XSD/VectoOutputManufacturer.0.9.xsd | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd index ca3f0abd27..f839cdb6a5 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd @@ -822,15 +822,7 @@ </xs:complexType> </xs:element> <xs:group ref="mrf:GeneralVehicleOutputGroup"/> - <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:group ref="mrf:CompletedBusSequenceGroup"/> </xs:sequence> </xs:group> <xs:group name="LorryGeneralVehicleOutputGroup"> @@ -1141,7 +1133,30 @@ </xs:complexType> <xs:complexType name="Exempted-CompletedBusVehicleOutputType"> <xs:sequence> - <xs:group ref="mrf:CompletedBusGeneralVehicleOutputGroup"/> + <xs:sequence> + <xs:element name="Manufacturers"> + <xs:complexType> + <xs:sequence maxOccurs="unbounded"> + <xs:element name="Step"> + <xs:complexType> + <xs:group ref="mrf:ManufacturerGroup"/> + <xs:attribute name="Count" type="xs:int"/> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:group ref="mrf:GeneralVehicleOutputGroup"/> + <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:sequence> </xs:complexType> <!--Components--> -- GitLab