use NonEMS values for EMS missions

VectoCore/VectoCore/Models/Declaration/VehicleOperation/MileageLookup.cs

@@ -15,7 +15,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation
     {
 		#region Overrides of LookupData
 		protected override string ResourceId => "TUGraz.VectoCore.Resources.Declaration.VehicleOperation.AnnualMileage.csv";
-		protected override string ErrorMessage => "Error looking up mileage";
+		protected override string ErrorMessage => "Error looking up mileage {0}";
 
 		protected override void ParseData(DataTable table)
 		{
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation
 
 		public MileageEntry Lookup(VehicleClass hdvClass, MissionType mission)
 		{
-			return Lookup(hdvClass.GetClassNumber(), mission);
+			return Lookup(hdvClass.GetClassNumber(), mission.GetNonEMSMissionType());
 		}
 
 

VectoCore/VectoCore/Models/Declaration/VehicleOperation/StationaryChargingLookup.cs

@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation
 
 		public T Lookup(VehicleClass hdvClass, MissionType mission)
 		{
-			return ConvertValue(Lookup(hdvClass.GetClassNumber(), mission));
+			return ConvertValue(Lookup(hdvClass.GetClassNumber(), mission.GetNonEMSMissionType()));
 		}
 
 		protected abstract T ConvertValue(double val);