@nextgis/ngw-map 4.0.0-alpha.5 → 4.0.0-alpha.6

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 4.0.0-alpha.5; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 4.0.0-alpha.6; author: NextGIS */
 var NgwMap = (function (exports) {
   'use strict';
 
@@ -347,9 +347,6 @@ var NgwMap = (function (exports) {
   function isObject$1(val) {
     return Object.prototype.toString.call(val) === "[object Object]";
   }
-  function isArray(val) {
-    return Object.prototype.toString.call(val) === "[object Array]";
-  }
 
   function fixUrlStr(url) {
     return url.replace(/([^:]\/)\/+/g, "$1");
@@ -398,7 +395,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __async$x = (__this, __arguments, generator) => {
+  var __async$w = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -419,7 +416,7 @@ var NgwMap = (function (exports) {
     });
   };
   function apiRequest(opt) {
-    return __async$x(this, null, function* () {
+    return __async$w(this, null, function* () {
       const { params, name, connector, requestOptions } = opt;
       const apiItems = yield connector.connect();
       let apiItem = apiItems && apiItems[name];
@@ -1083,7 +1080,7 @@ var NgwMap = (function (exports) {
   }
 
   var pkg = {
-  	version: "4.0.0-alpha.5"};
+  	version: "4.0.0-alpha.6"};
 
   class AbortError extends Error {
     constructor(message = "AbortError") {
@@ -1297,7 +1294,7 @@ var NgwMap = (function (exports) {
       }
     return target;
   };
-  var __async$w = (__this, __arguments, generator) => {
+  var __async$v = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -1322,7 +1319,7 @@ var NgwMap = (function (exports) {
     return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
   }
   function responseJson(response) {
-    return __async$w(this, null, function* () {
+    return __async$v(this, null, function* () {
       try {
         return response.json();
       } catch (e) {
@@ -1331,7 +1328,7 @@ var NgwMap = (function (exports) {
     });
   }
   function lunkwillResponseUrl(lwResp) {
-    return __async$w(this, null, function* () {
+    return __async$v(this, null, function* () {
       const lwData = yield responseJson(lwResp);
       let delay = lwData.delay_ms;
       const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
@@ -1375,7 +1372,7 @@ var NgwMap = (function (exports) {
     });
   }
   function lunkwillFetch(lwRespUrl) {
-    return __async$w(this, null, function* () {
+    return __async$v(this, null, function* () {
       try {
         return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
       } catch (e) {
@@ -1423,7 +1420,7 @@ var NgwMap = (function (exports) {
     return path + urlParams;
   }
   function request(path, options, cacheEngine) {
-    return __async$w(this, null, function* () {
+    return __async$v(this, null, function* () {
       var _b, _c;
       const defaults = {
         method: "GET",
@@ -1467,7 +1464,7 @@ var NgwMap = (function (exports) {
         opt.headers = headers;
       }
       const url = generateUrl(path, query);
-      const makeRequest = () => __async$w(null, null, function* () {
+      const makeRequest = () => __async$v(null, null, function* () {
         let response;
         try {
           response = yield fetch(url, opt);
@@ -1531,8 +1528,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$L = Object.defineProperty;
-  var __defProps$m = Object.defineProperties;
-  var __getOwnPropDescs$m = Object.getOwnPropertyDescriptors;
+  var __defProps$l = Object.defineProperties;
+  var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
   var __hasOwnProp$y = Object.prototype.hasOwnProperty;
   var __propIsEnum$y = Object.prototype.propertyIsEnumerable;
@@ -1548,7 +1545,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
+  var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
   var __objRest$6 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -1561,7 +1558,7 @@ var NgwMap = (function (exports) {
       }
     return target;
   };
-  var __async$v = (__this, __arguments, generator) => {
+  var __async$u = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -1612,7 +1609,7 @@ var NgwMap = (function (exports) {
   }
   function route(name, connector, ...rest) {
     const result = {
-      url: (opt) => __async$v(null, null, function* () {
+      url: (opt) => __async$u(null, null, function* () {
         var _a;
         const routeData = yield connector.connect();
         const template = routeURL(
@@ -1643,7 +1640,7 @@ var NgwMap = (function (exports) {
           const headers = objectRemoveEmpty(__spreadValues$x(__spreadValues$x({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
           return request(
             template,
-            __spreadProps$m(__spreadValues$x({
+            __spreadProps$l(__spreadValues$x({
               headers
             }, restOpt), {
               method
@@ -1768,8 +1765,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$K = Object.defineProperty;
-  var __defProps$l = Object.defineProperties;
-  var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
+  var __defProps$k = Object.defineProperties;
+  var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
   var __hasOwnProp$x = Object.prototype.hasOwnProperty;
   var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
@@ -1785,7 +1782,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
+  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
   var __objRest$5 = (source, exclude) => {
     var target = {};
     for (var prop in source)
@@ -1799,7 +1796,7 @@ var NgwMap = (function (exports) {
     return target;
   };
   var __publicField$u = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$u = (__this, __arguments, generator) => {
+  var __async$t = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -1823,7 +1820,7 @@ var NgwMap = (function (exports) {
   let REQUEST_ID = 0;
   class NgwConnector {
     constructor(options) {
-      this.options = options;
+      __publicField$u(this, "options", options);
       __publicField$u(this, "id", ID$2++);
       __publicField$u(this, "emitter", new EventEmitter());
       __publicField$u(this, "user");
@@ -1888,7 +1885,7 @@ var NgwMap = (function (exports) {
      * ```
      */
     connect() {
-      return __async$u(this, arguments, function* ({
+      return __async$t(this, arguments, function* ({
         signal
       } = {}) {
         const auth = this.options.auth;
@@ -1927,7 +1924,7 @@ var NgwMap = (function (exports) {
       this.emitter.emit("logout");
     }
     getUserInfo(credentials, options) {
-      return __async$u(this, null, function* () {
+      return __async$t(this, null, function* () {
         if (this.user && this.user.id) {
           return this.user;
         }
@@ -1987,7 +1984,7 @@ var NgwMap = (function (exports) {
      * @param options - Request options
      */
     makeQuery(_0, _1) {
-      return __async$u(this, arguments, function* (url, params, options = {}) {
+      return __async$t(this, arguments, function* (url, params, options = {}) {
         var _b;
         url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
         if (!url) {
@@ -2020,7 +2017,7 @@ var NgwMap = (function (exports) {
           });
         }
         options.signal = internalSignal;
-        const createPromise = () => __async$u(this, null, function* () {
+        const createPromise = () => __async$t(this, null, function* () {
           const id = REQUEST_ID++;
           this.activeRequests[id] = internalAbortController;
           try {
@@ -2030,7 +2027,7 @@ var NgwMap = (function (exports) {
           }
         });
         if (method === "GET" && cache !== false) {
-          const cacheOptions = cacheProps ? cacheProps : __spreadProps$l(__spreadValues$w({}, objectRemoveEmpty({
+          const cacheOptions = cacheProps ? cacheProps : __spreadProps$k(__spreadValues$w({}, objectRemoveEmpty({
             headers,
             withCredentials,
             responseType,
@@ -2084,7 +2081,7 @@ var NgwMap = (function (exports) {
       });
     }
     _login(credentials, options) {
-      return __async$u(this, null, function* () {
+      return __async$t(this, null, function* () {
         try {
           const data = yield this.getUserInfo(credentials, options);
           this.user = data;
@@ -2143,8 +2140,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$J = Object.defineProperty;
-  var __defProps$k = Object.defineProperties;
-  var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
+  var __defProps$j = Object.defineProperties;
+  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
   var __hasOwnProp$w = Object.prototype.hasOwnProperty;
   var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
@@ -2160,9 +2157,9 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$k = (a, b) => __defProps$k(a, __getOwnPropDescs$k(b));
+  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
   var __publicField$t = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$t = (__this, __arguments, generator) => {
+  var __async$s = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -2280,19 +2277,20 @@ var NgwMap = (function (exports) {
           } else {
             Object.assign(query, resourceToQuery(resource));
           }
-          return this.connector.route("resource.search").get(__spreadProps$k(__spreadValues$v({}, requestOptions), {
+          return this.connector.route("resource.search").get(__spreadProps$j(__spreadValues$v({}, requestOptions), {
             query: __spreadValues$v({
               serialization: "full"
             }, query)
           })).then((resources) => {
-            if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
-              for (const x of resources) {
+            const items2 = Array.isArray(resources) ? resources : resources.items;
+            if (requestOptions == null ? void 0 : requestOptions.cache) {
+              for (const x of items2) {
                 this.cache.add("resource.item", Promise.resolve(x), {
                   id: x.resource.id
                 });
               }
             }
-            return resources;
+            return items2;
           });
         }
         return items;
@@ -2334,7 +2332,7 @@ var NgwMap = (function (exports) {
       });
     }
     _getChildrenOf(_0, _1) {
-      return __async$t(this, arguments, function* (parentDef, requestOptions, _items = []) {
+      return __async$s(this, arguments, function* (parentDef, requestOptions, _items = []) {
         let parent = void 0;
         if (typeof parentDef === "string") {
           parent = yield this.getId(parentDef, requestOptions);
@@ -2343,7 +2341,7 @@ var NgwMap = (function (exports) {
         } else {
           parent = parentDef;
         }
-        const items = yield this.connector.route("resource.collection").get(__spreadProps$k(__spreadValues$v({}, requestOptions), {
+        const items = yield this.connector.route("resource.collection").get(__spreadProps$j(__spreadValues$v({}, requestOptions), {
           query: {
             parent
           }
@@ -2371,7 +2369,7 @@ var NgwMap = (function (exports) {
       });
     }
     _cleanResourceItemCache(id) {
-      return __async$t(this, null, function* () {
+      return __async$s(this, null, function* () {
         var _a;
         const all = this.cache.all();
         const toDelete = [];
@@ -2641,8 +2639,8 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$H = Object.defineProperty;
-  var __defProps$j = Object.defineProperties;
-  var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
+  var __defProps$i = Object.defineProperties;
+  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
   var __hasOwnProp$v = Object.prototype.hasOwnProperty;
   var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
@@ -2658,7 +2656,7 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
+  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
   function getNgwWebmapExtent(webmap) {
     const bottom = webmap["extent_bottom"];
     const left = webmap["extent_left"];
@@ -2725,14 +2723,14 @@ var NgwMap = (function (exports) {
       if (resource.cls && resource.parent && resource.cls.indexOf("style") !== -1) {
         return connector.getResource(resource.parent.id, options).then((res) => {
           if (res) {
-            return fetchNgwLayerExtent(__spreadProps$j(__spreadValues$u({}, options), {
+            return fetchNgwLayerExtent(__spreadProps$i(__spreadValues$u({}, options), {
               resourceId: res.resource.id,
               connector
             }));
           }
         });
       } else {
-        return fetchNgwLayerExtent(__spreadProps$j(__spreadValues$u({}, options), {
+        return fetchNgwLayerExtent(__spreadProps$i(__spreadValues$u({}, options), {
           resourceId: resource.id,
           connector
         }));
@@ -2743,7 +2741,7 @@ var NgwMap = (function (exports) {
   var __defProp$G = Object.defineProperty;
   var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __publicField$r = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$s = (__this, __arguments, generator) => {
+  var __async$r = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -2771,12 +2769,12 @@ var NgwMap = (function (exports) {
     }
     /** @deprecated use {@link NgwResource.getBounds} instead */
     getExtent() {
-      return __async$s(this, null, function* () {
+      return __async$r(this, null, function* () {
         return this.getBounds();
       });
     }
     getBounds(options) {
-      return __async$s(this, null, function* () {
+      return __async$r(this, null, function* () {
         if (this._extent) {
           return this._extent;
         }
@@ -2792,7 +2790,7 @@ var NgwMap = (function (exports) {
     }
   }
 
-  var __async$r = (__this, __arguments, generator) => {
+  var __async$q = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -2813,7 +2811,7 @@ var NgwMap = (function (exports) {
     });
   };
   function resourceIdFromLayerOptions(options, connector) {
-    return __async$r(this, null, function* () {
+    return __async$q(this, null, function* () {
       const resource = options.resource;
       const item = resource;
       let { keyname, resourceId } = options;
@@ -2855,7 +2853,7 @@ var NgwMap = (function (exports) {
     return a;
   };
   var __publicField$q = (obj, key, value) => __defNormalProp$F(obj, typeof key !== "symbol" ? key + "" : key, value);
-  var __async$q = (__this, __arguments, generator) => {
+  var __async$p = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -2876,7 +2874,7 @@ var NgwMap = (function (exports) {
     });
   };
   function createOnFirstShowAdapter(_0) {
-    return __async$q(this, arguments, function* ({
+    return __async$p(this, arguments, function* ({
       webMap,
       adapterOptions = {},
       onLayerAdded,
@@ -2902,7 +2900,7 @@ var NgwMap = (function (exports) {
           return this._removed;
         }
         showLayer() {
-          return __async$q(this, null, function* () {
+          return __async$p(this, null, function* () {
             this.options.visibility = true;
             if (this.layer.length) {
               for (const x of this.layer) {
@@ -2914,7 +2912,7 @@ var NgwMap = (function (exports) {
           });
         }
         hideLayer() {
-          return __async$q(this, null, function* () {
+          return __async$p(this, null, function* () {
             this.options.visibility = false;
             if (this.layer) {
               for (const x of this.layer) {
@@ -2924,7 +2922,7 @@ var NgwMap = (function (exports) {
           });
         }
         loadLayer() {
-          return __async$q(this, null, function* () {
+          return __async$p(this, null, function* () {
             if (!this.layer.length && !this._creatingInProgress) {
               this._creatingInProgress = true;
               const Adapter = yield createAdapter(this);
@@ -2958,7 +2956,7 @@ var NgwMap = (function (exports) {
     });
   }
 
-  var __async$p = (__this, __arguments, generator) => {
+  var __async$o = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
         try {
@@ -2979,7 +2977,7 @@ var NgwMap = (function (exports) {
     });
   };
   function createOnFirstShowNgwAdapter(_0) {
-    return __async$p(this, arguments, function* ({
+    return __async$o(this, arguments, function* ({
       webMap,
       connector,
       item,
@@ -3108,8 +3106,6 @@ var NgwMap = (function (exports) {
   }
 
   var __defProp$D = Object.defineProperty;
-  var __defProps$i = Object.defineProperties;
-  var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
   var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
   var __hasOwnProp$s = Object.prototype.hasOwnProperty;
   var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
@@ -3125,27 +3121,6 @@ var NgwMap = (function (exports) {
       }
     return a;
   };
-  var __spreadProps$i = (a, b) => __defProps$i(a, __getOwnPropDescs$i(b));
-  var __async$o = (__this, __arguments, generator) => {
-    return new Promise((resolve, reject) => {
-      var fulfilled = (value) => {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      };
-      var rejected = (value) => {
-        try {
-          step(generator.throw(value));
-        } catch (e) {
-          reject(e);
-        }
-      };
-      var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-      step((generator = generator.apply(__this, __arguments)).next());
-    });
-  };
   const FEATURE_REQUEST_PARAMS = {
     srs: 4326,
     geom_format: "geojson",
@@ -3192,86 +3167,6 @@ var NgwMap = (function (exports) {
       {}
     );
   }
-  function createFeatureFieldFilterQueries(opt) {
-    return __async$o(this, null, function* () {
-      const queries = getQueries(opt);
-      const itemsParts = yield Promise.all(queries);
-      const ids = [];
-      const items = [];
-      for (const part of itemsParts) {
-        for (const item of part) {
-          if (!ids.includes(item.id)) {
-            items.push(item);
-            ids.push(item.id);
-          }
-        }
-      }
-      const offset = opt.offset !== void 0 ? opt.offset : 0;
-      const limit = opt.limit !== void 0 ? opt.limit : items.length;
-      if (opt.offset || opt.limit) {
-        return items.splice(offset, limit);
-      }
-      return items;
-    });
-  }
-  function createParam(pf) {
-    const [field, operation, value] = pf;
-    const isFldStr = field !== "id" ? "fld_" : "";
-    let vStart = "";
-    let vEnd = "";
-    const field_ = String(field).trim().replace(/^(%?)(.+?)(%?)$/, (m, a, b, c) => {
-      vStart = a;
-      vEnd = c;
-      return b;
-    });
-    const v = vStart + value + vEnd;
-    return [`${isFldStr}${field_}__${operation}`, v];
-  }
-  function getQueries(opt, _queries = [], _parentAllParams = []) {
-    var _a;
-    const { filters } = opt;
-    const paramList = (_a = opt.paramList) != null ? _a : [];
-    const logic = typeof filters[0] === "string" ? filters[0] : "all";
-    const filters_ = filters.filter((x) => Array.isArray(x));
-    if (logic === "any") {
-      for (const f of filters_) {
-        if (isPropertyFilter$1(f)) {
-          _queries.push(
-            fetchNgwLayerItemsRequest(__spreadProps$i(__spreadValues$r({}, opt), {
-              paramList: [..._parentAllParams, ...paramList, createParam(f)]
-            }))
-          );
-        } else {
-          getQueries(__spreadProps$i(__spreadValues$r({}, opt), { filters: f }), _queries, [..._parentAllParams]);
-        }
-      }
-    } else if (logic === "all") {
-      const filters2 = [];
-      const propertiesFilterList = [];
-      for (const f of filters_) {
-        if (isPropertyFilter$1(f)) {
-          filters2.push(createParam(f));
-        } else {
-          propertiesFilterList.push(f);
-        }
-      }
-      if (propertiesFilterList.length) {
-        for (const x of propertiesFilterList) {
-          getQueries(__spreadProps$i(__spreadValues$r({}, opt), { filters: x }), _queries, [
-            ..._parentAllParams,
-            ...filters2
-          ]);
-        }
-      } else {
-        _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$i(__spreadValues$r({}, opt), {
-            paramList: [..._parentAllParams, ...paramList, ...filters2]
-          }))
-        );
-      }
-    }
-    return _queries;
-  }
   function createWktFromCoordArray(coord) {
     const polygon = coord.map(([lng, lat]) => {
       const [x, y] = degrees2meters(lng, lat).map((c) => round(c));
@@ -3345,6 +3240,147 @@ var NgwMap = (function (exports) {
     return fields;
   }
 
+  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 field === "id" ? ["fid"] : ["get", field];
+  }
+  function parseWildcardField(field) {
+    const leadingWildcard = field.startsWith("%");
+    const trailingWildcard = field.endsWith("%");
+    return {
+      field: field.slice(
+        leadingWildcard ? 1 : 0,
+        trailingWildcard ? -1 : void 0
+      ),
+      leadingWildcard,
+      trailingWildcard
+    };
+  }
+  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 "ilike": {
+        if (typeof value !== "string") {
+          throw new Error(`Operator "ilike" requires string for "${field}"`);
+        }
+        const parsed = parseWildcardField(field);
+        const pattern = `${parsed.leadingWildcard ? "%" : ""}${value}${parsed.trailingWildcard ? "%" : ""}`;
+        return ["ilike", toGetExpr(parsed.field), pattern];
+      }
+      case "like":
+        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)
+    );
+  }
+
   var __defProp$C = Object.defineProperty;
   var __defProps$h = Object.defineProperties;
   var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
@@ -3389,10 +3425,12 @@ var NgwMap = (function (exports) {
       var _a;
       const filters = options.filters;
       if (filters) {
-        let data = yield createFeatureFieldFilterQueries(__spreadProps$h(__spreadValues$q({}, options), {
-          filters
+        let data = yield fetchNgwLayerItemsRequest(__spreadProps$h(__spreadValues$q({}, options), {
+          query: __spreadProps$h(__spreadValues$q({}, options.query), {
+            filter: propertiesFilterToExpressionString(filters)
+          })
         }));
-        const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
+        const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : false;
         if (clientFilterValidate) {
           data = data.filter((y) => {
             const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$h(__spreadValues$q({}, y.fields), {
@@ -3408,21 +3446,6 @@ var NgwMap = (function (exports) {
       }
     });
   }
-  function isFilterWithAnyCase(filters) {
-    if (filters[0] === "any") {
-      return true;
-    }
-    for (let i = 1; i < filters.length; i++) {
-      const p = filters[i];
-      if (isArray(p)) {
-        const deep = isFilterWithAnyCase(p);
-        if (deep) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
 
   function getImageAdapterOptions({
     resourceId,
@@ -3598,7 +3621,7 @@ var NgwMap = (function (exports) {
   var __publicField$p = (obj, key, value) => __defNormalProp$A(obj, typeof key !== "symbol" ? key + "" : key, value);
   class BookmarkItem {
     constructor(options) {
-      this.options = options;
+      __publicField$p(this, "options", options);
       __publicField$p(this, "name");
       __publicField$p(this, "resourceId");
       __publicField$p(this, "item");
@@ -3920,7 +3943,7 @@ var NgwMap = (function (exports) {
   const STRING_TYPE = "string";
   const _ItemProperties = class _ItemProperties {
     constructor(item, propertiesList) {
-      this.item = item;
+      __publicField$m(this, "item", item);
       __publicField$m(this, "options", {});
       __publicField$m(this, "_properties", {});
       __publicField$m(this, "_propertiesList", []);
@@ -4603,6 +4626,9 @@ var NgwMap = (function (exports) {
           this.tree.addChild(childItem);
         }
       }
+      if (this.item.item_type === "group" && !group.group_enabled) {
+        this.properties.property("visibility").set(false);
+      }
       return Promise.resolve();
     }
     initLayerItem(layer) {
@@ -4678,7 +4704,9 @@ var NgwMap = (function (exports) {
         name: "visibility",
         getProperty(item) {
           if (item) {
-            if (item.item.item_type === "group" || item.item.item_type === "root") {
+            if (item.item.item_type === "group") {
+              return item.item.group_enabled;
+            } else if (item.item.item_type === "root") {
               return treeSome(
                 item.item,
                 (i) => "layer_enabled" in i ? i.layer_enabled : false,
@@ -4691,7 +4719,9 @@ var NgwMap = (function (exports) {
           return false;
         },
         onSet(value, options, item) {
-          if (item && item.item.item_type === "layer") {
+          if ((item == null ? void 0 : item.item.item_type) === "group") {
+            item.item.group_enabled = value;
+          } else if ((item == null ? void 0 : item.item.item_type) === "layer") {
             if (item.layer) {
               if (value) {
                 item.webMap.showLayer(item.layer, options);
@@ -4753,8 +4783,8 @@ var NgwMap = (function (exports) {
   };
   class NgwWebmapLayerAdapter {
     constructor(map, options) {
-      this.map = map;
-      this.options = options;
+      __publicField$h(this, "map", map);
+      __publicField$h(this, "options", options);
       __publicField$h(this, "layer");
       __publicField$h(this, "NgwWebmapItem", NgwWebmapItem);
       /**
@@ -5992,131 +6022,13 @@ 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) {
+    const value = propertiesFilterToExpressionString(filter);
+    if (value === void 0) {
+      return {};
+    }
     return {
-      [`filter[${resourceId}]`]: propertiesFilterToExpressionString(filter)
+      [`filter[${resourceId}]`]: value
     };
   }
 
@@ -6204,7 +6116,7 @@ var NgwMap = (function (exports) {
         return class RasterAdapter extends AdapterClass {
           constructor(map, _options) {
             super(map, _options);
-            this.map = map;
+            __publicField$c(this, "map", map);
             __publicField$c(this, "item", item);
             __publicField$c(this, "resourceId", resourceId);
             __publicField$c(this, "blocked", false);
@@ -6502,7 +6414,7 @@ var NgwMap = (function (exports) {
   };
   class NgwKit {
     constructor(options) {
-      this.options = options;
+      __publicField$b(this, "options", options);
       __publicField$b(this, "url");
       __publicField$b(this, "connector");
       __publicField$b(this, "webMap");
@@ -8190,7 +8102,7 @@ var NgwMap = (function (exports) {
   var __publicField$7 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
   class StateItem {
     constructor(webMap, opt) {
-      this.webMap = webMap;
+      __publicField$7(this, "webMap", webMap);
       __publicField$7(this, "name");
       __publicField$7(this, "event");
       __publicField$7(this, "value");
@@ -9982,7 +9894,7 @@ var NgwMap = (function (exports) {
   var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
   var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
   var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-  var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+  var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
   var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __spreadValues$3 = (a, b) => {
     for (var prop in b || (b = {}))