diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs index 96a025eab6747278d04f1c5d4d07ab2cae6f4d24..caf7233c1401eabf555400c5e2e8aaa05cd40cbc 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs +++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs @@ -1446,6 +1446,15 @@ namespace TUGraz.VectoCommon.Resources { } } + /// <summary> + /// Looks up a localized string similar to CO2StandardsGroup. + /// </summary> + public static string Report_CO2StandardsGroup { + get { + return ResourceManager.GetString("Report_CO2StandardsGroup", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to CertificationMethod. /// </summary> @@ -1941,15 +1950,6 @@ namespace TUGraz.VectoCommon.Resources { } } - /// <summary> - /// Looks up a localized string similar to VehicleSubGroup. - /// </summary> - public static string Report_VehicleSubGroup { - get { - return ResourceManager.GetString("Report_VehicleSubGroup", resourceCulture); - } - } - /// <summary> /// Looks up a localized string similar to RetarderLossMap. /// </summary> diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx index 16161d7e6760e0c8dcfa44f822a6d57724d1ac0b..3388ab7af72828f838eed56a4da6234b768d3b69 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.resx +++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx @@ -1053,7 +1053,7 @@ <data name="TorqueConverter_MaxInputSpeed" xml:space="preserve"> <value>MaxInputSpeed</value> </data> -<data name="Report_VehicleSubGroup" xml:space="preserve"> - <value>VehicleSubGroup</value> +<data name="Report_CO2StandardsGroup" xml:space="preserve"> + <value>CO2StandardsGroup</value> </data> </root> \ No newline at end of file diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs index 3e053ec65dc1d4bae4b2ee2a7bd35bfd97d718cb..80bb2d5b80a93c9b7f0f5bcb345cf5a07dfc03d4 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs @@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.OutputData.XML exempted ? ExemptedData(modelData) : new[] { new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()), new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, modelData.VehicleData.VehicleClass.GetClassNumber()), - new XElement(tns + XMLNames.Report_VehicleSubGroup, DeclarationReport.WeightingGroup.ToXMLFormat()), + new XElement(tns + XMLNames.Report_CO2StandardsGroup, DeclarationReport.WeightingGroup.ToXMLFormat()), new XElement(tns + XMLNames.Vehicle_VocationalVehicle, modelData.VehicleData.VocationalVehicle), new XElement(tns + XMLNames.Vehicle_SleeperCab, modelData.VehicleData.SleeperCab), GetADAS(modelData.VehicleData.ADAS) diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs index 27ec4c147d5eea317c0607f5507e20dd4c0badd8..1a7bf845c97fd3e7460036cace11ef2bf51a7c7a 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs @@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.OutputData.XML : new[] { new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()), new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, modelData.VehicleData.VehicleClass.GetClassNumber()), - new XElement(tns + XMLNames.Report_VehicleSubGroup, DeclarationReport.WeightingGroup.ToXMLFormat()), + new XElement(tns + XMLNames.Report_CO2StandardsGroup, DeclarationReport.WeightingGroup.ToXMLFormat()), new XElement(tns + XMLNames.Vehicle_VocationalVehicle, modelData.VehicleData.VocationalVehicle), new XElement(tns + XMLNames.Vehicle_SleeperCab, modelData.VehicleData.SleeperCab), new XElement(tns + XMLNames.Vehicle_PTO, modelData.PTO != null), diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.1.xsd index bf2d288cb39f6b048e966a230101b9e69f5550a2..0f9f51b46aabb63f380be133885bee234cf6eca2 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.1.xsd @@ -247,7 +247,7 @@ <xs:documentation>VECTO / II.1.1.5</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="VehicleSubGroup"> + <xs:element name="CO2StandardsGroup"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:minLength value="1"/> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.1.xsd index a561c8ba1a728a4c515877888dea4e662fc0fd9d..60231bf98a83a72028e129fb44c32882e8d319b2 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.1.xsd @@ -729,7 +729,7 @@ <xs:documentation>VECTO / I.1.1.7 / #13</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="VehicleSubGroup"> + <xs:element name="CO2StandardsGroup"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:minLength value="1"/>