[Maps] Remove client-side scaling of ordinal values

x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js

@@ -64,13 +64,17 @@ export function getColorRampCenterColor(colorRampName) {
 
 // Returns an array of color stops
 // [ stop_input_1: number, stop_output_1: color, stop_input_n: number, stop_output_n: color ]
-export function getOrdinalColorRampStops(colorRampName, numberColors = GRADIENT_INTERVALS) {
+export function getOrdinalColorRampStops(colorRampName, min, max) {
   if (!colorRampName) {
     return null;
   }
+
+  const numberColors = GRADIENT_INTERVALS;
+  const delta = max - min;
   return getHexColorRangeStrings(colorRampName, numberColors).reduce(
     (accu, stopColor, idx, srcArr) => {
-      const stopNumber = idx / srcArr.length; // number between 0 and 1, increasing as index increases
+      // const stopNumber = idx / srcArr.length; // number between 0 and 1, increasing as index increases
+      const stopNumber = delta > 0 ? min + (delta * idx) / srcArr.length : 1;
       return [...accu, stopNumber, stopColor];
     },
     []

x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js

@@ -61,7 +61,7 @@ describe('getColorRampCenterColor', () => {
 
 describe('getColorRampStops', () => {
   it('Should create color stops for color ramp', () => {
-    expect(getOrdinalColorRampStops('Blues')).toEqual([
+    expect(getOrdinalColorRampStops('Blues', 0, 1)).toEqual([
       0,
       '#f7faff',
       0.125,

x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js

@@ -81,7 +81,7 @@ export class HeatmapStyle extends AbstractStyle {
 
     const { colorRampName } = this._descriptor;
     if (colorRampName && colorRampName !== DEFAULT_HEATMAP_COLOR_RAMP_NAME) {
-      const colorStops = getOrdinalColorRampStops(colorRampName);
+      const colorStops = getOrdinalColorRampStops(colorRampName, 0, 1);
       mbMap.setPaintProperty(layerId, 'heatmap-color', [
         'interpolate',
         ['linear'],

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js

@@ -88,10 +88,6 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     return true;
   }
 
-  isOrdinalScaled() {
-    return this.isOrdinal() && !this.isCustomOrdinalColorRamp();
-  }
-
   isOrdinalRanged() {
     return this.isOrdinal() && !this.isCustomOrdinalColorRamp();
   }
@@ -232,7 +228,11 @@ export class DynamicColorProperty extends DynamicStyleProperty {
         return [...accumulatedStops, nextStop.stop, nextStop.color];
       }, []);
     } else {
-      return getOrdinalColorRampStops(this._options.color);
+      const rangeFieldMeta = this.getFieldMeta();
+      if (!rangeFieldMeta) {
+        return null;
+      }
+      return getOrdinalColorRampStops(this._options.color, rangeFieldMeta.min, rangeFieldMeta.max);
     }
   }
 

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js

@@ -25,8 +25,4 @@ export class DynamicOrientationProperty extends DynamicStyleProperty {
   supportsFeatureState() {
     return false;
   }
-
-  isOrdinalScaled() {
-    return false;
-  }
 }

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js

@@ -121,25 +121,28 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
   }
 
   getMbSizeExpression() {
-    if (this._isSizeDynamicConfigComplete(this._options)) {
-      return this._getMbDataDrivenSize({
-        targetName: this.getComputedFieldName(),
-        minSize: this._options.minSize,
-        maxSize: this._options.maxSize,
-      });
+    if (!this._isSizeDynamicConfigComplete(this._options)) {
+      return null;
     }
-    return null;
+
+    return this._getMbDataDrivenSize({
+      targetName: this.getComputedFieldName(),
+      minSize: this._options.minSize,
+      maxSize: this._options.maxSize,
+    });
   }
 
   _getMbDataDrivenSize({ targetName, minSize, maxSize }) {
+    const rangeFieldMeta = this.getFieldMeta();
+
     const lookup = this.supportsFeatureState() ? 'feature-state' : 'get';
     return [
       'interpolate',
       ['linear'],
       ['coalesce', [lookup, targetName], 0],
-      0,
+      rangeFieldMeta.min,
       minSize,
-      1,
+      rangeFieldMeta.max,
       maxSize,
     ];
   }
@@ -149,7 +152,8 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
       this._field &&
       this._field.isValid() &&
       _.has(this._options, 'minSize') &&
-      _.has(this._options, 'maxSize')
+      _.has(this._options, 'maxSize') &&
+      this.getFieldMeta()
     );
   }
 

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js

@@ -8,7 +8,7 @@ import _ from 'lodash';
 import { AbstractStyleProperty } from './style_property';
 import { DEFAULT_SIGMA } from '../vector_style_defaults';
 import { COLOR_PALETTE_MAX_SIZE, STYLE_TYPE } from '../../../../../common/constants';
-import { scaleValue, getComputedFieldName } from '../style_util';
+import { getComputedFieldName } from '../style_util';
 import React from 'react';
 import { OrdinalLegend } from './components/ordinal_legend';
 import { CategoricalLegend } from './components/categorical_legend';
@@ -84,7 +84,7 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
 
   supportsFieldMeta() {
     if (this.isOrdinal()) {
-      return this.isComplete() && this.isOrdinalScaled() && this._field.supportsFieldMeta();
+      return this.isComplete() && this._field.supportsFieldMeta();
     } else if (this.isCategorical()) {
       return this.isComplete() && this._field.supportsFieldMeta();
     } else {
@@ -109,10 +109,6 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     return true;
   }
 
-  isOrdinalScaled() {
-    return true;
-  }
-
   getFieldMetaOptions() {
     return _.get(this.getOptions(), 'fieldMetaOptions', {});
   }
@@ -245,9 +241,6 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     }
 
     const valueAsFloat = parseFloat(value);
-    if (this.isOrdinalScaled()) {
-      return scaleValue(valueAsFloat, this.getFieldMeta());
-    }
     if (isNaN(valueAsFloat)) {
       return 0;
     }

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js

@@ -28,8 +28,4 @@ export class DynamicTextProperty extends DynamicStyleProperty {
   supportsFeatureState() {
     return false;
   }
-
-  isOrdinalScaled() {
-    return false;
-  }
 }

x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js

@@ -34,22 +34,6 @@ export function isOnlySingleFeatureType(featureType, supportedFeatures, hasFeatu
   }, true);
 }
 
-export function scaleValue(value, range) {
-  if (isNaN(value) || !range) {
-    return -1; //Nothing to scale, put outside scaled range
-  }
-
-  if (range.delta === 0 || value >= range.max) {
-    return 1; //snap to end of scaled range
-  }
-
-  if (value <= range.min) {
-    return 0; //snap to beginning of scaled range
-  }
-
-  return (value - range.min) / range.delta;
-}
-
 export function assignCategoriesToPalette({ categories, paletteValues }) {
   const stops = [];
   let fallback = null;

x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isOnlySingleFeatureType, scaleValue, assignCategoriesToPalette } from './style_util';
+import { isOnlySingleFeatureType, assignCategoriesToPalette } from './style_util';
 import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
 
 describe('isOnlySingleFeatureType', () => {
@@ -62,32 +62,6 @@ describe('isOnlySingleFeatureType', () => {
   });
 });
 
-describe('scaleValue', () => {
-  test('Should scale value between 0 and 1', () => {
-    expect(scaleValue(5, { min: 0, max: 10, delta: 10 })).toBe(0.5);
-  });
-
-  test('Should snap value less then range min to 0', () => {
-    expect(scaleValue(-1, { min: 0, max: 10, delta: 10 })).toBe(0);
-  });
-
-  test('Should snap value greater then range max to 1', () => {
-    expect(scaleValue(11, { min: 0, max: 10, delta: 10 })).toBe(1);
-  });
-
-  test('Should snap value to 1 when tere is not range delta', () => {
-    expect(scaleValue(10, { min: 10, max: 10, delta: 0 })).toBe(1);
-  });
-
-  test('Should put value as -1 when value is not provided', () => {
-    expect(scaleValue(undefined, { min: 0, max: 10, delta: 10 })).toBe(-1);
-  });
-
-  test('Should put value as -1 when range is not provided', () => {
-    expect(scaleValue(5, undefined)).toBe(-1);
-  });
-});
-
 describe('assignCategoriesToPalette', () => {
   test('Categories and palette values have same length', () => {
     const categories = [{ key: 'alpah' }, { key: 'bravo' }, { key: 'charlie' }, { key: 'delta' }];