Fisheye: Tag 397feab39b3bd3a7611c76529ade220c50aaec0d refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RingtoetsWellKnownTileSource.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 397feab39b3bd3a7611c76529ade220c50aaec0d refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RingtoetsWellKnownTileSourceExtension.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSource.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSource.cs (revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSource.cs (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Riskeer.Common.Data.AssessmentSection
+{
+ ///
+ /// All well known tile sources for which built-in support is provided.
+ ///
+ public enum RiskeerWellKnownTileSource
+ {
+ ///
+ /// OpenStreetMap.
+ ///
+ OpenStreetMap = 1,
+
+ ///
+ /// Microsoft Bing's satellite imagery.
+ ///
+ BingAerial = 2,
+
+ ///
+ /// Microsoft Bing's satellite imagery highlighting roads and major landmarks.
+ ///
+ BingHybrid = 3,
+
+ ///
+ /// Microsoft Bing's map showing roads, buildings and geography.
+ ///
+ BingRoads = 4,
+
+ ///
+ /// Esri's topographic map showing boundaries, cities, water features, physiographic features, park, landmarks, transportation and buildings.
+ ///
+ EsriWorldTopo = 5,
+
+ ///
+ /// Esri's surface elevation as shaded relief.
+ ///
+ EsriWorldShadedRelief = 6
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSourceExtension.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSourceExtension.cs (revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/RiskeerWellKnownTileSourceExtension.cs (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -0,0 +1,71 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using Riskeer.Common.Data.Properties;
+
+namespace Riskeer.Common.Data.AssessmentSection
+{
+ ///
+ /// Extension class for .
+ ///
+ public static class RiskeerWellKnownTileSourceExtension
+ {
+ ///
+ /// Gets the display name corresponding to .
+ ///
+ /// The
+ /// to get the display name of.
+ /// The display name.
+ /// Thrown when
+ /// is not a valid value of .
+ /// Thrown when
+ /// is not supported.
+ public static string GetDisplayName(this RiskeerWellKnownTileSource riskeerWellKnownTileSource)
+ {
+ if (!Enum.IsDefined(typeof(RiskeerWellKnownTileSource), riskeerWellKnownTileSource))
+ {
+ throw new InvalidEnumArgumentException(nameof(riskeerWellKnownTileSource),
+ (int) riskeerWellKnownTileSource,
+ typeof(RiskeerWellKnownTileSource));
+ }
+
+ switch (riskeerWellKnownTileSource)
+ {
+ case RiskeerWellKnownTileSource.OpenStreetMap:
+ return Resources.RiskeerWellKnownTileSource_OpenStreetMap_DisplayName;
+ case RiskeerWellKnownTileSource.BingAerial:
+ return Resources.RiskeerWellKnownTileSource_BingAerial_DisplayName;
+ case RiskeerWellKnownTileSource.BingHybrid:
+ return Resources.RiskeerWellKnownTileSource_BingHybrid_DisplayName;
+ case RiskeerWellKnownTileSource.BingRoads:
+ return Resources.RiskeerWellKnownTileSource_BingRoads_DisplayName;
+ case RiskeerWellKnownTileSource.EsriWorldTopo:
+ return Resources.RiskeerWellKnownTileSource_EsriWorldTopo_DisplayName;
+ case RiskeerWellKnownTileSource.EsriWorldShadedRelief:
+ return Resources.RiskeerWellKnownTileSource_EsriWorldShadedRelief_DisplayName;
+ default:
+ throw new NotSupportedException();
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs (.../WellKnownBackgroundDataConfiguration.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs (.../WellKnownBackgroundDataConfiguration.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -30,14 +30,14 @@
/// Creates a new instance of .
///
/// The type of well known tile source.
- public WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource wellKnownTileSource)
+ public WellKnownBackgroundDataConfiguration(RiskeerWellKnownTileSource wellKnownTileSource)
{
WellKnownTileSource = wellKnownTileSource;
}
///
/// Gets the type of well known tile source.
///
- public RingtoetsWellKnownTileSource WellKnownTileSource { get; }
+ public RiskeerWellKnownTileSource WellKnownTileSource { get; }
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/OtherFailureMechanism.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Data/Contribution/OtherFailureMechanism.cs (.../OtherFailureMechanism.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/OtherFailureMechanism.cs (.../OtherFailureMechanism.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -27,7 +27,7 @@
namespace Riskeer.Common.Data.Contribution
{
///
- /// This class represents a failure mechanism which has no representative within Ringtoets but
+ /// This class represents a failure mechanism which has no representative within Riskeer, but
/// contributes to the overall verdict nonetheless.
///
public class OtherFailureMechanism : FailureMechanismBase
Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -830,54 +830,54 @@
///
/// Looks up a localized string similar to Bing Maps - Satelliet.
///
- public static string RingtoetsWellKnownTileSource_BingAerial_DisplayName {
+ public static string RiskeerWellKnownTileSource_BingAerial_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_BingAerial_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_BingAerial_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to Bing Maps - Satelliet + Wegen.
///
- public static string RingtoetsWellKnownTileSource_BingHybrid_DisplayName {
+ public static string RiskeerWellKnownTileSource_BingHybrid_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_BingHybrid_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_BingHybrid_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to Bing Maps - Wegen.
///
- public static string RingtoetsWellKnownTileSource_BingRoads_DisplayName {
+ public static string RiskeerWellKnownTileSource_BingRoads_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_BingRoads_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_BingRoads_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to Esri World - Reliëf.
///
- public static string RingtoetsWellKnownTileSource_EsriWorldShadedRelief_DisplayName {
+ public static string RiskeerWellKnownTileSource_EsriWorldShadedRelief_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_EsriWorldShadedRelief_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_EsriWorldShadedRelief_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to Esri World - Topografisch.
///
- public static string RingtoetsWellKnownTileSource_EsriWorldTopo_DisplayName {
+ public static string RiskeerWellKnownTileSource_EsriWorldTopo_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_EsriWorldTopo_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_EsriWorldTopo_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to OpenStreetMap.
///
- public static string RingtoetsWellKnownTileSource_OpenStreetMap_DisplayName {
+ public static string RiskeerWellKnownTileSource_OpenStreetMap_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsWellKnownTileSource_OpenStreetMap_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RiskeerWellKnownTileSource_OpenStreetMap_DisplayName", resourceCulture);
}
}
Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -237,22 +237,22 @@
De transparantie moet in het bereik {0} liggen.
-
+
Bing Maps - Satelliet
-
+
Bing Maps - Satelliet + Wegen
-
+
Bing Maps - Wegen
-
+
Esri World - Reliëf
-
+
Esri World - Topografisch
-
+
OpenStreetMap
Index: Riskeer/Common/src/Riskeer.Common.Data/Riskeer.Common.Data.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Data/Riskeer.Common.Data.csproj (.../Riskeer.Common.Data.csproj) (revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/Common/src/Riskeer.Common.Data/Riskeer.Common.Data.csproj (.../Riskeer.Common.Data.csproj) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -28,8 +28,8 @@
-
-
+
+
Index: Riskeer/Common/src/Riskeer.Common.Util/TypeConverters/BackgroundDataConverter.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/src/Riskeer.Common.Util/TypeConverters/BackgroundDataConverter.cs (.../BackgroundDataConverter.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Util/TypeConverters/BackgroundDataConverter.cs (.../BackgroundDataConverter.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -136,7 +136,7 @@
private static WellKnownBackgroundDataConfiguration CreateWellKnownBackgroundDataConfiguration(WellKnownTileSourceMapData mapData)
{
- return new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) mapData.TileSource);
+ return new WellKnownBackgroundDataConfiguration((RiskeerWellKnownTileSource) mapData.TileSource);
}
private static WmtsBackgroundDataConfiguration CreateWmtsBackgroundDataConfiguration(WmtsMapData mapData)
Fisheye: Tag 397feab39b3bd3a7611c76529ade220c50aaec0d refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceExtensionTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 397feab39b3bd3a7611c76529ade220c50aaec0d refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceExtensionTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceExtensionTest.cs (revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceExtensionTest.cs (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -0,0 +1,71 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Riskeer.Common.Data.AssessmentSection;
+
+namespace Riskeer.Common.Data.Test.AssessmentSection
+{
+ [TestFixture]
+ public class RiskeerWellKnownTileSourceExtensionTest
+ {
+ [Test]
+ [TestCaseSource(nameof(GetValidRiskeerWellKnownTileSources))]
+ public void GetDisplayName_ValidEnum_ReturnsExpectedDislayName(RiskeerWellKnownTileSource riskeerWellKnownTileSource,
+ string expectedDisplayName)
+ {
+ // Call
+ string displayName = riskeerWellKnownTileSource.GetDisplayName();
+
+ // Assert
+ Assert.AreEqual(expectedDisplayName, displayName);
+ }
+
+ [Test]
+ public void GetDisplayName_InvalidEnum_ThrowsInvalidEnumArgumentException()
+ {
+ // Setup
+ const int invalidValue = 9999;
+ const RiskeerWellKnownTileSource wellKnownTileSource = (RiskeerWellKnownTileSource) invalidValue;
+
+ // Call
+ TestDelegate call = () => wellKnownTileSource.GetDisplayName();
+
+ // Assert
+ string expectedMessage = $"The value of argument 'riskeerWellKnownTileSource' ({invalidValue}) is invalid for Enum type '{nameof(RiskeerWellKnownTileSource)}'.";
+ string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage).ParamName;
+ Assert.AreEqual("riskeerWellKnownTileSource", parameterName);
+ }
+
+ private static IEnumerable GetValidRiskeerWellKnownTileSources()
+ {
+ yield return new TestCaseData(RiskeerWellKnownTileSource.OpenStreetMap, "OpenStreetMap");
+ yield return new TestCaseData(RiskeerWellKnownTileSource.BingAerial, "Bing Maps - Satelliet");
+ yield return new TestCaseData(RiskeerWellKnownTileSource.BingHybrid, "Bing Maps - Satelliet + Wegen");
+ yield return new TestCaseData(RiskeerWellKnownTileSource.BingRoads, "Bing Maps - Wegen");
+ yield return new TestCaseData(RiskeerWellKnownTileSource.EsriWorldTopo, "Esri World - Topografisch");
+ yield return new TestCaseData(RiskeerWellKnownTileSource.EsriWorldShadedRelief, "Esri World - Reliëf");
+ }
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceTest.cs (revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/RiskeerWellKnownTileSourceTest.cs (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -0,0 +1,88 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Riskeer.Common.Data.AssessmentSection;
+
+namespace Riskeer.Common.Data.Test.AssessmentSection
+{
+ [TestFixture]
+ public class RiskeerWellKnownTileSourceTest : EnumWithResourcesDisplayNameTestFixture
+ {
+ protected override IDictionary ExpectedDisplayNameForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ RiskeerWellKnownTileSource.OpenStreetMap, null
+ },
+ {
+ RiskeerWellKnownTileSource.BingAerial, null
+ },
+ {
+ RiskeerWellKnownTileSource.BingHybrid, null
+ },
+ {
+ RiskeerWellKnownTileSource.BingRoads, null
+ },
+ {
+ RiskeerWellKnownTileSource.EsriWorldTopo, null
+ },
+ {
+ RiskeerWellKnownTileSource.EsriWorldShadedRelief, null
+ }
+ };
+ }
+ }
+
+ protected override IDictionary ExpectedValueForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ RiskeerWellKnownTileSource.OpenStreetMap, 1
+ },
+ {
+ RiskeerWellKnownTileSource.BingAerial, 2
+ },
+ {
+ RiskeerWellKnownTileSource.BingHybrid, 3
+ },
+ {
+ RiskeerWellKnownTileSource.BingRoads, 4
+ },
+ {
+ RiskeerWellKnownTileSource.EsriWorldTopo, 5
+ },
+ {
+ RiskeerWellKnownTileSource.EsriWorldShadedRelief, 6
+ }
+ };
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs (.../WellKnownBackgroundDataConfigurationTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs (.../WellKnownBackgroundDataConfigurationTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -34,7 +34,7 @@
{
// Setup
var random = new Random(21);
- var wellKnownTileSource = random.NextEnumValue();
+ var wellKnownTileSource = random.NextEnumValue();
// Call
var configuration = new WellKnownBackgroundDataConfiguration(wellKnownTileSource);
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj (.../Riskeer.Common.Data.Test.csproj) (revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj (.../Riskeer.Common.Data.Test.csproj) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -30,8 +30,8 @@
-
-
+
+
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/RingtoetsMapControlTest.cs (.../RingtoetsMapControlTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/RingtoetsMapControlTest.cs (.../RingtoetsMapControlTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -281,7 +281,7 @@
ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
// When
- backgroundData.Configuration = new WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource.BingRoads);
+ backgroundData.Configuration = new WellKnownBackgroundDataConfiguration(RiskeerWellKnownTileSource.BingRoads);
backgroundData.NotifyObservers();
// Then
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs (.../MapDataTestHelper.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs (.../MapDataTestHelper.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -243,7 +243,7 @@
Assert.IsInstanceOf(imageBasedMapData);
var wellKnownTileSourceMapData = (WellKnownTileSourceMapData) imageBasedMapData;
- Assert.AreEqual(wellKnownBackgroundDataConfiguration.WellKnownTileSource, (RingtoetsWellKnownTileSource) wellKnownTileSourceMapData.TileSource);
+ Assert.AreEqual(wellKnownBackgroundDataConfiguration.WellKnownTileSource, (RiskeerWellKnownTileSource) wellKnownTileSourceMapData.TileSource);
Assert.IsTrue(wellKnownTileSourceMapData.IsConfigured);
return;
Index: Riskeer/Common/test/Riskeer.Common.Util.Test/TypeConverters/BackgroundDataConverterTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Common/test/Riskeer.Common.Util.Test/TypeConverters/BackgroundDataConverterTest.cs (.../BackgroundDataConverterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Util.Test/TypeConverters/BackgroundDataConverterTest.cs (.../BackgroundDataConverterTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -115,7 +115,7 @@
Assert.AreEqual(mapData.Transparency, backgroundData.Transparency);
var configuration = (WellKnownBackgroundDataConfiguration) backgroundData.Configuration;
- var mapDataTileSource = (RingtoetsWellKnownTileSource) mapData.TileSource;
+ var mapDataTileSource = (RiskeerWellKnownTileSource) mapData.TileSource;
Assert.AreEqual(mapDataTileSource, configuration.WellKnownTileSource);
}
@@ -178,7 +178,7 @@
public void ConvertFrom_BackgroundDataWithInvalidWellKnownTileSourceValue_ThrowsInvalidEnumArgumentException()
{
// Setup
- var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) 999));
+ var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((RiskeerWellKnownTileSource) 999));
// Call
TestDelegate call = () => BackgroundDataConverter.ConvertFrom(backgroundData);
Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -50,7 +50,7 @@
public sealed class AssessmentSection : Observable, IAssessmentSection
{
private const double defaultNorm = 1.0 / 30000;
- private const RingtoetsWellKnownTileSource defaultWellKnownTileSource = RingtoetsWellKnownTileSource.BingAerial;
+ private const RiskeerWellKnownTileSource defaultWellKnownTileSource = RiskeerWellKnownTileSource.BingAerial;
private readonly ObservableList waterLevelCalculationsForFactorizedSignalingNorm = new ObservableList();
private readonly ObservableList waterLevelCalculationsForSignalingNorm = new ObservableList();
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -106,7 +106,7 @@
Assert.AreEqual(0.60, backgroundData.Transparency, backgroundData.Transparency.GetAccuracy());
Assert.AreEqual("Bing Maps - Satelliet", backgroundData.Name);
var configuration = (WellKnownBackgroundDataConfiguration) backgroundData.Configuration;
- Assert.AreEqual(RingtoetsWellKnownTileSource.BingAerial, configuration.WellKnownTileSource);
+ Assert.AreEqual(RiskeerWellKnownTileSource.BingAerial, configuration.WellKnownTileSource);
CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm);
CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs (.../BackgroundDataPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs (.../BackgroundDataPropertiesTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -128,7 +128,7 @@
const string name = "A";
var mapData = new TestImageBasedMapData(name, false);
- var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource.BingAerial))
+ var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration(RiskeerWellKnownTileSource.BingAerial))
{
Name = mapData.Name,
Transparency = mapData.Transparency,
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs (.../BackgroundDataPropertyInfoTest .cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs (.../BackgroundDataPropertyInfoTest .cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -80,7 +80,7 @@
new BackgroundData(new TestBackgroundDataConfiguration()))
.SetName("Arbitrary BackgroundData Configuration");
yield return new TestCaseData(
- new BackgroundData(new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) wellKnownMapData.TileSource))
+ new BackgroundData(new WellKnownBackgroundDataConfiguration((RiskeerWellKnownTileSource) wellKnownMapData.TileSource))
{
Name = wellKnownMapData.Name
}).SetName("WellKnown BingRoads BackgroundData");
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -632,7 +632,7 @@
Assert.AreEqual(mapData.Transparency, backgroundData.Transparency);
var configuration = (WellKnownBackgroundDataConfiguration) backgroundData.Configuration;
- var wellKnownTileSource = (RingtoetsWellKnownTileSource) mapData.TileSource;
+ var wellKnownTileSource = (RiskeerWellKnownTileSource) mapData.TileSource;
Assert.AreEqual(wellKnownTileSource, configuration.WellKnownTileSource);
}
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs (.../BackgroundDataEntityReadExtensions.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs (.../BackgroundDataEntityReadExtensions.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -114,7 +114,7 @@
backgroundDataMetaEntities.Single(metaEntity => metaEntity.Key.Equals(BackgroundDataIdentifiers.WellKnownTileSource))
.Read();
- var wellKnownTileSource = (RingtoetsWellKnownTileSource) Convert.ToInt32(parameter.Value);
+ var wellKnownTileSource = (RiskeerWellKnownTileSource) Convert.ToInt32(parameter.Value);
return new WellKnownBackgroundDataConfiguration(wellKnownTileSource);
}
}
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs (.../BackgroundDataCreateExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/BackgroundDataCreateExtensionsTest.cs (.../BackgroundDataCreateExtensionsTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -141,7 +141,7 @@
{
// Setup
var random = new Random(21);
- var wellKnownTileSource = random.NextEnumValue();
+ var wellKnownTileSource = random.NextEnumValue();
const string name = "background";
const bool isVisible = true;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -132,7 +132,7 @@
bool isVisible = random.NextBoolean();
const BackgroundDataType backgroundDataType = BackgroundDataType.WellKnown;
- var wellKnownTileSource = random.NextEnumValue();
+ var wellKnownTileSource = random.NextEnumValue();
string wellKnownTileSourceValue = ((int) wellKnownTileSource).ToString();
var backgroundDataMetaEntities = new[]
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/BackgroundDataEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r397feab39b3bd3a7611c76529ade220c50aaec0d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/BackgroundDataEntityReadExtensionsTest.cs (.../BackgroundDataEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/BackgroundDataEntityReadExtensionsTest.cs (.../BackgroundDataEntityReadExtensionsTest.cs) (revision 397feab39b3bd3a7611c76529ade220c50aaec0d)
@@ -116,7 +116,7 @@
const BackgroundDataType backgroundDataType = BackgroundDataType.WellKnown;
var random = new Random(21);
- var wellKnownTileSource = random.NextEnumValue();
+ var wellKnownTileSource = random.NextEnumValue();
var entity = new BackgroundDataEntity
{