Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs (.../ClosingStructuresFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs (.../ClosingStructuresFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -r7154e6dfb0f42104c92afd887142bf7106e2437e -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 7154e6dfb0f42104c92afd887142bf7106e2437e) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -31,7 +31,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.Factories; @@ -51,12 +50,7 @@ private MapLineData foreshoreProfilesMapData; private MapPointData structuresMapData; private MapLineData calculationsMapData; - - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; + private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer hydraulicBoundaryLocationsObserver; @@ -130,7 +124,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose(); @@ -167,18 +160,8 @@ calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(); structuresMapData = RiskeerMapDataFactory.CreateStructuresMapData(); - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - mapDataCollection.Add(referenceLineMapData); - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(structuresMapData); @@ -187,10 +170,6 @@ private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismMapData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateReferenceLineMapData) { Observable = AssessmentSection @@ -256,7 +235,6 @@ private void SetAllMapDataFeatures() { SetReferenceLineMapData(); - SetSectionsMapData(); SetHydraulicBoundaryLocationsMapData(); SetForeshoreProfilesMapData(); SetStructuresMapData(); @@ -311,26 +289,6 @@ #endregion - #region FailureMechanism MapData - - private void UpdateFailureMechanismMapData() - { - SetSectionsMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetSectionsMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region Structures MapData private void UpdateStructuresMapData() Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs (.../ClosingStructuresDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs (.../ClosingStructuresDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -167,8 +167,7 @@ } var changedObjects = new Collection(); - object[] removedObjects = failureMechanism.Sections.OfType() - .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.CalculationsGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.ForeshoreProfiles) .Concat(failureMechanism.ClosingStructures) .ToArray(); Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs (.../DuneErosionFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs (.../DuneErosionFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.DuneErosion.Data; Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs =================================================================== diff -u -rb7563beb9774f2f1f733dd041941efe962080911 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs (.../DuneErosionFailureMechanismView.cs) (revision b7563beb9774f2f1f733dd041941efe962080911) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs (.../DuneErosionFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,13 +20,11 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Windows.Forms; using Core.Common.Base; using Core.Components.Gis.Data; using Core.Components.Gis.Forms; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.Factories; using Riskeer.DuneErosion.Data; using Riskeer.DuneErosion.Forms.Factories; @@ -42,12 +40,7 @@ private MapDataCollection mapDataCollection; private MapLineData referenceLineMapData; private MapPointData duneLocationsMapData; - - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; + private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer duneLocationsObserver; @@ -112,7 +105,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); duneLocationsObserver.Dispose(); @@ -133,10 +125,6 @@ private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismMapData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateReferenceLineMapData) { Observable = AssessmentSection @@ -163,25 +151,13 @@ referenceLineMapData = RiskeerMapDataFactory.CreateReferenceLineMapData(); duneLocationsMapData = RiskeerMapDataFactory.CreateHydraulicBoundaryLocationsMapData(); - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - mapDataCollection.Add(referenceLineMapData); - - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(duneLocationsMapData); } private void SetMapDataFeatures() { SetReferenceLineMapData(); - SetFailureMechanismMapData(); SetDuneLocationMapData(); } @@ -211,26 +187,6 @@ #endregion - #region FailureMechanism MapData - - private void UpdateFailureMechanismMapData() - { - SetFailureMechanismMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetFailureMechanismMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region DuneLocation MapData private void UpdateDuneLocationMapData() Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionInwardsFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionInwardsFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.GrassCoverErosionInwards.Data; Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs =================================================================== diff -u -rb7563beb9774f2f1f733dd041941efe962080911 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision b7563beb9774f2f1f733dd041941efe962080911) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -29,7 +29,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.Helpers; @@ -50,12 +49,7 @@ private MapLineData dikeProfilesMapData; private MapLineData foreshoreProfilesMapData; private MapLineData calculationsMapData; - - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; + private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer hydraulicBoundaryLocationsObserver; @@ -127,7 +121,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose(); @@ -161,19 +154,8 @@ dikeProfilesMapData = RiskeerMapDataFactory.CreateDikeProfileMapData(); foreshoreProfilesMapData = RiskeerMapDataFactory.CreateForeshoreProfileMapData(); calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(); - - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - + mapDataCollection.Add(referenceLineMapData); - - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(dikeProfilesMapData); mapDataCollection.Add(foreshoreProfilesMapData); @@ -182,10 +164,6 @@ private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismMapData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateUpdateReferenceLineMapData) { Observable = AssessmentSection @@ -245,8 +223,6 @@ SetCalculationsMapData(); SetHydraulicBoundaryLocationsMapData(); SetReferenceLineMapData(); - - SetSectionsMapData(); SetDikeProfilesMapData(); } @@ -299,26 +275,6 @@ #endregion - #region FailureMechanism MapData - - private void UpdateFailureMechanismMapData() - { - SetSectionsMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetSectionsMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region DikeProfiles MapData private void UpdateDikeProfilesMapData() Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsDataSynchronizationService.cs (.../GrassCoverErosionInwardsDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsDataSynchronizationService.cs (.../GrassCoverErosionInwardsDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -153,9 +153,7 @@ } var changedObjects = new List(); - object[] removedObjects = failureMechanism.Sections - .OfType() - .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.CalculationsGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.DikeProfiles) .ToArray(); Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.GrassCoverErosionOutwards.Data; Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs =================================================================== diff -u -rb7563beb9774f2f1f733dd041941efe962080911 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision b7563beb9774f2f1f733dd041941efe962080911) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -29,7 +29,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.Helpers; @@ -50,12 +49,7 @@ private MapPointData hydraulicBoundaryLocationsMapData; private MapLineData foreshoreProfilesMapData; private MapLineData calculationsMapData; - - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; + private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer hydraulicBoundaryLocationsObserver; @@ -129,7 +123,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); waterLevelCalculationsForMechanismSpecificFactorizedSignalingNormObserver.Dispose(); @@ -165,29 +158,14 @@ foreshoreProfilesMapData = RiskeerMapDataFactory.CreateForeshoreProfileMapData(); calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(); - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - mapDataCollection.Add(referenceLineMapData); - - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(calculationsMapData); } private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateReferenceLineData) { Observable = AssessmentSection @@ -249,7 +227,6 @@ private void SetMapDataFeatures() { SetReferenceLineMapData(); - SetSectionsMapData(); SetHydraulicBoundaryLocationsMapData(); SetForeshoreProfilesMapData(); SetCalculationsMapData(); @@ -302,28 +279,8 @@ } #endregion + - #region FailureMechanism MapData - - private void UpdateFailureMechanismData() - { - SetSectionsMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetSectionsMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region Foreshore Profiles MapData private void UpdateForeshoreProfilesMapData() Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs (.../GrassCoverErosionOutwardsDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs (.../GrassCoverErosionOutwardsDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -129,8 +129,7 @@ } var changedObjects = new List(); - object[] removedObjects = failureMechanism.Sections.OfType() - .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs (.../HeightStructuresFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs (.../HeightStructuresFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.HeightStructures.Data; Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r862ee4a6ae0e249344f2a98fe640788312980b88 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 862ee4a6ae0e249344f2a98fe640788312980b88) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -30,7 +30,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.Factories; @@ -52,11 +51,6 @@ private MapPointData structuresMapData; private MapLineData calculationsMapData; - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer hydraulicBoundaryLocationsObserver; @@ -130,7 +124,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose(); @@ -167,18 +160,7 @@ calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(); structuresMapData = RiskeerMapDataFactory.CreateStructuresMapData(); - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - mapDataCollection.Add(referenceLineMapData); - - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(structuresMapData); @@ -187,10 +169,6 @@ private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismMapData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateReferenceLineMapData) { Observable = AssessmentSection @@ -256,7 +234,6 @@ private void SetAllMapDataFeatures() { SetReferenceLineMapData(); - SetSectionsMapData(); SetHydraulicBoundaryLocationsMapData(); SetForeshoreProfilesMapData(); SetStructuresMapData(); @@ -311,26 +288,6 @@ #endregion - #region FailureMechanism MapData - - private void UpdateFailureMechanismMapData() - { - SetSectionsMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetSectionsMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region Structures MapData private void UpdateStructuresMapData() Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -166,8 +166,7 @@ } var changedObjects = new List(); - object[] removedObjects = failureMechanism.Sections.OfType() - .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.CalculationsGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.ForeshoreProfiles) .Concat(failureMechanism.HeightStructures) .ToArray(); Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -127,8 +127,7 @@ } var changedObjects = new List(); - object[] removedObjects = failureMechanism.Sections.OfType() - .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs =================================================================== diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Data; Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs =================================================================== diff -u -rb7563beb9774f2f1f733dd041941efe962080911 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision b7563beb9774f2f1f733dd041941efe962080911) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -29,7 +29,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.Helpers; @@ -50,12 +49,7 @@ private MapPointData hydraulicBoundaryLocationsMapData; private MapLineData foreshoreProfilesMapData; private MapLineData calculationsMapData; - - private MapLineData sectionsMapData; - private MapPointData sectionsStartPointMapData; - private MapPointData sectionsEndPointMapData; - - private Observer failureMechanismObserver; + private Observer assessmentSectionObserver; private Observer referenceLineObserver; private Observer hydraulicBoundaryLocationsObserver; @@ -127,7 +121,6 @@ protected override void Dispose(bool disposing) { - failureMechanismObserver.Dispose(); assessmentSectionObserver.Dispose(); referenceLineObserver.Dispose(); waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose(); @@ -161,29 +154,14 @@ foreshoreProfilesMapData = RiskeerMapDataFactory.CreateForeshoreProfileMapData(); calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(); - MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); - sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); - sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); - sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - mapDataCollection.Add(referenceLineMapData); - - sectionsMapDataCollection.Add(sectionsMapData); - sectionsMapDataCollection.Add(sectionsStartPointMapData); - sectionsMapDataCollection.Add(sectionsEndPointMapData); - mapDataCollection.Add(sectionsMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(calculationsMapData); } private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateFailureMechanismData) - { - Observable = FailureMechanism - }; assessmentSectionObserver = new Observer(UpdateReferenceLineData) { Observable = AssessmentSection @@ -241,7 +219,6 @@ private void SetMapDataFeatures() { SetReferenceLineMapData(); - SetSectionsMapData(); SetHydraulicBoundaryLocationsMapData(); SetForeshoreProfilesMapData(); SetCalculationsMapData(); @@ -295,27 +272,6 @@ #endregion - #region FailureMechanism MapData - - private void UpdateFailureMechanismData() - { - SetSectionsMapData(); - sectionsMapData.NotifyObservers(); - sectionsStartPointMapData.NotifyObservers(); - sectionsEndPointMapData.NotifyObservers(); - } - - private void SetSectionsMapData() - { - IEnumerable failureMechanismSections = FailureMechanism.Sections; - - sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); - sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); - sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - } - - #endregion - #region Foreshore Profiles MapData private void UpdateForeshoreProfilesMapData() Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs =================================================================== diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -r223f32191727ef7b3d9f3d220482d8e7bf80e998 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs (.../WaveImpactAsphaltCoverDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs (.../WaveImpactAsphaltCoverDataSynchronizationService.cs) (revision 223f32191727ef7b3d9f3d220482d8e7bf80e998) @@ -126,8 +126,7 @@ } var changedObjects = new List(); - object[] removedObjects = failureMechanism.Sections.OfType() - .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + object[] removedObjects = failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive().OfType() .Concat(failureMechanism.ForeshoreProfiles) .ToArray();