@elastic/ems-client 8.3.2 → 8.4.0

package/target/web/utils.js

@@ -1,19 +1,12 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import chroma from 'chroma-js';
 
+import chroma from 'chroma-js';
 /**
  * Resolves a target URL path relative to the host.
  * This is specifically useed by the Kibana proxy re-routing.
@@ -23,10 +16,8 @@ export function toAbsoluteUrl(host, path) {
   if (!host) {
     return path;
   }
-
   var hostEndWithSlash = host[host.length - 1] === '/';
   var pathStartsWithSlash = path[0] === '/';
-
   if (hostEndWithSlash === true && pathStartsWithSlash === true) {
     return host + path.slice(1);
   } else if (hostEndWithSlash !== pathStartsWithSlash) {
@@ -35,6 +26,7 @@ export function toAbsoluteUrl(host, path) {
     return host + '/' + path;
   }
 }
+
 /*
 Type with the possible ways to define a color in maplibre
 */
@@ -51,22 +43,22 @@ function transformColor(paintColor, func) {
       var newColor = transformColor(stop[1], func);
       return [stop[0], newColor];
     });
-
-    var newPaintColor = _objectSpread(_objectSpread({}, paintColor), stops);
-
+    var newPaintColor = Object.assign({}, paintColor, {
+      stops: stops
+    });
     return newPaintColor;
   } else return paintColor;
 }
+
 /*
 This is the function used to generate the current EMS desaturated roadmap
 */
-
-
 export function desaturateColor(paintColor) {
   return transformColor(paintColor, function (color) {
     return chroma(color).desaturate(1.1).brighten(0.33);
   });
 }
+
 /*
 Blends an original maplibre color definition with a destination
 color. Accepts different blending modes and an additional `mix`
@@ -77,7 +69,6 @@ More details:
 https://gka.github.io/chroma.js/#chroma-blend
 https://gka.github.io/chroma.js/#chroma-mix
 */
-
 export function colorizeColor(sourceColor, destColor) {
   var operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'screen';
   var percentage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0.5;

package/test/ems_client_colour.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LayerSpecification } from 'maplibre-gl';
+import { FillLayerSpecification, LayerSpecification } from 'maplibre-gl';
 import { TMSService } from '../src';
 import { mlLayerTypes } from './ems_client_util';
 import chroma from 'chroma-js';
@@ -76,4 +76,65 @@ describe('Transform colours', () => {
       },
     ]);
   });
+
+  it('should work with color expressions with stops', () => {
+    const inColor = chroma('#D36086');
+    const fillColors = [chroma('rgba(0,0,0,1)'), chroma('rgba(255,0,0,1)')];
+    const inOp = 'lighten';
+
+    const outColors = fillColors.map((fillColor) => {
+      return chroma.blend(fillColor, inColor, inOp);
+    });
+
+    const transform = TMSService.transformColorProperties;
+
+    const layerWithTextColor = {
+      id: 'layer',
+      type: 'fill',
+      source: '',
+      paint: {
+        'fill-color': {
+          base: 1,
+          stops: fillColors.map((fillColor) => {
+            return [1, chroma2css(fillColor)];
+          }),
+        } as unknown,
+      },
+    } as FillLayerSpecification;
+
+    const { color } = transform(layerWithTextColor, inColor.hex('rgba'), inOp, 0)[0];
+
+    expect(color).toEqual({
+      base: 1,
+      stops: outColors.map((fillColor) => {
+        return [1, chroma2css(fillColor)];
+      }),
+    });
+  });
+
+  it('should return the same colors if no input color is specified', () => {
+    const fillColors = ['#ff0000', '#00ff00', '#0000ff'];
+
+    const transform = TMSService.transformColorProperties;
+
+    const fillColorPaint = {
+      base: 1,
+      stops: fillColors.map((fillColor) => {
+        return [1, fillColor];
+      }),
+    };
+
+    const layerWithFillColor = {
+      id: 'layer',
+      type: 'fill',
+      paint: {
+        'fill-color': fillColorPaint,
+      } as unknown,
+    } as FillLayerSpecification;
+
+    const { color, property } = transform(layerWithFillColor)[0];
+
+    expect(property).toEqual('fill-color');
+    expect(color).toEqual(fillColorPaint);
+  });
 });