Index: Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs
===================================================================
diff -u -r7fcd0c3e627c8a69c3b4618c09782321a5b78c2e -r09a80719dc9424b9c7e092b3ad9b0686b16676ae
--- Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 7fcd0c3e627c8a69c3b4618c09782321a5b78c2e)
+++ Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 09a80719dc9424b9c7e092b3ad9b0686b16676ae)
@@ -41,6 +41,7 @@
         protected FeatureBasedMapData(string name) : base(name)
         {
             features = new MapFeature[0];
+            ShowLabels = false;
         }
 
         /// <summary>
@@ -76,5 +77,10 @@
                 throw new ArgumentNullException("featuresToValidate", @"The array of features cannot be null or contain null.");
             }
         }
+
+        /// <summary>
+        /// Gets or sets a value indicating wheter the labels of the <see cref="FeatureBasedMapData"/> should be shown.
+        /// </summary>
+        public bool ShowLabels { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Data/MapData.cs
===================================================================
diff -u -r44e2c0b1a9a5cf648e6287c2f02038cc1d598c46 -r09a80719dc9424b9c7e092b3ad9b0686b16676ae
--- Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision 44e2c0b1a9a5cf648e6287c2f02038cc1d598c46)
+++ Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision 09a80719dc9424b9c7e092b3ad9b0686b16676ae)
@@ -40,7 +40,6 @@
         {
             Name = name;
             IsVisible = true;
-            ShowLabels = false;
         }
 
         /// <summary>
@@ -67,10 +66,5 @@
         /// Gets or sets a value indicating whether the <see cref="MapData"/> is visible.
         /// </summary>
         public bool IsVisible { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating wheter the labels of the <see cref="MapData"/> should be shown.
-        /// </summary>
-        public bool ShowLabels { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs
===================================================================
diff -u -red96d38a758365e4c0f117def83a2926c589c18a -r09a80719dc9424b9c7e092b3ad9b0686b16676ae
--- Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision ed96d38a758365e4c0f117def83a2926c589c18a)
+++ Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision 09a80719dc9424b9c7e092b3ad9b0686b16676ae)
@@ -41,6 +41,7 @@
             // Assert
             Assert.AreEqual("test data", data.Name);
             Assert.IsEmpty(data.Features);
+            Assert.IsFalse(data.ShowLabels);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs
===================================================================
diff -u -r44e2c0b1a9a5cf648e6287c2f02038cc1d598c46 -r09a80719dc9424b9c7e092b3ad9b0686b16676ae
--- Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs	(.../MapDataTest.cs)	(revision 44e2c0b1a9a5cf648e6287c2f02038cc1d598c46)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs	(.../MapDataTest.cs)	(revision 09a80719dc9424b9c7e092b3ad9b0686b16676ae)
@@ -57,7 +57,6 @@
             Assert.IsInstanceOf<Observable>(data);
             Assert.AreEqual(name, data.Name);
             Assert.IsTrue(data.IsVisible);
-            Assert.IsFalse(data.ShowLabels);
         }
 
         [Test]