diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd index dc235397685df3b619c16b20c10e19319da440ab..4bc021eb60efaf7522a10221a5c0d0a4dfabb465 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd @@ -5,117 +5,116 @@ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/> - <xs:complexType name="HeavyBusPrimaryVehicleDeclarationType"> + <xs:complexType name="AbstractPrimaryVehicleAuxiliaryDataDeclarationType" abstract="true"/> + <xs:complexType name="AbstractPrimaryVehicleComponentsDeclarationType" abstract="true"/> + <xs:complexType name="AuxiliariesComponentHeavyBusDeclarationType"> + <xs:sequence> + <xs:element name="Data" type="tns:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="CompletedVehicleDeclarationType"> <xs:complexContent> <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> - <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/> - <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/> - <xs:element name="Model" type="v1.0:ModelType"> - <xs:annotation> - <xs:documentation>P236</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="VIN" type="v1.0:VINType"> - <xs:annotation> - <xs:documentation>P238</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> - <xs:annotation> - <xs:documentation>P239</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="VehicleCategory" type="tns:VehicleCategoryDeclarationType"> - <xs:annotation> - <xs:documentation>P036 - enum</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"> - <xs:annotation> - <xs:documentation>P037 - enum</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"> - <xs:annotation> - <xs:documentation>P041 - [kg]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"> - <xs:annotation> - <xs:documentation>P198 - [1/min]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="RetarderType" type="v1.0:RetarderTypeType"> - <xs:annotation> - <xs:documentation>P052 - enum</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0"> - <xs:annotation> - <xs:documentation>P053 - [-]</xs:documentation> - </xs:annotation> + <xs:element name="ManufacturerCompletedVehicle"/> + <xs:element name="ManufacturerAddressCompletedVehicle"/> + <xs:element name="Model"/> + <xs:element name="VIN"/> + <xs:element name="Date"/> + <xs:element name="LegislativeClass"/> + <xs:element name="CurbMassChassis"/> + <xs:element name="TechnicalPermissibleMaximumLadenMass"/> + <xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"/> + <xs:element name="RegisteredClass"/> + <xs:element name="VehicleCode"/> + <xs:element name="RegisteredPassengers"> + <xs:complexType> + <xs:sequence> + <xs:element name="LowerDeck"/> + <xs:element name="UpperDeck"/> + </xs:sequence> + </xs:complexType> </xs:element> - <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType"> - <xs:annotation> - <xs:documentation>P180 - enum</xs:documentation> - </xs:annotation> + <xs:element name="LowEntry"/> + <xs:element name="HeightIntegratedBod"/> + <xs:element name="VehicleLength"/> + <xs:element name="VehicleWidth"/> + <xs:element name="EntranceHeight"/> + <xs:element name="Components"> + <xs:complexType> + <xs:sequence> + <xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType"/> + <xs:element name="Auxiliaries"> + <xs:complexType> + <xs:sequence> + <xs:element name="Data"> + <xs:complexType> + <xs:sequence> + <xs:element name="ElectricSystem"> + <xs:complexType> + <xs:sequence> + <xs:element name="AlternatorTechnology" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation>PXXX</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="ratio" type="v1.0:Double3" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="LEDLights"> + <xs:complexType> + <xs:sequence> + <xs:element name="Dayrunninglights" type="xs:boolean"/> + <xs:element name="Headlights" type="xs:boolean"/> + <xs:element name="Positionlights" type="xs:boolean"/> + <xs:element name="Brakelights" type="xs:boolean"/> + <xs:element name="Interiorlights" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="HVAC"> + <xs:complexType> + <xs:sequence> + <xs:element name="SystemConfiguration" type="xs:int"/> + <xs:element name="CompressorType"> + <xs:complexType> + <xs:sequence> + <xs:element name="DriverAC" type="tns:HVACTechnology"/> + <xs:element name="PassengerAC" type="tns:HVACTechnology"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AuxiliaryHeaterPower" type="xs:int"/> + <xs:element name="DoubleGlasing" type="xs:boolean"/> + <xs:element name="HeatPump" type="xs:boolean"/> + <xs:element name="AdjustableAuxiliaryHeater" type="xs:boolean"/> + <xs:element name="SeparateAirDistributionDucts" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> </xs:element> - <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> - <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/> - <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> - <xs:element name="Components" type="tns:AbstractHeavyBusPrimaryComponentsDeclarationType"/> </xs:sequence> </xs:extension> </xs:complexContent> </xs:complexType> - <xs:simpleType name="LegislativeClassDeclarationType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="N2"/> - <xs:enumeration value="N3"/> - <xs:enumeration value="M3"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="VehicleCategoryDeclarationType"> - <xs:annotation> - <xs:appinfo> - <vectoParam:description> - <vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId> - <vectoParam:unit>-</vectoParam:unit> - </vectoParam:description> - </xs:appinfo> - <xs:documentation>P036 - enum (Declaration)</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:string"> - <xs:enumeration value="Bus"/> - </xs:restriction> - </xs:simpleType> - <xs:complexType name="AbstractHeavyBusPrimaryComponentsDeclarationType" abstract="true"/> - <xs:complexType name="VehicleComponentsType"> + <xs:complexType name="PrimaryVehicleAuxiliaryDataDeclarationType"> <xs:complexContent> - <xs:extension base="tns:AbstractHeavyBusPrimaryComponentsDeclarationType"> - <xs:sequence> - <xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/> - <xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/> - <xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/> - <xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/> - <xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/> - <xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/> - <xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/> - <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentHeavyBusDeclarationType"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="AuxiliariesComponentHeavyBusDeclarationType"> - <xs:sequence> - <xs:element name="Data" type="tns:AbstractAuxiliaryDataHeavyBusDeclarationType"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="AbstractAuxiliaryDataHeavyBusDeclarationType" abstract="true"/> - <xs:complexType name="AuxiliaryDataHeavyBusDeclarationType"> - <xs:complexContent> - <xs:extension base="tns:AbstractAuxiliaryDataHeavyBusDeclarationType"> + <xs:extension base="tns:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"> <xs:sequence> <xs:element name="Fan"> <xs:complexType> @@ -176,6 +175,7 @@ <xs:element name="PneumaticSystem"> <xs:complexType> <xs:sequence> + <xs:element name="SizeOfAirSupply" type="xs:string"/> <xs:element name="AirsuspensionControl"> <xs:simpleType> <xs:restriction base="xs:string"> @@ -208,6 +208,103 @@ </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="PrimaryVehicleComponentsType"> + <xs:complexContent> + <xs:extension base="tns:AbstractPrimaryVehicleComponentsDeclarationType"> + <xs:sequence> + <xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/> + <xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/> + <xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/> + <xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/> + <xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/> + <xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/> + <xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/> + <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentHeavyBusDeclarationType"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="PrimaryVehicleDeclarationType"> + <xs:complexContent> + <xs:extension base="v2.0:AbstractVehicleDeclarationType"> + <xs:sequence> + <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/> + <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/> + <xs:element name="Model" type="v1.0:ModelType"> + <xs:annotation> + <xs:documentation>P236</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="VIN" type="v1.0:VINType"> + <xs:annotation> + <xs:documentation>P238</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> + <xs:annotation> + <xs:documentation>P239</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="VehicleCategory" type="tns:VehicleCategoryDeclarationType"> + <xs:annotation> + <xs:documentation>P036 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"> + <xs:annotation> + <xs:documentation>P037 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"> + <xs:annotation> + <xs:documentation>P041 - [kg]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"> + <xs:annotation> + <xs:documentation>P198 - [1/min]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="RetarderType" type="v1.0:RetarderTypeType"> + <xs:annotation> + <xs:documentation>P052 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0"> + <xs:annotation> + <xs:documentation>P053 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType"> + <xs:annotation> + <xs:documentation>P180 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> + <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/> + <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> + <xs:element name="Components" type="tns:AbstractPrimaryVehicleComponentsDeclarationType"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:simpleType name="AuxFanTechnologyType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/> + <xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/> + <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 stages"/> + <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 stages"/> + <xs:enumeration value="Crankshaft mounted - On/off clutch"/> + <xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/> + <xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/> + <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 stages"/> + <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 stages"/> + <xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/> + <xs:enumeration value="Hydraulic driven - Variable displacement pump"/> + <xs:enumeration value="Hydraulic driven - Constant displacement pump"/> + <xs:enumeration value="Electrically driven - Electronically controlled"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="AuxSPTechnologyType"> <xs:annotation> <xs:documentation>P182</xs:documentation> @@ -230,21 +327,31 @@ <xs:enumeration value="Full electric steering gear"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="AuxFanTechnologyType"> + <xs:simpleType name="HVACTechnology"> <xs:restriction base="xs:string"> - <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/> - <xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/> - <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 stages"/> - <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 stages"/> - <xs:enumeration value="Crankshaft mounted - On/off clutch"/> - <xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/> - <xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/> - <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 stages"/> - <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 stages"/> - <xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/> - <xs:enumeration value="Hydraulic driven - Variable displacement pump"/> - <xs:enumeration value="Hydraulic driven - Constant displacement pump"/> - <xs:enumeration value="Electrically driven - Electronically controlled"/> + <xs:enumeration value="sample tech 1"/> + <xs:enumeration value="sample tech 2"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="LegislativeClassDeclarationType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="N2"/> + <xs:enumeration value="N3"/> + <xs:enumeration value="M3"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="VehicleCategoryDeclarationType"> + <xs:annotation> + <xs:appinfo> + <vectoParam:description> + <vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId> + <vectoParam:unit>-</vectoParam:unit> + </vectoParam:description> + </xs:appinfo> + <xs:documentation>P036 - enum (Declaration)</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="Bus"/> </xs:restriction> </xs:simpleType> </xs:schema>