Merge branch 'issue-338' into 'amdm2/develop'

fix #338: eco roll set to 'none' in special case

See merge request !181

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs

@@ -54,16 +54,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 	public abstract class AbstractSimulationDataAdapter : LoggingObject
 	{
 		// =========================
-		protected VehicleData.ADASData CreateADAS(IAdvancedDriverAssistantSystemDeclarationInputData adas)
-		{
-			return new VehicleData.ADASData
-			{
-				EngineStopStart = adas.EngineStopStart,
-				EcoRoll = adas.EcoRoll,
-				PredictiveCruiseControl = adas.PredictiveCruiseControl,
-				InputData = adas
-			};
-		}
 		internal AirdragData SetCommonAirdragData(IAirdragDeclarationInputData data)
 		{
 			var retVal = new AirdragData()

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

@@ -108,8 +108,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 				}: 
 				new VehicleData.ADASData {
 					EngineStopStart = adas.EngineStopStart,
-					EcoRoll = adas.EcoRoll,
-					PredictiveCruiseControl = adas.PredictiveCruiseControl
+					PredictiveCruiseControl = adas.PredictiveCruiseControl,
+					EcoRoll = ((adas.PredictiveCruiseControl == PredictiveCruiseControlType.None) 
+							&& adas.EcoRoll.WithoutEngineStop())
+					? EcoRollType.None
+					: adas.EcoRoll,
 			};
 		}
 

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ADASDataAdapter.cs

@@ -12,9 +12,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			return new VehicleData.ADASData
 			{
 				EngineStopStart = adas.EngineStopStart,
-				EcoRoll = adas.EcoRoll,
 				PredictiveCruiseControl = adas.PredictiveCruiseControl,
-				InputData = adas
+				InputData = adas,
+				EcoRoll = ((adas.PredictiveCruiseControl == PredictiveCruiseControlType.None) 
+							&& adas.EcoRoll.WithoutEngineStop())
+					? EcoRollType.None
+					: adas.EcoRoll,
 			};
 		}
 	}