@nextgis/ngw-map 3.0.0 → 3.1.0

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.1.0; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -354,6 +354,20 @@ var NgwMap = (function (exports) {
   function fixUrlStr(url) {
     return url.replace(/([^:]\/)\/+/g, "$1");
   }
+  function updateUrlParams(urlStr, params) {
+    const url = new URL(urlStr);
+    const searchParams = new URLSearchParams(url.search);
+    Object.entries(params).forEach(([key, value]) => {
+      if (value === void 0) {
+        searchParams.delete(key);
+      } else {
+        searchParams.set(key, value);
+      }
+    });
+    searchParams.set("timestamp", String((/* @__PURE__ */ new Date()).getTime()));
+    const newSearch = [...searchParams.entries()].map(([key, value]) => `${key}=${value}`).join("&");
+    return `${url.origin}${url.pathname}?${newSearch}`;
+  }
 
   const templateRe = /\{ *([\w_-]+) *\}/g;
   function template(str, data) {
@@ -1068,7 +1082,7 @@ var NgwMap = (function (exports) {
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "3.0.0",
+  	version: "3.0.1",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -1325,7 +1339,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __objRest$5 = (source, exclude) => {
+  var __objRest$6 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$y.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1479,7 +1493,7 @@ var NgwMap = (function (exports) {
         cache,
         query,
         json
-      } = _a, opt = __objRest$5(_a, [
+      } = _a, opt = __objRest$6(_a, [
         "withCredentials",
         "responseType",
         "cacheProps",
@@ -1589,7 +1603,7 @@ var NgwMap = (function (exports) {
     return a;
   };
   var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
-  var __objRest$4 = (source, exclude) => {
+  var __objRest$5 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$x.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1668,7 +1682,7 @@ var NgwMap = (function (exports) {
     for (const method of methods) {
       const methodResp = (requestOptions) => {
         var _b;
-        const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$4(_a, ["headers"]);
+        const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$5(_a, ["headers"]);
         if ((_b = requestOptions == null ? void 0 : requestOptions.signal) == null ? void 0 : _b.aborted) {
           throw new AbortError();
         }
@@ -1826,7 +1840,7 @@ var NgwMap = (function (exports) {
     return a;
   };
   var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
-  var __objRest$3 = (source, exclude) => {
+  var __objRest$4 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$w.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -2001,7 +2015,7 @@ var NgwMap = (function (exports) {
       credentials = credentials || this.options.auth;
       if (credentials) {
         const { login, password } = credentials;
-        const encodedStr = [login, password].map(encodeURIComponent).join(":");
+        const encodedStr = `${login}:${password}`;
         {
           return window.btoa(encodedStr);
         }
@@ -2034,7 +2048,7 @@ var NgwMap = (function (exports) {
           throw new Error("Empty `url` not allowed");
         }
         if (params) {
-          const _a = params, restParams = __objRest$3(_a, ["paramList"]);
+          const _a = params, restParams = __objRest$4(_a, ["paramList"]);
           url = template(url, restParams);
         }
         url = encodeURI(fixUrlStr(url));
@@ -3104,7 +3118,7 @@ var NgwMap = (function (exports) {
       return like(a, b, true);
     }
   };
-  function isPropertyFilter(filter) {
+  function isPropertyFilter$1(filter) {
     const pf = filter;
     if (pf.length === 3 && typeof pf[0] === "string" && typeof pf[1] === "string") {
       return true;
@@ -3122,7 +3136,7 @@ var NgwMap = (function (exports) {
   function propertiesFilter(properties, filters) {
     const logic = typeof filters[0] === "string" ? filters[0] : "all";
     const filterFunction = (p) => {
-      if (isPropertyFilter(p)) {
+      if (isPropertyFilter$1(p)) {
         const [field, operation, value] = p;
         const operationExec = operationsAliases[operation];
         if (operationExec) {
@@ -3275,7 +3289,7 @@ var NgwMap = (function (exports) {
     const filters_ = filters.filter((x) => Array.isArray(x));
     if (logic === "any") {
       for (const f of filters_) {
-        if (isPropertyFilter(f)) {
+        if (isPropertyFilter$1(f)) {
           _queries.push(
             fetchNgwLayerItemsRequest(__spreadProps$f(__spreadValues$q({}, opt), {
               paramList: [..._parentAllParams, ...paramList, createParam(f)]
@@ -3289,7 +3303,7 @@ var NgwMap = (function (exports) {
       const filters2 = [];
       const propertiesFilterList = [];
       for (const f of filters_) {
-        if (isPropertyFilter(f)) {
+        if (isPropertyFilter$1(f)) {
           filters2.push(createParam(f));
         } else {
           propertiesFilterList.push(f);
@@ -5106,7 +5120,7 @@ var NgwMap = (function (exports) {
     return a;
   };
   var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
-  var __objRest$2 = (source, exclude) => {
+  var __objRest$3 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$h.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -5119,7 +5133,7 @@ var NgwMap = (function (exports) {
     return target;
   };
   function updateImageParams(params, resourceId) {
-    const _a = params, { bbox, width, height, nd } = _a, rest = __objRest$2(_a, ["bbox", "width", "height", "nd"]);
+    const _a = params, { bbox, width, height, nd } = _a, rest = __objRest$3(_a, ["bbox", "width", "height", "nd"]);
     return __spreadProps$9(__spreadValues$g({}, rest), {
       resource: Array.isArray(resourceId) ? resourceId.join(",") : resourceId,
       extent: bbox,
@@ -5250,7 +5264,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __objRest$1 = (source, exclude) => {
+  var __objRest$2 = (source, exclude) => {
     var target = {};
     for (var prop in source)
       if (__hasOwnProp$g.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -5283,11 +5297,11 @@ var NgwMap = (function (exports) {
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  const URL = "https://qms.nextgis.com";
-  function createQmsAdapter(webMapOrOptions, url = URL, createOpt = {}) {
+  const URL$1 = "https://qms.nextgis.com";
+  function createQmsAdapter(webMapOrOptions, url = URL$1, createOpt = {}) {
     let webMap;
     if ("webMap" in webMapOrOptions) {
-      const _a = webMapOrOptions, { webMap: webMap_, url: url_ } = _a, adapterOptions = __objRest$1(_a, ["webMap", "url"]);
+      const _a = webMapOrOptions, { webMap: webMap_, url: url_ } = _a, adapterOptions = __objRest$2(_a, ["webMap", "url"]);
       webMap = webMap_;
       if (url_) {
         url = url_;
@@ -5299,7 +5313,7 @@ var NgwMap = (function (exports) {
       webMap = webMapOrOptions;
     }
     if (!url) {
-      url = URL;
+      url = URL$1;
     }
     class QmsAdapter {
       constructor(map, options) {
@@ -5928,6 +5942,134 @@ var NgwMap = (function (exports) {
     });
   }
 
+  function isPropertyFilter(value) {
+    return Array.isArray(value) && value.length === 3 && typeof value[0] === "string" && typeof value[1] === "string";
+  }
+  function isPropertiesFilterGroup(value) {
+    return Array.isArray(value) && !isPropertyFilter(value);
+  }
+  function toGetExpr(field) {
+    return ["get", field];
+  }
+  function toConditionExpr(filter) {
+    const [fieldRaw, op, value] = filter;
+    const field = String(fieldRaw);
+    const getExpr = toGetExpr(field);
+    switch (op) {
+      case "eq":
+        if (value === null) {
+          return ["is_null", getExpr];
+        }
+        return ["==", getExpr, value];
+      case "ne":
+        if (value === null) {
+          return ["!is_null", getExpr];
+        }
+        return ["!=", getExpr, value];
+      case "gt":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "gt" requires number or string for "${field}"`
+          );
+        }
+        return [">", getExpr, value];
+      case "lt":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "lt" requires number or string for "${field}"`
+          );
+        }
+        return ["<", getExpr, value];
+      case "ge":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "ge" requires number or string for "${field}"`
+          );
+        }
+        return [">=", getExpr, value];
+      case "le":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw new Error(
+            `Operator "le" requires number or string for "${field}"`
+          );
+        }
+        return ["<=", getExpr, value];
+      case "in":
+        if (!Array.isArray(value) || !value.every((x) => typeof x === "string" || typeof x === "number")) {
+          throw new Error(
+            `Operator "in" requires (string | number)[] for "${field}"`
+          );
+        }
+        if (!value.length) {
+          throw new Error(
+            `Operator "in" requires non-empty array for "${field}"`
+          );
+        }
+        return ["in", getExpr, ...value];
+      case "notin":
+        if (!Array.isArray(value) || !value.every((x) => typeof x === "string" || typeof x === "number")) {
+          throw new Error(
+            `Operator "notin" requires (string | number)[] for "${field}"`
+          );
+        }
+        if (!value.length) {
+          throw new Error(
+            `Operator "notin" requires non-empty array for "${field}"`
+          );
+        }
+        return ["!in", getExpr, ...value];
+      case "like":
+      case "ilike":
+        throw new Error(
+          `Operator "${op}" is not supported by server FilterExpression`
+        );
+      default: {
+        const exhaustive = op;
+        throw new Error(`Unsupported operator: ${exhaustive}`);
+      }
+    }
+  }
+  function toGroupExpr(filters) {
+    let logicalOp = "all";
+    const children = [];
+    for (const item of filters) {
+      if (item === "all" || item === "any") {
+        logicalOp = item;
+        continue;
+      }
+      if (isPropertyFilter(item)) {
+        children.push(toConditionExpr(item));
+        continue;
+      }
+      if (isPropertiesFilterGroup(item)) {
+        children.push(toGroupExpr(item));
+        continue;
+      }
+      throw new Error("Invalid PropertiesFilter node");
+    }
+    return [logicalOp, ...children];
+  }
+  function propertiesFilterToExpression(filters) {
+    if (!(filters == null ? void 0 : filters.length)) {
+      return [];
+    }
+    return toGroupExpr(filters);
+  }
+  function propertiesFilterToExpressionString(filters) {
+    if (!(filters == null ? void 0 : filters.length)) {
+      return void 0;
+    }
+    return JSON.stringify(
+      propertiesFilterToExpression(filters)
+    );
+  }
+
+  function createLayerFilterParam(resourceId, filter) {
+    return {
+      [`filter[${resourceId}]`]: propertiesFilterToExpressionString(filter)
+    };
+  }
+
   var __defProp$j = Object.defineProperty;
   var __defProps$6 = Object.defineProperties;
   var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
@@ -5947,6 +6089,18 @@ var NgwMap = (function (exports) {
     return a;
   };
   var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+  var __objRest$1 = (source, exclude) => {
+    var target = {};
+    for (var prop in source)
+      if (__hasOwnProp$c.call(source, prop) && exclude.indexOf(prop) < 0)
+        target[prop] = source[prop];
+    if (source != null && __getOwnPropSymbols$c)
+      for (var prop of __getOwnPropSymbols$c(source)) {
+        if (exclude.indexOf(prop) < 0 && __propIsEnum$c.call(source, prop))
+          target[prop] = source[prop];
+      }
+    return target;
+  };
   var __publicField$c = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async$c = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -6011,8 +6165,18 @@ var NgwMap = (function (exports) {
               baseUrl: connector.options.baseUrl || ""
             });
             if (opt) {
-              const layerAdapterOptions = __spreadProps$6(__spreadValues$b(__spreadValues$b({}, opt), layerOptions.adapterOptions), {
-                params: { resource: resourceId },
+              const _a = layerOptions.adapterOptions || {}, { propertiesFilter } = _a, restAdapterOptions = __objRest$1(_a, ["propertiesFilter"]);
+              const filterParams = createLayerFilterParam(
+                resourceId,
+                propertiesFilter
+              );
+              const layerAdapterOptions = __spreadProps$6(__spreadValues$b(__spreadValues$b({}, opt), restAdapterOptions), {
+                params: __spreadValues$b({
+                  resource: resourceId
+                }, filterParams),
+                url: adapter === "TILE" && opt.url ? updateUrlParams(opt.url, __spreadValues$b({
+                  resource: String(resourceId)
+                }, filterParams)) : opt.url,
                 layers: opt.layers || String(resourceId),
                 resourceId
               });
@@ -6025,6 +6189,15 @@ var NgwMap = (function (exports) {
           addLayer(addOptions) {
             return super.addLayer(__spreadValues$b(__spreadValues$b({}, this.options), addOptions));
           }
+          propertiesFilter(filters) {
+            return __async$c(this, null, function* () {
+              var _a;
+              const opt = this.options;
+              const params = __spreadValues$b(__spreadValues$b({}, opt.params || {}), createLayerFilterParam(this.resourceId, filters));
+              opt.params = params;
+              (_a = this.updateLayer) == null ? void 0 : _a.call(this, { params });
+            });
+          }
           getIdentificationIds() {
             return __async$c(this, null, function* () {
               if (this.item) {
@@ -6520,7 +6693,8 @@ var NgwMap = (function (exports) {
           component: "pyramid"
         }
       });
-      if (settings && settings.company_logo && settings.company_logo.enabled) {
+      const company_logo = settings && "company_logo" in settings ? settings.company_logo : void 0;
+      if (company_logo && company_logo.enabled) {
         const anchor = document.createElement("a");
         anchor.style.position = "absolute";
         anchor.style.bottom = "0";
@@ -6555,10 +6729,10 @@ var NgwMap = (function (exports) {
         } else {
           return;
         }
-        if (settings.company_logo.link !== null && settings.company_logo.link.trim() !== "") {
-          anchor.href = settings.company_logo.link;
+        if (company_logo.link !== null && company_logo.link.trim() !== "") {
+          anchor.href = company_logo.link;
           anchor.target = "_blank";
-          if (settings.company_logo.link.search(/:\/\/nextgis/) !== -1) {
+          if (company_logo.link.search(/:\/\/nextgis/) !== -1) {
             img.alt = "Get your own Web GIS at nextgis.com";
           }
         }
@@ -9986,7 +10160,7 @@ var NgwMap = (function (exports) {
     addNgwLayer(options) {
       return __async$1(this, null, function* () {
         yield this.onMapLoad();
-        const { keyname, resourceId } = options;
+        const { keyname, resourceId, filters } = options;
         if (keyname || resourceId !== void 0) {
           deprecatedWarn(
             "set `resource` options instead of `keyname` or `resourceId`"
@@ -10000,12 +10174,15 @@ var NgwMap = (function (exports) {
         }
         if (defined(this.options.baseUrl)) {
           try {
+            options.adapterOptions = options.adapterOptions || {};
             if (defined(this.options.setViewDelay)) {
-              options.adapterOptions = options.adapterOptions || {};
               if (!defined(options.adapterOptions.setViewDelay)) {
                 options.adapterOptions.setViewDelay = this.options.setViewDelay;
               }
             }
+            if (defined(filters)) {
+              options.adapterOptions.propertiesFilter = filters;
+            }
             const adapter = createNgwLayerAdapter(options, this, this.connector);
             const adapterOpts = __spreadValues(__spreadValues({
               visibility: true