From 3ddcd79a868c3af62a00b97028ebc4bf5a6f60a7 Mon Sep 17 00:00:00 2001 From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at> Date: Thu, 4 Feb 2021 10:03:52 +0100 Subject: [PATCH] adjusted components element at input xsd --- .../VectoDeclarationDefinitions.2.8_Stage.xsd | 12 +++- .../vecto_vehicle-stage_input_full-sample.xml | 59 +------------------ 2 files changed, 12 insertions(+), 59 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd index 9272696e49..e7f1929769 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd @@ -9,6 +9,16 @@ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/> <xs:complexType name="AbstractCompletedVehicleAuxiliaryDataDeclarationType" abstract="true"/> <xs:complexType name="AbstractCompletedVehicleComponentsDeclarationType" abstract="true"/> + <xs:complexType name="CompletedVehicleComponentsDeclarationType"> + <xs:complexContent> + <xs:extension base="v2.8:AbstractCompletedVehicleComponentsDeclarationType"> + <xs:sequence> + <xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/> + <xs:element name="Auxiliaries" type="v2.8:CompletedVehicleAuxiliariesComponentDeclarationType"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="CompletedVehicleAuxiliariesComponentDeclarationType"> <xs:sequence> <xs:element name="Data" type="v2.8:AbstractCompletedVehicleAuxiliaryDataDeclarationType"/> @@ -336,7 +346,7 @@ </xs:annotation> </xs:element> <xs:element name="ADAS" type="v2.3:AdvancedDriverAssistantSystemsType" minOccurs="0"/> - <xs:element name="Components" type="v2.8:AbstractCompletedVehicleAuxiliaryDataDeclarationType" minOccurs="0"/> + <xs:element name="Components" type="v2.8:AbstractCompletedVehicleComponentsDeclarationType" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml index 4b7b4f4862..4a15767105 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml @@ -1,58 +1 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"> - <v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"> - <Manufacturer>Some Manufacturer</Manufacturer> - <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress> - <VIN>VEH-1234567890</VIN> - <Date>2020-01-09T11:00:00Z</Date> - <Model>Sample Bus Model</Model> - <LegislativeCategory>M3</LegislativeCategory> - <CorrectedActualMass>500</CorrectedActualMass> - <TechniclaPermissibleMaximumLadenMass>3500</TechniclaPermissibleMaximumLadenMass> - <AirdragModifiedMultistage>false</AirdragModifiedMultistage> - <NgTankSystem>Compressed</NgTankSystem> - <ClassBus>II+III</ClassBus> - <NumberPassengersLowerDeck>0</NumberPassengersLowerDeck> - <NumberPassengersUpperDeck>10</NumberPassengersUpperDeck> - <VehicleCode>CB</VehicleCode> - <LowEntry>false</LowEntry> - <HeightIntegratedBody>2500</HeightIntegratedBody> - <VehicleLength>9500</VehicleLength> - <VehicleWidth>2500</VehicleWidth> - <EntranceHeight>2000</EntranceHeight> - <DoorDriveTechnology>electric</DoorDriveTechnology> - <StateOfCompletion>incomplete</StateOfCompletion> - <ADAS> - <v2.3:EngineStopStart>true</v2.3:EngineStopStart> - <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop> - <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop> - <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl> - <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch> - </ADAS> - <Components xsi:type="CompletedVehicleAuxiliaryDataDeclarationType"> - <ElectricSystem> - <LEDLights> - <Interiorlights>false</Interiorlights> - <Dayrunninglights>true</Dayrunninglights> - <Positionlights>true</Positionlights> - <Brakelights>true</Brakelights> - <Headlights>false</Headlights> - </LEDLights> - </ElectricSystem> - <HVAC> - <SystemConfiguration>0</SystemConfiguration> - <HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment> - <HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment> - <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment> - <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment> - <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower> - <DoubleGlasing>false</DoubleGlasing> - <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater> - <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts> - <WaterElectricHeater>true</WaterElectricHeater> - <AirElectricHeater>false</AirElectricHeater> - <OtherHeatingTechnology>false</OtherHeatingTechnology> - </HVAC> - </Components> - </v2.0:Vehicle> -</tns:VectoInputDeclaration> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"> <v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"> <Manufacturer>Some Manufacturer</Manufacturer> <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress> <VIN>VEH-1234567890</VIN> <Date>2020-01-09T11:00:00Z</Date> <Model>Sample Bus Model</Model> <LegislativeCategory>M3</LegislativeCategory> <CorrectedActualMass>500</CorrectedActualMass> <TechniclaPermissibleMaximumLadenMass>3500</TechniclaPermissibleMaximumLadenMass> <AirdragModifiedMultistage>false</AirdragModifiedMultistage> <NgTankSystem>Compressed</NgTankSystem> <ClassBus>II+III</ClassBus> <NumberPassengersLowerDeck>0</NumberPassengersLowerDeck> <NumberPassengersUpperDeck>10</NumberPassengersUpperDeck> <VehicleCode>CB</VehicleCode> <LowEntry>false</LowEntry> <HeightIntegratedBody>2500</HeightIntegratedBody> <VehicleLength>9500</VehicleLength> <VehicleWidth>2500</VehicleWidth> <EntranceHeight>2000</EntranceHeight> <DoorDriveTechnology>electric</DoorDriveTechnology> <StateOfCompletion>incomplete</StateOfCompletion> <ADAS> <v2.3:EngineStopStart>true</v2.3:EngineStopStart> <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop> <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop> <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl> <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch> </ADAS> <Components xsi:type="CompletedVehicleComponentsDeclarationType"> <AirDrag> <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="asdf"> <v2.0:Manufacturer>Sampel Manufacturer</v2.0:Manufacturer> <v2.0:Model>Sample Model</v2.0:Model> <v2.0:CertificationNumber>sdf56478222</v2.0:CertificationNumber> <v2.0:Date>2020-01-09T11:00:00Z</v2.0:Date> <v2.0:AppVersion>Version1</v2.0:AppVersion> <v2.0:CdxA_0>10.00</v2.0:CdxA_0> <v2.0:TransferredCdxA>10.00</v2.0:TransferredCdxA> <v2.0:DeclaredCdxA>15.00</v2.0:DeclaredCdxA> </v2.0:Data> <v2.0:Signature> <di:Reference> <di:DigestMethod Algorithm=""></di:DigestMethod> <di:DigestValue></di:DigestValue> </di:Reference> </v2.0:Signature> </AirDrag> <Auxiliaries> <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType"> <ElectricSystem> <LEDLights> <Interiorlights>false</Interiorlights> <Dayrunninglights>true</Dayrunninglights> <Positionlights>true</Positionlights> <Brakelights>true</Brakelights> <Headlights>false</Headlights> </LEDLights> </ElectricSystem> <HVAC> <SystemConfiguration>0</SystemConfiguration> <HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment> <HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment> <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment> <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment> <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower> <DoubleGlasing>false</DoubleGlasing> <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater> <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts> <WaterElectricHeater>true</WaterElectricHeater> <AirElectricHeater>false</AirElectricHeater> <OtherHeatingTechnology>false</OtherHeatingTechnology> </HVAC> </Data> </Auxiliaries> </Components> </v2.0:Vehicle> </tns:VectoInputDeclaration> \ No newline at end of file -- GitLab