Index: Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs =================================================================== diff -u -r16bd8076863c03907abeee60b16704aba1bdb1a0 -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs (.../WmtsMapData.cs) (revision 16bd8076863c03907abeee60b16704aba1bdb1a0) +++ Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs (.../WmtsMapData.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -188,6 +188,8 @@ IsConfigured = false; IsVisible = false; + + Name = Resources.WmtsMapData_Unconfigured_name; } } } \ No newline at end of file Index: Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs =================================================================== diff -u -r16bd8076863c03907abeee60b16704aba1bdb1a0 -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs (.../WmtsMapDataTest.cs) (revision 16bd8076863c03907abeee60b16704aba1bdb1a0) +++ Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs (.../WmtsMapDataTest.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -288,6 +288,7 @@ Assert.IsNull(mapData.SelectedCapabilityIdentifier); Assert.IsFalse(mapData.IsConfigured); Assert.IsFalse(mapData.IsVisible); + Assert.AreEqual("", mapData.Name); } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r51ddda3656dd349582d7790169a34080d79da68a -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 51ddda3656dd349582d7790169a34080d79da68a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -215,7 +215,7 @@ } /// - /// Looks up a localized string similar to Geeft aan of de geselecteerde achtergrondlaag in alle kaarten wordt weergegeven.. + /// Looks up a localized string similar to Geeft aan of de geselecteerde achtergrond kaartlaag in alle kaarten van dit traject wordt weergegeven.. /// public static string BackgroundMapDataContextProperties_IsVisible_Description { get { @@ -224,7 +224,7 @@ } /// - /// Looks up a localized string similar to Achtergrondlaag tonen. + /// Looks up a localized string similar to Weergeven. /// public static string BackgroundMapDataContextProperties_IsVisible_DisplayName { get { @@ -233,7 +233,7 @@ } /// - /// Looks up a localized string similar to Naam van de achtergrond kaartlaag.. + /// Looks up a localized string similar to Omschrijving van de achtergrond kaartlaag.. /// public static string BackgroundMapDataContextProperties_Name_Description { get { @@ -242,7 +242,7 @@ } /// - /// Looks up a localized string similar to Naam van de kaartlaag. + /// Looks up a localized string similar to Omschrijving. /// public static string BackgroundMapDataContextProperties_Name_DisplayName { get { @@ -251,7 +251,7 @@ } /// - /// Looks up a localized string similar to Transparantie waarmee de achtergrondlaag wordt weergegeven.. + /// Looks up a localized string similar to Transparantie waarmee de achtergrond kaartlaag wordt weergegeven.. /// public static string BackgroundMapDataContextProperties_Transparency_Description { get { @@ -278,7 +278,7 @@ } /// - /// Looks up a localized string similar to WMTS URL. + /// Looks up a localized string similar to URL. /// public static string BackgroundMapDataContextProperties_Url_DisplayName { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r51ddda3656dd349582d7790169a34080d79da68a -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 51ddda3656dd349582d7790169a34080d79da68a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -298,19 +298,19 @@ Trajecttype: {0} - Geeft aan of de geselecteerde achtergrondlaag in alle kaarten wordt weergegeven. + Geeft aan of de geselecteerde achtergrond kaartlaag in alle kaarten van dit traject wordt weergegeven. - Achtergrondlaag tonen + Weergeven - Naam van de achtergrond kaartlaag. + Omschrijving van de achtergrond kaartlaag. - Naam van de kaartlaag + Omschrijving - Transparantie waarmee de achtergrondlaag wordt weergegeven. + Transparantie waarmee de achtergrond kaartlaag wordt weergegeven. Transparantie @@ -319,6 +319,6 @@ Volledige URL naar de Web Map Tile Service (WMTS) die als achtergrond kaartlaag gebruikt wordt. - WMTS URL + URL \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/BackgroundWmtsMapDataProperties.cs =================================================================== diff -u -r51ddda3656dd349582d7790169a34080d79da68a -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/BackgroundWmtsMapDataProperties.cs (.../BackgroundWmtsMapDataProperties.cs) (revision 51ddda3656dd349582d7790169a34080d79da68a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/BackgroundWmtsMapDataProperties.cs (.../BackgroundWmtsMapDataProperties.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -56,7 +56,7 @@ { get { - return data.Name; + return data.IsConfigured ? data.Name : string.Empty; } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rab08e0e3f960e79fb76f0706a536775a3f0f20dd -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -202,7 +202,7 @@ } /// - /// Looks up a localized string similar to Achtergrondlaag. + /// Looks up a localized string similar to Achtergrondkaart. /// public static string RingtoetsPlugin_BackgroundMapDataContext_Text { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -rab08e0e3f960e79fb76f0706a536775a3f0f20dd -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -164,7 +164,7 @@ Wilt u doorgaan? - Achtergrondlaag + Achtergrondkaart Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd. Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundWmtsMapDataPropertiesTest.cs =================================================================== diff -u -r51ddda3656dd349582d7790169a34080d79da68a -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundWmtsMapDataPropertiesTest.cs (.../BackgroundWmtsMapDataPropertiesTest.cs) (revision 51ddda3656dd349582d7790169a34080d79da68a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundWmtsMapDataPropertiesTest.cs (.../BackgroundWmtsMapDataPropertiesTest.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -53,7 +53,7 @@ } [Test] - public void GetProperties_ValidData_ReturnsExpectedValues() + public void GetProperties_ConfiguredMapData_ReturnsExpectedValues() { // Setup WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData(); @@ -75,6 +75,28 @@ } [Test] + public void GetProperties_UnconfiguredMapData_ReturnsExpectedValues() + { + // Setup + WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData(); + + // Call + var properties = new BackgroundWmtsMapDataProperties(mapData); + + // Assert + Assert.IsInstanceOf>(properties); + + Assert.AreSame(mapData, properties.Data); + + Assert.AreEqual(string.Empty, properties.Name); + Assert.AreEqual(mapData.SourceCapabilitiesUrl, properties.Url); + + Assert.AreEqual(2, properties.Transparency.NumberOfDecimalPlaces); + Assert.AreEqual(mapData.Transparency, properties.Transparency); + Assert.AreEqual(mapData.IsVisible, properties.IsVisible); + } + + [Test] public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() { // Setup @@ -120,29 +142,29 @@ PropertyDescriptor nameProperty = dynamicProperties[requiredNamePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, "Algemeen", - "Naam van de kaartlaag", - "Naam van de achtergrond kaartlaag.", + "Omschrijving", + "Omschrijving van de achtergrond kaartlaag.", true); PropertyDescriptor urlProperty = dynamicProperties[requiredUrlPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(urlProperty, "Algemeen", - "WMTS URL", + "URL", "Volledige URL naar de Web Map Tile Service (WMTS) die als achtergrond kaartlaag gebruikt wordt.", true); PropertyDescriptor transparencyPropertyIndex = dynamicProperties[requiredTransparencyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(transparencyPropertyIndex, "Algemeen", "Transparantie", - "Transparantie waarmee de achtergrondlaag wordt weergegeven.", + "Transparantie waarmee de achtergrond kaartlaag wordt weergegeven.", true); PropertyDescriptor visibilityProperty = dynamicProperties[requiredVisibilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(visibilityProperty, "Algemeen", - "Achtergrondlaag tonen", - "Geeft aan of de geselecteerde achtergrondlaag in alle kaarten wordt weergegeven.", + "Weergeven", + "Geeft aan of de geselecteerde achtergrond kaartlaag in alle kaarten van dit traject wordt weergegeven.", true); } @@ -167,14 +189,14 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(transparencyPropertyIndex, "Algemeen", "Transparantie", - "Transparantie waarmee de achtergrondlaag wordt weergegeven.", + "Transparantie waarmee de achtergrond kaartlaag wordt weergegeven.", !isMapConfigured); PropertyDescriptor visibilityProperty = dynamicProperties[requiredVisibilityPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(visibilityProperty, "Algemeen", - "Achtergrondlaag tonen", - "Geeft aan of de geselecteerde achtergrondlaag in alle kaarten wordt weergegeven.", + "Weergeven", + "Geeft aan of de geselecteerde achtergrond kaartlaag in alle kaarten van dit traject wordt weergegeven.", !isMapConfigured); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs =================================================================== diff -u -r000b675444761bd16bc9aa7860c2af198b705bb0 -rb41f4c465f094e91312ffd90174e765417b28ba9 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs (.../BackgroundMapDataContextTreeNodeInfoTest.cs) (revision 000b675444761bd16bc9aa7860c2af198b705bb0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs (.../BackgroundMapDataContextTreeNodeInfoTest.cs) (revision b41f4c465f094e91312ffd90174e765417b28ba9) @@ -78,7 +78,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("Achtergrondlaag", text); + Assert.AreEqual("Achtergrondkaart", text); } }