Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r7aa6b8425147795b1a87b552fe9d82ae5e9c7565 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 7aa6b8425147795b1a87b552fe9d82ae5e9c7565)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -64,7 +64,7 @@
 
         protected override IFeatureSymbolizer CreateSymbolizer(MapPolygonData mapData)
         {
-            return new PolygonSymbolizer(mapData.Style.FillColor, mapData.Style.StrokeColor, mapData.Style.Width);
+            return new PolygonSymbolizer(mapData.Style.FillColor, mapData.Style.StrokeColor, mapData.Style.StrokeThickness);
         }
 
         private static IBasicGeometry GetGeometry(List<IPolygon> geometryList)
Index: Core/Components/src/Core.Components.Gis/Style/PolygonStyle.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Components/src/Core.Components.Gis/Style/PolygonStyle.cs	(.../PolygonStyle.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis/Style/PolygonStyle.cs	(.../PolygonStyle.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -33,27 +33,27 @@
         /// </summary>
         /// <param name="fillColor">The fill color of the polygon.</param>
         /// <param name="strokeColor">The stroke color of the polygon.</param>
-        /// <param name="width">The width of the polygon border.</param>
-        public PolygonStyle(Color fillColor, Color strokeColor, int width)
+        /// <param name="strokeThickness">The stroke thickness of the polygon border.</param>
+        public PolygonStyle(Color fillColor, Color strokeColor, int strokeThickness)
         {
             FillColor = fillColor;
             StrokeColor = strokeColor;
-            Width = width;
+            StrokeThickness = strokeThickness;
         }
 
         /// <summary>
-        /// Gets the polygon fill color.
+        /// Gets or sets the polygon fill color.
         /// </summary>
-        public Color FillColor { get; private set; }
+        public Color FillColor { get; set; }
 
         /// <summary>
-        /// Gets the polygon stroke color.
+        /// Gets or sets the polygon stroke color.
         /// </summary>
-        public Color StrokeColor { get; private set; }
+        public Color StrokeColor { get; set; }
 
         /// <summary>
-        /// Gets the polygon border width.
+        /// Gets or sets the polygon border stroke thickness.
         /// </summary>
-        public int Width { get; private set; }
+        public int StrokeThickness { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs
===================================================================
diff -u -r7aa6b8425147795b1a87b552fe9d82ae5e9c7565 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision 7aa6b8425147795b1a87b552fe9d82ae5e9c7565)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -48,7 +48,7 @@
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreEqual(Color.DarkGray, data.Style.FillColor);
             Assert.AreEqual(Color.Black, data.Style.StrokeColor);
-            Assert.AreEqual(2, data.Style.Width);
+            Assert.AreEqual(2, data.Style.StrokeThickness);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Style/PolygonStyleTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Components/test/Core.Components.Gis.Test/Style/PolygonStyleTest.cs	(.../PolygonStyleTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.Test/Style/PolygonStyleTest.cs	(.../PolygonStyleTest.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -42,7 +42,7 @@
             // Assert
             Assert.AreEqual(fillColor, polygonStyle.FillColor);
             Assert.AreEqual(strokeColor, polygonStyle.StrokeColor);
-            Assert.AreEqual(width, polygonStyle.Width);
+            Assert.AreEqual(width, polygonStyle.StrokeThickness);
         }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs
===================================================================
diff -u -r899cae178642faba04c628db05a792b657b6d979 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 899cae178642faba04c628db05a792b657b6d979)
+++ Core/Plugins/src/Core.Plugins.Map/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -273,15 +273,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven..
-        /// </summary>
-        public static string MapData_Color_Description {
-            get {
-                return ResourceManager.GetString("MapData_Color_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kleur.
         /// </summary>
         public static string MapData_Color_DisplayName {
@@ -327,6 +318,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Lijnkleur.
+        /// </summary>
+        public static string MapData_StrokeColor_DisplayName {
+            get {
+                return ResourceManager.GetString("MapData_StrokeColor_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lijndikte.
+        /// </summary>
+        public static string MapData_StrokeThickness_DisplayName {
+            get {
+                return ResourceManager.GetString("MapData_StrokeThickness_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De naam van deze map met kaartlagen..
         /// </summary>
         public static string MapDataCollection_Name_Description {
@@ -420,6 +429,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De kleur van de lijnen waarmee deze kaartlaag wordt weergegeven..
+        /// </summary>
+        public static string MapLineData_Color_Description {
+            get {
+                return ResourceManager.GetString("MapLineData_Color_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De stijl van de lijnen waarmee deze kaartlaag wordt weergegeven..
         /// </summary>
         public static string MapLineData_DashStyle_Description {
@@ -447,15 +465,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lijndikte.
-        /// </summary>
-        public static string MapLineData_Width_DisplayName {
-            get {
-                return ResourceManager.GetString("MapLineData_Width_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Shapebestand.
         /// </summary>
         public static string MapPlugin_GetImportInfos_MapDataCollection_filefilter_Description {
@@ -484,6 +493,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven..
+        /// </summary>
+        public static string MapPointData_Color_Description {
+            get {
+                return ResourceManager.GetString("MapPointData_Color_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De grootte van de symbolen waarmee deze kaartlaag wordt weergegeven..
         /// </summary>
         public static string MapPointData_Size_Description {
@@ -511,15 +529,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lijnkleur.
-        /// </summary>
-        public static string MapPointData_StrokeColor_DisplayName {
-            get {
-                return ResourceManager.GetString("MapPointData_StrokeColor_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to De dikte van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven..
         /// </summary>
         public static string MapPointData_StrokeThickness_Description {
@@ -529,15 +538,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lijndikte.
-        /// </summary>
-        public static string MapPointData_StrokeThickness_DisplayName {
-            get {
-                return ResourceManager.GetString("MapPointData_StrokeThickness_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Het symbool waarmee deze kaartlaag wordt weergegeven..
         /// </summary>
         public static string MapPointData_Symbol_Description {
@@ -566,6 +566,33 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De kleur van de vlakken waarmee deze kaartlaag wordt weergegeven..
+        /// </summary>
+        public static string MapPolygonData_FillColor_Description {
+            get {
+                return ResourceManager.GetString("MapPolygonData_FillColor_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De kleur van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven..
+        /// </summary>
+        public static string MapPolygonData_StrokeColor_Description {
+            get {
+                return ResourceManager.GetString("MapPolygonData_StrokeColor_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De dikte van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven..
+        /// </summary>
+        public static string MapPolygonData_StrokeThickness_Description {
+            get {
+                return ResourceManager.GetString("MapPolygonData_StrokeThickness_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Kaartlaag.
         /// </summary>
         public static string Name_Layer {
Index: Core/Plugins/src/Core.Plugins.Map/Properties/Resources.resx
===================================================================
diff -u -r899cae178642faba04c628db05a792b657b6d979 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/src/Core.Plugins.Map/Properties/Resources.resx	(.../Resources.resx)	(revision 899cae178642faba04c628db05a792b657b6d979)
+++ Core/Plugins/src/Core.Plugins.Map/Properties/Resources.resx	(.../Resources.resx)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -274,7 +274,7 @@
   <data name="Categories_Styling" xml:space="preserve">
     <value>Stijl</value>
   </data>
-  <data name="MapData_Color_Description" xml:space="preserve">
+  <data name="MapPointData_Color_Description" xml:space="preserve">
     <value>De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven.</value>
   </data>
   <data name="MapData_Color_DisplayName" xml:space="preserve">
@@ -289,13 +289,13 @@
   <data name="MapPointData_StrokeColor_Description" xml:space="preserve">
     <value>De kleur van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.</value>
   </data>
-  <data name="MapPointData_StrokeColor_DisplayName" xml:space="preserve">
+  <data name="MapData_StrokeColor_DisplayName" xml:space="preserve">
     <value>Lijnkleur</value>
   </data>
   <data name="MapPointData_StrokeThickness_Description" xml:space="preserve">
     <value>De dikte van de lijn van de symbolen waarmee deze kaartlaag wordt weergegeven.</value>
   </data>
-  <data name="MapPointData_StrokeThickness_DisplayName" xml:space="preserve">
+  <data name="MapData_StrokeThickness_DisplayName" xml:space="preserve">
     <value>Lijndikte</value>
   </data>
   <data name="MapPointData_Symbol_Description" xml:space="preserve">
@@ -313,9 +313,6 @@
   <data name="MapLineData_Width_Description" xml:space="preserve">
     <value>De dikte van de lijnen waarmee deze kaartlaag wordt weergegeven.</value>
   </data>
-  <data name="MapLineData_Width_DisplayName" xml:space="preserve">
-    <value>Lijndikte</value>
-  </data>
   <data name="DashStyle_DashDotDot_DisplayName" xml:space="preserve">
     <value>Streep-stip-stip</value>
   </data>
@@ -331,4 +328,16 @@
   <data name="DashStyle_Solid_DisplayName" xml:space="preserve">
     <value>Doorgetrokken</value>
   </data>
+  <data name="MapLineData_Color_Description" xml:space="preserve">
+    <value>De kleur van de lijnen waarmee deze kaartlaag wordt weergegeven.</value>
+  </data>
+  <data name="MapPolygonData_FillColor_Description" xml:space="preserve">
+    <value>De kleur van de vlakken waarmee deze kaartlaag wordt weergegeven.</value>
+  </data>
+  <data name="MapPolygonData_StrokeColor_Description" xml:space="preserve">
+    <value>De kleur van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven.</value>
+  </data>
+  <data name="MapPolygonData_StrokeThickness_Description" xml:space="preserve">
+    <value>De dikte van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs
===================================================================
diff -u -r899cae178642faba04c628db05a792b657b6d979 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 899cae178642faba04c628db05a792b657b6d979)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -40,7 +40,7 @@
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.MapData_Color_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_Color_Description))]
         [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(MapColorConverter))]
         public Color Color
@@ -58,7 +58,7 @@
 
         [PropertyOrder(6)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapLineData_Width_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeThickness_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_Width_Description))]
         public int Width
         {
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs
===================================================================
diff -u -r9db03162dd78287d02807c92b35d7d967fac9c8a -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 9db03162dd78287d02807c92b35d7d967fac9c8a)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -41,7 +41,7 @@
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.MapData_Color_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_Color_Description))]
         [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(MapColorConverter))]
         public Color Color
@@ -59,7 +59,7 @@
 
         [PropertyOrder(6)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapPointData_StrokeColor_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_StrokeColor_Description))]
         [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(MapColorConverter))]
@@ -78,7 +78,7 @@
 
         [PropertyOrder(7)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapPointData_StrokeThickness_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeThickness_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_StrokeThickness_Description))]
         public int StrokeThickness
         {
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -19,8 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using Core.Common.Gui.Attributes;
+using Core.Common.Utils.Attributes;
 using Core.Components.Gis.Data;
+using Core.Plugins.Map.Converters;
 using Core.Plugins.Map.Properties;
+using Core.Plugins.Map.UITypeEditors;
 
 namespace Core.Plugins.Map.PropertyClasses
 {
@@ -29,6 +36,61 @@
     /// </summary>
     public class MapPolygonDataProperties : FeatureBasedMapDataProperties<MapPolygonData>
     {
+        [PropertyOrder(5)]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_FillColor_Description))]
+        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [TypeConverter(typeof(MapColorConverter))]
+        public Color FillColor
+        {
+            get
+            {
+                return data.Style.FillColor;
+            }
+            set
+            {
+                data.Style.FillColor = value;
+                data.NotifyObservers();
+            }
+        }
+
+        [PropertyOrder(6)]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_StrokeColor_Description))]
+        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [TypeConverter(typeof(MapColorConverter))]
+        public Color StrokeColor
+        {
+            get
+            {
+                return data.Style.StrokeColor;
+            }
+            set
+            {
+                data.Style.StrokeColor = value;
+                data.NotifyObservers();
+            }
+        }
+
+        [PropertyOrder(7)]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeThickness_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_StrokeThickness_Description))]
+        public int StrokeThickness
+        {
+            get
+            {
+                return data.Style.StrokeThickness;
+            }
+            set
+            {
+                data.Style.StrokeThickness = value;
+                data.NotifyObservers();
+            }
+        }
+
         public override string Type
         {
             get
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs
===================================================================
diff -u -r899cae178642faba04c628db05a792b657b6d979 -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision 899cae178642faba04c628db05a792b657b6d979)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -83,7 +83,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
                                                                             "Stijl",
                                                                             "Kleur",
-                                                                            "De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven.");
+                                                                            "De kleur van de lijnen waarmee deze kaartlaag wordt weergegeven.");
 
             PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -refe5cc540b802c2307b33eadaa7912e38b9d68a3
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision efe5cc540b802c2307b33eadaa7912e38b9d68a3)
@@ -19,15 +19,29 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using Core.Components.Gis.Geometries;
+using Core.Components.Gis.Style;
+using Core.Plugins.Map.Converters;
 using Core.Plugins.Map.PropertyClasses;
 using NUnit.Framework;
+using Rhino.Mocks;
 
 namespace Core.Plugins.Map.Test.PropertyClasses
 {
     [TestFixture]
     public class MapPolygonDataPropertiesTest
     {
+        private const int fillColorPropertyIndex = 5;
+        private const int strokeColorPropertyIndex = 6;
+        private const int strokeThicknessPropertyIndex = 7;
+
         [Test]
         public void Constructor_ExpectedValues()
         {
@@ -39,5 +53,108 @@
             Assert.IsNull(properties.Data);
             Assert.AreEqual("Polygonen", properties.Type);
         }
+
+        [Test]
+        public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
+        {
+            // Setup
+            var mapPolygonData = new MapPolygonData("Test")
+            {
+                Features = new[]
+                {
+                    new MapFeature(Enumerable.Empty<MapGeometry>())
+                },
+                ShowLabels = true
+            };
+
+            // Call
+            var properties = new MapPolygonDataProperties
+            {
+                Data = mapPolygonData
+            };
+
+            // Assert
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(8, dynamicProperties.Count);
+
+            PropertyDescriptor colorProperty = dynamicProperties[fillColorPropertyIndex];
+            Assert.IsInstanceOf<MapColorConverter>(colorProperty.Converter);
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
+                                                                            "Stijl",
+                                                                            "Kleur",
+                                                                            "De kleur van de vlakken waarmee deze kaartlaag wordt weergegeven.");
+
+            PropertyDescriptor widthProperty = dynamicProperties[strokeColorPropertyIndex];
+            Assert.IsInstanceOf<MapColorConverter>(colorProperty.Converter);
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
+                                                                            "Stijl",
+                                                                            "Lijnkleur",
+                                                                            "De kleur van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven.");
+
+            PropertyDescriptor styleProperty = dynamicProperties[strokeThicknessPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
+                                                                            "Stijl",
+                                                                            "Lijndikte",
+                                                                            "De dikte van de lijn van de vlakken waarmee deze kaartlaag wordt weergegeven.");
+        }
+
+        [Test]
+        public void Data_SetNewMapPolygonDataInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            Color fillColor = Color.Aqua;
+            Color strokeColor = Color.Bisque;
+            const int strokeThickness = 4;
+
+            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(fillColor, strokeColor, strokeThickness));
+            var properties = new MapPolygonDataProperties();
+
+            // Call
+            properties.Data = mapPolygonData;
+
+            // Assert
+            Assert.AreEqual(mapPolygonData.ShowLabels, properties.ShowLabels);
+            Assert.AreEqual(string.Empty, properties.SelectedMetaDataAttribute.MetaDataAttribute);
+            Assert.AreEqual(mapPolygonData.MetaData, properties.GetAvailableMetaDataAttributes());
+
+            Assert.AreEqual(fillColor, properties.FillColor);
+            Assert.AreEqual(strokeColor, properties.StrokeColor);
+            Assert.AreEqual(strokeThickness, properties.StrokeThickness);
+        }
+
+        [Test]
+        public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers()
+        {
+            // Setup
+            const int numberOfChangedProperties = 3;
+            var mocks = new MockRepository();
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties);
+            mocks.ReplayAll();
+
+            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(Color.AliceBlue, Color.Blue, 3));
+
+            mapPolygonData.Attach(observerMock);
+
+            var properties = new MapPolygonDataProperties
+            {
+                Data = mapPolygonData
+            };
+
+            Color newFillColor = Color.Blue;
+            Color newStrokeColor = Color.Red;
+            const int newStrokeThickness = 6;
+
+            // Call
+            properties.FillColor = newFillColor;
+            properties.StrokeColor = newStrokeColor;
+            properties.StrokeThickness = newStrokeThickness;
+
+            // Assert
+            Assert.AreEqual(newFillColor, mapPolygonData.Style.FillColor);
+            Assert.AreEqual(newStrokeColor, mapPolygonData.Style.StrokeColor);
+            Assert.AreEqual(newStrokeThickness, mapPolygonData.Style.StrokeThickness);
+            mocks.VerifyAll();
+        }
     }
 }
\ No newline at end of file