This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

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 994f4548 authored by Stefanos Doumpoulakis's avatar Stefanos Doumpoulakis
Browse files

Merge remote-tracking branch 'codeu-tobia/declDef2.5' into trailer

parents a8c64980 fb70c7c8
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 146 additions and 2 deletions
.vs/VECTO/v17/fileList.bin
+ 0
− 0
View file @ 994f4548
No preview for this file type
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
+ 18
− 0
View file @ 994f4548
......@@ -128,4 +128,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override string FuelEfficiencyClass { get { return GetString("FuelEfficiencyClass"); } }
}
// ---------------------------------------------------------------------------------------
public class XMLDeclarationTyreDataProviderV25 : XMLDeclarationTyreDataProviderV23
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V25;
//public new const string XSD_TYPE = "TyreComponentDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLDeclarationTyreDataProviderV25(XmlNode componentNode, string sourceFile)
: base(componentNode, sourceFile) { }
protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
\ No newline at end of file
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV25InjectModule.cs 0 → 100644
+ 15
− 0
View file @ 994f4548
using Ninject.Modules;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
{
public class XMLDeclarationInputDataV25InjectModule : NinjectModule
{
public override void Load()
{
Bind<IXMLTyreDeclarationInputData>().To<XMLDeclarationTyreDataProviderV25>().Named(
XMLDeclarationTyreDataProviderV25.QUALIFIED_XSD_TYPE);
}
}
}
\ No newline at end of file
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
+ 2
− 1
View file @ 994f4548
......@@ -20,6 +20,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
new XMLDeclarationInputDataV21InjectModule(),
new XMLDeclarationInputDataV22InjectModule(),
new XMLDeclarationInputDataV23InjectModule(),
new XMLDeclarationInputDataV25InjectModule(),
new XMLDeclarationInputDataV26InjectModule(),
new XMLDeclarationInputDataV27InjectModule(),
new XMLDeclarationPrimaryVehicleBusV01InjectModule(),
......
VectoCore/VectoCore/Models/Declaration/Axle.cs
+ 1
− 1
View file @ 994f4548
......@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Models.Declaration
try {
DeclarationData.Wheels.Lookup(axle.WheelsDimension);
} catch (Exception) {
return new ValidationResult(string.Format("Unknown Tyre dimenstion '{0}'", axle.WheelsDimension));
return new ValidationResult(string.Format("Unknown Tyre dimension '{0}'", axle.WheelsDimension));
}
return ValidationResult.Success;
}
......
VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.5.xsd 0 → 100644
+ 103
− 0
View file @ 994f4548
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.5" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.5" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.5" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
<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="TyreDataDeclarationType">
<xs:complexContent>
<xs:extension base="v1.0:AbstractTyreDataDeclarationType">
<xs:sequence>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
<xs:documentation>P230 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
<xs:documentation>P231 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
<xs:annotation>
<xs:documentation>P267 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
<xs:documentation>P233 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
<xs:documentation>P234 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Dimension" type="tns:TyreDimensionType">
<xs:annotation>
<xs:documentation>P108 - enum</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TyreClass">
<xs:annotation>
<xs:documentation>P370 - enum</xs:documentation>
<xs:appinfo>
<vectoParam:description>
<vectoParam:parameterId component="Tyre">370</vectoParam:parameterId>
<vectoParam:unit>-</vectoParam:unit>
</vectoParam:description>
</xs:appinfo>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:minLength value="1"/>
<xs:enumeration value="C1"/>
<xs:enumeration value="C2"/>
<xs:enumeration value="C3"/>
<xs:enumeration value="N/A"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="FuelEfficiencyClass">
<xs:annotation>
<xs:documentation>P371 - enum</xs:documentation>
<xs:appinfo>
<vectoParam:description>
<vectoParam:parameterId component="Tyre">371</vectoParam:parameterId>
<vectoParam:unit>-</vectoParam:unit>
</vectoParam:description>
</xs:appinfo>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="A"/>
<xs:enumeration value="B"/>
<xs:enumeration value="C"/>
<xs:enumeration value="D"/>
<xs:enumeration value="E"/>
<xs:enumeration value="F"/>
<xs:enumeration value="G"/>
<xs:enumeration value="N/A"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="RRCDeclared" type="v1.0:TyreRRCISOType">
<xs:annotation>
<xs:documentation>P046 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FzISO" type="v1.0:TyreFzISOType">
<xs:annotation>
<xs:documentation>P047 - [N]</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:simpleType name="TyreDimensionType">
<xs:restriction base="xs:token"/>
</xs:simpleType>
</xs:schema>
VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.7_BT.xsd
+ 1
− 0
View file @ 994f4548
......@@ -5,6 +5,7 @@
<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:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.5" schemaLocation="VectoDeclarationDefinitions.2.5.xsd"/>
<xs:complexType name="AbstractCertifiedAeroDataDeclarationType" abstract="true">
<xs:complexContent>
<xs:extension base="v1.0:VectoSimulationComponent"/>
......
VectoCore/VectoCore/Utils/XMLDefinitions.cs
+ 2
− 0
View file @ 994f4548
......@@ -54,6 +54,8 @@ namespace TUGraz.VectoCore.Utils
public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":v2.3";
public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V25 = DECLARATION_NAMESPACE + ":v2.5";
public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V26 = DECLARATION_NAMESPACE + ":DEV:v2.6";
public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V27 = DECLARATION_NAMESPACE + ":DEV:v2.7";
......
VectoCore/VectoCore/VectoCore.csproj
+ 4
− 0
View file @ 994f4548
......@@ -224,6 +224,7 @@
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV21InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV22InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV23InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV25InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV27InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationInputDataV26InjectModule.cs" />
<Compile Include="InputData\FileIO\XML\Declaration\NinjectModules\XMLDeclarationPrimaryVehicleBusV01InjectModule.cs" />
......@@ -1000,6 +1001,9 @@
<EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.5.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="Utils\VectoVersionCore.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VectoVersionCore.cs</LastGenOutput>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about