Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs =================================================================== diff -u -r758b0db0a58b0fecd5e3d7d8b5f22d162778ee04 -ref70beef434ef774830c56e3d4a3b5def29bb01b --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision 758b0db0a58b0fecd5e3d7d8b5f22d162778ee04) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision ef70beef434ef774830c56e3d4a3b5def29bb01b) @@ -98,6 +98,7 @@ [PropertyOrder(selectedMetaDataAttributePropertyIndex)] [DynamicVisible] + [DynamicReadOnly] [Editor(typeof(MetaDataAttributeEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(Resources), "Categories_Label")] [ResourcesDisplayName(typeof(Resources), "Mapdata_SelectedMetaDataAttribute_DisplayName")] Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs =================================================================== diff -u -r758b0db0a58b0fecd5e3d7d8b5f22d162778ee04 -ref70beef434ef774830c56e3d4a3b5def29bb01b --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs (.../FeatureBasedMapDataPropertiesTest.cs) (revision 758b0db0a58b0fecd5e3d7d8b5f22d162778ee04) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/FeatureBasedMapDataPropertiesTest.cs (.../FeatureBasedMapDataPropertiesTest.cs) (revision ef70beef434ef774830c56e3d4a3b5def29bb01b) @@ -176,7 +176,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void ShowLabels_MapDataHasMetaData_ShowLabelsShouldNotBeReadOnly(bool hasMetaData) + public void ShowLabels_MapDataHasMetaData_ShowLabelsAndSelectedMetaDataAttributeShouldNotBeReadOnly(bool hasMetaData) { // Setup var feature = new MapFeature(Enumerable.Empty()); @@ -190,7 +190,8 @@ Features = new[] { feature - } + }, + ShowLabels = true }; // Call @@ -208,6 +209,13 @@ "Weergeven", "Geeft aan of labels worden weergegeven op deze kaartlaag.", !hasMetaData); + + PropertyDescriptor selectedMetaDataAttributeProperty = dynamicProperties[selectedMetaDataAttributePropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(selectedMetaDataAttributeProperty, + "Label", + "Op basis van", + "Toont de eigenschap op basis waarvan labels worden weergegeven op deze kaartlaag.", + !hasMetaData); } [Test] @@ -217,7 +225,7 @@ { // Setup var feature = new MapFeature(Enumerable.Empty()); - feature.MetaData["key"] = "value"; + feature.MetaData["key"] = "value"; var mapPointData = new MapPointData("Test") {