From 3c0d452e5c1fe4902a1b642fcc8cdc4e92e0bd1e Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 24 Feb 2020 17:10:59 +0100
Subject: [PATCH] refactor customer report, new vtp report
---
.../VectoCore/Resources/XSD/VTPReport.0.2.xsd | 616 ++++++++++++++++++
.../VectoCore/Resources/XSD/VTPReport.xsd | 13 +
.../Resources/XSD/VectoOutputCustomer.0.8.xsd | 406 +++++++-----
.../Resources/XSD/VectoOutputCustomer.xsd | 12 +-
.../Resources/XSD/VectoOutputDefinitions.xsd | 2 +
VectoCore/VectoXML.spp | 2 +
6 files changed, 878 insertions(+), 173 deletions(-)
create mode 100644 VectoCore/VectoCore/Resources/XSD/VTPReport.0.2.xsd
create mode 100644 VectoCore/VectoCore/Resources/XSD/VTPReport.xsd
diff --git a/VectoCore/VectoCore/Resources/XSD/VTPReport.0.2.xsd b/VectoCore/VectoCore/Resources/XSD/VTPReport.0.2.xsd
new file mode 100644
index 0000000000..46f1d4887a
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VTPReport.0.2.xsd
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:VTPReport:v0.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:VTPReport:v0.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+ <xs:complexType name="AbstractComponentsType" abstract="true"/>
+ <xs:complexType name="AirDragType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P241</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="AirdragCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>VECTO</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P268</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CdxA" type="vdecdef:AirdragCdxAType">
+ <xs:annotation>
+ <xs:documentation>P146</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AngleDriveType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P221</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:AngledriveCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P258</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P265</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Ratio" type="vdecdef:AngledriveRatioType">
+ <xs:annotation>
+ <xs:documentation>P176</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AuxiliariesType">
+ <xs:sequence>
+ <xs:element name="FanTechnology" type="vdecdef:AuxFanTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P181</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SteeringPumpTechnology" type="vdecdef:AuxSPTechnologyType" maxOccurs="4">
+ <xs:annotation>
+ <xs:documentation>P182</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ElectricSystemTechnology" type="vdecdef:AuxESTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P183</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PneumaticSystemTechnology" type="vdecdef:AuxPSTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P184</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HVACTechnology" type="vdecdef:AuxHVACTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P185</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AxlegearType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P216</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:AxlegearCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P256</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P264</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LineType" type="vdecdef:AxlegearLineTypeType">
+ <xs:annotation>
+ <xs:documentation>P253</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Ratio" type="vdecdef:AxlegearRatioType">
+ <xs:annotation>
+ <xs:documentation>P150</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AxleType">
+ <xs:sequence>
+ <xs:element name="TyreDimension" type="vdecdef:TyreDimensionType">
+ <xs:annotation>
+ <xs:documentation>P108</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P267</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TyreRRCDeclared" type="vdecdef:TyreRRCISOType">
+ <xs:annotation>
+ <xs:documentation>P046</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TwinTyres" type="vdecdef:AxleTwinTyresType">
+ <xs:annotation>
+ <xs:documentation>P045</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="AxleWheelsType">
+ <xs:sequence minOccurs="2" maxOccurs="4">
+ <xs:element name="Axle" type="AxleType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="CO2ResultType">
+ <xs:sequence>
+ <xs:element name="Mission">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Declared">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="CO2UnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Verified">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="CO2UnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ComponentsTruckFWDType">
+ <xs:complexContent>
+ <xs:extension base="AbstractComponentsType">
+ <xs:sequence>
+ <xs:element name="Engine" type="EngineType"/>
+ <xs:element name="Gearbox" type="GearboxFWDType"/>
+ <xs:element name="TorqueConverter" type="TorqueConverterType" minOccurs="0"/>
+ <xs:element name="Retarder" type="RetarderType"/>
+ <xs:element name="AngleDrive" type="AngleDriveType" minOccurs="0"/>
+ <xs:element name="AirDrag" type="AirDragType"/>
+ <xs:element name="AxleWheels" type="AxleWheelsType"/>
+ <xs:element name="Auxiliaries" type="AuxiliariesType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="ComponentsTruckType">
+ <xs:complexContent>
+ <xs:extension base="AbstractComponentsType">
+ <xs:sequence>
+ <xs:element name="Engine" type="EngineType"/>
+ <xs:element name="Gearbox" type="GearboxType"/>
+ <xs:element name="TorqueConverter" type="TorqueConverterType" minOccurs="0"/>
+ <xs:element name="Retarder" type="RetarderType"/>
+ <xs:element name="AngleDrive" type="AngleDriveType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="AxlegearType"/>
+ <xs:element name="AirDrag" type="AirDragType"/>
+ <xs:element name="AxleWheels" type="AxleWheelsType"/>
+ <xs:element name="Auxiliaries" type="AuxiliariesType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="DataIntegrityCheckType">
+ <xs:sequence>
+ <xs:element name="Components">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Component" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="DataIntegrityResultType">
+ <xs:attribute name="componentName" type="xs:token" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ManufacturerReport" type="DataIntegrityResultType"/>
+ <xs:element name="JobData" type="DataIntegrityResultType"/>
+ </xs:sequence>
+ <xs:attribute name="status" type="DataIntegrityStatusType" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="DataIntegrityResultType">
+ <xs:choice>
+ <xs:sequence>
+ <xs:element name="DigestValueRecomputed" type="xs:token"/>
+ <xs:element name="DigestValueRead" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:token">
+ <xs:attribute name="source" type="xs:token" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:sequence>
+ <xs:element name="Error" type="xs:string"/>
+ </xs:sequence>
+ </xs:choice>
+ <xs:attribute name="status" type="DataIntegrityStatusType" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="EngineType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P201</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P261</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedPower" type="vdecdef:EngineRatedPower">
+ <xs:annotation>
+ <xs:documentation>P250</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Displacement" type="vdecdef:EngineDisplacementType">
+ <xs:annotation>
+ <xs:documentation>P061</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FuelType" type="vdecdef:FuelTypeType">
+ <xs:annotation>
+ <xs:documentation>P193</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FuelConsumptionResultType">
+ <xs:sequence>
+ <xs:element name="Measured">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="FCUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="MeasuredCorrected">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="FCUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Simulated">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="FCUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="GearboxFWDType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P206</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:GearboxCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P254</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P262</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
+ <xs:annotation>
+ <xs:documentation>P076</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="GearsCount">
+ <xs:annotation>
+ <xs:documentation>P199</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="AxlegearRatio" type="vdecdef:AxlegearRatioType"/>
+ <xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType">
+ <xs:annotation>
+ <xs:documentation>P078</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="GearboxType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P206</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:GearboxCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P254</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P262</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
+ <xs:annotation>
+ <xs:documentation>P076</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="GearsCount">
+ <xs:annotation>
+ <xs:documentation>P199</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType">
+ <xs:annotation>
+ <xs:documentation>P078</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ResultsType">
+ <xs:sequence>
+ <xs:element name="Status" type="VTPStatusType"/>
+ <xs:element name="AverageFanPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="WorkPosVT">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="WorkUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="TestFuelNCV" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="NCVUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="FuelConsumption" type="FuelConsumptionResultType"/>
+ <xs:element name="CO2" type="CO2ResultType"/>
+ <xs:element name="VTRatio" type="xs:double"/>
+ <xs:element name="Warnings" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Warning" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="RetarderType">
+ <xs:sequence>
+ <xs:element name="RetarderType" type="vdecdef:RetarderTypeType">
+ <xs:annotation>
+ <xs:documentation>P052</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:sequence minOccurs="0">
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P226</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:RetarderCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P255</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P266</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="TorqueConverterType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P211</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="vdecdef:TorqueConverterCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P257</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P263</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="VehicleType">
+ <xs:complexContent>
+ <xs:extension base="AbstractVehicleType">
+ <xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P236</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VIN" type="vdecdef:VINType">
+ <xs:annotation>
+ <xs:documentation>P238</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P251</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VehicleGroup" type="VehicleGroupType">
+ <xs:annotation>
+ <xs:documentation>VECTO</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AxleConfiguration">
+ <xs:annotation>
+ <xs:documentation>P037</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="GrossVehicleMass" type="vdecdef:VehicleGrossVehicleMassType">
+ <xs:annotation>
+ <xs:documentation>P041</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CurbMassChassis" type="vdecdef:VehicleCurbMassChassisType">
+ <xs:annotation>
+ <xs:documentation>P038</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RetarderRatio" type="vdecdef:RetarderRatioType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P053</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PTO" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P247</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Components" type="AbstractComponentsType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="VTPReportDataType">
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVTPReportDataType">
+ <xs:sequence>
+ <xs:element name="General">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
+ <xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Vehicle" type="AbstractVehicleType"/>
+ <xs:element name="DataIntegrityCheck" type="DataIntegrityCheckType"/>
+ <xs:element name="TestConditions"/>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion"/>
+ <xs:element name="Date"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:simpleType name="AirdragCertificationOptionType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Measured"/>
+ <xs:enumeration value="Standard values"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="CO2UnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="g/t-km"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="DataIntegrityStatusType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="success"/>
+ <xs:enumeration value="failed"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="FCUnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="g/kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="NCVUnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="MJ/kg"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="PowerUnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="kW"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="VehicleGroupType">
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="VTPStatusType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="Passed"/>
+ <xs:enumeration value="Failed"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="WorkUnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:complexType name="AbstractVehicleType" abstract="true"/>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VTPReport.xsd b/VectoCore/VectoCore/Resources/XSD/VTPReport.xsd
new file mode 100644
index 0000000000..2c8cbeebff
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VTPReport.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:VTPReport" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:vtp1.0="urn:tugraz:ivt:VectoAPI:VTPReport:v0.1" xmlns:vtp2.0="urn:tugraz:ivt:VectoAPI:VTPReport:v0.2" targetNamespace="urn:tugraz:ivt:VectoAPI:VTPReport" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:VTPReport:v0.1" schemaLocation="VTPReport.0.1.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:VTPReport:v0.2" schemaLocation="VTPReport.0.2.xsd"/>
+ <xs:element name="VectoVTPReport" type="VectoVTPReportType"/>
+ <xs:complexType name="VectoVTPReportType">
+ <xs:sequence>
+ <xs:element name="Data" type="out:AbstractVTPReportDataType"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
index 48877f1aff..6637f51554 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
@@ -1,23 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
<!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
- <xs:element name="VectoCustomerInformation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="VectoOutputDataType"/>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Signature" type="vdecdef:SignatureType"/>
- </xs:sequence>
- <xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
- </xs:complexType>
- </xs:element>
<xs:complexType name="ADASType">
<xs:sequence>
<xs:element name="EngineStopStart" type="xs:boolean">
@@ -110,171 +96,175 @@
</xs:attribute>
</xs:complexType>
<xs:complexType name="VectoOutputDataType">
- <xs:sequence>
- <xs:element name="Vehicle" type="VehicleType"/>
- <xs:element name="ResultDataSignature" type="vdecdef:SignatureType">
- <xs:annotation>
- <xs:documentation>II.3</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Results">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Status">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="success"/>
- <xs:enumeration value="error"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:choice>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="AbstractVehicleType"/>
+ <xs:element name="ResultDataSignature" type="vdecdef:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results">
+ <xs:complexType>
<xs:sequence>
- <xs:element name="Result" type="ResultType" maxOccurs="unbounded">
+ <xs:element name="Status">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="success"/>
+ <xs:enumeration value="error"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:choice>
+ <xs:sequence>
+ <xs:element name="Result" type="ResultType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>II.2.1, II.2.2</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Summary" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SpecificCO2Emissions">
+ <xs:annotation>
+ <xs:documentation>II.2.3</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="gCO2/tkm"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AveragePayload">
+ <xs:annotation>
+ <xs:documentation>II.2.4</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="t"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="ExemptedVehicle">
+ <xs:complexType/>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
<xs:annotation>
- <xs:documentation>II.2.1, II.2.2</xs:documentation>
+ <xs:documentation>II.2.5</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Summary" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SpecificCO2Emissions">
- <xs:annotation>
- <xs:documentation>II.2.3</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="gCO2/tkm"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="AveragePayload">
- <xs:annotation>
- <xs:documentation>II.2.4</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="t"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:element name="Date" type="vdecdef:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>II.2.5</xs:documentation>
+ </xs:annotation>
</xs:element>
</xs:sequence>
- <xs:element name="ExemptedVehicle">
- <xs:complexType/>
- </xs:element>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ApplicationInformation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SimulationToolVersion" type="xs:string">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="vdecdef:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="VehiclePerformanceType">
<xs:sequence/>
</xs:complexType>
<xs:complexType name="VehicleType">
- <xs:sequence>
- <xs:element name="Model" type="vdecdef:ModelType">
- <xs:annotation>
- <xs:documentation>P236 / II.1.1.7</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P235 / II.1.1.6</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
- <xs:annotation>
- <xs:documentation>P252 / II.1.1.6</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VIN" type="vdecdef:VINType">
- <xs:annotation>
- <xs:documentation>P238 / II.1.1.1</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
- <xs:annotation>
- <xs:documentation>P251 / II.1.1.2</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="GrossVehicleMass">
- <xs:annotation>
- <xs:documentation>P041 / II.1.1.4</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="CurbMassChassis">
- <xs:annotation>
- <xs:documentation>P038 / II.1.1.8</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="vdecdef:VehicleCurbMassChassisType">
- <xs:attribute name="unit" type="MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P269 / II.1.1.10</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="HybridElectricHDV" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P279 / II.1.1.11</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DualFuelVehicle" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P280 / II.1.1.12</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:choice>
+ <xs:complexContent>
+ <xs:extension base="AbstractVehicleType">
<xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P236 / II.1.1.7</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P235 / II.1.1.6</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+ <xs:annotation>
+ <xs:documentation>P252 / II.1.1.6</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VIN" type="vdecdef:VINType">
+ <xs:annotation>
+ <xs:documentation>P238 / II.1.1.1</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P251 / II.1.1.2</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="GrossVehicleMass">
+ <xs:annotation>
+ <xs:documentation>P041 / II.1.1.4</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CurbMassChassis">
+ <xs:annotation>
+ <xs:documentation>P038 / II.1.1.8</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="vdecdef:VehicleCurbMassChassisType">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P269 / II.1.1.10</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HybridElectricHDV" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P279 / II.1.1.11</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DualFuelVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P280 / II.1.1.12</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="AxleConfiguration" type="xs:string">
<xs:annotation>
<xs:documentation>P037 / II.1.1.3</xs:documentation>
@@ -377,8 +367,79 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
+ <xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
</xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="ExemptedVehicleType">
+ <xs:complexContent>
+ <xs:extension base="AbstractVehicleType">
<xs:sequence>
+ <xs:element name="Model" type="vdecdef:ModelType">
+ <xs:annotation>
+ <xs:documentation>P236 / II.1.1.7</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P235 / II.1.1.6</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+ <xs:annotation>
+ <xs:documentation>P252 / II.1.1.6</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VIN" type="vdecdef:VINType">
+ <xs:annotation>
+ <xs:documentation>P238 / II.1.1.1</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P251 / II.1.1.2</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="GrossVehicleMass">
+ <xs:annotation>
+ <xs:documentation>P041 / II.1.1.4</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CurbMassChassis">
+ <xs:annotation>
+ <xs:documentation>P038 / II.1.1.8</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="vdecdef:VehicleCurbMassChassisType">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P269 / II.1.1.10</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HybridElectricHDV" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P279 / II.1.1.11</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DualFuelVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P280 / II.1.1.12</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="MaxNetPower1" minOccurs="0">
<xs:annotation>
<xs:documentation>P277</xs:documentation>
@@ -403,10 +464,10 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
+ <xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
</xs:sequence>
- </xs:choice>
- <xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
- </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:simpleType name="AccelerationUnitType">
<xs:restriction base="xs:token">
@@ -483,4 +544,5 @@
<xs:minLength value="1"/>
</xs:restriction>
</xs:simpleType>
+ <xs:complexType name="AbstractVehicleType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
index 1aeee1c426..864d29ad85 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
@@ -1,12 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:all_cif="urn:tugraz:ivt:VectoAPI:CustomerOutput" xmlns:cif0.5="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" xmlns:cif0.7="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" xmlns:cif0.8="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:CustomerOutput" xmlns:cif0.5="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" xmlns:cif0.7="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" xmlns:cif0.8="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for all supported versions of customer information file and all supported declaration definitions
-->
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" schemaLocation="VectoOutputCustomer.0.5.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" schemaLocation="VectoOutputCustomer.0.7.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" schemaLocation="VectoOutputCustomer.0.8.xsd"/>
+ <xs:element name="VectoCustomerInformation" type="tns:VectoCustomerInformationType"/>
+ <xs:complexType name="VectoCustomerInformationType">
+ <xs:sequence>
+ <xs:element name="Data" type="out:AbstractVectoOutputCustomerDataType"/>
+ <xs:element name="Signature" type="v1.0:SignatureType"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputDefinitions.xsd
index 1a459df00e..c04dc2a75d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputDefinitions.xsd
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+ <xs:complexType name="AbstractVTPReportDataType" abstract="true"/>
<xs:complexType name="AbstractPrimaryVehicleDataPIFType" abstract="true"/>
<xs:complexType name="AbstractVectoOutputManufacturerDataType" abstract="true"/>
+ <xs:complexType name="AbstractVectoOutputCustomerDataType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 9bde8a26de..6db5910e36 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -115,6 +115,8 @@
<File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryBus.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryVehicleInformation.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VTPReport.0.2.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VTPReport.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
<Folder FolderName="Entities" ExtStr="ent"/>
--
GitLab