Merge pull request #68 from OpenWebconcept/feature/AS-20050

AS-20050 Extend custom color to polygons.

Author: merelacato

build/blocks/owc-openkaarten/streetmap/client.js

@@ -1,5 +1,5 @@
 {
-    "/blocks/owc-openkaarten/streetmap/client.js": "/blocks/owc-openkaarten/streetmap/client.js?id=abba2af106ce02a7f12fc5c987be36ae",
+    "/blocks/owc-openkaarten/streetmap/client.js": "/blocks/owc-openkaarten/streetmap/client.js?id=09deb186ca339d57438a62d9f2072970",
     "/blocks/owc-openkaarten/streetmap/style.css": "/blocks/owc-openkaarten/streetmap/style.css?id=b3188898fe0cdd30cad5c03ec8995bf6",
     "/blocks/owc-openkaarten/streetmap/editor.css": "/blocks/owc-openkaarten/streetmap/editor.css?id=f4316f0723fb86e3b028a9b448b1f3ae"
 }

build/blocks/owc-openkaarten/streetmap/client.js.map

@@ -101,16 +101,36 @@ const attachEvents = (marker, location, set) => {
 	});
 };
 
-// Helper function to get color from marker config
-const getColorFromMarker = (markerConfig) => {
+// Helper function to get color from marker config.
+const getColorFromMarker = (markerConfig, props) => {
+  const colorMap = {
+    "marker-black": "#000000",
+    "marker-blue": "#0072B2",
+    "marker-brown": "#A0522D",
+    "marker-darkgray": "#555555",
+    "marker-deep-purple": "#4B0082",
+    "marker-gray": "#757575",
+    "marker-green": "#008661",
+    "marker-navy-blue": "#003366",
+    "marker-orange": "#9D6D00",
+    "marker-purple": "#A26085",
+    "marker-red": "#C15500",
+    "marker-turquoise": "#3B7BA0",
+    "marker-yellow": "#7E7722",
+  };
+
   if (!markerConfig) return props.primaryColor;
-  
+
   // If marker has a custom color, use that
-  if (markerConfig.color) return markerConfig.color;
-  
+  if (markerConfig.color) {
+    return colorMap[markerConfig.color];
+  }
+
   // If marker has a custom icon with color, use that
-  if (markerConfig.icon?.color) return markerConfig.icon.color;
-  
+  if (markerConfig.icon?.color) {
+    return colorMap[markerConfig.icon.color];
+  }
+
   return props.primaryColor;
 };