Fisheye: Tag d00d30719d5bffa635f40b975e490af4e4c298e9 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis/BackgroundMapDataContainer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -r8fc0fa5cc4f728cc834f633236e60c7fe4bfb5e3 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj (.../Core.Components.Gis.csproj) (revision 8fc0fa5cc4f728cc834f633236e60c7fe4bfb5e3)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj (.../Core.Components.Gis.csproj) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -40,7 +40,6 @@
Properties\GlobalAssembly.cs
-
Fisheye: Tag d00d30719d5bffa635f40b975e490af4e4c298e9 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/BackgroundMapDataContainerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -50,7 +50,6 @@
Properties\GlobalAssembly.cs
-
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -109,15 +109,6 @@
private static void InitializeBackgroundMapData(AssessmentSection demoAssessmentSection)
{
WmtsMapData targetConfiguration = WmtsMapData.CreateDefaultPdokMapData();
- demoAssessmentSection.BackgroundMapData.IsVisible = targetConfiguration.IsVisible;
- demoAssessmentSection.BackgroundMapData.Transparency = targetConfiguration.Transparency;
-
- var backgroundMapData = (WmtsMapData) demoAssessmentSection.BackgroundMapData.MapData;
- backgroundMapData.Name = targetConfiguration.Name;
- backgroundMapData.Configure(targetConfiguration.SourceCapabilitiesUrl,
- targetConfiguration.SelectedCapabilityIdentifier,
- targetConfiguration.PreferredFormat);
-
demoAssessmentSection.BackgroundData.Name = targetConfiguration.Name;
demoAssessmentSection.BackgroundData.BackgroundMapDataType = BackgroundMapDataType.Wmts;
demoAssessmentSection.BackgroundData.IsVisible = targetConfiguration.IsVisible;
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r3014d0ced22c45300938639e7958ea0850485240 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 3014d0ced22c45300938639e7958ea0850485240)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -34,6 +34,7 @@
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.Probabilistics;
@@ -102,16 +103,14 @@
Assert.AreEqual("Demo traject", demoAssessmentSection.Name);
Assert.AreEqual("6-3", demoAssessmentSection.Id);
- Assert.IsTrue(demoAssessmentSection.BackgroundMapData.IsVisible);
- Assert.AreEqual(0.0, demoAssessmentSection.BackgroundMapData.Transparency.Value);
+ Assert.IsTrue(demoAssessmentSection.BackgroundData.IsVisible);
+ Assert.AreEqual(0.0, demoAssessmentSection.BackgroundData.Transparency.Value);
- var mapData = (WmtsMapData)demoAssessmentSection.BackgroundMapData.MapData;
- Assert.IsTrue(mapData.IsConfigured);
WmtsMapData expectedWmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
- Assert.AreEqual(expectedWmtsMapData.Name, mapData.Name);
- Assert.AreEqual(expectedWmtsMapData.SourceCapabilitiesUrl, mapData.SourceCapabilitiesUrl);
- Assert.AreEqual(expectedWmtsMapData.SelectedCapabilityIdentifier, mapData.SelectedCapabilityIdentifier);
- Assert.AreEqual(expectedWmtsMapData.PreferredFormat, mapData.PreferredFormat);
+ Assert.AreEqual(expectedWmtsMapData.Name, demoAssessmentSection.BackgroundData.Name);
+ Assert.AreEqual(expectedWmtsMapData.SourceCapabilitiesUrl, demoAssessmentSection.BackgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl]);
+ Assert.AreEqual(expectedWmtsMapData.SelectedCapabilityIdentifier, demoAssessmentSection.BackgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier]);
+ Assert.AreEqual(expectedWmtsMapData.PreferredFormat, demoAssessmentSection.BackgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat]);
AssertHydraulicBoundaryDatabase(demoAssessmentSection);
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs
===================================================================
diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -71,11 +71,8 @@
HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; }
///
- /// Gets the container that holds the layer that represents the background for all
- /// geo-referenced data.
+ /// Gets the data that represents the background for all geo-referenced data.
///
- BackgroundMapDataContainer BackgroundMapData { get; }
-
BackgroundData BackgroundData { get; }
///
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs
===================================================================
diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs (.../ObservableTestAssessmentSectionStubTest.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs (.../ObservableTestAssessmentSectionStubTest.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -49,7 +49,6 @@
Assert.AreEqual(0, Convert.ToInt32(assessmentSection.Composition));
Assert.IsNull(assessmentSection.ReferenceLine);
Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase);
- Assert.IsNull(assessmentSection.BackgroundMapData.MapData);
Assert.IsNotNull(assessmentSection.BackgroundData);
Assert.AreEqual("Background data", assessmentSection.BackgroundData.Name);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs
===================================================================
diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs (.../ObservableTestAssessmentSectionStub.cs) (revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs (.../ObservableTestAssessmentSectionStub.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -40,7 +40,6 @@
public ObservableTestAssessmentSectionStub()
{
FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 1.0 / 300000);
- BackgroundMapData = new BackgroundMapDataContainer();
BackgroundData = new BackgroundData
{
Name = "Background data"
@@ -54,8 +53,7 @@
public ReferenceLine ReferenceLine { get; set; }
public FailureMechanismContribution FailureMechanismContribution { get; }
public HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; }
- public BackgroundMapDataContainer BackgroundMapData { get; }
- public BackgroundData BackgroundData { get; }
+ public BackgroundData BackgroundData { get; set; }
public IEnumerable GetFailureMechanisms()
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r250899bf76acee45d411a95377d8a021a0977a75 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 250899bf76acee45d411a95377d8a021a0977a75)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -62,12 +62,6 @@
Comments = new Comment();
WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
- BackgroundMapData = new BackgroundMapDataContainer
- {
- IsVisible = mapData.IsVisible,
- Transparency = mapData.Transparency,
- MapData = mapData
- };
BackgroundData = new BackgroundData
{
@@ -220,8 +214,6 @@
public HydraulicBoundaryDatabase HydraulicBoundaryDatabase { get; set; }
- public BackgroundMapDataContainer BackgroundMapData { get; }
-
public BackgroundData BackgroundData { get; }
public IEnumerable GetFailureMechanisms()
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -r250899bf76acee45d411a95377d8a021a0977a75 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 250899bf76acee45d411a95377d8a021a0977a75)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -144,15 +144,11 @@
Assert.AreEqual(sum, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution));
- Assert.IsFalse(section.BackgroundMapData.IsVisible);
- Assert.AreEqual(0.0, section.BackgroundMapData.Transparency.Value);
- var mapData = (WmtsMapData)section.BackgroundMapData.MapData;
- Assert.IsFalse(mapData.IsConfigured);
-
Assert.IsFalse(section.BackgroundData.IsVisible);
Assert.AreEqual(0.0, section.BackgroundData.Transparency.Value);
Assert.IsFalse(section.BackgroundData.IsConfigured);
Assert.AreEqual("", section.BackgroundData.Name);
+ CollectionAssert.IsEmpty(section.BackgroundData.Parameters);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd00d30719d5bffa635f40b975e490af4e4c298e9
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision f9db544ad22552799aaaedc2a154abd8765f7099)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision d00d30719d5bffa635f40b975e490af4e4c298e9)
@@ -193,10 +193,7 @@
WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
var assessmentSection = new ObservableTestAssessmentSectionStub
{
- BackgroundMapData =
- {
- MapData = backgroundMapData
- }
+ BackgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(backgroundMapData)
};
using (new UseCustomTileSourceFactoryConfig(backgroundMapData))