bugfix: WHTC correction factor

error in testcase: wrong order of arguments
error in parsing declaration data: wrong order of rows (urban/rural/motorway vs. rural/urban/motorway)
fix: corrected parsing declaration data
fix: corrected testcase
additional testcases

VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs

@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 			NormalizeTable(table);
 			foreach (MissionType mission in Enum.GetValues(typeof(MissionType))) {
 				var values = table.Columns[mission.ToString().ToLower()].Values<string>().ToDouble().ToArray();
-				_data[mission] = new WHTCCorrectionEntry { Rural = values[0], Urban = values[1], Motorway = values[2] };
+				_data[mission] = new WHTCCorrectionEntry { Urban = values[0], Rural = values[1], Motorway = values[2] };
 			}
 		}
 

VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs

@@ -124,12 +124,42 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				var urban = r.NextDouble() * 2;
 				var rural = r.NextDouble() * 2;
 				var motorway = r.NextDouble() * 2;
-				var whtcValue = whtc.Lookup(Missions[i], urban, rural, motorway);
+				var whtcValue = whtc.Lookup(Missions[i], rural: rural, urban: urban, motorway: motorway);
 				Assert.AreEqual(urban * factors.urban[i] + rural * factors.rural[i] + motorway * factors.motorway[i],
 					whtcValue);
 			}
 		}
 
+		[TestMethod]
+		public void WHTCLookupTestLongHaul()
+		{
+			var expected = 1.015501;
+
+			var rural = 1.0265;
+			var urban = 1.0948;
+			var motorway = 1.0057;
+
+			var lookup = DeclarationData.WHTCCorrection.Lookup(MissionType.LongHaul, rural: rural, urban: urban,
+				motorway: motorway);
+			Assert.AreEqual(expected, lookup, 1e-8);
+		}
+
+
+		[TestMethod]
+		public void WHTCLookupTestRegionalDelivery()
+		{
+			var expected = 1.02708700;
+
+			var rural = 1.0265;
+			var urban = 1.0948;
+			var motorway = 1.0057;
+
+			var lookup = DeclarationData.WHTCCorrection.Lookup(MissionType.RegionalDelivery, rural: rural, urban: urban,
+				motorway: motorway);
+			Assert.AreEqual(expected, lookup, 1e-8);
+		}
+
+
 		[TestMethod]
 		public void AirDragTest()
 		{