@nextgis/ngw-map 3.0.1 → 3.1.1

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.1.1; author: NextGIS */
 const svgPath = {
   brill: '<path d="m6 0-5 6 5 6 5-6z"/>',
   circle: '<circle cx="6" cy="6" r="6"/>',
@@ -351,6 +351,20 @@ function isArray(val) {
 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) {
@@ -621,7 +635,9 @@ EventEmitter.init = function() {
   this.domain = null;
   if (EventEmitter.usingDomains) {
     // if there is an active domain, then attach to it.
-    if (domain.active) ;
+    if (domain.active && !(this instanceof domain.Domain)) {
+      this.domain = domain.active;
+    }
   }
 
   if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
@@ -1064,63 +1080,7 @@ function unwrapListeners(arr) {
 }
 
 var pkg = {
-	name: "@nextgis/ngw-connector",
-	version: "3.0.1",
-	_priority: 12,
-	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
-	main: "index.js",
-	module: "lib/ngw-connector.esm-bundler.js",
-	unpkg: "lib/ngw-connector.global.prod.js",
-	jsdelivr: "lib/ngw-connector.global.prod.js",
-	types: "lib/index.d.ts",
-	dependencies: {
-		"@nextgis/cache": "3.0.0",
-		"@nextgis/cancelable-promise": "3.0.0",
-		"@nextgis/utils": "3.0.0",
-		"@types/events": "^3.0.0",
-		events: "*",
-		"form-data": "^4.0.0"
-	},
-	devDependencies: {
-		"@nextgis/build-tools": "3.0.0"
-	},
-	scripts: {
-		clean: "rimraf ./lib",
-		dev: "node ../build-tools/lib/build.js",
-		prod: "npm run dev -- --release",
-		lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
-		watch: "npm run dev -- --watch",
-		"gen:types": "node ./scripts/generator"
-	},
-	buildOptions: {
-		name: "NgwConnector",
-		formats: [
-			"esm-bundler",
-			"esm-browser",
-			"cjs",
-			"global"
-		]
-	},
-	keywords: [
-		"NextGIS",
-		"MAP"
-	],
-	author: "NextGIS",
-	files: [
-		"index.js",
-		"lib"
-	],
-	license: "MIT",
-	homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
-	repository: {
-		type: "git",
-		url: "git://github.com/nextgis/nextgis_frontend.git"
-	},
-	engines: {
-		node: ">=18.20.4"
-	},
-	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
-};
+	version: "3.1.1"};
 
 class AbortError extends Error {
   constructor(message = "AbortError") {
@@ -1322,7 +1282,7 @@ var __spreadValues$x = (a, b) => {
     }
   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)
@@ -1476,7 +1436,7 @@ function request(path, options, cacheEngine) {
       cache,
       query,
       json
-    } = _a, opt = __objRest$5(_a, [
+    } = _a, opt = __objRest$6(_a, [
       "withCredentials",
       "responseType",
       "cacheProps",
@@ -1586,7 +1546,7 @@ var __spreadValues$w = (a, b) => {
   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)
@@ -1665,7 +1625,7 @@ function route(name, connector, ...rest) {
   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();
       }
@@ -1823,7 +1783,7 @@ var __spreadValues$v = (a, b) => {
   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)
@@ -2031,7 +1991,7 @@ class NgwConnector {
         throw new Error("Empty `url` not allowed");
       }
       if (params) {
-        const _a = params, restParams = __objRest$3(_a, ["paramList"]);
+        const _a = params, { paramList } = _a, restParams = __objRest$4(_a, ["paramList"]);
         url = template(url, restParams);
       }
       url = encodeURI(fixUrlStr(url));
@@ -2321,8 +2281,9 @@ class ResourcesControl {
           query: __spreadValues$u({
             serialization: "full"
           }, query)
-        })).then((resources) => {
-          if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
+        })).then((response) => {
+          const resources = Array.isArray(response) ? response : response.items;
+          if (requestOptions == null ? void 0 : requestOptions.cache) {
             for (const x of resources) {
               this.cache.add("resource.item", Promise.resolve(x), {
                 id: x.resource.id
@@ -3101,7 +3062,7 @@ const operationsAliases = {
     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;
@@ -3119,7 +3080,7 @@ function featureFilter(feature, filters) {
 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) {
@@ -3272,7 +3233,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
   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)]
@@ -3286,7 +3247,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
     const filters2 = [];
     const propertiesFilterList = [];
     for (const f of filters_) {
-      if (isPropertyFilter(f)) {
+      if (isPropertyFilter$1(f)) {
         filters2.push(createParam(f));
       } else {
         propertiesFilterList.push(f);
@@ -5103,7 +5064,7 @@ var __spreadValues$g = (a, b) => {
   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)
@@ -5116,7 +5077,7 @@ var __objRest$2 = (source, exclude) => {
   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,
@@ -5247,7 +5208,7 @@ var __spreadValues$f = (a, b) => {
     }
   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)
@@ -5280,11 +5241,11 @@ var __async$h = (__this, __arguments, generator) => {
     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_;
@@ -5296,7 +5257,7 @@ function createQmsAdapter(webMapOrOptions, url = URL, createOpt = {}) {
     webMap = webMapOrOptions;
   }
   if (!url) {
-    url = URL;
+    url = URL$1;
   }
   class QmsAdapter {
     constructor(map, options) {
@@ -5446,9 +5407,9 @@ function createBasemapLayerAdapter(_0) {
     item
   }) {
     if (item.basemap_layer) {
-      const qms = item.basemap_layer.qms;
-      const url = item.basemap_layer.url;
-      if (qms) {
+      const basemap = item.basemap_layer;
+      const { qms, url } = basemap;
+      if (qms && typeof qms === "string") {
         const qms_ = JSON.parse(qms);
         const adapter = Promise.resolve(
           QmsKit.utils.createQmsAdapter(webMap, void 0, {
@@ -5461,10 +5422,19 @@ function createBasemapLayerAdapter(_0) {
         const TileAdapter = webMap.mapAdapter.layerAdapters.TILE;
         if (TileAdapter) {
           class BasemapTileAdapter extends TileAdapter {
+            constructor(map, options) {
+              super(map, __spreadProps$8(__spreadValues$d({}, options), { baselayer: true, order: 0 }));
+            }
             addLayer(opt) {
               return __async$g(this, null, function* () {
+                var _a, _b, _c;
                 if (url) {
-                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$8(__spreadValues$d({}, opt), { url }));
+                  return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$8(__spreadValues$d({}, opt), {
+                    url,
+                    minZoom: (_a = basemap.z_min) != null ? _a : opt.minZoom,
+                    maxZoom: (_b = basemap.z_max) != null ? _b : opt.maxZoom,
+                    attribution: (_c = basemap.copyright_text) != null ? _c : opt.attribution
+                  }));
                 }
               });
             }
@@ -5925,6 +5895,134 @@ function createWebMapAdapter(_0) {
   });
 }
 
+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;
@@ -5944,6 +6042,18 @@ var __spreadValues$b = (a, b) => {
   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) => {
@@ -6008,8 +6118,18 @@ function createRasterAdapter(_0) {
             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
             });
@@ -6022,6 +6142,15 @@ function createRasterAdapter(_0) {
         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) {
@@ -6517,7 +6646,8 @@ function getCompanyLogo(connector, options) {
         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";
@@ -6552,10 +6682,10 @@ function getCompanyLogo(connector, options) {
       } 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";
         }
       }
@@ -9983,7 +10113,7 @@ const _NgwMap = class _NgwMap extends WebMap {
   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`"
@@ -9997,12 +10127,15 @@ const _NgwMap = class _NgwMap extends WebMap {
       }
       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
@@ -10094,7 +10227,6 @@ const _NgwMap = class _NgwMap extends WebMap {
     const promise = fetchIdentifyGeoJson({
       identify,
       connector: this.connector,
-      multiple,
       requestOptions: { signal: abortController.signal }
     });
     if (promise && "then" in promise) {