Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
===================================================================
diff -u -r2547 -r2931
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2547)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2931)
@@ -272,11 +272,6 @@
public const string ForbiddenZoneFactorColumnName = "ForbiddenZoneFactor";
///
- /// ZoneAreaRestSlopeCrestWidth
- ///
- public const string ZoneAreaRestSlopeCrestWidthColumnName = "ZoneAreaRestSlopeCrestWidth";
-
- ///
/// NewDikeTopWidth
///
public const string NewDikeTopWidthColumnName = "NewDikeTopWidth";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2826 -r2931
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2826)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2931)
@@ -805,7 +805,6 @@
location.SlopeAdaptionStepCotangent = locationRecord.SlopeAdaptionStepCotangent.GetValueOrDefault(location.SlopeAdaptionStepCotangent);
location.StabilityZoneType = locationRecord.StabilityZoneType.GetValueOrDefault(location.StabilityZoneType);
location.ForbiddenZoneFactor = locationRecord.ForbiddenZoneFactor.GetValueOrDefault(location.ForbiddenZoneFactor);
- location.ZoneAreaRestSlopeCrestWidth = locationRecord.ZoneAreaRestSlopeCrestWidth.GetValueOrDefault(location.ZoneAreaRestSlopeCrestWidth);
location.NewDepthDitch = locationRecord.NewDepthDitch.GetValueOrDefault(location.NewDepthDitch);
location.NewDikeSlopeInside = locationRecord.NewDikeSlopeInside.GetValueOrDefault(location.NewDikeSlopeInside);
location.NewDikeSlopeOutside = locationRecord.NewDikeSlopeOutside.GetValueOrDefault(location.NewDikeSlopeOutside);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2529 -r2931
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2529)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2931)
@@ -83,7 +83,6 @@
public StabilityDesignMethod? StabilityDesignMethod { get; set; }
public MStabZonesType? StabilityZoneType { get; set; }
public double? ForbiddenZoneFactor { get; set; }
- public double? ZoneAreaRestSlopeCrestWidth { get; set; }
public double? SlopeAdaptionStartCotangent { get; set; }
public double? SlopeAdaptionEndCotangent { get; set; }
public double? SlopeAdaptionStepCotangent { get; set; }
@@ -172,7 +171,6 @@
int colIndexStabilityDesignMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityDesignMethodColumnName);
int colIndexStabilityZoneType = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneTypeColumnName);
int colIndexForbiddenZoneFactor = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ForbiddenZoneFactorColumnName);
- int colIndexZoneAreaRestSlopeCrestWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName);
int colIndexSlopeAdaptionStartCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStartCotangentColumnName);
int colIndexSlopeAdaptionEndCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionEndCotangentColumnName);
int colIndexSlopeAdaptionStepCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStepCotangentColumnName);
@@ -407,11 +405,6 @@
colIndex = colIndexForbiddenZoneFactor;
locationRecord.ForbiddenZoneFactor = Convert.ToDouble(csv[colIndexForbiddenZoneFactor]);
}
- if (colIndexZoneAreaRestSlopeCrestWidth > -1)
- {
- colIndex = colIndexZoneAreaRestSlopeCrestWidth;
- locationRecord.ZoneAreaRestSlopeCrestWidth = Convert.ToDouble(csv[colIndexZoneAreaRestSlopeCrestWidth]);
- }
if (colIndexSlopeAdaptionStartCotangent > -1)
{
colIndex = colIndexSlopeAdaptionStartCotangent;
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r2529 -r2931
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2529)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2931)
@@ -31,7 +31,6 @@
using NetTopologySuite.Geometries;
using NUnit.Framework;
using Rhino.Mocks;
-using Location = Deltares.Dam.Data.Location;
namespace Deltares.Dam.Tests.Importers
{
@@ -213,7 +212,6 @@
XSoilGeometry2DOrigin = doubleInitialValue,
StabilityZoneType = MStabZonesType.NoZones,
ForbiddenZoneFactor = doubleInitialValue,
- ZoneAreaRestSlopeCrestWidth = doubleInitialValue,
UseNewDikeTopWidth = boolInitialValue,
NewDikeTopWidth = doubleInitialValue,
UseNewDikeSlopeInside = boolInitialValue,
@@ -284,7 +282,6 @@
Assert.AreEqual(doubleTestValue, location.XSoilGeometry2DOrigin);
Assert.AreEqual(mstabZonesTypeTestValue, location.StabilityZoneType);
Assert.AreEqual(doubleTestValue, location.ForbiddenZoneFactor);
- Assert.AreEqual(doubleTestValue, location.ZoneAreaRestSlopeCrestWidth);
Assert.AreEqual(boolTestValue, location.UseNewDikeTopWidth);
Assert.AreEqual(doubleTestValue, location.NewDikeTopWidth);
Assert.AreEqual(boolTestValue, location.UseNewDikeSlopeInside);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2609 -r2931
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2609)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2931)
@@ -364,15 +364,6 @@
public const string ForbiddenZoneFactorAttributeId = CsvColumnNames.ForbiddenZoneFactorColumnName;
///
- /// ZoneAreaRestSlopeCrestWidth
- /// CustomShape
- /// StabilityZones.shp
- /// ZoneAreaRestSlopeCrestWidth
- /// double
- ///
- public const string ZoneAreaRestSlopeCrestWidthAttributeId = CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName;
-
- ///
/// StabilityDesignMethodColumnName
/// CustomShape
/// DesignParameters.shp
@@ -634,7 +625,6 @@
createItem(PlLineCreationMethodAttributeId, "PLLineCreationMethod.shp", "PLCrtMthd", (t, value) => t.PLLineCreationMethod = LocationImportHelper.ToPLLineCreationMethod(value)),
createItem(ZoneTypeAttributeId, "StabilityZones.shp", "ZoneType", (t, value) => t.StabilityZoneType = LocationImportHelper.ToMStabZonesTypeMethod(value)),
createItem(ForbiddenZoneFactorAttributeId, "StabilityZones.shp", "ForbiddenZoneFactor", (t, value) => t.ForbiddenZoneFactor = value.ToType()),
- createItem(ZoneAreaRestSlopeCrestWidthAttributeId, "StabilityZones.shp", "ZoneAreaRestSlopeCrestWidth", (t, value) => t.ZoneAreaRestSlopeCrestWidth = value.ToType()),
createItem(PlLineOffsetBelowDikeTopAtRiverAttributeId, PlLineShapeFileName, "PLBlwTDRvr", (t, value) => t.PlLineOffsetBelowDikeTopAtRiver = value.ToType()),
createItem(PlLineOffsetBelowDikeTopAtPolderAttributeId, PlLineShapeFileName, "PLBlwTDPld", (t, value) => t.PlLineOffsetBelowDikeTopAtPolder = value.ToType()),
createItem(PlLineOffsetBelowShoulderBaseInsideAttributeId, PlLineShapeFileName, "PLBlwTDSh", (t, value) => t.PlLineOffsetBelowShoulderBaseInside = value.ToType()),
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2824 -r2931
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2824)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2931)
@@ -791,8 +791,6 @@
Assert.AreEqual(MStabZonesType.ForbiddenZone, locationRecords[1].StabilityZoneType);
Assert.AreEqual(0.5, locationRecords[0].ForbiddenZoneFactor, tolerance);
Assert.AreEqual(0.9, locationRecords[1].ForbiddenZoneFactor, tolerance);
- Assert.AreEqual(1.6, locationRecords[0].ZoneAreaRestSlopeCrestWidth, tolerance);
- Assert.AreEqual(2.1, locationRecords[1].ZoneAreaRestSlopeCrestWidth, tolerance);
Assert.AreEqual(1.0, locationRecords[0].PlLineOffsetBelowDikeCrestMiddle, tolerance);
Assert.AreEqual(1.1, locationRecords[1].PlLineOffsetBelowDikeCrestMiddle, tolerance);
Assert.AreEqual(null, locationRecords[0].UsePlLineOffsetBelowDikeCrestMiddle);