@elastic/ems-client 8.3.0 → 8.3.3

package/test/ems_client_colour.test.ts

@@ -0,0 +1,140 @@
+/*
+ * 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 { FillLayerSpecification, LayerSpecification } from 'maplibre-gl';
+import { TMSService } from '../src';
+import { mlLayerTypes } from './ems_client_util';
+import chroma from 'chroma-js';
+
+function chroma2css(color: chroma.Color): string {
+  return `rgba(${color.rgba().join(',')})`;
+}
+
+describe('Transform colours', () => {
+  it('should return an empty array for non symbol layers without any paint property to update', () => {
+    mlLayerTypes
+      .filter((l) => l != 'symbol')
+      .forEach((type) => {
+        const layer = {
+          id: 'layer',
+          type,
+          layout: {},
+        } as LayerSpecification;
+        expect(TMSService.transformColorProperties(layer, '#FF0000', 'burn', 0)).toEqual([]);
+      });
+  });
+
+  it('should return an empty array for non symbol layer with an empty paint property', () => {
+    const layer = {
+      id: 'layer',
+      type: 'fill',
+      paint: {},
+    } as LayerSpecification;
+
+    expect(TMSService.transformColorProperties(layer, '#FF0000', 'lighten', 0)).toEqual([]);
+  });
+
+  it('should return a text-color for symbol layers without a paint property', () => {
+    const inColor = chroma('#D36086');
+    const textColor = chroma('rgba(0,0,0,1)');
+    const inOp = 'lighten';
+    const outColor = chroma.blend(textColor, inColor, inOp);
+
+    const transform = TMSService.transformColorProperties;
+
+    const layerWithTextColor = {
+      id: 'layer',
+      type: 'symbol',
+      paint: {
+        'text-color': chroma2css(textColor),
+      },
+    } as LayerSpecification;
+
+    const layerWithoutTextColor = {
+      id: 'layer',
+      type: 'symbol',
+      paint: {},
+    } as LayerSpecification;
+
+    const resultWithTextColor = transform(layerWithTextColor, inColor.hex('rgba'), inOp, 0);
+    const resultWithoutTextColor = transform(layerWithoutTextColor, inColor.hex('rgba'), inOp, 0);
+
+    expect(resultWithTextColor).toEqual([
+      {
+        color: chroma2css(outColor),
+        property: 'text-color',
+      },
+    ]);
+    expect(resultWithoutTextColor).toEqual([
+      {
+        color: chroma2css(outColor),
+        property: 'text-color',
+      },
+    ]);
+  });
+
+  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);
+  });
+});

package/test/ems_client_lang.test.ts

@@ -0,0 +1,122 @@
+/*
+ * 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 { LayerSpecification } from 'maplibre-gl';
+import { TMSService } from '../src';
+import { mlLayerTypes } from './ems_client_util';
+
+describe('Support for languages', () => {
+  it('should return undefined for non symbol layers', () => {
+    mlLayerTypes
+      .filter((l) => l !== 'symbol')
+      .forEach((type) => {
+        const layer = {
+          id: 'aLayer',
+          type,
+        } as LayerSpecification;
+
+        expect(TMSService.transformLanguageProperty(layer, 'en')).toBeUndefined();
+      });
+  });
+
+  it('should return undefined for non layers without a layout', () => {
+    const layer = {
+      id: 'aLayer',
+      type: 'symbol',
+    } as LayerSpecification;
+
+    expect(TMSService.transformLanguageProperty(layer, 'en')).toBeUndefined();
+  });
+
+  it('should return nothing for inexistent languages', () => {
+    const enDashLayer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{name_en}',
+      },
+    } as LayerSpecification;
+    const invalidLang = 'I_DONT_EXIST';
+
+    expect(TMSService.transformLanguageProperty(enDashLayer, invalidLang)).toBeUndefined();
+  });
+
+  it('should handle {name_XX} and {name:XX} definitions', () => {
+    const enDashLayer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{name_en}',
+      },
+    } as LayerSpecification;
+
+    const transformLangEn = TMSService.transformLanguageProperty(enDashLayer, 'en');
+
+    expect(transformLangEn).toEqual(['coalesce', ['get', 'name:en'], ['get', 'name_en']]);
+    const enColonLayer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{name:en}',
+      },
+    } as LayerSpecification;
+
+    const transformLangJa = TMSService.transformLanguageProperty(enColonLayer, 'ja-jp');
+
+    expect(transformLangJa).toEqual(['coalesce', ['get', 'name:ja'], ['get', 'name:en']]);
+  });
+
+  it('should handle {name:latin}\\n{name:nonlatin} definitions', () => {
+    const layer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{name:latin}\n{name:nonlatin}',
+      },
+    } as LayerSpecification;
+
+    const transform = TMSService.transformLanguageProperty(layer, 'ja-jp');
+
+    expect(transform).toEqual([
+      'coalesce',
+      ['get', 'name:ja'],
+      ['concat', ['get', 'name:latin'], '\n', ['get', 'name:nonlatin']],
+    ]);
+  });
+
+  it('should handle {name:latin} {name:nonlatin} definitions', () => {
+    const layer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{name:latin} {name:nonlatin}',
+      },
+    } as LayerSpecification;
+
+    const transform = TMSService.transformLanguageProperty(layer, 'ja-jp');
+
+    expect(transform).toEqual([
+      'coalesce',
+      ['get', 'name:ja'],
+      ['concat', ['get', 'name:latin'], '\n', ['get', 'name:nonlatin']],
+    ]);
+  });
+
+  it('should handle text field properties that are not translated', () => {
+    const layer = {
+      id: 'sampLayer',
+      type: 'symbol',
+      layout: {
+        'text-field': '{ref}',
+      },
+    } as LayerSpecification;
+
+    const transform = TMSService.transformLanguageProperty(layer, 'ja-jp');
+
+    expect(transform).toBe('{ref}');
+  });
+});

package/test/ems_client_util.ts

@@ -94,3 +94,15 @@ export function getEMSClient(options = {}) {
     });
   return { emsClient, getManifestMock };
 }
+
+export const mlLayerTypes = [
+  'background',
+  'circle',
+  'fill-extrusion',
+  'fill',
+  'heatmap',
+  'hillshade',
+  'line',
+  'raster',
+  'symbol',
+];

package/test/ems_mocks/sample_style_bright_vector_source.json

@@ -19,8 +19,8 @@
     4
   ],
   "description": "A tileset showcasing all layers in OpenMapTiles. https://openmaptiles.org",
-  "maxzoom": 10,
-  "minzoom": 0,
+  "maxzoom": 15,
+  "minzoom": 3,
   "pixel_scale": "256",
   "vector_layers": [
     {

package/target/origin.d.ts

@@ -1,4 +0,0 @@
-export declare const ORIGIN: {
-    EMS: string;
-    KIBANA_YML: string;
-};