Merge 2f8bc28 into fe0445a

terrestris · Jun 14, 2021 · 82b943e · 82b943e
2 parents fe0445a + 2f8bc28
commit 82b943e
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/Button/DigitizeButton/DigitizeButton.jsx b/src/Button/DigitizeButton/DigitizeButton.jsx
@@ -518,7 +518,6 @@ class DigitizeButton extends React.Component {
       map,
       drawType,
       editType,
-      drawStyle,
       onFeatureSelect
     } = this.props;
 
@@ -532,9 +531,6 @@ class DigitizeButton extends React.Component {
     this._digitizeFeatures = digitizeLayer.getSource().getFeaturesCollection();
 
     if (pressed) {
-      if (drawStyle) {
-        digitizeLayer.setStyle(this.getDigitizeStyleFunction);
-      }
       if (drawType) {
         this.createDrawInteraction(pressed);
       } else if (editType) {
@@ -596,12 +592,18 @@ class DigitizeButton extends React.Component {
       drawStyle,
     } = this.props;
 
-    let styleObj;
+    if (!feature.getGeometry()) {
+      return null;
+    }
+
+    if (drawStyle) {
+      return isFunction(drawStyle) ? drawStyle(feature) : drawStyle;
+    }
 
     switch (feature.getGeometry().getType()) {
       case DigitizeButton.POINT_DRAW_TYPE: {
         if (!feature.get('isLabel')) {
-          styleObj = drawStyle || new OlStyleStyle({
+          return new OlStyleStyle({
             image: new OlStyleCircle({
               radius: 7,
               fill: new OlStyleFill({
@@ -613,7 +615,7 @@ class DigitizeButton extends React.Component {
             })
           });
         } else {
-          styleObj = drawStyle || new OlStyleStyle({
+          return new OlStyleStyle({
             text: new OlStyleText({
               text: feature.get('label'),
               offsetX: 5,
@@ -628,20 +630,18 @@ class DigitizeButton extends React.Component {
             })
           });
         }
-        return styleObj;
       }
       case DigitizeButton.LINESTRING_DRAW_TYPE: {
-        styleObj = drawStyle || new OlStyleStyle({
+        return new OlStyleStyle({
           stroke: new OlStyleStroke({
             color: DigitizeButton.DEFAULT_STROKE_COLOR,
             width: 2
           })
         });
-        return styleObj;
       }
       case DigitizeButton.POLYGON_DRAW_TYPE:
       case DigitizeButton.CIRCLE_DRAW_TYPE: {
-        styleObj = drawStyle || new OlStyleStyle({
+        return new OlStyleStyle({
           fill: new OlStyleFill({
             color: DigitizeButton.DEFAULT_FILL_COLOR
           }),
@@ -650,10 +650,9 @@ class DigitizeButton extends React.Component {
             width: 2
           })
         });
-        return styleObj;
       }
       default: {
-        break;
+        return null;
       }
     }
   }