Index: Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs =================================================================== diff -u -r6f159dc2b01ba3605c9c67a3405275fe88d24741 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs (.../FeatureBasedMapDataTest.cs) (revision 6f159dc2b01ba3605c9c67a3405275fe88d24741) +++ Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs (.../FeatureBasedMapDataTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -111,7 +111,7 @@ } [Test] - public void MetaData_Always_ReturnAllAvailableMetaDataAttributesFromFeatures() + public void MetaData_Always_ReturnAllUniqueAvailableMetaDataAttributesFromFeatures() { // Setup var feature1 = new MapFeature(Enumerable.Empty()); Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs =================================================================== diff -u -ref70beef434ef774830c56e3d4a3b5def29bb01b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision ef70beef434ef774830c56e3d4a3b5def29bb01b) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -107,7 +107,7 @@ { get { - return new SelectableMetaDataAttribute(data.SelectedMetaDataAttribute); + return new SelectableMetaDataAttribute(data.SelectedMetaDataAttribute ?? string.Empty); } set { Index: Core/Plugins/src/Core.Plugins.Map/UITypeEditors/SelectableMetaDataAttribute.cs =================================================================== diff -u -r758b0db0a58b0fecd5e3d7d8b5f22d162778ee04 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Core/Plugins/src/Core.Plugins.Map/UITypeEditors/SelectableMetaDataAttribute.cs (.../SelectableMetaDataAttribute.cs) (revision 758b0db0a58b0fecd5e3d7d8b5f22d162778ee04) +++ Core/Plugins/src/Core.Plugins.Map/UITypeEditors/SelectableMetaDataAttribute.cs (.../SelectableMetaDataAttribute.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -72,22 +72,22 @@ { return false; } - return Equals((SelectableMetaDataAttribute)obj); + return Equals((SelectableMetaDataAttribute) obj); } public override int GetHashCode() { return metaDataAttribute.GetHashCode(); } - private bool Equals(SelectableMetaDataAttribute other) + public override string ToString() { - return Equals(metaDataAttribute, other.MetaDataAttribute); + return metaDataAttribute; } - public override string ToString() + private bool Equals(SelectableMetaDataAttribute other) { - return metaDataAttribute; + return Equals(metaDataAttribute, other.MetaDataAttribute); } } } \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs =================================================================== diff -u -r8ab296bc0a9c2c1e156801755faa0f8c6ad44340 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs (.../FeatureBasedMapDataPropertiesTest.cs) (revision 8ab296bc0a9c2c1e156801755faa0f8c6ad44340) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs (.../FeatureBasedMapDataPropertiesTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -59,10 +59,7 @@ public void Data_SetNewMapPointDataInstance_ReturnCorrectPropertyValues() { // Setup - var mapPointData = new MapPointData("Test") - { - SelectedMetaDataAttribute = string.Empty - }; + var mapPointData = new MapPointData("Test"); var properties = new TestFeatureBasedMapDataProperties(); // Call @@ -73,7 +70,7 @@ Assert.AreEqual("Test feature based map data", properties.Type); Assert.AreEqual(mapPointData.IsVisible, properties.IsVisible); Assert.AreEqual(mapPointData.ShowLabels, properties.ShowLabels); - Assert.AreEqual(mapPointData.SelectedMetaDataAttribute, properties.SelectedMetaDataAttribute.MetaDataAttribute); + Assert.AreEqual(string.Empty, properties.SelectedMetaDataAttribute.MetaDataAttribute); Assert.AreEqual(mapPointData.MetaData, properties.GetAvailableMetaDataAttributes()); } Index: Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/MetaDataAttributeEditorTest.cs =================================================================== diff -u -r758b0db0a58b0fecd5e3d7d8b5f22d162778ee04 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/MetaDataAttributeEditorTest.cs (.../MetaDataAttributeEditorTest.cs) (revision 758b0db0a58b0fecd5e3d7d8b5f22d162778ee04) +++ Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/MetaDataAttributeEditorTest.cs (.../MetaDataAttributeEditorTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -22,13 +22,9 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Linq; using System.Windows.Forms.Design; using Core.Common.Gui.PropertyBag; using Core.Common.Gui.UITypeEditors; -using Core.Components.Gis.Data; -using Core.Components.Gis.Features; -using Core.Components.Gis.Geometries; using Core.Plugins.Map.PropertyClasses; using Core.Plugins.Map.UITypeEditors; using NUnit.Framework; Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -205,7 +205,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); structuresMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures); calculationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructureCalculationsFeatures(calculations); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1392,15 +1392,6 @@ } /// - /// Looks up a localized string similar to Waterstand bij doorsnede-eis. - /// - public static string MetaData_DesignWaterLevel_GrassOutwards { - get { - return ResourceManager.GetString("MetaData_DesignWaterLevel_GrassOutwards", resourceCulture); - } - } - - /// /// Looks up a localized string similar to ID. /// public static string MetaData_ID { @@ -1437,15 +1428,6 @@ } /// - /// Looks up a localized string similar to Golfhoogte bij doorsnede-eis. - /// - public static string MetaData_WaveHeight_GrassOutwards { - get { - return ResourceManager.GetString("MetaData_WaveHeight_GrassOutwards", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De gemiddelde waarde van de normale verdeling.. /// public static string NormalDistribution_Mean_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r54fd939cf2a3d8f718dad28faa24373334d4cc2e -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 54fd939cf2a3d8f718dad28faa24373334d4cc2e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -838,9 +838,6 @@ Toetspeil - - Waterstand bij doorsnede-eis - ID @@ -850,9 +847,6 @@ Golfhoogte - - Golfhoogte bij doorsnede-eis - Koppelingsafstand Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -161,7 +161,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs =================================================================== diff -u -rb7bfa326e697eed7d8c203b678f20dfc55e1c7ff -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision b7bfa326e697eed7d8c203b678f20dfc55e1c7ff) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.Linq; using Core.Common.Base.Data; @@ -73,15 +74,13 @@ } /// - /// Create hydraulic boundary database location features based on the provided - /// with default labels for design - /// water level and wave height. + /// Create hydraulic boundary database location features based on the provided .. /// /// The /// to create the location features for. /// An array of features or an empty array when /// is null. - public static MapFeature[] CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(HydraulicBoundaryDatabase hydraulicBoundaryDatabase) + public static MapFeature[] CreateHydraulicBoundaryDatabaseFeatures(HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { return CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryDatabase != null ? hydraulicBoundaryDatabase.Locations.ToArray() @@ -91,19 +90,48 @@ } /// - /// Create hydraulic boundary location features based on the provided - /// with optional labels for design - /// water level and wave height. + /// Create hydraulic boundary database location features based on the provided + /// . /// - /// The array of - /// to create the location features for. - /// An array of features or an empty array when - /// is null or empty. - public static MapFeature[] CreateHydraulicBoundaryLocationFeaturesWithOptionalLabels(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) + /// The locations to create the features for. + /// The name of the design water level attribute. + /// The name of the wave height attribute. + /// An array of features or an empty array when + /// is empty. + /// Thrown when any is null. + public static MapFeature[] CreateHydraulicBoundaryLocationFeatures(HydraulicBoundaryLocation[] hydraulicBoundaryLocations, + string designWaterLevelAttributeName, + string waveHeightAttributeName) { - return CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryLocations ?? new HydraulicBoundaryLocation[0], - Resources.MetaData_DesignWaterLevel_GrassOutwards, - Resources.MetaData_WaveHeight_GrassOutwards); + if (hydraulicBoundaryLocations == null) + { + throw new ArgumentNullException("hydraulicBoundaryLocations"); + } + if (designWaterLevelAttributeName == null) + { + throw new ArgumentNullException("designWaterLevelAttributeName"); + } + if (waveHeightAttributeName == null) + { + throw new ArgumentNullException("waveHeightAttributeName"); + } + + var features = new MapFeature[hydraulicBoundaryLocations.Length]; + + for (int i = 0; i < hydraulicBoundaryLocations.Length; i++) + { + HydraulicBoundaryLocation location = hydraulicBoundaryLocations[i]; + var feature = GetAsSingleMapFeature(location.Location); + + feature.MetaData[Resources.MetaData_ID] = location.Id; + feature.MetaData[Resources.MetaData_Name] = location.Name; + feature.MetaData[designWaterLevelAttributeName] = location.DesignWaterLevel; + feature.MetaData[waveHeightAttributeName] = location.WaveHeight; + + features[i] = feature; + } + + return features; } /// @@ -284,28 +312,6 @@ return feature; } - private static MapFeature[] CreateHydraulicBoundaryLocationFeatures(HydraulicBoundaryLocation[] hydraulicBoundaryLocations, - string designWaterLevelAttributeName, - string waveheightAttributeName) - { - var features = new MapFeature[hydraulicBoundaryLocations.Length]; - - for (int i = 0; i < hydraulicBoundaryLocations.Length; i++) - { - HydraulicBoundaryLocation location = hydraulicBoundaryLocations[i]; - var feature = GetAsSingleMapFeature(location.Location); - - feature.MetaData[Resources.MetaData_ID] = location.Id; - feature.MetaData[Resources.MetaData_Name] = location.Name; - feature.MetaData[designWaterLevelAttributeName] = location.DesignWaterLevel; - feature.MetaData[waveheightAttributeName] = location.WaveHeight; - - features[i] = feature; - } - - return features; - } - private static Point2D[] GetWorldPoints(DikeProfile dikeProfile) { return AdvancedMath2D.FromXToXY( Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r9b1e17e9bf547bdec6bfef350cd2bab3b233eb6a -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFeaturesFactoryTest.cs (.../RingtoetsMapDataFeaturesFactoryTest.cs) (revision 9b1e17e9bf547bdec6bfef350cd2bab3b233eb6a) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFeaturesFactoryTest.cs (.../RingtoetsMapDataFeaturesFactoryTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.Linq; using Core.Common.Base.Data; @@ -81,17 +82,17 @@ } [Test] - public void CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels_HydraulicBoundaryDatabaseNull_ReturnsEmptyFeaturesArray() + public void CreateHydraulicBoundaryDatabaseFeatures_HydraulicBoundaryDatabaseNull_ReturnsEmptyFeaturesArray() { // Call - MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(null); + MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(null); // Assert CollectionAssert.IsEmpty(features); } [Test] - public void CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels_GivenHydraulicBoundaryDatabase_ReturnsLocationFeaturesArray() + public void CreateHydraulicBoundaryDatabaseFeatures_GivenHydraulicBoundaryDatabase_ReturnsLocationFeaturesArray() { // Setup var points = new[] @@ -103,7 +104,7 @@ hydraulicBoundaryDatabase.Locations.AddRange(points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y))); // Call - MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); // Assert List hydraulicBoundaryLocations = hydraulicBoundaryDatabase.Locations; @@ -121,38 +122,78 @@ } [Test] - public void CreateHydraulicBoundaryLocationsFeaturesWithOptionalLabels_HydraulicBoundaryLocationsNull_ReturnsEmptyFeaturesArray() + public void CreateHydraulicBoundaryLocationFeatures_HydraulicBoundaryLocationsArrayEmpty_ReturnsEmptyFeaturesArray() { // Call - MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeaturesWithOptionalLabels(null); + MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(new HydraulicBoundaryLocation[0], string.Empty, string.Empty); // Assert CollectionAssert.IsEmpty(features); } [Test] - public void CreateHydraulicBoundaryLocationFeaturesWithOptionalLabels_GivenHydraulicBoundaryLocations_ReturnsLocationFeaturesArray() + public void CreateHydraulicBoundaryLocationFeatures_HydraulicBoundaryLocationsNull_ThrowArgumentNullException() { + // Call + TestDelegate test = () => RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(null, string.Empty, string.Empty); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("hydraulicBoundaryLocations", exception.ParamName); + } + + [Test] + public void CreateHydraulicBoundaryLocationFeatures_designWaterLevelAttributeNameNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(new HydraulicBoundaryLocation[0], null, string.Empty); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("designWaterLevelAttributeName", exception.ParamName); + } + + [Test] + public void CreateHydraulicBoundaryLocationFeatures_WaveHeightAtrtributeNameNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(new HydraulicBoundaryLocation[0], string.Empty, null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("waveHeightAttributeName", exception.ParamName); + } + + [Test] + public void CreateHydraulicBoundaryLocationFeatures_GivenHydraulicBoundaryLocations_ReturnsLocationFeaturesArray() + { // Setup + const string designWaterLevelAttributeName = "Toetspeil"; + const string waveheightAttributeName = "Golfhoogte"; + var points = new[] { new Point2D(1.2, 2.3), new Point2D(2.7, 2.0) }; - var hydraulicBoundaryLocations = points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y)).ToArray(); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + hydraulicBoundaryDatabase.Locations.AddRange(points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y))); // Call - MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeaturesWithOptionalLabels(hydraulicBoundaryLocations); + MapFeature[] features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryDatabase.Locations.ToArray(), + designWaterLevelAttributeName, + waveheightAttributeName); // Assert - Assert.AreEqual(hydraulicBoundaryLocations.Length, features.Length); - for (int i = 0; i < hydraulicBoundaryLocations.Length; i++) + List hydraulicBoundaryLocations = hydraulicBoundaryDatabase.Locations; + Assert.AreEqual(hydraulicBoundaryLocations.Count, features.Length); + for (int i = 0; i < hydraulicBoundaryLocations.Count; i++) { Assert.AreEqual(4, features[i].MetaData.Keys.Count); Assert.AreEqual(hydraulicBoundaryLocations[i].Id, features[i].MetaData["ID"]); Assert.AreEqual(hydraulicBoundaryLocations[i].Name, features[i].MetaData["Naam"]); - Assert.AreEqual(hydraulicBoundaryLocations[i].DesignWaterLevel, features[i].MetaData["Waterstand bij doorsnede-eis"]); - Assert.AreEqual(hydraulicBoundaryLocations[i].WaveHeight, features[i].MetaData["Golfhoogte bij doorsnede-eis"]); + Assert.AreEqual(hydraulicBoundaryLocations[i].DesignWaterLevel, features[i].MetaData[designWaterLevelAttributeName]); + Assert.AreEqual(hydraulicBoundaryLocations[i].WaveHeight, features[i].MetaData[waveheightAttributeName]); } AssertEqualFeatureCollections(points, features); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs =================================================================== diff -u -rb7bfa326e697eed7d8c203b678f20dfc55e1c7ff -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision b7bfa326e697eed7d8c203b678f20dfc55e1c7ff) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -196,7 +196,7 @@ var mapData = new MapLineData("test"); // Call - TestDelegate test = () => MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(null, mapData); + TestDelegate test = () => MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(Enumerable.Empty(), mapData); // Assert Assert.Throws(test); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -200,7 +200,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); dikeProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateDikeProfilesFeatures(dikeProfiles); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(dikeProfiles.Select(dp => dp.ForeshoreProfile)); calculationsMapData.Features = GrassCoverErosionInwardsMapDataFeaturesFactory.CreateCalculationFeatures(calculations); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6d4085c478883a718c7967c3d773619074c726db -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6d4085c478883a718c7967c3d773619074c726db) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -268,5 +268,23 @@ return ResourceManager.GetString("GrassCoverErosionOutwardsWaveHeightLocationsContext_DisplayName", resourceCulture); } } + + /// + /// Looks up a localized string similar to Waterstand bij doorsnede-eis. + /// + public static string MetaData_DesignWaterLevel { + get { + return ResourceManager.GetString("MetaData_DesignWaterLevel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Golfhoogte bij doorsnede-eis. + /// + public static string MetaData_WaveHeight { + get { + return ResourceManager.GetString("MetaData_WaveHeight", resourceCulture); + } + } } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx =================================================================== diff -u -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -177,4 +177,10 @@ Gras + + Waterstand bij doorsnede-eis + + + Golfhoogte bij doorsnede-eis + \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs =================================================================== diff -u -r7be99d03dbd62918973eefd1cf9d799e57fb4474 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 7be99d03dbd62918973eefd1cf9d799e57fb4474) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -190,7 +190,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeaturesWithOptionalLabels(hydraulicBoundaryLocations); + hydraulicBoundaryLocationsMapData.Features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryLocations); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); calculationsMapData.Features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateCalculationFeatures(calculations); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs =================================================================== diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision 31d83651ac426afc55ed5796843a2cd5f1770480) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -26,6 +26,8 @@ using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; +using Ringtoets.HydraRing.Data; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views { @@ -61,5 +63,19 @@ return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } + + /// + /// Create hydraulic boundary location features based on the provided . + /// + /// The array of + /// to create the location features for. + /// An array of features or an empty array when + /// is null or empty. + public static MapFeature[] CreateHydraulicBoundaryLocationFeatures(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) + { + return RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryLocations ?? new HydraulicBoundaryLocation[0], + Resources.MetaData_DesignWaterLevel, + Resources.MetaData_WaveHeight); + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r51c41f19c5b5ed0a0ad42b5dc3a969246d58a2d6 -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision 51c41f19c5b5ed0a0ad42b5dc3a969246d58a2d6) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -91,9 +91,59 @@ }, features[1].MapGeometries.ElementAt(0)); } + [Test] + public void CreateHydraulicBoundaryLocationsFeatures_HydraulicBoundaryLocationsNull_ReturnsEmptyFeaturesArray() + { + // Call + MapFeature[] features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(null); + + // Assert + CollectionAssert.IsEmpty(features); + } + + [Test] + public void CreateHydraulicBoundaryLocationFeatures_GivenHydraulicBoundaryLocations_ReturnsLocationFeaturesArray() + { + // Setup + var points = new[] + { + new Point2D(1.2, 2.3), + new Point2D(2.7, 2.0) + }; + var hydraulicBoundaryLocations = points.Select(p => new HydraulicBoundaryLocation(0, "", p.X, p.Y)).ToArray(); + + // Call + MapFeature[] features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(hydraulicBoundaryLocations); + + // Assert + Assert.AreEqual(hydraulicBoundaryLocations.Length, features.Length); + for (int i = 0; i < hydraulicBoundaryLocations.Length; i++) + { + Assert.AreEqual(4, features[i].MetaData.Keys.Count); + Assert.AreEqual(hydraulicBoundaryLocations[i].Id, features[i].MetaData["ID"]); + Assert.AreEqual(hydraulicBoundaryLocations[i].Name, features[i].MetaData["Naam"]); + Assert.AreEqual(hydraulicBoundaryLocations[i].DesignWaterLevel, features[i].MetaData["Waterstand bij doorsnede-eis"]); + Assert.AreEqual(hydraulicBoundaryLocations[i].WaveHeight, features[i].MetaData["Golfhoogte bij doorsnede-eis"]); + } + + AssertEqualFeatureCollections(points, features); + } + private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry) { CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First()); } + + private static void AssertEqualFeatureCollections(Point2D[] points, MapFeature[] features) + { + Assert.AreEqual(points.Length, features.Length); + for (int i = 0; i < points.Length; i++) + { + CollectionAssert.AreEqual(new[] + { + points[i] + }, features[i].MapGeometries.First().PointCollections.First()); + } + } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -206,7 +206,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); structuresMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures); calculationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructureCalculationsFeatures(calculations); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -126,7 +126,7 @@ private void SetMapDataFeatures() { referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data.ReferenceLine, data.Id, data.Name); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(data.HydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data.HydraulicBoundaryDatabase); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -208,7 +208,7 @@ surfaceLinesMapData.Features = PipingMapDataFeaturesFactory.CreateSurfaceLineFeatures(ringtoetsPipingSurfaceLines.ToArray()); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); calculationsMapData.Features = PipingMapDataFeaturesFactory.CreateCalculationFeatures(calculations); } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -205,7 +205,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); structuresMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures); calculationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructureCalculationsFeatures Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -197,7 +197,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); calculationsMapData.Features = StabilityStoneCoverMapDataFeaturesFactory.CreateCalculationFeatures(calculations); } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs =================================================================== diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r86b6ce2b77450d63016858e8e18796c02bdaad52 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 86b6ce2b77450d63016858e8e18796c02bdaad52) @@ -197,7 +197,7 @@ sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeaturesWithDefaultLabels(hydraulicBoundaryDatabase); + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); calculationsMapData.Features = WaveImpactAsphaltCoverMapDataFeaturesFactory.CreateCalculationFeatures(calculations); }