Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs =================================================================== diff -u -rd77f0eae87afa15b1a5484d5ef7c54f952a04166 -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision d77f0eae87afa15b1a5484d5ef7c54f952a04166) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -102,14 +102,14 @@ feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = location.Name; feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm] = location.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm; feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificSignalingNorm] = location.WaterLevelCalculationForMechanismSpecificSignalingNorm; - feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificLowerLimit] = location.WaterLevelCalculationForMechanismSpecificLowerLimitNorm; - feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismLowerLimit] = location.WaterLevelCalculationForLowerLimitNorm; - feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = location.WaterLevelCalculationForFactorizedLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificLowerLimitNorm] = location.WaterLevelCalculationForMechanismSpecificLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimitNorm] = location.WaterLevelCalculationForLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm] = location.WaterLevelCalculationForFactorizedLowerLimitNorm; feature.MetaData[Resources.MetaData_WaveHeightCalculationForMechanismSpecificFactorizedSignalingNorm] = location.WaveHeightCalculationForMechanismSpecificFactorizedSignalingNorm; feature.MetaData[Resources.MetaData_WaveHeightCalculationForMechanismSpecificSignalingNorm] = location.WaveHeightCalculationForMechanismSpecificSignalingNorm; - feature.MetaData[Resources.MetaData_WaveHeightCalculationForMechanismSpecificLowerLimit] = location.WaveHeightCalculationForMechanismSpecificLowerLimitNorm; - feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = location.WaveHeightCalculationForLowerLimitNorm; - feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = location.WaveHeightCalculationForFactorizedLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaveHeightCalculationForMechanismSpecificLowerLimitNorm] = location.WaveHeightCalculationForMechanismSpecificLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimitNorm] = location.WaveHeightCalculationForLowerLimitNorm; + feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm] = location.WaveHeightCalculationForFactorizedLowerLimitNorm; return feature; } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs (revision 0) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -0,0 +1,113 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; +using Ringtoets.GrassCoverErosionOutwards.Util; + +namespace Ringtoets.GrassCoverErosionOutwards.Forms +{ + /// + /// Class for providing meta data attribute names of hydraulic boundary locations. + /// + public class GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider + : IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider + { + public string WaterLevelCalculationForMechanismSpecificFactorizedSignalingNormAttributeName + { + get + { + return Resources.MetaData_WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm; + } + } + + public string WaterLevelCalculationForMechanismSpecificSignalingNormAttributeName + { + get + { + return Resources.MetaData_WaterLevelCalculationForMechanismSpecificSignalingNorm; + } + } + + public string WaterLevelCalculationForMechanismSpecificLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaterLevelCalculationForMechanismSpecificLowerLimitNorm; + } + } + + public string WaterLevelCalculationForLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaterLevelCalculationForLowerLimitNorm; + } + } + + public string WaterLevelCalculationForFactorizedLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm; + } + } + + public string WaveHeightCalculationForMechanismSpecificFactorizedSignalingNormAttributeName + { + get + { + return Resources.MetaData_WaveHeightCalculationForMechanismSpecificFactorizedSignalingNorm; + } + } + + public string WaveHeightCalculationForMechanismSpecificSignalingNormAttributeName + { + get + { + return Resources.MetaData_WaveHeightCalculationForMechanismSpecificSignalingNorm; + } + } + + public string WaveHeightCalculationForMechanismSpecificLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaveHeightCalculationForMechanismSpecificLowerLimitNorm; + } + } + + public string WaveHeightCalculationForLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaveHeightCalculationForLowerLimitNorm; + } + } + + public string WaveHeightCalculationForFactorizedLowerLimitNormAttributeName + { + get + { + return Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm; + } + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a960f05a5324192bd268fe1891fdcf8712b2905e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -263,18 +263,18 @@ /// /// Looks up a localized string similar to h(Vv->VIv). /// - public static string MetaData_WaterLevelCalculationForFactorizedLowerLimit { + public static string MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm", resourceCulture); } } /// /// Looks up a localized string similar to h(IVv->Vv). /// - public static string MetaData_WaterLevelCalculationForMechanismLowerLimit { + public static string MetaData_WaterLevelCalculationForLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaterLevelCalculationForMechanismLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaterLevelCalculationForLowerLimitNorm", resourceCulture); } } @@ -290,9 +290,9 @@ /// /// Looks up a localized string similar to h(IIIv->IVv). /// - public static string MetaData_WaterLevelCalculationForMechanismSpecificLowerLimit { + public static string MetaData_WaterLevelCalculationForMechanismSpecificLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaterLevelCalculationForMechanismSpecificLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaterLevelCalculationForMechanismSpecificLowerLimitNorm", resourceCulture); } } @@ -317,18 +317,18 @@ /// /// Looks up a localized string similar to hs(Vv->VIv). /// - public static string MetaData_WaveHeightCalculationForFactorizedLowerLimit { + public static string MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm", resourceCulture); } } /// /// Looks up a localized string similar to hs(IVv->Vv). /// - public static string MetaData_WaveHeightCalculationForLowerLimit { + public static string MetaData_WaveHeightCalculationForLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimitNorm", resourceCulture); } } @@ -344,9 +344,9 @@ /// /// Looks up a localized string similar to hs(IIIv->IVv). /// - public static string MetaData_WaveHeightCalculationForMechanismSpecificLowerLimit { + public static string MetaData_WaveHeightCalculationForMechanismSpecificLowerLimitNorm { get { - return ResourceManager.GetString("MetaData_WaveHeightCalculationForMechanismSpecificLowerLimit", resourceCulture); + return ResourceManager.GetString("MetaData_WaveHeightCalculationForMechanismSpecificLowerLimitNorm", resourceCulture); } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx =================================================================== diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision a960f05a5324192bd268fe1891fdcf8712b2905e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -179,31 +179,31 @@ Weet u zeker dat u wilt doorgaan? - + h(Vv->VIv) - + h(IVv->Vv) h(Iv->IIv) - + h(IIIv->IVv) h(IIv->IIIv) - + hs(Vv->VIv) - + hs(IVv->Vv) hs(Iv->IIv) - + hs(IIIv->IVv) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj =================================================================== diff -u -r36828a0ba71303efd79ccb1123c8c427b8028b24 -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj) (revision 36828a0ba71303efd79ccb1123c8c427b8028b24) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -14,6 +14,7 @@ + Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r1b358a36d3c0747f46c8035e7a65f13467427a2b -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 1b358a36d3c0747f46c8035e7a65f13467427a2b) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -52,7 +52,6 @@ using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses; using Ringtoets.GrassCoverErosionOutwards.Forms.Views; using Ringtoets.GrassCoverErosionOutwards.IO.Exporters; -using Ringtoets.GrassCoverErosionOutwards.Plugin.MetaDataAttributeNameProviders; using Ringtoets.GrassCoverErosionOutwards.Service; using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; using Ringtoets.Revetment.Data; @@ -262,7 +261,7 @@ Name = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsExporter_DisplayName, CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter(context.WrappedData, - filePath, new GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider()), + filePath, new MetaDataAttributeNameProviders.GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider()), IsEnabled = context => context.WrappedData.Count > 0, FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIoResources.Shape_file_filter_Extension, RingtoetsCommonIoResources.Shape_file_filter_Description) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs =================================================================== diff -u -r1f337c632c27f2286f45782fb4c813f34325f0d1 -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs (.../IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs) (revision 1f337c632c27f2286f45782fb4c813f34325f0d1) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs (.../IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider.cs) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -22,7 +22,7 @@ namespace Ringtoets.GrassCoverErosionOutwards.Util { /// - /// Interface for providing meta data attribute names during exports of hydraulic boundary locations. + /// Interface for providing meta data attribute names of hydraulic boundary locations. /// public interface IGrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProviderTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProviderTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProviderTest.cs (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using NUnit.Framework; +using Ringtoets.GrassCoverErosionOutwards.Util; + +namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test +{ + [TestFixture] + public class GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProviderTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Call + var nameProvider = new GrassCoverErosionOutwardsHydraulicBoundaryLocationMetaDataAttributeNameProvider(); + + // Assert + Assert.IsInstanceOf(nameProvider); + Assert.AreEqual("h(Iv->IIv)", nameProvider.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNormAttributeName); + Assert.AreEqual("h(IIv->IIIv)", nameProvider.WaterLevelCalculationForMechanismSpecificSignalingNormAttributeName); + Assert.AreEqual("h(IIIv->IVv)", nameProvider.WaterLevelCalculationForMechanismSpecificLowerLimitNormAttributeName); + Assert.AreEqual("h(IVv->Vv)", nameProvider.WaterLevelCalculationForLowerLimitNormAttributeName); + Assert.AreEqual("h(Vv->VIv)", nameProvider.WaterLevelCalculationForFactorizedLowerLimitNormAttributeName); + Assert.AreEqual("hs(Iv->IIv)", nameProvider.WaveHeightCalculationForMechanismSpecificFactorizedSignalingNormAttributeName); + Assert.AreEqual("hs(IIv->IIIv)", nameProvider.WaveHeightCalculationForMechanismSpecificSignalingNormAttributeName); + Assert.AreEqual("hs(IIIv->IVv)", nameProvider.WaveHeightCalculationForMechanismSpecificLowerLimitNormAttributeName); + Assert.AreEqual("hs(IVv->Vv)", nameProvider.WaveHeightCalculationForLowerLimitNormAttributeName); + Assert.AreEqual("hs(Vv->VIv)", nameProvider.WaveHeightCalculationForFactorizedLowerLimitNormAttributeName); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj =================================================================== diff -u -ra960f05a5324192bd268fe1891fdcf8712b2905e -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision a960f05a5324192bd268fe1891fdcf8712b2905e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9) @@ -25,6 +25,7 @@ + @@ -151,6 +152,10 @@ {18E9F7C8-3170-4E9D-8D9F-1378225EED90} Ringtoets.GrassCoverErosionOutwards.Service + + {033ED27D-E806-42B4-9689-8150CFAE1906} + Ringtoets.GrassCoverErosionOutwards.Util + {C700ED66-8565-48B2-9A4E-B0D33FB2B26D} Ringtoets.GrassCoverErosionOutwards.Util.TestUtil