From 45956f45d3249dd45d5325df53f7d906dff6e74b Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 27 Nov 2018 13:35:01 +0100
Subject: [PATCH] xml schema manufacturer report: introduce new type, add 
 weighted CO2 and payload

---
 .../XSD/VectoOutputManufacturer.0.7.xsd       | 68 +++++++++++++++----
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
index d30e741431..3469c1f13d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
@@ -8,17 +8,11 @@
 			<xs:documentation>Comment describing your root element</xs:documentation>
 		</xs:annotation>
 		<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:complexContent>
+				<xs:extension base="VectoOutputManufacturerType">
+					<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+				</xs:extension>
+			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="AirdragType">
@@ -400,7 +394,45 @@
 							</xs:simpleType>
 						</xs:element>
 						<xs:choice>
-							<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
+							<xs:sequence>
+								<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
+								<xs:element name="Summary">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="SpecificCO2Emissions">
+												<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: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>
@@ -720,4 +752,16 @@
 			<xs:enumeration value="ltr"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:complexType name="VectoOutputManufacturerType">
+		<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:complexType>
 </xs:schema>
-- 
GitLab