added HEV IEPC S Vehicle Type writer

VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs

@@ -16,7 +16,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 
 		#region Vehicle
 
-		IXmlTypeWriter GetConventionalLorryVehicleType();
+		IXmlTypeWriter GetConventionalVehicleType();
+		IXmlTypeWriter GetHevIepcSVehicleType();
+
+
 
 
 		#endregion

VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs

@@ -24,8 +24,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			#region VehicleTypes
 
 
-			Bind<IXmlTypeWriter>().To<VIFConventionalVehicle>().When(AccessedViaVIFFactory)
-				.NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalLorryVehicleType());
+			Bind<IXmlTypeWriter>().To<ConventionalVehicleType>().When(AccessedViaVIFFactory)
+				.NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalVehicleType());
+
+			Bind<IXmlTypeWriter>().To<HevIepcSVehicleType>().When(AccessedViaVIFFactory)
+				.NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSVehicleType());
 
 
 			#endregion

VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleWriter.cs

@@ -27,22 +27,40 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 	}
 
 
-	public class VIFConventionalVehicle : VehicleWriter
+	public class ConventionalVehicleType : VehicleWriter
 	{
-		public VIFConventionalVehicle(IVIFReportFactory vifReportFactory) : base(vifReportFactory)
-		{
-		}
+		public ConventionalVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
 		
 		#region Overrides of VehicleWriter
 		
 		public override XElement GetElement(IDeclarationInputDataProvider inputData)
 		{
-			var commonVehicleGroup = _vifReportFactory.GetConventionalVehicleGroup().GetElements(inputData);
-			commonVehicleGroup.Add(_vifReportFactory.GetConventionalComponentType().GetElement(inputData));
+			var vehicleData = _vifReportFactory.GetConventionalVehicleGroup().GetElements(inputData);
+			vehicleData.Add(_vifReportFactory.GetConventionalComponentType().GetElement(inputData));
+
+			return new XElement(_vif + XMLNames.Component_Vehicle,
+					new XAttribute(_xsi + "type", "vif:ConventionalVehicleVIFType"),
+					vehicleData);
+		}
+
+		#endregion
+	}
+
+
+	public class HevIepcSVehicleType : VehicleWriter
+	{
+		public HevIepcSVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			var vehicleData = _vifReportFactory.GetHevIepcSVehicleGroup().GetElements(inputData);
+			vehicleData.Add(_vifReportFactory.GetHevIepcSComponentVIFType().GetElement(inputData));
 
 			return new XElement(_vif + XMLNames.Component_Vehicle,
-				new XAttribute(_xsi + "type", "vif: ConventionalVehicleVIFType"),
-				commonVehicleGroup);
+					new XAttribute(_xsi + "type", "vif:HEV-IEPC-S_VehicleVIFType"),
+					vehicleData);
 		}
 
 		#endregion