Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r2529 -r2785 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2785) @@ -303,7 +303,6 @@ location1.Name = "Location1"; location1.XRd = 45782; location1.YRd = 143090; - location1.PolderLevel = 0.4; location1.HeadPL2 = 4.0; location1.DikeEmbankmentMaterial = "clay"; location1.ShoulderEmbankmentMaterial = "sand"; Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs =================================================================== diff -u -r2541 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2541) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2785) @@ -234,7 +234,6 @@ Assert.AreEqual("1", dike.Locations[0].Segment.Name); Assert.AreEqual(414.950, dike.Locations[0].XRd); Assert.AreEqual(91.850, dike.Locations[0].YRd); - Assert.AreEqual(0.1, dike.Locations[0].PolderLevel); Assert.AreEqual(4.0, dike.Locations[0].HeadPL2); Assert.AreEqual(14.0, dike.Locations[0].XSoilGeometry2DOrigin); Assert.AreEqual("ophoogmateriaaldijk", dike.Locations[0].DikeEmbankmentMaterial); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2776 -r2785 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2776) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2785) @@ -757,7 +757,6 @@ location.XRd = locationRecord.GeoX.GetValueOrDefault(location.XRd); location.YRd = locationRecord.GeoY.GetValueOrDefault(location.YRd); - location.PolderLevel = locationRecord.PolderLevel.GetValueOrDefault(location.PolderLevel); location.XSoilGeometry2DOrigin = locationRecord.XSoilGeometry2DOrigin.GetValueOrDefault(location.XSoilGeometry2DOrigin); location.DampingFactorPL3 = locationRecord.DampingFactorPl3.GetValueOrDefault(location.DampingFactorPL3); location.DampingFactorPL4 = locationRecord.DampingFactorPl4.GetValueOrDefault(location.DampingFactorPL4); Index: DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs =================================================================== diff -u -r2560 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2560) +++ DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2785) @@ -76,19 +76,5 @@ Assert.AreEqual(stabilityShoulderGrowDeltaX, actualLocation.StabilityShoulderGrowDeltaX); Assert.AreEqual(stabilitySlopeAdaptionDeltaX, actualLocation.StabilitySlopeAdaptionDeltaX); } - - - [Test] - public void PolderLevel_ReadWrite_ShouldGiveExpectedResult() - { - // setup - const double expected = 2.2; - using (var location = new Location("test") {PolderLevel = expected}) - { - // checks - Assert.AreEqual(expected, location.PolderLevel); - } - } } - } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r2776 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2776) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2785) @@ -218,7 +218,6 @@ Assert.AreEqual(424173.0, location.YRd, tolerance); Assert.AreEqual(2.0, location.XSoilGeometry2DOrigin, tolerance); //Assert.AreEqual("25-2-2-A-1-A", location.PL1Line.Name); - Assert.AreEqual(-0.25, location.PolderLevel, tolerance); Assert.AreEqual(0.8727, location.HeadPL2.Value, tolerance); Assert.AreEqual("klei", location.DikeEmbankmentMaterial); Assert.AreEqual("klei2", location.ShoulderEmbankmentMaterial); Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r2529 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2785) @@ -122,7 +122,6 @@ // Check locations Assert.AreEqual(13, dike.Locations.Count); Location location = dike.Locations.First(x => x.Name.Equals(locationId)); - Assert.AreEqual(-0.70, location.PolderLevel, cTolerance); // Assert.AreEqual(0.25, location.MinimalCircleDepth, cTolerance); // is default from modelparameters Assert.AreEqual("segment_dijkring10_dwp04_1", location.Segment.Name); Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r2529 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2785) @@ -91,7 +91,6 @@ XRd = 111232.178664511, YRd = 507197.06382921, SegmentId = "234", - PolderLevel = -1.29999995232, HeadPL2 = -1.3, XSoilGeometry2DOrigin = 0.0, // actual value DikeEmbankmentMaterial = "HHNK1_Bfg", Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2560 -r2785 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2560) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2785) @@ -53,7 +53,6 @@ public const string SegmentId = "SegmentId"; public const string SurfaceLineId = "SurfaceLineId"; public const string PL1LineId = "PL1LineId"; - public const string PolderLevel = "PolderLevel"; public const string HeadPL2 = "HeadPL2"; public const string XSoilGeometry2DOrigin = "XSoilGeometry2DOrigin"; public const string DikeEmbankmentMaterial = "DikeEmbankmentMaterial"; @@ -1730,7 +1729,6 @@ { nameValuePairs.Add(LocationParameterNames.PL1LineId, PL1Line.Name); } - nameValuePairs.Add(LocationParameterNames.PolderLevel, PolderLevel.ToString(numberFormatInfo)); if (HeadPL2.HasValue) { nameValuePairs.Add(LocationParameterNames.HeadPL2, HeadPL2.Value.ToString(numberFormatInfo)); @@ -2021,10 +2019,6 @@ { SurfaceLineId = parameterValue; } - if (parameterName.Equals(LocationParameterNames.PolderLevel)) - { - PolderLevel = Convert.ToDouble(parameterValue, numberFormatInfo); - } if (parameterName.Equals(LocationParameterNames.HeadPL2)) { HeadPL2 = Convert.ToDouble(parameterValue, numberFormatInfo); @@ -2255,8 +2249,6 @@ return true; case "TL_DegreeOfConsolidation": return true; - case "PolderLevel": - return true; case "HeadPL2": return true; case "DampingFactorPL3": Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r2700 -r2785 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2700) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2785) @@ -932,6 +932,42 @@ Assert.AreEqual(expectedValue, actualValue); } + [Test] + public void GetValue_PolderLevelAndSourceTypeIgnore_ReturnsNull() + { + // Setup + var sensor = new Sensor(); + const double sensorValue = 1.1; + var sensorValues = new Dictionary { { sensor, sensorValue } }; + var sensorLocation = CreateValidSensorLocation(); + + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore; + + // call + var actualValue = sensorLocation.GetValue(x => x.PolderLevel, sensorValues, sensor); + + // assert + Assert.IsNull(actualValue); + } + + [Test] + public void GetValue_PolderLevelAndSourceTypeSensor_ReturnsSensorValue() + { + // Setup + var sensor = new Sensor(); + const double sensorValue = 1.1; + var sensorValues = new Dictionary { { sensor, sensorValue } }; + var sensorLocation = CreateValidSensorLocation(); + + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + + // call + var actualValue = sensorLocation.GetValue(x => x.PolderLevel, sensorValues, sensor); + + // assert + Assert.AreEqual(sensorValue, actualValue); + } + #endregion