@elastic/ems-client 8.3.3 → 8.4.1

package/target/node/tms_service.js

@@ -4,94 +4,71 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TMSService = void 0;
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _ems_service = require("./ems_service");
-
 var _utils = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /*
+                                                                                                                                                                                                                                                                                                                                                                                           * 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.
+                                                                                                                                                                                                                                                                                                                                                                                           */
 class TMSService extends _ems_service.AbstractEmsService {
-  /*
-  List of supported languages with labels and OMT codes extracted
-  from https://openmaptiles.org/languages
-   Keys are values for i18.locale from Kibana settings
-  and OMT codes for the rest. 
-  */
-
-  /*
-  Suggested default operations for the different EMS styles
-  */
   constructor(config, emsClient, proxyPath) {
     super(config, emsClient, proxyPath);
-
     _defineProperty(this, "_config", void 0);
-
     _defineProperty(this, "_getRasterStyleJson", _lodash.default.once(async () => {
       const rasterUrl = this._getStyleUrlForLocale('raster');
-
       if (rasterUrl) {
         const url = this._proxyPath + this._getAbsoluteUrl(rasterUrl);
-
         return this._emsClient.getManifest(this._emsClient.extendUrlWithParams(url));
       } else {
         return;
       }
     }));
-
     _defineProperty(this, "_getVectorStyleJsonRaw", _lodash.default.once(async () => {
       const vectorUrl = this._getStyleUrlForLocale('vector');
-
       if (vectorUrl) {
         const url = this._proxyPath + this._getAbsoluteUrl(vectorUrl);
-
         const vectorJson = await this._emsClient.getManifest(this._emsClient.extendUrlWithParams(url));
-        return { ...vectorJson
+        return {
+          ...vectorJson
         };
       } else {
         return;
       }
     }));
-
     _defineProperty(this, "_getVectorStyleJsonInlined", _lodash.default.once(async () => {
       const vectorJson = await this._getVectorStyleJsonRaw();
-
       if (vectorJson) {
         const inlinedSources = {};
         const {
           sources
         } = vectorJson;
-
         for (const sourceName of Object.getOwnPropertyNames(sources)) {
           const {
             url
           } = sources[sourceName];
-
           if (url) {
-            var _sourceJson$tiles;
-
             const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
-
             const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
-
             const sourceJson = await this._emsClient.getManifest(extendedUrl);
-            const tiles = sourceJson === null || sourceJson === void 0 ? void 0 : (_sourceJson$tiles = sourceJson.tiles) === null || _sourceJson$tiles === void 0 ? void 0 : _sourceJson$tiles.map(tileUrl => {
+            const tiles = sourceJson?.tiles?.map(tileUrl => {
               const directUrl = this._proxyPath + this._getAbsoluteUrl(tileUrl);
-
               return this._emsClient.extendUrlWithParams(directUrl);
             });
-            inlinedSources[sourceName] = { ...sourceJson,
+            inlinedSources[sourceName] = {
+              ...sourceJson,
               type: 'vector',
               tiles
             };
           }
         }
-
-        return { ...vectorJson,
+        return {
+          ...vectorJson,
           sources: inlinedSources,
           sprite: await this._getSpriteSheetRootPath(),
           glyphs: await this._getUrlTemplateForGlyphs()
@@ -100,43 +77,35 @@ class TMSService extends _ems_service.AbstractEmsService {
         return;
       }
     }));
-
     this._config = config;
   }
+
   /*
   This method returns an array of objects with the layers and the new
   layout['text-field'] to apply using map.setLayoutProperty
   */
-
-
   static transformLanguageProperty(layer, lang) {
     const supportedLang = this.SupportedLanguages.find(l => l.key === lang);
-
     if (layer.type === 'symbol' && layer.layout !== undefined && supportedLang !== undefined) {
       const omtLang = supportedLang.omt;
       const textField = layer.layout['text-field'];
-
       if (textField && typeof textField === 'string') {
         return TMSService._getTextField(textField, omtLang);
       }
     }
-
     return;
   }
+
   /*
   This method returns an array of objects per layer, containing a list of
   properties with new colors to apply using map.setPaintProperty
   */
-
-
   static transformColorProperties(layer, color, operation, percentage) {
     if (['background', 'fill', 'line', 'symbol'].indexOf(layer.type) !== -1 && layer.paint) {
       const paint = layer.paint;
-
       if (layer.type === 'symbol' && Object.keys(paint).length === 0) {
         paint['text-color'] = 'rgb(0,0,0)';
       }
-
       const types = Object.keys(paint).filter(key => {
         return ['background-color', 'circle-color', 'circle-stroke-color', 'fill-color', 'fill-extrusion-color', 'fill-outline-color', 'icon-color', 'icon-halo-color', 'line-color', 'text-color', 'text-halo-color'].indexOf(key) !== -1;
       });
@@ -151,29 +120,26 @@ class TMSService extends _ems_service.AbstractEmsService {
       return [];
     }
   }
-
   static _getTextField(label, lang) {
     // Capture {name:xx} labels
     const labelMatch = label.match(/\{name([:_])(.{2})\}/);
-
     if (labelMatch && labelMatch[1] != lang) {
       // Only apply if the languages are different
       return ['coalesce', ['get', `name:${lang}`], ['get', `name${labelMatch[1]}${labelMatch[2]}`]];
     } else if (label.includes('latin') && label.includes('nonlatin')) {
       // Capture the common pattern {name:latin}\n{name:nonlatin}
       return ['coalesce', ['get', `name:${lang}`], ['concat', ['get', 'name:latin'], '\n', ['get', 'name:nonlatin']]];
-    } // If no case is found, return the input label
-
+    }
 
+    // If no case is found, return the input label
     return label;
   }
-
   async getDefaultRasterStyle() {
     const tileJson = await this._getRasterStyleJson();
-
     if (tileJson) {
       const tiles = tileJson.tiles.map(tile => this._proxyPath + this._getAbsoluteUrl(tile));
-      return { ...tileJson,
+      return {
+        ...tileJson,
         ...{
           tiles
         }
@@ -182,49 +148,36 @@ class TMSService extends _ems_service.AbstractEmsService {
       return;
     }
   }
-
   async getUrlTemplate() {
     const tileJson = await this._getRasterStyleJson();
-
     if (tileJson) {
       const directUrl = this._proxyPath + this._getAbsoluteUrl(tileJson.tiles[0]);
-
       return this._emsClient.extendUrlWithParams(directUrl);
     } else {
       return '';
     }
   }
-
   async getUrlTemplateForVector(sourceId) {
-    var _tileJson$sources$sou, _tileJson$sources$sou2;
-
     const tileJson = await this._getVectorStyleJsonInlined();
-    const url = tileJson === null || tileJson === void 0 ? void 0 : (_tileJson$sources$sou = tileJson.sources[sourceId]) === null || _tileJson$sources$sou === void 0 ? void 0 : (_tileJson$sources$sou2 = _tileJson$sources$sou.tiles) === null || _tileJson$sources$sou2 === void 0 ? void 0 : _tileJson$sources$sou2.pop();
-
+    const url = tileJson?.sources[sourceId]?.tiles?.pop();
     if (url) {
       const directUrl = this._proxyPath + this._getAbsoluteUrl(url);
-
       return this._emsClient.extendUrlWithParams(directUrl);
     } else {
       return '';
     }
   }
-
   async getVectorStyleSheet() {
     return await this._getVectorStyleJsonInlined();
   }
-
   async getVectorStyleSheetRaw() {
     return await this._getVectorStyleJsonRaw();
   }
-
   async getSpriteSheetMeta(isRetina = false) {
     const metaUrl = await this.getSpriteSheetJsonPath(isRetina);
     const spritePngs = await this.getSpriteSheetPngPath(isRetina);
-
     if (metaUrl && spritePngs) {
       const metaUrlExtended = this._emsClient.extendUrlWithParams(metaUrl);
-
       const jsonMeta = await this._emsClient.getManifest(metaUrlExtended);
       return {
         png: spritePngs,
@@ -234,10 +187,8 @@ class TMSService extends _ems_service.AbstractEmsService {
       return;
     }
   }
-
   async getSpriteSheetJsonPath(isRetina = false) {
     const spriteSheetRootPath = await this._getSpriteSheetRootPath();
-
     if (spriteSheetRootPath) {
       const suffix = isRetina ? '@2x' : '';
       return spriteSheetRootPath + suffix + '.json';
@@ -245,10 +196,8 @@ class TMSService extends _ems_service.AbstractEmsService {
       return '';
     }
   }
-
   async getSpriteSheetPngPath(isRetina = false) {
     const spriteSheetRootPath = await this._getSpriteSheetRootPath();
-
     if (spriteSheetRootPath) {
       const suffix = isRetina ? '@2x' : '';
       return spriteSheetRootPath + suffix + '.png';
@@ -256,11 +205,9 @@ class TMSService extends _ems_service.AbstractEmsService {
       return '';
     }
   }
-
   getDisplayName() {
     return this._emsClient.getValueInLanguage(this._config.name);
   }
-
   async getMinZoom(format = 'vector') {
     switch (format) {
       case 'vector':
@@ -272,18 +219,15 @@ class TMSService extends _ems_service.AbstractEmsService {
         return Math.min(...Object.values(sources).map(({
           minzoom
         }) => minzoom).filter(minzoom => Number.isFinite(minzoom)));
-
       case 'raster':
         const {
           minzoom
         } = (await this._getRasterStyleJson()) || {};
         return minzoom;
-
       default:
         return;
     }
   }
-
   async getMaxZoom(format = 'vector') {
     switch (format) {
       case 'vector':
@@ -295,78 +239,66 @@ class TMSService extends _ems_service.AbstractEmsService {
         return Math.max(...Object.values(sources).map(({
           maxzoom
         }) => maxzoom).filter(maxzoom => Number.isFinite(maxzoom)));
-
       case 'raster':
         const {
           maxzoom
         } = (await this._getRasterStyleJson()) || {};
         return maxzoom;
-
       default:
         return;
     }
   }
-
   getId() {
     return this._config.id;
   }
-
   hasId(id) {
     return this._config.id === id;
   }
-
   getApiUrl() {
     return this._emsClient.getTileApiUrl();
   }
-
   _getStyleUrlForLocale(formatType) {
     let vectorFormats = this._getFormats(formatType, this._emsClient.getLocale());
-
     if (!vectorFormats.length) {
       //fallback to default locale
       vectorFormats = this._getFormats(formatType, this._emsClient.getDefaultLocale());
     }
-
     if (!vectorFormats.length) {
       // eslint-disable-next-line max-len
       throw new Error(`Cannot find ${formatType} tile layer for locale ${this._emsClient.getLocale()} or ${this._emsClient.getDefaultLocale()}`);
     }
-
     const defaultStyle = vectorFormats[0];
-
     if (defaultStyle && defaultStyle.hasOwnProperty('url')) {
       return defaultStyle.url;
     }
   }
-
   _getFormats(formatType, locale) {
     return this._config.formats.filter(format => format.locale === locale && format.format === formatType);
   }
-
   async _getSpriteSheetRootPath() {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
-
-    if (vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.sprite) {
+    if (vectorStyleJson?.sprite) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.sprite);
     } else {
       return '';
     }
   }
-
   async _getUrlTemplateForGlyphs() {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
-
-    if (vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.glyphs) {
+    if (vectorStyleJson?.glyphs) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.glyphs);
     } else {
       return '';
     }
   }
-
 }
-
 exports.TMSService = TMSService;
-
+/*
+List of supported languages with labels and OMT codes extracted
+from https://openmaptiles.org/languages
+ Keys are values for i18.locale from Kibana settings
+and OMT codes for the rest. 
+*/
 _defineProperty(TMSService, "SupportedLanguages", [{
   key: 'ar',
   omt: 'ar'
@@ -545,7 +477,9 @@ _defineProperty(TMSService, "SupportedLanguages", [{
   key: 'zh-cn',
   omt: 'zh'
 }]);
-
+/*
+Suggested default operations for the different EMS styles
+*/
 _defineProperty(TMSService, "colorOperationDefaults", [{
   style: 'road_map',
   operation: 'mix',

package/target/node/utils.js

@@ -6,11 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.colorizeColor = colorizeColor;
 exports.desaturateColor = desaturateColor;
 exports.toAbsoluteUrl = toAbsoluteUrl;
-
 var _chromaJs = _interopRequireDefault(require("chroma-js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -27,10 +24,8 @@ function toAbsoluteUrl(host, path) {
   if (!host) {
     return path;
   }
-
   const hostEndWithSlash = host[host.length - 1] === '/';
   const pathStartsWithSlash = path[0] === '/';
-
   if (hostEndWithSlash === true && pathStartsWithSlash === true) {
     return host + path.slice(1);
   } else if (hostEndWithSlash !== pathStartsWithSlash) {
@@ -39,10 +34,15 @@ function toAbsoluteUrl(host, path) {
     return host + '/' + path;
   }
 }
+
 /*
 Type with the possible ways to define a color in maplibre
 */
 
+/*
+A selection of the different maplibre-gl-js properties that refer to a color.
+Taken from maplibre https://github.com/maplibre/maplibre-gl-js/blob/main/src/style-spec/types.g.ts
+*/
 
 /*
 Function to transform a maplibre color definition by a given function.
@@ -51,7 +51,7 @@ function transformColor(paintColor, func) {
   if (typeof paintColor == 'string') {
     const modifiedColor = func(paintColor);
     return `rgba(${modifiedColor.rgba().join(',')})`;
-  } else if (typeof paintColor == 'object' && 'stops' in paintColor && Array.isArray(paintColor === null || paintColor === void 0 ? void 0 : paintColor.stops)) {
+  } else if (typeof paintColor == 'object' && 'stops' in paintColor && Array.isArray(paintColor?.stops)) {
     const stops = paintColor['stops'].map(stop => {
       const newColor = transformColor(stop[1], func);
       return [stop[0], newColor];
@@ -62,16 +62,16 @@ function transformColor(paintColor, func) {
     return newPaintColor;
   } else return paintColor;
 }
+
 /*
 This is the function used to generate the current EMS desaturated roadmap
 */
-
-
 function desaturateColor(paintColor) {
   return transformColor(paintColor, color => {
     return (0, _chromaJs.default)(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`
@@ -82,8 +82,6 @@ More details:
 https://gka.github.io/chroma.js/#chroma-blend
 https://gka.github.io/chroma.js/#chroma-mix
 */
-
-
 function colorizeColor(sourceColor, destColor, operation = 'screen', percentage = 0.5) {
   return transformColor(sourceColor, color => {
     if (operation !== 'mix') {

package/target/tms_service.d.ts

@@ -38,7 +38,7 @@ export declare class TMSService extends AbstractEmsService {
     }[];
     static colorOperationDefaults: {
         style: string;
-        operation: string;
+        operation: blendMode;
         percentage: number;
     }[];
     protected readonly _config: TMSServiceConfig;