Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs =================================================================== diff -u -rae5c573fb82f4b30350f63cb6f202ae99275f4ff -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs (.../ClosingStructuresFailureMechanismView.Designer.cs) (revision ae5c573fb82f4b30350f63cb6f202ae99275f4ff) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs (.../ClosingStructuresFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.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 ClosingStructuresFailureMechanismContext 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 { @@ -152,14 +146,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; } } } @@ -183,19 +173,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(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -103,22 +103,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new ClosingStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new ClosingStructuresFailureMechanismContext( new ClosingStructuresFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -144,6 +145,8 @@ // Setup using (var view = new ClosingStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new ClosingStructuresFailureMechanismContext( @@ -153,15 +156,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(8, view.Map.Data.Collection.Count()); + Assert.AreEqual(8, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -424,34 +428,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new ClosingStructuresFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs =================================================================== diff -u -r267dd861d69e6952235fb997a426aec5efdbf432 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs (.../FailureMechanismView.Designer.cs) (revision 267dd861d69e6952235fb997a426aec5efdbf432) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs (.../FailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private RingtoetsMapControl mapControl; } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -41,7 +41,6 @@ private readonly Observer failureMechanismObserver; private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryDatabaseObserver; - private readonly Observer backgroundMapDataObserver; private readonly MapDataCollection mapDataCollection; private readonly MapLineData referenceLineMapData; @@ -50,8 +49,6 @@ private readonly MapPointData sectionsEndPointMapData; private readonly MapPointData hydraulicBoundaryLocationsMapData; - private WmtsMapData backgroundMapData; - private FailureMechanismContext data; /// @@ -72,7 +69,6 @@ UpdateMapData(); }); hydraulicBoundaryDatabaseObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); mapDataCollection = new MapDataCollection(defaultMapDataCollectionName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); @@ -104,12 +100,10 @@ assessmentSectionObserver.Observable = null; hydraulicBoundaryDatabaseObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - mapDataCollection.Name = defaultMapDataCollectionName; Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -119,14 +113,10 @@ mapDataCollection.Name = data.WrappedData.Name; hydraulicBoundaryDatabaseObserver.Observable = data.Parent.HydraulicBoundaryDatabase; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -145,19 +135,13 @@ assessmentSectionObserver.Dispose(); hydraulicBoundaryDatabaseObserver.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(); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -93,22 +93,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new FailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanism = new TestFailureMechanism(); var failureMechanismContext = new FailureMechanismContext(failureMechanism, assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -125,7 +126,6 @@ // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.BackgroundMapData); } } @@ -135,19 +135,23 @@ // Setup using (var view = new FailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new FailureMechanismContext(new TestFailureMechanism(), new ObservableTestAssessmentSectionStub()); view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(5, view.Map.Data.Collection.Count()); + Assert.AreEqual(5, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -365,34 +369,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new FailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new FailureMechanismContext(new TestFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs =================================================================== diff -u -r9ea9915bf83c70b481d4c58af0ae7e5866218766 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs (.../DuneErosionFailureMechanismView.Designer.cs) (revision 9ea9915bf83c70b481d4c58af0ae7e5866218766) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs (.../DuneErosionFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -59,6 +59,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs (.../DuneErosionFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs (.../DuneErosionFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -41,7 +41,6 @@ private readonly Observer failureMechanismObserver; private readonly Observer assessmentSectionObserver; private readonly Observer duneLocationsObserver; - private readonly Observer backgroundMapDataObserver; private readonly MapDataCollection mapDataCollection; private readonly MapLineData referenceLineMapData; @@ -50,8 +49,6 @@ private readonly MapPointData sectionsEndPointMapData; private readonly MapPointData duneLocationsMapData; - private WmtsMapData backgroundMapData; - private DuneErosionFailureMechanismContext data; /// @@ -64,7 +61,6 @@ failureMechanismObserver = new Observer(UpdateMapData); assessmentSectionObserver = new Observer(UpdateMapData); duneLocationsObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); mapDataCollection = new MapDataCollection(DuneErosionDataResources.DuneErosionFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); @@ -96,10 +92,8 @@ assessmentSectionObserver.Observable = null; duneLocationsObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -109,14 +103,10 @@ mapDataCollection.Name = data.WrappedData.Name; duneLocationsObserver.Observable = data.WrappedData.DuneLocations; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -142,12 +132,6 @@ base.Dispose(disposing); } - private void UpdateBackgroundMapData() - { - RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(backgroundMapData, data.Parent.BackgroundData); - backgroundMapData.NotifyObservers(); - } - private void UpdateMapData() { SetMapDataFeatures(); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs (.../DuneErosionFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs (.../DuneErosionFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -114,21 +114,22 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new DuneErosionFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -138,22 +139,25 @@ // Setup using (var view = new DuneErosionFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), assessmentSection); view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(5, view.Map.Data.Collection.Count()); + Assert.AreEqual(5, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -345,32 +349,6 @@ } [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new DuneErosionFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs =================================================================== diff -u -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs (.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs) (revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs (.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -46,7 +46,6 @@ private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryDatabaseObserver; private readonly Observer dikeProfilesObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -62,8 +61,6 @@ private readonly MapLineData foreshoreProfilesMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private GrassCoverErosionInwardsFailureMechanismContext data; /// @@ -85,7 +82,6 @@ }); hydraulicBoundaryDatabaseObserver = new Observer(UpdateMapData); dikeProfilesObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); calculationInputObserver = new RecursiveObserver( UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); @@ -132,10 +128,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -147,14 +141,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; } } } @@ -177,19 +167,13 @@ calculationGroupObserver.Dispose(); calculationObserver.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(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -115,21 +115,22 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new GrassCoverErosionInwardsFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -139,22 +140,25 @@ // Setup using (var view = new GrassCoverErosionInwardsFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(8, view.Map.Data.Collection.Count()); + Assert.AreEqual(8, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -411,34 +415,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new GrassCoverErosionInwardsFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void NotifyObservers_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs =================================================================== diff -u -re866d883e0603dc8613eebc581953a9b2a8f5986 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs (.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs) (revision e866d883e0603dc8613eebc581953a9b2a8f5986) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs (.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -47,7 +47,6 @@ private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryLocationsObserver; private readonly Observer foreshoreProfilesObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -62,8 +61,6 @@ private readonly MapLineData foreshoreProfilesMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private GrassCoverErosionOutwardsFailureMechanismContext data; /// @@ -77,7 +74,6 @@ assessmentSectionObserver = new Observer(UpdateMapData); hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData); foreshoreProfilesObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); calculationInputObserver = new RecursiveObserver( UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); @@ -122,10 +118,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -137,14 +131,10 @@ calculationGroupObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; calculationObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -167,19 +157,13 @@ calculationGroupObserver.Dispose(); calculationObserver.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(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -113,22 +113,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new GrassCoverErosionOutwardsFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext( new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -138,6 +139,8 @@ // Setup using (var view = new GrassCoverErosionOutwardsFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext( @@ -146,15 +149,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(7, view.Map.Data.Collection.Count()); + Assert.AreEqual(7, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -305,34 +309,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(failureMechanism.HydraulicBoundaryLocations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new GrassCoverErosionOutwardsFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs =================================================================== diff -u -rf724e2a23cc180381b736c4da1318d87398e5758 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs (.../HeightStructuresFailureMechanismView.Designer.cs) (revision f724e2a23cc180381b736c4da1318d87398e5758) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs (.../HeightStructuresFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } 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(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -118,22 +118,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new HeightStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new HeightStructuresFailureMechanismContext( new HeightStructuresFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -143,6 +144,8 @@ // Setup using (var view = new HeightStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl)view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new HeightStructuresFailureMechanismContext( @@ -151,15 +154,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(8, view.Map.Data.Collection.Count()); + Assert.AreEqual(8, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -421,34 +425,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new HeightStructuresFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r28e008eb00299c3c5a6a7c825dee3c4dba2f239a -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 28e008eb00299c3c5a6a7c825dee3c4dba2f239a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -102,7 +102,7 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); @@ -131,7 +131,7 @@ var mapControl = (RingtoetsMapControl) view.Map; // Precondition - Assert.AreEqual(2, view.Map.Data.Collection.Count()); + Assert.AreEqual(2, mapControl.Data.Collection.Count()); // Call view.Data = null; @@ -263,34 +263,8 @@ AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - var assessmentSection = new ObservableTestAssessmentSectionStub(); - using (var view = new AssessmentSectionView()) - { - view.Data = assessmentSection; - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs (.../PipingFailureMechanismView.Designer.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs (.../PipingFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -46,7 +46,6 @@ private readonly Observer assessmentSectionObserver; private readonly Observer surfaceLinesObserver; private readonly Observer stochasticSoilModelsObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -62,8 +61,6 @@ private readonly MapPointData hydraulicBoundaryLocationsMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private PipingFailureMechanismContext data; /// @@ -86,7 +83,6 @@ hydraulicBoundaryDatabaseObserver = new Observer(UpdateMapData); surfaceLinesObserver = new Observer(UpdateMapData); stochasticSoilModelsObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); calculationInputObserver = new RecursiveObserver( UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); @@ -134,10 +130,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -150,14 +144,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; } } } @@ -181,19 +171,13 @@ calculationGroupObserver.Dispose(); calculationObserver.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(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -rd00d30719d5bffa635f40b975e490af4e4c298e9 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -167,22 +167,22 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new PipingFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData( - assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -199,19 +199,22 @@ using (new UseCustomTileSourceFactoryConfig(backgroundMapData)) using (var view = new PipingFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + view.Data = new PipingFailureMechanismContext( new PipingFailureMechanism(), assessmentSection); // Precondition - Assert.IsNotNull(view.Map.Data); - Assert.IsNotNull(view.Map.BackgroundMapData); + Assert.IsNotNull(mapControl.Data); + Assert.IsNotNull(mapControl.BackgroundMapData); // Call view.Data = null; // Assert - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -466,34 +469,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new PipingFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs =================================================================== diff -u -reab8aad1da52fe14404e06a6cc684dd6c391abe4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs (.../StabilityPointStructuresFailureMechanismView.Designer.cs) (revision eab8aad1da52fe14404e06a6cc684dd6c391abe4) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs (.../StabilityPointStructuresFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.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 StabilityPointStructuresFailureMechanismContext data; /// @@ -93,7 +90,6 @@ UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType>().Select(pc => pc.InputParameters))); calculationGroupObserver = new RecursiveObserver(UpdateMapData, pcg => pcg.Children); calculationObserver = new RecursiveObserver>(UpdateMapData, pcg => pcg.Children); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); mapDataCollection = new MapDataCollection(StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); @@ -136,10 +132,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -152,14 +146,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; } } } @@ -183,19 +173,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(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -118,23 +118,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new StabilityPointStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( new StabilityPointStructuresFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -144,6 +144,8 @@ // Setup using (var view = new StabilityPointStructuresFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( @@ -152,15 +154,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(8, view.Map.Data.Collection.Count()); + Assert.AreEqual(8, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -422,35 +425,8 @@ MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new StabilityPointStructuresFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), - assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated() { // Setup Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs =================================================================== diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs (.../StabilityStoneCoverFailureMechanismView.Designer.cs) (revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs (.../StabilityStoneCoverFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -47,7 +47,6 @@ private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryDatabaseObserver; private readonly Observer foreshoreProfilesObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -62,8 +61,6 @@ private readonly MapLineData foreshoreProfilesMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private StabilityStoneCoverFailureMechanismContext data; /// @@ -90,7 +87,6 @@ UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); calculationGroupObserver = new RecursiveObserver(UpdateMapData, pcg => pcg.Children); calculationObserver = new RecursiveObserver(UpdateMapData, pcg => pcg.Children); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); mapDataCollection = new MapDataCollection(StabilityStoneCoverDataResources.StabilityStoneCoverFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); @@ -130,10 +126,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -145,14 +139,10 @@ calculationGroupObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; calculationObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -175,19 +165,13 @@ calculationGroupObserver.Dispose(); calculationObserver.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(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -114,23 +114,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new StabilityStoneCoverFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext( new StabilityStoneCoverFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData( - assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -140,6 +140,8 @@ // Setup using (var view = new StabilityStoneCoverFailureMechanismView()) { + var mapControl = (RingtoetsMapControl) view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext( @@ -148,15 +150,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(7, view.Map.Data.Collection.Count()); + Assert.AreEqual(7, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -280,36 +283,8 @@ AssertCalculationsMapData(failureMechanism.Calculations.Cast(), mapDataList[calculationsIndex]); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new StabilityStoneCoverFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new StabilityStoneCoverFailureMechanismContext(new StabilityStoneCoverFailureMechanism(), - assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData( - backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_AssessmentSectionUpdated_MapDataUpdated() { // Setup Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs =================================================================== diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs (.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs) (revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs (.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -36,7 +36,7 @@ /// private void InitializeComponent() { - this.mapControl = new Core.Components.DotSpatial.Forms.MapControl(); + this.mapControl = new Common.Forms.Views.RingtoetsMapControl(); this.SuspendLayout(); // // MapView @@ -60,6 +60,6 @@ #endregion - private Core.Components.DotSpatial.Forms.MapControl mapControl; + private Common.Forms.Views.RingtoetsMapControl mapControl; } } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs =================================================================== diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -47,7 +47,6 @@ private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryDatabaseObserver; private readonly Observer foreshoreProfilesObserver; - private readonly Observer backgroundMapDataObserver; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationGroupObserver; @@ -62,8 +61,6 @@ private readonly MapLineData foreshoreProfilesMapData; private readonly MapLineData calculationsMapData; - private WmtsMapData backgroundMapData; - private WaveImpactAsphaltCoverFailureMechanismContext data; /// @@ -85,7 +82,6 @@ }); hydraulicBoundaryDatabaseObserver = new Observer(UpdateMapData); foreshoreProfilesObserver = new Observer(UpdateMapData); - backgroundMapDataObserver = new Observer(UpdateBackgroundMapData); calculationInputObserver = new RecursiveObserver( UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); @@ -130,10 +126,8 @@ calculationGroupObserver.Observable = null; calculationObserver.Observable = null; - backgroundMapDataObserver.Observable = null; - Map.Data = null; - Map.BackgroundMapData = null; + mapControl.BackgroundData = null; } else { @@ -145,14 +139,10 @@ calculationGroupObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; calculationObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - backgroundMapDataObserver.Observable = data.Parent.BackgroundData; - SetMapDataFeatures(); - backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(data.Parent.BackgroundData); - Map.Data = mapDataCollection; - Map.BackgroundMapData = backgroundMapData; + mapControl.BackgroundData = data.Parent.BackgroundData; } } } @@ -175,19 +165,13 @@ calculationGroupObserver.Dispose(); calculationObserver.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(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision d71d12fa277ebebb488ccc434cb59bed32c0755b) @@ -114,23 +114,23 @@ } [Test] - public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet() + public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); using (var view = new WaveImpactAsphaltCoverFailureMechanismView()) { + var mapControl = (RingtoetsMapControl)view.Map; + var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext( new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection); // Call view.Data = failureMechanismContext; // Assert - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData( - assessmentSection.BackgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); + Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData); } } @@ -140,6 +140,8 @@ // Setup using (var view = new WaveImpactAsphaltCoverFailureMechanismView()) { + var mapControl = (RingtoetsMapControl)view.Map; + var assessmentSection = new ObservableTestAssessmentSectionStub(); var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext( @@ -148,15 +150,16 @@ view.Data = failureMechanismContext; // Precondition - Assert.AreEqual(7, view.Map.Data.Collection.Count()); + Assert.AreEqual(7, mapControl.Data.Collection.Count()); // Call view.Data = null; // Assert Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); + Assert.IsNull(mapControl.Data); + Assert.IsNull(mapControl.BackgroundData); + Assert.IsNull(mapControl.BackgroundMapData); } } @@ -281,36 +284,8 @@ mapDataList[calculationsIndex]); } } - + [Test] - public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated() - { - // Given - using (var view = new WaveImpactAsphaltCoverFailureMechanismView()) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - view.Data = new WaveImpactAsphaltCoverFailureMechanismContext(new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); - - BackgroundData backgroundData = assessmentSection.BackgroundData; - - backgroundData.Name = "some Name"; - backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL"; - backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier"; - backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format"; - backgroundData.IsConfigured = true; - - // When - backgroundData.NotifyObservers(); - - // Then - ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData( - backgroundData); - MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData); - } - } - - [Test] public void UpdateObserver_AssessmentSectionUpdated_MapDataUpdated() { // Setup