Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit c59f32b5 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

correcting XML schema for MRF and CIF: use common base elements, do not...

correcting XML schema for MRF and CIF: use common base elements, do not reference MRF in CIF, use base class in CIF
parent f2bd4f8a
Branches
Tags
No related merge requests found
...@@ -7,110 +7,163 @@ ...@@ -7,110 +7,163 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" schemaLocation="VectoOutputManufacturer.0.9.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:element name="VectoOutput">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="AbstractVectoCustomerOutputType"/>
<xs:complexType name="ConventionalLorryOutputType"> <xs:complexType name="ConventionalLorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="Conventional_LorryVehicleType"/> <xs:element name="Vehicle" type="Conventional_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_Px_LorryOutputType"> <xs:complexType name="HEV_Px_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_Px_IHPC_LorryVehicleType"/> <xs:element name="Vehicle" type="HEV_Px_IHPC_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_S2_LorryOutputType"> <xs:complexType name="HEV_S2_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_S2_LorryVehicleType"/> <xs:element name="Vehicle" type="HEV_S2_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_S3_LorryOutputType"> <xs:complexType name="HEV_S3_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_S3_LorryVehicleType"/> <xs:element name="Vehicle" type="HEV_S3_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_S4_LorryOutputType"> <xs:complexType name="HEV_S4_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_S4_LorryVehicleType"/> <xs:element name="Vehicle" type="HEV_S4_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_IEPC_S_LorryOutputType"> <xs:complexType name="HEV_IEPC_S_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_IEPC_S_LorryVehicleType"/> <xs:element name="Vehicle" type="HEV_IEPC_S_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_E2_LorryOutputType"> <xs:complexType name="PEV_E2_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="PEV_E2_LorryVehicleType"/> <xs:element name="Vehicle" type="PEV_E2_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_E3_LorryOutputType"> <xs:complexType name="PEV_E3_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="PEV_E3_LorryVehicleType"/> <xs:element name="Vehicle" type="PEV_E3_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_E4_LorryOutputType"> <xs:complexType name="PEV_E4_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="PEV_E4_LorryVehicleType"/> <xs:element name="Vehicle" type="PEV_E4_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_IEPC_LorryOutputType"> <xs:complexType name="PEV_IEPC_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="PEV_IEPC_LorryVehicleType"/> <xs:element name="Vehicle" type="PEV_IEPC_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="Conventional_CompletedBusOutputType"> <xs:complexType name="Conventional_CompletedBusOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="Conventional_CompletedBusVehicleType"/> <xs:element name="Vehicle" type="Conventional_CompletedBusVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_CompletedBusOutputType"> <xs:complexType name="HEV_CompletedBusOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="HEV_CompletedBusVehicleType"/> <xs:element name="Vehicle" type="HEV_CompletedBusVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_CompletedBusOutputType"> <xs:complexType name="PEV_CompletedBusOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="PEV_CompletedBusVehicleType"/> <xs:element name="Vehicle" type="PEV_CompletedBusVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="Exempted_LorryOutputType"> <xs:complexType name="Exempted_LorryOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="Exempted_LorryVehicleType"/> <xs:element name="Vehicle" type="Exempted_LorryVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="Exempted_CompletedBusOutputType"> <xs:complexType name="Exempted_CompletedBusOutputType">
<xs:complexContent>
<xs:extension base="out:AbstractVectoOutputCustomerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="Exempted_CompletedBusVehicleType"/> <xs:element name="Vehicle" type="Exempted_CompletedBusVehicleType"/>
<xs:element name="Results" type="ResultsType"/> <xs:element name="Results" type="ResultsType"/>
</xs:sequence> </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="Conventional_LorryVehicleType"> <xs:complexType name="Conventional_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="GeneralVehicleSequenceGroup"/> <xs:group ref="GeneralVehicleSequenceGroup"/>
<xs:group ref="LorryGeneralVehicleSequenceGroup"/> <xs:group ref="LorryGeneralVehicleSequenceGroup"/>
<xs:group ref="Conventional_LorryVehicleSequenceGroup"/> <xs:group ref="Conventional_LorryVehicleSequenceGroup"/>
<xs:element name="ADAS" type="mrf:ConventionalADASType"/> <xs:element name="ADAS" type="ConventionalADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="TransmissionGroup"/> <xs:group ref="TransmissionGroup"/>
<xs:element name="Retarder" type="xs:boolean"/> <xs:element name="Retarder" type="xs:boolean"/>
...@@ -122,7 +175,7 @@ ...@@ -122,7 +175,7 @@
<xs:complexType name="HEV_Px_IHPC_LorryVehicleType"> <xs:complexType name="HEV_Px_IHPC_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/> <xs:group ref="HEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
...@@ -136,7 +189,7 @@ ...@@ -136,7 +189,7 @@
<xs:complexType name="HEV_S2_LorryVehicleType"> <xs:complexType name="HEV_S2_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/> <xs:group ref="HEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
...@@ -150,7 +203,7 @@ ...@@ -150,7 +203,7 @@
<xs:complexType name="HEV_S3_LorryVehicleType"> <xs:complexType name="HEV_S3_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/> <xs:group ref="HEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
...@@ -163,7 +216,7 @@ ...@@ -163,7 +216,7 @@
<xs:complexType name="HEV_S4_LorryVehicleType"> <xs:complexType name="HEV_S4_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/> <xs:group ref="HEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
...@@ -174,7 +227,7 @@ ...@@ -174,7 +227,7 @@
<xs:complexType name="HEV_IEPC_S_LorryVehicleType"> <xs:complexType name="HEV_IEPC_S_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/> <xs:group ref="HEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/> <xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
...@@ -187,7 +240,7 @@ ...@@ -187,7 +240,7 @@
<xs:complexType name="PEV_E2_LorryVehicleType"> <xs:complexType name="PEV_E2_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/> <xs:group ref="PEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/> <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
<xs:group ref="TransmissionGroup"/> <xs:group ref="TransmissionGroup"/>
...@@ -200,7 +253,7 @@ ...@@ -200,7 +253,7 @@
<xs:complexType name="PEV_E3_LorryVehicleType"> <xs:complexType name="PEV_E3_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/> <xs:group ref="PEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/> <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
<xs:element name="Retarder"/> <xs:element name="Retarder"/>
...@@ -212,7 +265,7 @@ ...@@ -212,7 +265,7 @@
<xs:complexType name="PEV_E4_LorryVehicleType"> <xs:complexType name="PEV_E4_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/> <xs:group ref="PEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/> <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
<xs:group ref="AxleWheelsGroup"/> <xs:group ref="AxleWheelsGroup"/>
...@@ -222,7 +275,7 @@ ...@@ -222,7 +275,7 @@
<xs:complexType name="PEV_IEPC_LorryVehicleType"> <xs:complexType name="PEV_IEPC_LorryVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/> <xs:group ref="PEV_LorryVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/> <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/> <xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/> <xs:group ref="REESSGroup"/>
<xs:element name="Retarder"/> <xs:element name="Retarder"/>
...@@ -234,21 +287,21 @@ ...@@ -234,21 +287,21 @@
<xs:complexType name="Conventional_CompletedBusVehicleType"> <xs:complexType name="Conventional_CompletedBusVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="CompletedBusVehicleTypeGroup"/> <xs:group ref="CompletedBusVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:ConventionalADASType"/> <xs:element name="ADAS" type="ConventionalADASType"/>
<xs:group ref="CompletedBusAuxGroup"/> <xs:group ref="CompletedBusAuxGroup"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV_CompletedBusVehicleType"> <xs:complexType name="HEV_CompletedBusVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="CompletedBusVehicleTypeGroup"/> <xs:group ref="CompletedBusVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/> <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="CompletedBusAuxGroup"/> <xs:group ref="CompletedBusAuxGroup"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV_CompletedBusVehicleType"> <xs:complexType name="PEV_CompletedBusVehicleType">
<xs:sequence> <xs:sequence>
<xs:group ref="CompletedBusVehicleTypeGroup"/> <xs:group ref="CompletedBusVehicleTypeGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/> <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="CompletedBusAuxGroup"/> <xs:group ref="CompletedBusAuxGroup"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -294,10 +347,16 @@ ...@@ -294,10 +347,16 @@
</xs:sequence> </xs:sequence>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="RatedPowerType">
<xs:restriction base="xs:int"/>
</xs:simpleType>
<xs:simpleType name="LegislativeCategoryType">
<xs:union memberTypes="v2.4:LegislativeCategoryHeavyLorryDeclarationType v2.4:LegislativeCategoryMediumLorryDeclarationType v2.4:LegislativeCategoryPrimaryBusDeclarationType"/>
</xs:simpleType>
<xs:group name="GeneralVehicleSequenceGroup"> <xs:group name="GeneralVehicleSequenceGroup">
<xs:sequence> <xs:sequence>
<xs:element name="VIN" type="v1.0:VINType"/> <xs:element name="VIN" type="v1.0:VINType"/>
<xs:element name="VehicleCategory" type="mrf:LegislativeCategoryType"/> <xs:element name="VehicleCategory" type="LegislativeCategoryType"/>
<xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/> <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/>
<xs:element name="TechnicalPermissibleMaximumLadenMass"> <xs:element name="TechnicalPermissibleMaximumLadenMass">
<xs:complexType> <xs:complexType>
...@@ -406,6 +465,11 @@ ...@@ -406,6 +465,11 @@
</xs:sequence> </xs:sequence>
</xs:sequence> </xs:sequence>
</xs:group> </xs:group>
<xs:complexType name="EngineCapacityType">
<xs:simpleContent>
<xs:extension base="xs:double"/>
</xs:simpleContent>
</xs:complexType>
<xs:group name="EngineGroup"> <xs:group name="EngineGroup">
<xs:sequence> <xs:sequence>
<xs:element name="EngineRatedPower"> <xs:element name="EngineRatedPower">
...@@ -420,7 +484,7 @@ ...@@ -420,7 +484,7 @@
<xs:element name="EngineCapacity"> <xs:element name="EngineCapacity">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="mrf:EngineCapacityType"> <xs:extension base="EngineCapacityType">
<xs:attribute name="unit" type="out:VolumeUnitType" use="required"/> <xs:attribute name="unit" type="out:VolumeUnitType" use="required"/>
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
...@@ -462,7 +526,7 @@ ...@@ -462,7 +526,7 @@
<xs:element name="TotalRatedPropulsionPower"> <xs:element name="TotalRatedPropulsionPower">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="mrf:RatedPowerType"> <xs:extension base="RatedPowerType">
<xs:attribute name="unit" type="out:PowerUnitType" use="required"/> <xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
...@@ -474,7 +538,7 @@ ...@@ -474,7 +538,7 @@
<xs:element name="VoltageLevel" maxOccurs="unbounded"> <xs:element name="VoltageLevel" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="MaxContinuousPropulsionPower" type="mrf:RatedPowerType"/> <xs:element name="MaxContinuousPropulsionPower" type="RatedPowerType"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="voltage"/> <xs:attribute name="voltage"/>
</xs:complexType> </xs:complexType>
...@@ -1042,4 +1106,39 @@ ...@@ -1042,4 +1106,39 @@
<xs:extension base="ResultSummaryConventionalType"/> <xs:extension base="ResultSummaryConventionalType"/>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="ConventionalADASType">
<xs:sequence>
<xs:group ref="ConventionalADASGroup"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="HEVADASType">
<xs:sequence>
<xs:group ref="HEVADASGroup"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PEVADASType">
<xs:sequence>
<xs:group ref="PEVADASGroup"/>
</xs:sequence>
</xs:complexType>
<!--ADAS-->
<xs:group name="ConventionalADASGroup">
<xs:sequence>
<xs:element name="EngineStopStart" type="xs:boolean"/>
<xs:element name="EcoRollWithoutEngineStopStart" type="xs:boolean"/>
<xs:element name="EcoRollWithEngineStopStart" type="xs:boolean"/>
<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
</xs:sequence>
</xs:group>
<xs:group name="HEVADASGroup">
<xs:sequence>
<xs:element name="EngineStopStart" type="xs:boolean"/>
<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
</xs:sequence>
</xs:group>
<xs:group name="PEVADASGroup">
<xs:sequence>
<xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
</xs:sequence>
</xs:group>
</xs:schema> </xs:schema>
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" schemaLocation="VectoOutputCustomer.0.7.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.7.1" schemaLocation="VectoOutputCustomer.0.7.1.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.1" schemaLocation="VectoOutputCustomer.0.7.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" schemaLocation="VectoOutputCustomer.0.8.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" schemaLocation="VectoOutputCustomer.0.8.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" schemaLocation="VectoOutputCustomer.0.9.xsd"/>
<xs:element name="VectoCustomerInformation" type="tns:VectoCustomerInformationType"/> <xs:element name="VectoCustomerInformation" type="tns:VectoCustomerInformationType"/>
<xs:complexType name="VectoCustomerInformationType"> <xs:complexType name="VectoCustomerInformationType">
<xs:sequence> <xs:sequence>
......
...@@ -10,15 +10,9 @@ ...@@ -10,15 +10,9 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.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:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<!-- End imports___________________________________________ --> <!-- End imports___________________________________________ -->
<xs:element name="VectoOutput" type="mrf:AbstractVectoManufacturerOutputType">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="AbstractVectoManufacturerOutputType" abstract="true"/>
<xs:complexType name="ConventionalLorryManufacturerOutputDataType"> <xs:complexType name="ConventionalLorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Conventional-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -28,7 +22,7 @@ ...@@ -28,7 +22,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-Px_IHPCLorryManufacturerOutputDataType"> <xs:complexType name="HEV-Px_IHPCLorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -38,7 +32,7 @@ ...@@ -38,7 +32,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S2_LorryManufacturerOutputDataType"> <xs:complexType name="HEV-S2_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S2-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S2-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -48,7 +42,7 @@ ...@@ -48,7 +42,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S3_LorryManufacturerOutputDataType"> <xs:complexType name="HEV-S3_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S3-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S3-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -58,7 +52,7 @@ ...@@ -58,7 +52,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S4_LorryManufacturerOutputDataType"> <xs:complexType name="HEV-S4_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S4-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S4-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -68,7 +62,7 @@ ...@@ -68,7 +62,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-IEPC-S_LorryManufacturerOutputDataType"> <xs:complexType name="HEV-IEPC-S_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-IEPC-S-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-IEPC-S-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -78,7 +72,7 @@ ...@@ -78,7 +72,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E2_LorryManufacturerOutputDataType"> <xs:complexType name="PEV-E2_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E2-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E2-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -88,7 +82,7 @@ ...@@ -88,7 +82,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E3_LorryManufacturerOutputDataType"> <xs:complexType name="PEV-E3_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E3-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E3-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -98,7 +92,7 @@ ...@@ -98,7 +92,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E4_LorryManufacturerOutputDataType"> <xs:complexType name="PEV-E4_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E4-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E4-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -108,7 +102,7 @@ ...@@ -108,7 +102,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-IEPC_LorryManufacturerOutputDataType"> <xs:complexType name="PEV-IEPC_LorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-IEPC-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-IEPC-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -118,7 +112,7 @@ ...@@ -118,7 +112,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="ConventionalPrimaryBusManufacturerOutputDataType"> <xs:complexType name="ConventionalPrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Conventional-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -128,7 +122,7 @@ ...@@ -128,7 +122,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-Px_IHPCPrimaryBusManufacturerOutputDataType"> <xs:complexType name="HEV-Px_IHPCPrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -138,7 +132,7 @@ ...@@ -138,7 +132,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S2_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="HEV-S2_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S2-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S2-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -148,7 +142,7 @@ ...@@ -148,7 +142,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S3_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="HEV-S3_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S3-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S3-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -158,7 +152,7 @@ ...@@ -158,7 +152,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-S4_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="HEV-S4_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S4-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-S4-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -168,7 +162,7 @@ ...@@ -168,7 +162,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEV-IEPC-S_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="HEV-IEPC-S_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-IEPC-S-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-IEPC-S-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -178,7 +172,7 @@ ...@@ -178,7 +172,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E2_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="PEV-E2_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E2-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E2-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -188,7 +182,7 @@ ...@@ -188,7 +182,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E3_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="PEV-E3_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E3-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E3-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -198,7 +192,7 @@ ...@@ -198,7 +192,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-E4_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="PEV-E4_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E4-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-E4-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -208,7 +202,7 @@ ...@@ -208,7 +202,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEV-IEPC_PrimaryBusManufacturerOutputDataType"> <xs:complexType name="PEV-IEPC_PrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-IEPC-PrimaryBus-VehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-IEPC-PrimaryBus-VehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -218,7 +212,7 @@ ...@@ -218,7 +212,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="ConventionalCompletedBusManufacturerOutputDataType"> <xs:complexType name="ConventionalCompletedBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-CompletedBusVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Conventional-CompletedBusVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -228,7 +222,7 @@ ...@@ -228,7 +222,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="HEVCompletedBusManufacturerOutputDataType"> <xs:complexType name="HEVCompletedBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-CompletedBusVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:HEV-CompletedBusVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -238,7 +232,7 @@ ...@@ -238,7 +232,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="PEVCompletedBusManufacturerOutputDataType"> <xs:complexType name="PEVCompletedBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-CompletedBusVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:PEV-CompletedBusVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -248,7 +242,7 @@ ...@@ -248,7 +242,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="ExemptedLorryManufacturerOutputDataType"> <xs:complexType name="ExemptedLorryManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-LorryVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Exempted-LorryVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -258,7 +252,7 @@ ...@@ -258,7 +252,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="ExemptedPrimaryBusManufacturerOutputDataType"> <xs:complexType name="ExemptedPrimaryBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-PrimaryBusVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Exempted-PrimaryBusVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
...@@ -268,7 +262,7 @@ ...@@ -268,7 +262,7 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="ExemptedCompletedBusManufacturerOutputDataType"> <xs:complexType name="ExemptedCompletedBusManufacturerOutputDataType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="mrf:AbstractVectoManufacturerOutputType"> <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence> <xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-CompletedBusVehicleOutputType"/> <xs:element name="Vehicle" type="mrf:Exempted-CompletedBusVehicleOutputType"/>
<xs:element name="Results" type="mrf:ResultsType"/> <xs:element name="Results" type="mrf:ResultsType"/>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.1" schemaLocation="VectoOutputManufacturer.0.7.1.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.1" schemaLocation="VectoOutputManufacturer.0.7.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" schemaLocation="VectoOutputManufacturer.0.8.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" schemaLocation="VectoOutputManufacturer.0.8.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" schemaLocation="VectoOutputManufacturer.0.9.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:element name="VectoOutput" type="mrf:VectoOutputManufacturerType"> <xs:element name="VectoOutput" type="mrf:VectoOutputManufacturerType">
......
...@@ -1387,7 +1387,7 @@ ...@@ -1387,7 +1387,7 @@
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>
<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
<xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_ConventionalType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
<xs:element name="Components" type="vif:AbstractVehicleComponentsConventionalVIFType"/> <xs:element name="Components" type="vif:AbstractVehicleComponentsConventionalVIFType"/>
</xs:sequence> </xs:sequence>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment