@nextgis/geocoder 3.0.0-alpha.7 → 3.0.0-alpha.9

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.7; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.9; author: NextGIS */
 function defined(val) {
   return val !== void 0 && val !== null;
 }
@@ -917,7 +917,7 @@ let Cache = _Cache;
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.7",
+	version: "3.0.0-alpha.8",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -3125,56 +3125,69 @@ var __asyncGenerator = (__this, __arguments, generator) => {
 };
 class NominatimProvider extends BaseProvider {
   constructor(options) {
-    super(options);
+    super();
+    this.options = options;
     __publicField(this, "searchUrl", "https://nominatim.openstreetmap.org");
-    __publicField(this, "_abort", []);
+    __publicField(this, "_abortControllers", []);
     if (options && options.searchUrl) {
       this.searchUrl = options.searchUrl;
     }
   }
   abort() {
-    this._abort.forEach((x) => x());
-    this._abort = [];
+    this._abortControllers.forEach((controller) => {
+      controller.abort();
+    });
+    this._abortControllers = [];
   }
   search(val) {
     return __asyncGenerator(this, null, function* () {
-      const url = fixUrlStr(
-        // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`
-        `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`
-      );
-      const request = new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.open("GET", url, true);
-        xhr.onload = () => {
-          try {
-            const geojson = JSON.parse(xhr.responseText);
-            const features = geojson.features.map((x) => {
-              return {
-                geom: x,
-                extent: x.bbox,
-                text: x.properties && x.properties.display_name,
-                query: val
-              };
-            });
-            resolve(features);
-          } catch (er) {
-            reject(er);
-          }
-        };
-        xhr.onerror = (er) => {
-          reject(er);
-        };
-        this._abort.push(xhr.abort);
-        xhr.send();
-      }).catch((er) => {
-        if (er.name === "CancelError") ;
-        throw er;
+      var _a, _b, _c, _d, _e, _f, _g;
+      const params = new URLSearchParams({
+        format: "geojson",
+        polygon_geojson: "1",
+        q: val,
+        limit: ((_b = (_a = this.options) == null ? void 0 : _a.limit) == null ? void 0 : _b.toString()) || "10"
       });
-      const items = yield new __await(request);
-      if (items) {
-        for (const i of items) {
-          i.result = () => this.result(i);
-          yield i;
+      if ((_c = this.options) == null ? void 0 : _c.countrycodes) {
+        params.append("countrycodes", this.options.countrycodes);
+      }
+      if ((_d = this.options) == null ? void 0 : _d.addressdetails) {
+        params.append("addressdetails", "1");
+      }
+      if ((_e = this.options) == null ? void 0 : _e.language) {
+        params.append("accept-language", this.options.language);
+      }
+      if ((_f = this.options) == null ? void 0 : _f.bounded) {
+        params.append("bounded", "1");
+      }
+      if ((_g = this.options) == null ? void 0 : _g.viewbox) {
+        const [minLon, minLat, maxLon, maxLat] = this.options.viewbox;
+        params.append("viewbox", `${minLon},${minLat},${maxLon},${maxLat}`);
+      }
+      const url = fixUrlStr(`${this.searchUrl}/search?${params.toString()}`);
+      const controller = new AbortController();
+      this._abortControllers.push(controller);
+      try {
+        const response = yield new __await(fetch(url, { signal: controller.signal }));
+        if (!response.ok) {
+          throw new Error(`Network response was not ok: ${response.statusText}`);
+        }
+        const geojson = yield new __await(response.json());
+        const features = geojson.features.map((x) => {
+          return {
+            geom: x,
+            extent: x.bbox,
+            text: x.properties && x.properties.display_name,
+            query: val
+          };
+        });
+        for (const item of features) {
+          item.result = () => this.result(item);
+          yield item;
+        }
+      } catch (error) {
+        if (error.name === "AbortError") ; else {
+          throw error;
         }
       }
     });
@@ -3188,41 +3201,41 @@ class NominatimProvider extends BaseProvider {
   }
   reverse(coordinates) {
     return __asyncGenerator(this, null, function* () {
+      var _a, _b;
       const [lng, lat] = coordinates;
-      const url = fixUrlStr(
-        `${this.searchUrl}/reverse?format=geojson&lat=${lat}&lon=${lng}`
-      );
-      const request = new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.open("GET", url, true);
-        xhr.onload = () => {
-          try {
-            const geojson = JSON.parse(xhr.responseText);
-            const feature = geojson.features[0];
-            const result = {
-              geom: feature,
-              extent: feature.bbox,
-              text: feature.properties && feature.properties.display_name,
-              query: `${lat}, ${lng}`
-            };
-            resolve(result);
-          } catch (er) {
-            reject(er);
-          }
-        };
-        xhr.onerror = (er) => {
-          reject(er);
-        };
-        this._abort.push(xhr.abort);
-        xhr.send();
-      }).catch((er) => {
-        if (er.name === "CancelError") ;
-        throw er;
+      const params = new URLSearchParams({
+        format: "geojson",
+        lat: lat.toString(),
+        lon: lng.toString()
       });
-      const item = yield new __await(request);
-      if (item) {
+      if ((_a = this.options) == null ? void 0 : _a.addressdetails) {
+        params.append("addressdetails", "1");
+      }
+      if ((_b = this.options) == null ? void 0 : _b.language) {
+        params.append("accept-language", this.options.language);
+      }
+      const url = fixUrlStr(`${this.searchUrl}/reverse?${params.toString()}`);
+      const controller = new AbortController();
+      this._abortControllers.push(controller);
+      try {
+        const response = yield new __await(fetch(url, { signal: controller.signal }));
+        if (!response.ok) {
+          throw new Error(`Network response was not ok: ${response.statusText}`);
+        }
+        const geojson = yield new __await(response.json());
+        const feature = geojson.features[0];
+        const item = {
+          geom: feature,
+          extent: feature.bbox,
+          text: feature.properties && feature.properties.display_name,
+          query: `${lat}, ${lng}`
+        };
         item.result = () => this.result(item);
         yield item;
+      } catch (error) {
+        if (error.name === "AbortError") ; else {
+          throw error;
+        }
       }
     });
   }