Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -r5ad8e6d01f15a280162b76b688ab30487e78e206
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision a960f05a5324192bd268fe1891fdcf8712b2905e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 5ad8e6d01f15a280162b76b688ab30487e78e206)
@@ -97,47 +97,6 @@
}
///
- /// Create hydraulic boundary database location features based on the provided .
- ///
- /// The
- /// to create the location features for.
- /// A collection of features.
- /// Thrown when is null.
- public static IEnumerable CreateHydraulicBoundaryDatabaseFeatures(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
- {
- if (hydraulicBoundaryDatabase == null)
- {
- throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase));
- }
-
- IEnumerable hydraulicBoundaryLocations = hydraulicBoundaryDatabase.Locations;
-
- int hydraulicBoundaryLocationsCount = hydraulicBoundaryLocations.Count();
- var features = new MapFeature[hydraulicBoundaryLocationsCount];
-
- for (var i = 0; i < hydraulicBoundaryLocationsCount; i++)
- {
- HydraulicBoundaryLocation location = hydraulicBoundaryLocations.ElementAt(i);
-
- MapFeature feature = CreateSinglePointMapFeature(location.Location);
- feature.MetaData[Resources.MetaData_ID] = location.Id;
- feature.MetaData[Resources.MetaData_Name] = location.Name;
- feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation1);
- feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation2);
- feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation3);
- feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation4);
- feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation1);
- feature.MetaData[Resources.MetaData_WaveHeightCalculationForSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation2);
- feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation3);
- feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation4);
-
- features[i] = feature;
- }
-
- return features;
- }
-
- ///
/// Create hydraulic boundary location features based on the provided .
///
/// The to create the location features for.
@@ -391,11 +350,6 @@
return feature;
}
- private static RoundedDouble GetHydraulicBoundaryLocationOutput(HydraulicBoundaryLocationCalculation calculation)
- {
- return calculation.Output?.Result ?? RoundedDouble.NaN;
- }
-
private static MapCalculationData CreateMapCalculationData(
StructuresCalculation calculation)
where TStructuresInput : StructuresInputBase, new()
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rb696329ea2268bfb69b2f7f6956774538dd5a2f3 -r5ad8e6d01f15a280162b76b688ab30487e78e206
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs (.../RingtoetsMapDataFeaturesFactoryTest.cs) (revision b696329ea2268bfb69b2f7f6956774538dd5a2f3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs (.../RingtoetsMapDataFeaturesFactoryTest.cs) (revision 5ad8e6d01f15a280162b76b688ab30487e78e206)
@@ -115,52 +115,6 @@
}
[Test]
- public void CreateHydraulicBoundaryDatabaseFeatures_HydraulicBoundaryDatabaseNull_ThrowArgumentNullException()
- {
- // Call
- TestDelegate test = () => RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(null);
-
- // Assert
- var exception = Assert.Throws(test);
- Assert.AreEqual("hydraulicBoundaryDatabase", exception.ParamName);
- }
-
- [Test]
- public void CreateHydraulicBoundaryDatabaseFeatures_GivenHydraulicBoundaryDatabase_ReturnsLocationFeaturesCollection()
- {
- // Setup
- var points = new[]
- {
- new Point2D(1.2, 2.3),
- new Point2D(2.7, 2.0)
- };
- var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
- hydraulicBoundaryDatabase.Locations.AddRange(points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y)));
- foreach (HydraulicBoundaryLocation location in hydraulicBoundaryDatabase.Locations)
- {
- SetHydraulicBoundaryLocationOutput(location);
- }
-
- // Call
- IEnumerable features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase);
-
- // Assert
- IEnumerable hydraulicBoundaryLocations = hydraulicBoundaryDatabase.Locations;
- int expectedHydraulicBoundaryLocationsCount = hydraulicBoundaryLocations.Count();
- Assert.AreEqual(expectedHydraulicBoundaryLocationsCount, features.Count());
- for (var i = 0; i < expectedHydraulicBoundaryLocationsCount; i++)
- {
- MapFeature mapFeature = features.ElementAt(i);
- Assert.AreEqual(10, mapFeature.MetaData.Keys.Count);
- HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocations.ElementAt(i);
-
- AssertHydraulicBoundaryLocationMetaData(hydraulicBoundaryLocation, mapFeature);
- }
-
- AssertEqualFeatureCollections(points, features);
- }
-
- [Test]
public void CreateHydraulicBoundaryLocationFeatures_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Call
@@ -781,51 +735,6 @@
Assert.AreSame(point, geometryPointCollections.First().First());
}
- private static void SetHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation location)
- {
- var random = new Random(37);
-
- location.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(double.NaN);
- location.DesignWaterLevelCalculation2.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
- location.DesignWaterLevelCalculation3.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
-
- location.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(double.NaN);
- location.WaveHeightCalculation2.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
- location.WaveHeightCalculation3.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
- }
-
- private static void AssertHydraulicBoundaryLocationMetaData(HydraulicBoundaryLocation hydraulicBoundaryLocation, MapFeature mapFeature)
- {
- Assert.AreEqual(hydraulicBoundaryLocation.Id, mapFeature.MetaData["ID"]);
- Assert.AreEqual(hydraulicBoundaryLocation.Name, mapFeature.MetaData["Naam"]);
-
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.DesignWaterLevelCalculation1,
- mapFeature,
- "h(A+->A)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.DesignWaterLevelCalculation2,
- mapFeature,
- "h(A->B)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.DesignWaterLevelCalculation3,
- mapFeature,
- "h(B->C)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.DesignWaterLevelCalculation4,
- mapFeature,
- "h(C->D)");
-
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.WaveHeightCalculation1,
- mapFeature,
- "Hs(A+->A)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.WaveHeightCalculation2,
- mapFeature,
- "Hs(A->B)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.WaveHeightCalculation3,
- mapFeature,
- "Hs(B->C)");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.WaveHeightCalculation4,
- mapFeature,
- "Hs(C->D)");
- }
-
private static void AssertEqualFeatureCollections(Point2D[] points, IEnumerable features)
{
Assert.AreEqual(points.Length, features.Count());
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs
===================================================================
diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -r5ad8e6d01f15a280162b76b688ab30487e78e206
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision a960f05a5324192bd268fe1891fdcf8712b2905e)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision 5ad8e6d01f15a280162b76b688ab30487e78e206)
@@ -22,11 +22,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Core.Common.Base.Data;
using Core.Components.Gis.Data;
using Core.Components.Gis.Features;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.Factories;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionOutwards.Data;
@@ -71,40 +69,6 @@
}
///
- /// Create hydraulic boundary location features based on the provided .
- ///
- /// The collection of
- /// to create the location features for.
- /// A collection of features or an empty collection when is empty.
- /// Thrown when is null.
- public static IEnumerable CreateHydraulicBoundaryLocationsFeatures(IEnumerable hydraulicBoundaryLocations)
- {
- if (hydraulicBoundaryLocations == null)
- {
- throw new ArgumentNullException(nameof(hydraulicBoundaryLocations));
- }
-
- int hydraulicBoundaryLocationsCount = hydraulicBoundaryLocations.Count();
- var features = new MapFeature[hydraulicBoundaryLocationsCount];
-
- for (var i = 0; i < hydraulicBoundaryLocationsCount; i++)
- {
- HydraulicBoundaryLocation location = hydraulicBoundaryLocations.ElementAt(i);
-
- MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSinglePointMapFeature(location.Location);
-
- feature.MetaData[RingtoetsCommonFormsResources.MetaData_ID] = location.Id;
- feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = location.Name;
- feature.MetaData[Resources.DesignWaterLevel_DisplayName] = location.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN;
- feature.MetaData[Resources.MetaData_WaveHeight] = location.WaveHeightCalculation1.Output?.Result ?? RoundedDouble.NaN;
-
- features[i] = feature;
- }
-
- return features;
- }
-
- ///
/// Create hydraulic boundary location features based on the provided
/// and .
///
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -r5ad8e6d01f15a280162b76b688ab30487e78e206
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision a960f05a5324192bd268fe1891fdcf8712b2905e)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision 5ad8e6d01f15a280162b76b688ab30487e78e206)
@@ -99,63 +99,6 @@
}
[Test]
- public void CreateHydraulicBoundaryLocationsFeatures_HydraulicBoundaryLocationsNull_ThrowArgumentNullException()
- {
- // Call
- TestDelegate test = () => GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationsFeatures(null);
-
- // Assert
- var exception = Assert.Throws(test);
- Assert.AreEqual("hydraulicBoundaryLocations", exception.ParamName);
- }
-
- [Test]
- public void CreateHydraulicBoundaryLocationsFeatures_HydraulicBoundaryLocationsArrayEmpty_ReturnsEmptyFeaturesCollection()
- {
- // Call
- IEnumerable features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationsFeatures(new HydraulicBoundaryLocation[0]);
-
- // Assert
- CollectionAssert.IsEmpty(features);
- }
-
- [Test]
- public void CreateHydraulicBoundaryLocationsFeatures_GivenHydraulicBoundaryLocations_ReturnsLocationFeaturesCollection()
- {
- // Setup
- var points = new[]
- {
- new Point2D(1.2, 2.3),
- new Point2D(2.7, 2.0)
- };
- IEnumerable hydraulicBoundaryLocations = points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y)).ToArray();
-
- // Call
- IEnumerable features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationsFeatures(hydraulicBoundaryLocations);
-
- // Assert
- int expectedHydraulicBoundaryLocationsCount = hydraulicBoundaryLocations.Count();
- Assert.AreEqual(expectedHydraulicBoundaryLocationsCount, features.Count());
- for (var i = 0; i < expectedHydraulicBoundaryLocationsCount; i++)
- {
- MapFeature mapFeature = features.ElementAt(i);
- HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocations.ElementAt(i);
-
- Assert.AreEqual(4, mapFeature.MetaData.Keys.Count);
- Assert.AreEqual(hydraulicBoundaryLocation.Id, mapFeature.MetaData["ID"]);
- Assert.AreEqual(hydraulicBoundaryLocation.Name, mapFeature.MetaData["Naam"]);
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.DesignWaterLevelCalculation1,
- mapFeature,
- "Waterstand bij doorsnede-eis");
- MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(hydraulicBoundaryLocation.WaveHeightCalculation1,
- mapFeature,
- "Golfhoogte bij doorsnede-eis");
- }
-
- AssertEqualFeatureCollections(points, features);
- }
-
- [Test]
public void CreateHydraulicBoundaryLocationsFeatures_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Call
@@ -213,7 +156,6 @@
.ToArray();
AssertEqualFeatureCollections(
expectedPoints, features);
-
}
private static void AssertHydraulicBoundaryFeaturesData(IAssessmentSection assessmentSection, GrassCoverErosionOutwardsFailureMechanism failureMechanism, IEnumerable features)
@@ -260,6 +202,7 @@
mapFeature, "hs(Vv->VIv)");
}
}
+
private static RoundedDouble GetExpectedResult(IEnumerable calculationList,
HydraulicBoundaryLocation hydraulicBoundaryLocation1)
{