diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd index 81d1c2a19408709c721609f86f782363ec667fe0..c389140af2a56b483915fd84203301ec13f02456 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd @@ -14,7 +14,7 @@ <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:element name="Auxiliaries" type="v2.8:CompletedVehicleAuxiliariesComponentDeclarationType" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml index 38cbc0a0971ce33f19bd1592f1065d6faf542ce2..58cc1205ef4d134b1a3ba7fe5ddeb8debfaab0d2 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml @@ -671,29 +671,26 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType"> <v2.8:AirDrag> <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h"> - <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer> - <v2.0:Model>Generic Model</v2.0:Model> - <v2.0:CertificationNumber>e12*0815/8051*2017/05E1000*00</v2.0:CertificationNumber> - <v2.0:Date>2018-03-24T15:00:00Z</v2.0:Date> - <v2.0:AppVersion>Vecto AirDrag x.y.z</v2.0:AppVersion> - <v2.0:CdxA_0>6.31</v2.0:CdxA_0> - <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA> - <v2.0:DeclaredCdxA>6.36</v2.0:DeclaredCdxA> - </v2.0:Data> - <v2.0:Signature> - <di:Reference URI="#CabinX24h"> - <di:Transforms> - <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> - <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> - </di:Transforms> - <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> - <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue> - </di:Reference> - </v2.0:Signature> + <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer> + <v2.0:Model>Generic Model</v2.0:Model> + <v2.0:CertificationNumber>e12*0815/8051*2017/05E1000*00</v2.0:CertificationNumber> + <v2.0:Date>2018-03-24T15:00:00Z</v2.0:Date> + <v2.0:AppVersion>Vecto AirDrag x.y.z</v2.0:AppVersion> + <v2.0:CdxA_0>6.31</v2.0:CdxA_0> + <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA> + <v2.0:DeclaredCdxA>6.36</v2.0:DeclaredCdxA> + </v2.0:Data> + <v2.0:Signature> + <di:Reference URI="#CabinX24h"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue> + </di:Reference> + </v2.0:Signature> </v2.8:AirDrag> - <v2.8:Auxiliaries> - <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"/> - </v2.8:Auxiliaries> </v2.8:Components> </Vehicle> <ApplicationInformation> @@ -740,7 +737,29 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop> <v2.3:PredictiveCruiseControl>1,2</v2.3:PredictiveCruiseControl> </v2.8:ADAS> - <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType"> + <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType"> + <v2.8:AirDrag> + <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h"> + <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer> + <v2.0:Model>Generic Model</v2.0:Model> + <v2.0:CertificationNumber>e12*0815/8051*2017/05E1000*00</v2.0:CertificationNumber> + <v2.0:Date>2018-03-24T15:00:00Z</v2.0:Date> + <v2.0:AppVersion>Vecto AirDrag x.y.z</v2.0:AppVersion> + <v2.0:CdxA_0>6.31</v2.0:CdxA_0> + <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA> + <v2.0:DeclaredCdxA>6.36</v2.0:DeclaredCdxA> + </v2.0:Data> + <v2.0:Signature> + <di:Reference URI="#CabinX24h"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue> + </di:Reference> + </v2.0:Signature> + </v2.8:AirDrag> <v2.8:Auxiliaries> <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"> <v2.8:ElectricSystem> @@ -811,6 +830,28 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch> </v2.8:ADAS> <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType"> + <v2.8:AirDrag> + <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h"> + <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer> + <v2.0:Model>Generic Model</v2.0:Model> + <v2.0:CertificationNumber>e12*0815/8051*2017/05E1000*00</v2.0:CertificationNumber> + <v2.0:Date>2018-03-24T15:00:00Z</v2.0:Date> + <v2.0:AppVersion>Vecto AirDrag x.y.z</v2.0:AppVersion> + <v2.0:CdxA_0>6.31</v2.0:CdxA_0> + <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA> + <v2.0:DeclaredCdxA>6.36</v2.0:DeclaredCdxA> + </v2.0:Data> + <v2.0:Signature> + <di:Reference URI="#CabinX24h"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue> + </di:Reference> + </v2.0:Signature> + </v2.8:AirDrag> <v2.8:Auxiliaries> <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"> <v2.8:ElectricSystem> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml index 3ee70563879a39e3d19c529fcaaa660c9fab5f75..c682749070edbc0a489d1d9e4b934f1add0a6e10 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml @@ -702,8 +702,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress> <v2.8:VIN>VEH-2234567890</v2.8:VIN> <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date> - <v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass> - <v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage> + <v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass> <v2.8:BodyworkCode>CB</v2.8:BodyworkCode> <v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology> <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml index 1198a4982abcc4cf089158284457a96ad0aba453..b1a628aa5856e2fb4709b2636dbb161affa74042 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml @@ -692,8 +692,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer> <v2.8:ManufacturerAddress></v2.8:ManufacturerAddress> <v2.8:VIN>VEH-2234567890</v2.8:VIN> - <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date> - <v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage> + <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date> <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType> <v2.8:ADAS> <v2.3:EngineStopStart>true</v2.3:EngineStopStart> @@ -735,8 +734,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion> <Date>2021-02-13T07:20:08.0187663Z</Date> </ApplicationInformation> - </Data> - + </Data> <Signature> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml index afa882b6d04922a6e76e18c9e608089cd5a15d77..f0ce6348b1bd2ecd49193c304ad3b3d3662222cd 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml @@ -662,7 +662,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory> <v2.8:CorrectedActualMass>25000</v2.8:CorrectedActualMass> <v2.8:TechnicalPermissibleMaximumLadenMass>30000</v2.8:TechnicalPermissibleMaximumLadenMass> - <v2.8:AirdragModifiedMultistage>true</v2.8:AirdragModifiedMultistage> <v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem> <v2.8:ClassBus>B</v2.8:ClassBus> <v2.8:NumberPassengersLowerDeck>30</v2.8:NumberPassengersLowerDeck>