updating writing engineering xml

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -288,6 +288,11 @@ namespace TUGraz.VectoCommon.InputData
 				default: throw new ArgumentOutOfRangeException(nameof(ecoRoll), ecoRoll, null);
 			}
 		}
+
+		public static string ToXMLFormat(this EcoRollType ecoRoll)
+		{
+			return GetName(ecoRoll).ToLowerInvariant();
+		}
 	}
 
 	public enum TankSystem

VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs

@@ -2472,6 +2472,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to EcoRoll.
+        /// </summary>
+        public static string Vehicle_ADAS_EcoRoll {
+            get {
+                return ResourceManager.GetString("Vehicle_ADAS_EcoRoll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to EcoRollWithEngineStop.
         /// </summary>

VectoCommon/VectoCommon/Resources/XMLNames.resx

@@ -1104,4 +1104,7 @@
   <data name="Engine_WHRType" xml:space="preserve">
     <value>WHRType</value>
   </data>
+  <data name="Vehicle_ADAS_EcoRoll" xml:space="preserve">
+    <value>EcoRoll</value>
+  </data>
 </root>
\ No newline at end of file

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs

@@ -81,7 +81,13 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 
 		private VehicleData.ADASData CreateADAS(IAdvancedDriverAssistantSystemsEngineering adas)
 		{
-			return new VehicleData.ADASData {
+			return adas == null ?
+				new VehicleData.ADASData() {
+					EngineStopStart = false,
+					EcoRoll = EcoRollType.None,
+					PredictiveCruiseControl = PredictiveCruiseControlType.None
+				}: 
+				new VehicleData.ADASData {
 				EngineStopStart = adas.EngineStopStart,
 				EcoRoll = adas.EcoRoll,
 				PredictiveCruiseControl = adas.PredictiveCruiseControl

VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringADASWriterV10.cs

 using System.Xml.Linq;
 using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
 using TUGraz.VectoCore.OutputData.XML.Engineering.Interfaces;
 using TUGraz.VectoCore.Utils;
 
@@ -20,8 +21,12 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer {
 			if (adas == null) {
 				return null;
 			}
-			// todo: write different ADAS options
-			return null;
+
+			var ns = ComponentDataNamespace;
+			return new object[] { new XElement(ns + XMLNames.Vehicle_AdvancedDriverAssist, 
+				new XElement(ns + XMLNames.Vehicle_ADAS_EngineStopStart, adas.EngineStopStart),
+				new XElement(ns + XMLNames.Vehicle_ADAS_EcoRoll, adas.EcoRoll.ToXMLFormat()),
+				new XElement(ns + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()))};
 		}
 
 		#endregion

VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringVehicleDataWriter.cs

@@ -64,14 +64,11 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
 				CreateTorqueLimits(ns, vehicle),
 				new XElement(ns + XMLNames.Vehicle_CurbMassExtra, vehicle.CurbMassExtra.Value()),
 				new XElement(ns + XMLNames.Vehicle_Loading, vehicle.Loading.Value()),
+				Factory.GetWriter(vehicle.ADAS, Writer, vehicle.ADAS.DataSource).WriteXML(vehicle),
 				new XElement(
 					ns + XMLNames.Vehicle_Components,
 					componentsWriter.WriteXML(vehicle)
-				),
-				vehicle.ADAS == null ? null : 
-				new XElement(ns + XMLNames.Vehicle_AdvancedDriverAssist,
-							Factory.GetWriter(vehicle.ADAS, Writer, vehicle.ADAS.DataSource).WriteXML(vehicle)
-				), 
+				) 
 			};
 			return retVal;
 		}