Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -48,7 +48,6 @@ private readonly Observer hydraulicBoundaryDatabaseObserver; private readonly Observer foreshoreProfilesObserver; private readonly Observer structuresObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -64,8 +63,6 @@ private readonly MapPointData structuresMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private HeightStructuresFailureMechanismContext data; /// @@ -88,7 +85,6 @@ hydraulicBoundaryDatabaseObserver = new Observer(UpdateMapData); foreshoreProfilesObserver = new Observer(UpdateMapData); structuresObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); calculationInputObserver = new RecursiveObserver( UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType>().Select(pc => pc.InputParameters))); @@ -136,10 +132,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -153,14 +147,10 @@ calculationGroupObserver.Observable = data.WrappedData.CalculationsGroup; calculationObserver.Observable = data.WrappedData.CalculationsGroup; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -184,19 +174,13 @@ calculationObserver.Dispose(); structuresObserver.Dispose(); - if (disposing && (components != null)) + if (disposing) { - components.Dispose(); + components?.Dispose(); } base.Dispose(disposing); } - - private void UpdateBackgroundMapData() - { - RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(backgroundMapData, data.Parent.BackgroundData); - backgroundMapData.NotifyObservers(); - } - + private void UpdateMapData() { SetMapDataFeatures();