Fix for styling of draganddrop layers (origo-map#1770)

Flodkvist · May 25, 2023 · dc90e68 · dc90e68
1 parent 1c8a05b
commit dc90e68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/controls/draganddrop.js b/src/controls/draganddrop.js
@@ -4,7 +4,6 @@ import GeoJSONFormat from 'ol/format/GeoJSON';
 import IGCFormat from 'ol/format/IGC';
 import KMLFormat from 'ol/format/KML';
 import TopoJSONFormat from 'ol/format/TopoJSON';
-import Style from '../style';
 import { Component, InputFile, Button, Element as El } from '../ui';
 
 const DragAndDrop = function DragAndDrop(options = {}) {
@@ -116,7 +115,6 @@ const DragAndDrop = function DragAndDrop(options = {}) {
           }
         }]
       };
-      const vectorStyles = Style.createGeometryStyle(featureStyles);
       dragAndDrop = new olDragAndDrop({
         formatConstructors: [
           GPXFormat,
@@ -161,7 +159,7 @@ const DragAndDrop = function DragAndDrop(options = {}) {
           features: event.features
         };
         if (!styleByAttribute) {
-          layerOptions.style = vectorStyles[event.features[0].getGeometry().getType()];
+          layerOptions.styleDef = featureStyles[event.features[0].getGeometry().getType()];
         }
         viewer.addLayer(layerOptions);
       });

diff --git a/src/viewer.js b/src/viewer.js
@@ -177,6 +177,12 @@ const Viewer = function Viewer(targetOption, options = {}) {
 
   const getStyles = () => styles;
 
+  const addStyle = function addStyle(styleName, styleProps) {
+    if (!(styleName in styles)) {
+      styles[styleName] = styleProps;
+    }
+  };
+
   const getResolutions = () => resolutions;
 
   const getMapUrl = () => {
@@ -419,6 +425,11 @@ const Viewer = function Viewer(targetOption, options = {}) {
     if (thisProps.layerParam && layerParams[thisProps.layerParam]) {
       layerProps = Object.assign({}, layerParams[thisProps.layerParam], thisProps);
     }
+    if (thisProps.styleDef && !thisProps.style) {
+      const styleId = generateUUID();
+      addStyle(styleId, [thisProps.styleDef]);
+      layerProps.style = styleId;
+    }
     const layer = Layer(layerProps, this);
     addLayerStylePicker(layerProps);
     if (insertBefore) {
@@ -497,12 +508,6 @@ const Viewer = function Viewer(targetOption, options = {}) {
     }
   };
 
-  const addStyle = function addStyle(styleName, styleProps) {
-    if (!(styleName in styles)) {
-      styles[styleName] = styleProps;
-    }
-  };
-
   const addMarker = function addMarker(coordinates, title, content, layerProps, showPopup) {
     maputils.createMarker(coordinates, title, content, this, layerProps, showPopup);
   };