Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs =================================================================== diff -u -r91357549bf6b91dbd7bdea07ec5ca6059527254c -rb1ac46d71a03753aaab278d2e129ba184b409e8e --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs (.../AggregatedDuneLocationFactory.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs (.../AggregatedDuneLocationFactory.cs) (revision b1ac46d71a03753aaab278d2e129ba184b409e8e) @@ -62,7 +62,7 @@ tp => tp.DuneLocation.Equals(location)))) .ToArray(); return new AggregatedDuneLocation( - location.Id, location.Name, location.Location, location.CoastalAreaId, location.Offset, location.D50, + location.Id, location.Name, location.Location, location.CoastalAreaId, location.Offset, calculationsForLocation.Select(c => new Tuple( c.Item1, GetWaterLevel(c.Item2))) .ToArray(), Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs =================================================================== diff -u -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4 -rb1ac46d71a03753aaab278d2e129ba184b409e8e --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs (.../DuneErosionMapDataFeaturesFactory.cs) (revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs (.../DuneErosionMapDataFeaturesFactory.cs) (revision b1ac46d71a03753aaab278d2e129ba184b409e8e) @@ -65,7 +65,6 @@ feature.MetaData[Resources.MetaData_CoastalAreaId] = location.CoastalAreaId; feature.MetaData[Resources.MetaData_Offset] = location.Offset.ToString(RiskeerDuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.CurrentCulture); - feature.MetaData[Resources.MetaData_D50] = location.D50.ToString(); HydraulicBoundaryLocationMapDataFeaturesFactory.AddTargetProbabilityMetaData(feature, location.WaterLevelCalculationsForTargetProbabilities, Resources.MetaData_WaterLevel_TargetProbability_0); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs =================================================================== diff -u -r91357549bf6b91dbd7bdea07ec5ca6059527254c -rb1ac46d71a03753aaab278d2e129ba184b409e8e --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision b1ac46d71a03753aaab278d2e129ba184b409e8e) @@ -116,7 +116,6 @@ Assert.AreEqual(duneLocation.Location, aggregatedLocation.Location); Assert.AreEqual(duneLocation.CoastalAreaId, aggregatedLocation.CoastalAreaId); Assert.AreEqual(duneLocation.Offset, aggregatedLocation.Offset); - Assert.AreEqual(duneLocation.D50, aggregatedLocation.D50); for (var j = 0; j < targetProbabilities.Length; j++) { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs =================================================================== diff -u -rd021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4 -rb1ac46d71a03753aaab278d2e129ba184b409e8e --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs (.../DuneErosionMapFeaturesTestHelper.cs) (revision d021fa9279b7ee0c48e83cf3ca5b3ffbcb2231e4) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.TestUtil/DuneErosionMapFeaturesTestHelper.cs (.../DuneErosionMapFeaturesTestHelper.cs) (revision b1ac46d71a03753aaab278d2e129ba184b409e8e) @@ -69,7 +69,6 @@ MapFeaturesMetaDataTestHelper.AssertMetaData(expectedDuneLocation.Name, mapFeature, "Naam"); MapFeaturesMetaDataTestHelper.AssertMetaData(expectedDuneLocation.CoastalAreaId, mapFeature, "Kustvaknummer"); MapFeaturesMetaDataTestHelper.AssertMetaData(expectedDuneLocation.Offset.ToString("0.#", CultureInfo.CurrentCulture), mapFeature, "Metrering"); - MapFeaturesMetaDataTestHelper.AssertMetaData(expectedDuneLocation.D50.ToString(), mapFeature, "Rekenwaarde d50"); Assert.AreEqual(expectedDuneLocation.Location, mapFeature.MapGeometries.First().PointCollections.First().Single()); @@ -95,7 +94,7 @@ mapFeature, calculationsForTargetProbability.TargetProbability, "Faseverschuiving tussen getij en opzet - {0}", presentedMetaDataItems); } - int expectedMetaDataCount = 5 + (6 * failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Count); + int expectedMetaDataCount = 4 + (6 * failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities.Count); Assert.AreEqual(expectedMetaDataCount, mapFeature.MetaData.Keys.Count); } }