Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv
===================================================================
diff -u -r2609 -r2620
--- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv	(.../scenarios.csv)	(revision 2609)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv	(.../scenarios.csv)	(revision 2620)
@@ -1,3 +1,2 @@
-location_id;location_scenario_id;water_height
-TPL_Hempolder_0010;1;55
-TPL_Hempolder_0020;1;66
+location_id;location_scenario_id;water_height;water_height_low;dike_table_height;head_pl3;head_pl4;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;UsePLLineOffsetBelowDikeCrestMiddle;PLLineOffsetBelowDikeCrestMiddle;UsePLLineOffsetFactorBelowShoulderCrest;PLLineOffsetFactorBelowShoulderCrest;uplift_criterion_stability;uplift_criterion_piping;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope
+TPL_Hempolder_0010;1;0.98;0.66;2.22;-2.22;-3.33;0.11;0.11;0.11;0.11;TRUE;0.11;TRUE;0.11;1.11;1.11;1.11;1.11;1.11
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.dbf
===================================================================
diff -u -r2609 -r2620
Binary files differ
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r2609 -r2620
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2609)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2620)
@@ -640,7 +640,7 @@
         /// Shapefiles: none
         /// Scenarios.csv: filled with only required values (none)
         /// Expected result: scenario will be filled with defaults
-        /// See Log.xlsx for all the values that are in all the files
+        /// See Log.xlsx for all the values that are in all the files, expected values in column Locations_basic.csv + Scenario_basic.csv
         /// </summary>
         [Test]
         public void ImportHemPolderScenarioDefaultsTest()
@@ -688,6 +688,28 @@
             Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
             Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
             Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
+            // check values for location 2
+            scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault();
+            scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId);
+            nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray();
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
+            Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
+            Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
+            Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
+            Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
+            Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
+            Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
+            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
+            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
+            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
         }
 
         /// <summary>
@@ -696,7 +718,7 @@
         /// Shapefiles: none
         /// Scenarios.csv: filled with only required values (waterheight)
         /// Expected result: scenario will be filled with values from locations.csv
-        /// See Log.xlsx for all the values that are in all the files
+        /// See Log.xlsx for all the values that are in all the files, expected values in column Locations_complete.csv + Scenario_basic.csv
         /// </summary>
         [Test]
         public void ImportHemPolderScenarioFromLocationsCsvTest()
@@ -726,24 +748,46 @@
             string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId);
             var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray();
-            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
-            Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
-            Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
-            Assert.AreEqual("0.26", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
-            Assert.AreEqual("0.27", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
-            Assert.AreEqual("0.28", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
+            Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
+            Assert.AreEqual("2.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
+            Assert.AreEqual("0.55", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
+            Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
+            Assert.AreEqual("0.57", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
+            Assert.AreEqual("0.58", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
-            Assert.AreEqual("0.29", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual("0.59", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("0.3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
-            Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
-            Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
-            Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
-            Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
-            Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
-            Assert.AreEqual("0.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
-            Assert.AreEqual("0.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
+            Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("0.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
+            Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
+            Assert.AreEqual("2.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
+            Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
+            Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
+            Assert.AreEqual("1.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
+            Assert.AreEqual("1.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
+            Assert.AreEqual("1.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
+            // check values for location 2
+            scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault();
+            scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId);
+            nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray();
+            Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
+            Assert.AreEqual("3.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
+            Assert.AreEqual("0.65", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
+            Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
+            Assert.AreEqual("0.67", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
+            Assert.AreEqual("0.68", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
+            Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual("0.69", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
+            Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
+            Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
+            Assert.AreEqual("1.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
+            Assert.AreEqual("1.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
+            Assert.AreEqual("1.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
+            Assert.AreEqual("1.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
+            Assert.AreEqual("1.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
         }
 
         /// <summary>
@@ -752,7 +796,7 @@
         /// Shapefiles: line shapes filled completely
         /// Scenarios.csv: filled with only required values (waterheight)
         /// Expected result: scenario will be filled with values from shapefiles
-        /// See Log.xlsx for all the values that are in all the files
+        /// See Log.xlsx for all the values that are in all the files, expected values in column Locations_complete.csv + LijnScenario.shp + Scenario_basic.csv
         /// </summary>
         [Test]
         public void ImportHemPolderLineShapeOverLocationsCsvTest()
@@ -837,7 +881,7 @@
         /// Shapefiles: area shapes filled completely
         /// Scenarios.csv: filled with only required values (waterheight)
         /// Expected result: scenario will be filled with values from shapefiles
-        /// See Log.xlsx for all the values that are in all the files
+        /// See Log.xlsx for all the values that are in all the files, expected values in column Locations_complete.csv + VlakScenario.shp + Scenario_basic.csv
         /// </summary>
         [Test]
         public void ImportHemPolderAreaShapeOverLocationsCsvTest()
@@ -922,7 +966,7 @@
         /// Shapefiles: line shapes filled completely
         /// Scenarios.csv: filled completely
         /// Expected result: scenario will be filled with values from scenarios.csv
-        /// See Log.xlsx for all the values that are in all the files
+        /// See Log.xlsx for all the values that are in all the files, expected values in column Locations_complete.csv + LijnScenario.shp + Scenario_complete.csv
         /// </summary>
         [Test]
         public void ImportHemPolderScenarioOverShapeAndLocationsCsvTest()
@@ -959,46 +1003,46 @@
             string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId);
             var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray();
-            Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
-            Assert.AreEqual("2.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
-            Assert.AreEqual("0.55", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
-            Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
-            Assert.AreEqual("0.57", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
-            Assert.AreEqual("0.58", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
+            Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
+            Assert.AreEqual("2.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
+            Assert.AreEqual("0.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
+            Assert.AreEqual("0.76", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
+            Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
+            Assert.AreEqual("0.78", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
-            Assert.AreEqual("0.59", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual("0.79", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("0.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
-            Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
-            Assert.AreEqual("2.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
-            Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
-            Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
-            Assert.AreEqual("1.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
-            Assert.AreEqual("1.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
-            Assert.AreEqual("1.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
+            Assert.AreEqual("0.8", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
+            Assert.AreEqual("0.91", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
+            Assert.AreEqual("0.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
+            Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
+            Assert.AreEqual("1.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
+            Assert.AreEqual("0.93", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
+            Assert.AreEqual("0.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
+            Assert.AreEqual("0.95", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
             // check values for location 2
             scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault();
             scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId);
             nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray();
-            Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
-            Assert.AreEqual("3.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
-            Assert.AreEqual("0.65", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
-            Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
-            Assert.AreEqual("0.67", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
-            Assert.AreEqual("0.68", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
+            Assert.AreEqual("1.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue);
+            Assert.AreEqual("3.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue);
+            Assert.AreEqual("1.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue);
+            Assert.AreEqual("1.76", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue);
+            Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue);
+            Assert.AreEqual("1.78", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
-            Assert.AreEqual("0.69", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
+            Assert.AreEqual("1.79", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue);
             Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
-            Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
-            Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
-            Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
-            Assert.AreEqual("1.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
-            Assert.AreEqual("1.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
-            Assert.AreEqual("1.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
-            Assert.AreEqual("1.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
-            Assert.AreEqual("1.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
+            Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue);
+            Assert.AreEqual("1.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue);
+            Assert.AreEqual("1.91", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue);
+            Assert.AreEqual("1.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue);
+            Assert.AreEqual("2.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue);
+            Assert.AreEqual("2.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue);
+            Assert.AreEqual("1.93", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue);
+            Assert.AreEqual("1.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue);
+            Assert.AreEqual("1.95", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue);
         }
     }
 }
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv
===================================================================
diff -u -r2609 -r2620
--- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv	(.../locations_complete.csv)	(revision 2609)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv	(.../locations_complete.csv)	(revision 2620)
@@ -1,3 +1,3 @@
 location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope
-TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1;3;0.25;0.26;0.27;0.28;TRUE;0.29;TRUE;0.3;1;3;2;2;1;0.9;0.92;0.94
-TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;2;4;0.35;0.36;0.37;0.38;TRUE;0.39;TRUE;0.4;2;4;3;2.5;1.5;0.91;0.93;0.95
+TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;0.11;2.11;0.55;0.56;0.57;0.58;TRUE;0.59;TRUE;0.6;0.88;0.77;2.88;1.11;1.77;1.09;1.12;1.14
+TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1.11;3.11;0.65;0.66;0.67;0.68;TRUE;0.69;TRUE;0.7;0.99;0.66;2.99;1.22;1.88;1.1;1.13;1.15
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv
===================================================================
diff -u -r2609 -r2620
--- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv	(.../locations.csv)	(revision 2609)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv	(.../locations.csv)	(revision 2620)
@@ -1,3 +1,3 @@
 location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope
-TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;0.11;2.11;0.55;0.56;0.57;0.58;TRUE;0.59;TRUE;0.6;0.88;0.77;2.88;1.11;1.77;1.09;1.12;1.14
-TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1.11;3.11;0.65;0.66;0.67;0.68;TRUE;0.69;TRUE;0.7;0.99;0.66;2.99;1.22;1.88;1.1;1.13;1.15
+TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1;3;0.25;0.26;0.27;0.28;TRUE;0.29;TRUE;0.3;1;3;2;2;1;0.9;0.92;0.94
+TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;2;4;0.35;0.36;0.37;0.38;TRUE;0.39;TRUE;0.4;2;4;3;2.5;1.5;0.91;0.93;0.95
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv
===================================================================
diff -u -r2609 -r2620
--- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv	(.../scenarios_complete.csv)	(revision 2609)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv	(.../scenarios_complete.csv)	(revision 2620)
@@ -1,3 +1,3 @@
 location_id;location_scenario_id;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope
-TPL_Hempolder_0010;1;0.11;2.11;0.55;0.56;0.57;0.58;TRUE;0.59;TRUE;0.6;0.88;0.77;2.88;1.11;1.77;1.09;1.12;1.14
-TPL_Hempolder_0020;1;1.11;3.11;0.65;0.66;0.67;0.68;TRUE;0.69;TRUE;0.7;0.99;0.66;2.99;1.22;1.88;1.1;1.13;1.15
+TPL_Hempolder_0010;1;0.25;2.25;0.75;0.76;0.77;0.78;TRUE;0.79;TRUE;0.8;0.9;0.91;0.92;1.5;1.25;0.93;0.94;0.95
+TPL_Hempolder_0020;1;1.25;3.25;1.75;1.76;1.77;1.78;TRUE;1.79;TRUE;0.9;1.9;1.91;1.92;2.5;2.25;1.93;1.94;1.95
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Log.xlsx
===================================================================
diff -u -r2609 -r2620
Binary files differ