Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rc359d9601ddf4e94f2380a0f49759a6f8324aa5c --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs (.../DuneErosionLocationsMapLayer.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionLocationsMapLayer.cs (.../DuneErosionLocationsMapLayer.cs) (revision c359d9601ddf4e94f2380a0f49759a6f8324aa5c) @@ -176,6 +176,9 @@ var waterLevelMetaDataItemsCounter = 0; var waveHeightMetaDataItemsCounter = 0; var wavePeriodMetaDataItemsCounter = 0; + var meanTidalAmplitudeMetaDataItemsCounter = 0; + var waveDirectionalSpreadMetaDataItemsCounter = 0; + var tideSurgePhaseDifferenceMetaDataItemsCounter = 0; foreach (string metaData in MapData.MetaData) { if (metaData.Contains(string.Format(Resources.MetaData_WaterLevel_TargetProbability_0, string.Empty))) @@ -196,6 +199,24 @@ lookupItem => lookupItem.WavePeriodMetaDataItem = metaData); wavePeriodMetaDataItemsCounter++; } + else if (metaData.Contains(string.Format(Resources.MetaData_MeanTidalAmplitude_TargetProbability_0, string.Empty))) + { + AddMetaDataItemToLookup(newMetaDataItemsLookups, calculationsForTargetProbabilities.ElementAt(meanTidalAmplitudeMetaDataItemsCounter), + lookupItem => lookupItem.MeanTidalAmplitudeMetaDataItem = metaData); + meanTidalAmplitudeMetaDataItemsCounter++; + } + else if (metaData.Contains(string.Format(Resources.MetaData_WaveDirectionalSpread_TargetProbability_0, string.Empty))) + { + AddMetaDataItemToLookup(newMetaDataItemsLookups, calculationsForTargetProbabilities.ElementAt(waveDirectionalSpreadMetaDataItemsCounter), + lookupItem => lookupItem.WaveDirectionalSpreadMetaDataItem = metaData); + waveDirectionalSpreadMetaDataItemsCounter++; + } + else if (metaData.Contains(string.Format(Resources.MetaData_TideSurgePhaseDifference_TargetProbability_0, string.Empty))) + { + AddMetaDataItemToLookup(newMetaDataItemsLookups, calculationsForTargetProbabilities.ElementAt(tideSurgePhaseDifferenceMetaDataItemsCounter), + lookupItem => lookupItem.TideSurgePhaseDifferenceMetaDataItem = metaData); + tideSurgePhaseDifferenceMetaDataItemsCounter++; + } } string currentSelectedMetaDataAttribute = MapData.SelectedMetaDataAttribute; @@ -204,7 +225,10 @@ MetaDataItemsLookup currentMetaDataItem = currentMetaDataItemLookup.Value; if (currentSelectedMetaDataAttribute == currentMetaDataItem.WaterLevelMetaDataItem || currentSelectedMetaDataAttribute == currentMetaDataItem.WaveHeightMetaDataItem - || currentSelectedMetaDataAttribute == currentMetaDataItem.WavePeriodMetaDataItem) + || currentSelectedMetaDataAttribute == currentMetaDataItem.WavePeriodMetaDataItem + || currentSelectedMetaDataAttribute == currentMetaDataItem.MeanTidalAmplitudeMetaDataItem + || currentSelectedMetaDataAttribute == currentMetaDataItem.WaveDirectionalSpreadMetaDataItem + || currentSelectedMetaDataAttribute == currentMetaDataItem.TideSurgePhaseDifferenceMetaDataItem) { DuneLocationCalculationsForTargetProbability calculationsForTargetProbability = currentMetaDataItemLookup.Key; if (!newMetaDataItemsLookups.ContainsKey(calculationsForTargetProbability)) @@ -217,6 +241,9 @@ SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.WaterLevelMetaDataItem, newMetaDataItem.WaterLevelMetaDataItem); SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.WaveHeightMetaDataItem, newMetaDataItem.WaveHeightMetaDataItem); SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.WavePeriodMetaDataItem, newMetaDataItem.WavePeriodMetaDataItem); + SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.MeanTidalAmplitudeMetaDataItem, newMetaDataItem.MeanTidalAmplitudeMetaDataItem); + SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.WaveDirectionalSpreadMetaDataItem, newMetaDataItem.WaveDirectionalSpreadMetaDataItem); + SetSelectedMetaDataAttribute(currentSelectedMetaDataAttribute, currentMetaDataItem.TideSurgePhaseDifferenceMetaDataItem, newMetaDataItem.TideSurgePhaseDifferenceMetaDataItem); } } } @@ -253,6 +280,12 @@ public string WaveHeightMetaDataItem { get; set; } public string WavePeriodMetaDataItem { get; set; } + + public string MeanTidalAmplitudeMetaDataItem { get; set; } + + public string WaveDirectionalSpreadMetaDataItem { get; set; } + + public string TideSurgePhaseDifferenceMetaDataItem { get; set; } } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionLocationsMapLayerTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rc359d9601ddf4e94f2380a0f49759a6f8324aa5c --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionLocationsMapLayerTest.cs (.../DuneErosionLocationsMapLayerTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionLocationsMapLayerTest.cs (.../DuneErosionLocationsMapLayerTest.cs) (revision c359d9601ddf4e94f2380a0f49759a6f8324aa5c) @@ -40,6 +40,9 @@ private const string waterLevelDisplayNameFormat = "Rekenwaarde h - {0}"; private const string waveHeightDisplayNameFormat = "Rekenwaarde Hs - {0}"; private const string wavePeriodDisplayNameFormat = "Rekenwaarde Tp - {0}"; + private const string meanTidalAmplitudeDisplayNameFormat = "Gemiddelde getijamplitude - {0}"; + private const string waveDirectionalSpreadDisplayNameFormat = "Golfrichtingspreiding - {0}"; + private const string tideSurgePhaseDifferenceDisplayNameFormat = "Faseverschuiving tussen getij en opzet - {0}"; [Test] public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() @@ -519,6 +522,9 @@ yield return waterLevelDisplayNameFormat; yield return waveHeightDisplayNameFormat; yield return wavePeriodDisplayNameFormat; + yield return meanTidalAmplitudeDisplayNameFormat; + yield return waveDirectionalSpreadDisplayNameFormat; + yield return tideSurgePhaseDifferenceDisplayNameFormat; } } } \ No newline at end of file