@nextgis/geocoder 4.0.0-alpha.5 → 4.0.0-alpha.6

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 4.0.0-alpha.5; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 4.0.0-alpha.6; author: NextGIS */
 function defined(val) {
   return val !== void 0 && val !== null;
 }
@@ -88,9 +88,6 @@ function objectRemoveEmpty(obj) {
 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");
@@ -105,12 +102,12 @@ class BaseGeocoder {
 }
 
 var __defProp$i = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
 var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
 var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
-var __knownSymbol$2 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __knownSymbol$2 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
@@ -123,9 +120,9 @@ var __spreadValues$8 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 var __publicField$d = (obj, key, value) => __defNormalProp$i(obj, key + "" , value);
-var __async$7 = (__this, __arguments, generator) => {
+var __async$6 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -157,7 +154,7 @@ var __asyncGenerator$2 = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
+  }, method = (k, call, wait, clear) => it[k] = (x) => (call = new Promise((yes, no, run) => (run = () => resume(k, x, yes, no), q ? q.then(run) : run())), clear = () => q === wait && (q = 0), q = wait = call.then(clear, clear), call), q, it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol$2("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol$2("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol$2("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
@@ -189,7 +186,7 @@ class Geocoder extends BaseGeocoder {
             for (var iter = __forAwait(results), more, temp, error; more = !(temp = yield new __await$2(iter.next())).done; more = false) {
               const r = temp.value;
               allProvidersFailed = false;
-              yield __spreadProps$5(__spreadValues$8({}, r), { provider, _id: ID$1++ });
+              yield __spreadProps$4(__spreadValues$8({}, r), { provider, _id: ID$1++ });
             }
           } catch (temp) {
             error = [temp];
@@ -232,7 +229,7 @@ class Geocoder extends BaseGeocoder {
           try {
             for (var iter = __forAwait(results), more, temp, error; more = !(temp = yield new __await$2(iter.next())).done; more = false) {
               const r = temp.value;
-              yield __spreadProps$5(__spreadValues$8({}, r), { provider, _id: ID$1++ });
+              yield __spreadProps$4(__spreadValues$8({}, r), { provider, _id: ID$1++ });
             }
           } catch (temp) {
             error = [temp];
@@ -256,7 +253,7 @@ class Geocoder extends BaseGeocoder {
    * @returns A promise that resolves to the first reverse geocoding result, or undefined if no results are found.
    */
   reverseGeocodeFirstResult(coordinates) {
-    return __async$7(this, null, function* () {
+    return __async$6(this, null, function* () {
       for (const provider of this.providers) {
         if (typeof provider.reverse === "function") {
           try {
@@ -333,7 +330,7 @@ var __spreadValues$7 = (a, b) => {
     }
   return a;
 };
-var __async$6 = (__this, __arguments, generator) => {
+var __async$5 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -354,7 +351,7 @@ var __async$6 = (__this, __arguments, generator) => {
   });
 };
 function apiRequest(opt) {
-  return __async$6(this, null, function* () {
+  return __async$5(this, null, function* () {
     const { params, name, connector, requestOptions } = opt;
     const apiItems = yield connector.connect();
     let apiItem = apiItems && apiItems[name];
@@ -1018,7 +1015,7 @@ function unwrapListeners(arr) {
 }
 
 var pkg = {
-	version: "4.0.0-alpha.5"};
+	version: "4.0.0-alpha.6"};
 
 class AbortError extends Error {
   constructor(message = "AbortError") {
@@ -1232,7 +1229,7 @@ var __objRest$2 = (source, exclude) => {
     }
   return target;
 };
-var __async$5 = (__this, __arguments, generator) => {
+var __async$4 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1257,7 +1254,7 @@ function lunkwillCheckResponse(lwResp) {
   return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
 }
 function responseJson(response) {
-  return __async$5(this, null, function* () {
+  return __async$4(this, null, function* () {
     try {
       return response.json();
     } catch (e) {
@@ -1266,7 +1263,7 @@ function responseJson(response) {
   });
 }
 function lunkwillResponseUrl(lwResp) {
-  return __async$5(this, null, function* () {
+  return __async$4(this, null, function* () {
     const lwData = yield responseJson(lwResp);
     let delay = lwData.delay_ms;
     const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
@@ -1310,7 +1307,7 @@ function lunkwillResponseUrl(lwResp) {
   });
 }
 function lunkwillFetch(lwRespUrl) {
-  return __async$5(this, null, function* () {
+  return __async$4(this, null, function* () {
     try {
       return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
     } catch (e) {
@@ -1358,7 +1355,7 @@ function generateUrl(path, query) {
   return path + urlParams;
 }
 function request(path, options, cacheEngine) {
-  return __async$5(this, null, function* () {
+  return __async$4(this, null, function* () {
     var _b, _c;
     const defaults = {
       method: "GET",
@@ -1402,7 +1399,7 @@ function request(path, options, cacheEngine) {
       opt.headers = headers;
     }
     const url = generateUrl(path, query);
-    const makeRequest = () => __async$5(null, null, function* () {
+    const makeRequest = () => __async$4(null, null, function* () {
       let response;
       try {
         response = yield fetch(url, opt);
@@ -1466,8 +1463,8 @@ function request(path, options, cacheEngine) {
 }
 
 var __defProp$7 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
 var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
 var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
@@ -1483,7 +1480,7 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -1496,7 +1493,7 @@ var __objRest$1 = (source, exclude) => {
     }
   return target;
 };
-var __async$4 = (__this, __arguments, generator) => {
+var __async$3 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1547,7 +1544,7 @@ function routeURL(name, baseUrl, routeData, ...rest) {
 }
 function route(name, connector, ...rest) {
   const result = {
-    url: (opt) => __async$4(null, null, function* () {
+    url: (opt) => __async$3(null, null, function* () {
       var _a;
       const routeData = yield connector.connect();
       const template = routeURL(
@@ -1578,7 +1575,7 @@ function route(name, connector, ...rest) {
         const headers = objectRemoveEmpty(__spreadValues$5(__spreadValues$5({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
         return request(
           template,
-          __spreadProps$4(__spreadValues$5({
+          __spreadProps$3(__spreadValues$5({
             headers
           }, restOpt), {
             method
@@ -1703,8 +1700,8 @@ function removeConnector(connector) {
 }
 
 var __defProp$6 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
 var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
 var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
@@ -1720,7 +1717,7 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -1734,7 +1731,7 @@ var __objRest = (source, exclude) => {
   return target;
 };
 var __publicField$4 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$3 = (__this, __arguments, generator) => {
+var __async$2 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1758,7 +1755,7 @@ let ID = 0;
 let REQUEST_ID = 0;
 class NgwConnector {
   constructor(options) {
-    this.options = options;
+    __publicField$4(this, "options", options);
     __publicField$4(this, "id", ID++);
     __publicField$4(this, "emitter", new EventEmitter());
     __publicField$4(this, "user");
@@ -1823,7 +1820,7 @@ class NgwConnector {
    * ```
    */
   connect() {
-    return __async$3(this, arguments, function* ({
+    return __async$2(this, arguments, function* ({
       signal
     } = {}) {
       const auth = this.options.auth;
@@ -1862,7 +1859,7 @@ class NgwConnector {
     this.emitter.emit("logout");
   }
   getUserInfo(credentials, options) {
-    return __async$3(this, null, function* () {
+    return __async$2(this, null, function* () {
       if (this.user && this.user.id) {
         return this.user;
       }
@@ -1922,7 +1919,7 @@ class NgwConnector {
    * @param options - Request options
    */
   makeQuery(_0, _1) {
-    return __async$3(this, arguments, function* (url, params, options = {}) {
+    return __async$2(this, arguments, function* (url, params, options = {}) {
       var _b;
       url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
       if (!url) {
@@ -1955,7 +1952,7 @@ class NgwConnector {
         });
       }
       options.signal = internalSignal;
-      const createPromise = () => __async$3(this, null, function* () {
+      const createPromise = () => __async$2(this, null, function* () {
         const id = REQUEST_ID++;
         this.activeRequests[id] = internalAbortController;
         try {
@@ -1965,7 +1962,7 @@ class NgwConnector {
         }
       });
       if (method === "GET" && cache !== false) {
-        const cacheOptions = cacheProps ? cacheProps : __spreadProps$3(__spreadValues$4({}, objectRemoveEmpty({
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps$2(__spreadValues$4({}, objectRemoveEmpty({
           headers,
           withCredentials,
           responseType,
@@ -2019,7 +2016,7 @@ class NgwConnector {
     });
   }
   _login(credentials, options) {
-    return __async$3(this, null, function* () {
+    return __async$2(this, null, function* () {
       try {
         const data = yield this.getUserInfo(credentials, options);
         this.user = data;
@@ -2078,8 +2075,8 @@ function resourceToQuery(resource, prefix = "") {
 }
 
 var __defProp$5 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
 var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
 var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
@@ -2095,9 +2092,9 @@ var __spreadValues$3 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$2 = (__this, __arguments, generator) => {
+var __async$1 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -2215,19 +2212,20 @@ class ResourcesControl {
         } else {
           Object.assign(query, resourceToQuery(resource));
         }
-        return this.connector.route("resource.search").get(__spreadProps$2(__spreadValues$3({}, requestOptions), {
+        return this.connector.route("resource.search").get(__spreadProps$1(__spreadValues$3({}, requestOptions), {
           query: __spreadValues$3({
             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;
@@ -2269,7 +2267,7 @@ class ResourcesControl {
     });
   }
   _getChildrenOf(_0, _1) {
-    return __async$2(this, arguments, function* (parentDef, requestOptions, _items = []) {
+    return __async$1(this, arguments, function* (parentDef, requestOptions, _items = []) {
       let parent = void 0;
       if (typeof parentDef === "string") {
         parent = yield this.getId(parentDef, requestOptions);
@@ -2278,7 +2276,7 @@ class ResourcesControl {
       } else {
         parent = parentDef;
       }
-      const items = yield this.connector.route("resource.collection").get(__spreadProps$2(__spreadValues$3({}, requestOptions), {
+      const items = yield this.connector.route("resource.collection").get(__spreadProps$1(__spreadValues$3({}, requestOptions), {
         query: {
           parent
         }
@@ -2306,7 +2304,7 @@ class ResourcesControl {
     });
   }
   _cleanResourceItemCache(id) {
-    return __async$2(this, null, function* () {
+    return __async$1(this, null, function* () {
       var _a;
       const all = this.cache.all();
       const toDelete = [];
@@ -2610,7 +2608,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;
@@ -2620,7 +2618,7 @@ function isPropertyFilter(filter) {
 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) {
@@ -2646,8 +2644,6 @@ function propertiesFilter(properties, filters) {
 }
 
 var __defProp$3 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
 var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
 var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
@@ -2663,27 +2659,6 @@ var __spreadValues$2 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-var __async$1 = (__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",
@@ -2720,86 +2695,6 @@ function paramListToQuery(paramList) {
     {}
   );
 }
-function createFeatureFieldFilterQueries(opt) {
-  return __async$1(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(f)) {
-        _queries.push(
-          fetchNgwLayerItemsRequest(__spreadProps$1(__spreadValues$2({}, opt), {
-            paramList: [..._parentAllParams, ...paramList, createParam(f)]
-          }))
-        );
-      } else {
-        getQueries(__spreadProps$1(__spreadValues$2({}, opt), { filters: f }), _queries, [..._parentAllParams]);
-      }
-    }
-  } else if (logic === "all") {
-    const filters2 = [];
-    const propertiesFilterList = [];
-    for (const f of filters_) {
-      if (isPropertyFilter(f)) {
-        filters2.push(createParam(f));
-      } else {
-        propertiesFilterList.push(f);
-      }
-    }
-    if (propertiesFilterList.length) {
-      for (const x of propertiesFilterList) {
-        getQueries(__spreadProps$1(__spreadValues$2({}, opt), { filters: x }), _queries, [
-          ..._parentAllParams,
-          ...filters2
-        ]);
-      }
-    } else {
-      _queries.push(
-        fetchNgwLayerItemsRequest(__spreadProps$1(__spreadValues$2({}, 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));
@@ -2873,6 +2768,147 @@ function prepareNgwFieldsToPropertiesFilter(fields) {
   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$2 = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -2917,10 +2953,12 @@ function fetchNgwLayerItems(options) {
     var _a;
     const filters = options.filters;
     if (filters) {
-      let data = yield createFeatureFieldFilterQueries(__spreadProps(__spreadValues$1({}, options), {
-        filters
+      let data = yield fetchNgwLayerItemsRequest(__spreadProps(__spreadValues$1({}, options), {
+        query: __spreadProps(__spreadValues$1({}, 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(__spreadValues$1({}, y.fields), {
@@ -2936,27 +2974,12 @@ function fetchNgwLayerItems(options) {
     }
   });
 }
-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;
-}
 
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __knownSymbol$1 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __knownSymbol$1 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -2982,7 +3005,7 @@ var __asyncGenerator$1 = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
+  }, method = (k, call, wait, clear) => it[k] = (x) => (call = new Promise((yes, no, run) => (run = () => resume(k, x, yes, no), q ? q.then(run) : run())), clear = () => q === wait && (q = 0), q = wait = call.then(clear, clear), call), q, it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol$1("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 const _NgwProvider = class _NgwProvider extends BaseProvider {
@@ -3130,7 +3153,7 @@ __publicField$1(_NgwProvider, "limit", 300);
 let NgwProvider = _NgwProvider;
 
 var __defProp = Object.defineProperty;
-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 = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __await = function(promise, isYieldStar) {
@@ -3145,13 +3168,13 @@ var __asyncGenerator = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
+  }, method = (k, call, wait, clear) => it[k] = (x) => (call = new Promise((yes, no, run) => (run = () => resume(k, x, yes, no), q ? q.then(run) : run())), clear = () => q === wait && (q = 0), q = wait = call.then(clear, clear), call), q, it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 class NominatimProvider extends BaseProvider {
   constructor(options) {
     super();
-    this.options = options;
+    __publicField(this, "options", options);
     __publicField(this, "searchUrl", "https://nominatim.openstreetmap.org");
     __publicField(this, "_abortControllers", []);
     if (options && options.searchUrl) {