improve readability

elastic · Mar 23, 2020 · 0257429 · 0257429
1 parent 0342357
commit 0257429
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
@@ -278,10 +278,6 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     }
   }
 
-  getFormattedValue(value) {
-    return this.isOrdinal() ? this.getNumericalMbFeatureStateValue(value) : this.formatField(value);
-  }
-
   getNumericalMbFeatureStateValue(value) {
     const valueAsFloat = parseFloat(value);
     return isNaN(valueAsFloat) ? null : valueAsFloat;

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
@@ -510,7 +510,12 @@ export class VectorStyle extends AbstractStyle {
           //in practice, a new system property will only be created for:
           // - label text: this requires the value to be formatted first.
           // - icon orientation: this is a lay-out property which do not support feature-state (but we're still coercing to a number)
-          feature.properties[computedName] = dynamicStyleProp.getFormattedValue(rawValue);
+
+          const formattedValue = dynamicStyleProp.isOrdinal()
+            ? dynamicStyleProp.getNumericalMbFeatureStateValue(rawValue)
+            : dynamicStyleProp.formatField(rawValue);
+
+          feature.properties[computedName] = formattedValue;
         }
       }
       tmpFeatureIdentifier.source = mbSourceId;