Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs (.../MapDataHelper.cs) (revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs (.../MapDataHelper.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -53,6 +53,9 @@
case PointSymbol.Diamond:
shape = PointShape.Diamond;
break;
+ case PointSymbol.Star:
+ shape = PointShape.Star;
+ break;
default:
throw new InvalidEnumArgumentException(nameof(symbol),
(int) symbol,
Index: Core/Components/src/Core.Components.Gis/Properties/Resources.Designer.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Components/src/Core.Components.Gis/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/src/Core.Components.Gis/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -172,6 +172,15 @@
}
///
+ /// Looks up a localized string similar to Ster.
+ ///
+ internal static string Star_DisplayName {
+ get {
+ return ResourceManager.GetString("Star_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Driekhoek.
///
internal static string Triangle_DisplayName {
Index: Core/Components/src/Core.Components.Gis/Properties/Resources.resx
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Components/src/Core.Components.Gis/Properties/Resources.resx (.../Resources.resx) (revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/src/Core.Components.Gis/Properties/Resources.resx (.../Resources.resx) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -153,4 +153,7 @@
Driekhoek
+
+ Ster
+
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Style/PointSymbol.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Components/src/Core.Components.Gis/Style/PointSymbol.cs (.../PointSymbol.cs) (revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/src/Core.Components.Gis/Style/PointSymbol.cs (.../PointSymbol.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -36,6 +36,8 @@
[ResourcesDisplayName(typeof(Resources), nameof(Resources.Triangle_DisplayName))]
Triangle,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.Diamond_DisplayName))]
- Diamond
+ Diamond,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Star_DisplayName))]
+ Star
}
}
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataHelperTest.cs
===================================================================
diff -u -r87ac68e11e89dda424f6fe34e145ee901cdc4e5c -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataHelperTest.cs (.../MapDataHelperTest.cs) (revision 87ac68e11e89dda424f6fe34e145ee901cdc4e5c)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataHelperTest.cs (.../MapDataHelperTest.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -71,6 +71,16 @@
}
[Test]
+ public void Convert_Star_ReturnStar()
+ {
+ // Call
+ PointShape symbol = MapDataHelper.Convert(PointSymbol.Star);
+
+ // Assert
+ Assert.AreEqual(PointShape.Star, symbol);
+ }
+
+ [Test]
public void Convert_InvalidPointSymbol_ThrowsInvalidEnumArgumentException()
{
// Call
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs
===================================================================
diff -u -re8c1804f4a27a708313b7ba2512512b62ad2d3e6 -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs (.../MapLineDataProperties.cs) (revision e8c1804f4a27a708313b7ba2512512b62ad2d3e6)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs (.../MapLineDataProperties.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -61,8 +61,6 @@
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.MapLineData_Width_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_Width_Description))]
- [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
- [TypeConverter(typeof(MapColorConverter))]
public int Width
{
get
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs
===================================================================
diff -u -re8c1804f4a27a708313b7ba2512512b62ad2d3e6 -r76b76c41226d2981a674fb5a25b817931f2a1313
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs (.../MapLineDataPropertiesTest.cs) (revision e8c1804f4a27a708313b7ba2512512b62ad2d3e6)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs (.../MapLineDataPropertiesTest.cs) (revision 76b76c41226d2981a674fb5a25b817931f2a1313)
@@ -25,7 +25,6 @@
using System.Linq;
using Core.Common.Base;
using Core.Common.TestUtil;
-using Core.Common.Utils;
using Core.Components.Gis.Data;
using Core.Components.Gis.Features;
using Core.Components.Gis.Geometries;
@@ -42,7 +41,7 @@
{
private const int colorPropertyIndex = 5;
private const int widthPropertyIndex = 6;
- private const int lineStylePropertyIndex = 7;
+ private const int stylePropertyIndex = 7;
[Test]
public void Constructor_ExpectedValues()
@@ -86,14 +85,14 @@
"Kleur",
"De kleur van de symbolen waarmee deze kaartlaag wordt weergegeven.");
- PropertyDescriptor strokeColorProperty = dynamicProperties[widthPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
+ PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
"Stijl",
"Lijndikte",
"De dikte van de lijnen waarmee deze kaartlaag wordt weergegeven.");
- PropertyDescriptor strokeThicknessProperty = dynamicProperties[lineStylePropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
+ PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
"Stijl",
"Lijnstijl",
"De stijl van de lijnen waarmee deze kaartlaag wordt weergegeven.");