@nextgis/geocoder 1.9.4 → 1.11.8

package/lib/geocoder.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.9.4; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.8; author: NextGIS */
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { objectAssign, fixUrlStr } from '@nextgis/utils';
 import NgwConnector from '@nextgis/ngw-connector';

package/lib/geocoder.esm-bundler.prod.js

@@ -1,2 +1,2 @@
-import e from"@nextgis/cancelable-promise";import{objectAssign as t,fixUrlStr as s}from"@nextgis/utils";import r from"@nextgis/ngw-connector";class o{constructor(e){e&&t(this,e)}}let c=0;class n extends o{constructor(e){super(e),this.providers=[],e&&e.providers&&(this.providers=e.providers)}abort(){this.providers.forEach((e=>{e.abort&&e.abort()}))}async*search(e){for(const t of this.providers)try{const s=t.search(e);for await(const e of s)yield{...e,provider:t,_id:c++}}catch(e){}}result(t){return t.provider?t.provider.result(t):e.resolve(void 0)}}class i extends o{}class a extends i{constructor(e){super(e),this.caseInsensitive=!0,this.searchUrl="https://maxim.nextgis.com",this.searchResources=[],this.requests=[],this.connector=e.connector||new r({baseUrl:this.searchUrl}),this.searchResources=e.searchResources}abort(){this.requests.forEach((e=>{e.cancel()})),this.requests=[]}async*search(e){for(const t of this.searchResources){const s=this.connector.get("feature_layer.store",{headers:{RANGE:`items=0-${t.limit||300}`}},{id:t.id,like:e});this.requests.push(s),s.catch((e=>{console.warn(e)}));const r=await s,o=[];r&&r.forEach((s=>{o.push({query:e,resourceId:t.id,...s})}));for(const e of this._items(o))e.result=()=>this.result(e),yield e}}result(e){const t=this.connector.get("feature_layer.feature.item_extent",null,{id:e.resourceId,fid:e.featureId}).then((t=>{const s=t.extent;return{text:e.text,extent:[s.minLon,s.minLat,s.maxLon,s.maxLat]}}));return this.requests.push(t),t}_items(e){const t=[];return e.forEach((e=>{this.searchResources.find((t=>t.id===e.resourceId))&&t.push({query:e.query,text:e.label,featureId:e.id,resourceId:e.resourceId})})),t}}class h extends i{constructor(e){super(e),this.searchUrl="https://nominatim.openstreetmap.org",this._requests=[]}abort(){this._requests.forEach((e=>e.cancel())),this._requests=[]}async*search(t){const r=s(`${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${t}`),o=new e(((e,s,o)=>{const c=new XMLHttpRequest;c.open("GET",r,!0),c.onload=()=>{try{const s=JSON.parse(c.responseText).features.map((e=>({geom:e,extent:e.bbox,text:e.properties&&e.properties.display_name,query:t})));e(s)}catch(e){s(e)}},c.onerror=e=>{s(e)},o((()=>{c.abort()})),c.send()})).catch((e=>{throw e}));this._requests.push(o);const c=await o;if(c)for(const e of c)e.result=()=>this.result(e),yield e}result(t){return e.resolve({text:t.text,extent:t.extent||[],geom:t.geom})}}function u(e){return new n(e)}export{i as BaseProvider,n as Geocoder,a as NgwProvider,h as NominatimProvider,u as create};
+import e from"@nextgis/cancelable-promise";import{objectAssign as t,fixUrlStr as s}from"@nextgis/utils";import r from"@nextgis/ngw-connector";class o{constructor(e){e&&t(this,e)}}let c=0;class n extends o{constructor(e){super(e),this.providers=[],e&&e.providers&&(this.providers=e.providers)}abort(){this.providers.forEach((e=>{e.abort&&e.abort()}))}async*search(e){for(const s of this.providers)try{const t=s.search(e);for await(const e of t)yield{...e,provider:s,_id:c++}}catch(t){}}result(t){return t.provider?t.provider.result(t):e.resolve(void 0)}}class i extends o{}class a extends i{constructor(e){super(e),this.caseInsensitive=!0,this.searchUrl="https://maxim.nextgis.com",this.searchResources=[],this.requests=[],this.connector=e.connector||new r({baseUrl:this.searchUrl}),this.searchResources=e.searchResources}abort(){this.requests.forEach((e=>{e.cancel()})),this.requests=[]}async*search(e){for(const t of this.searchResources){const s=this.connector.get("feature_layer.store",{headers:{RANGE:`items=0-${t.limit||300}`}},{id:t.id,like:e});this.requests.push(s),s.catch((e=>{console.warn(e)}));const r=await s,o=[];r&&r.forEach((s=>{o.push({query:e,resourceId:t.id,...s})}));for(const e of this._items(o))e.result=()=>this.result(e),yield e}}result(e){const t=this.connector.get("feature_layer.feature.item_extent",null,{id:e.resourceId,fid:e.featureId}).then((t=>{const s=t.extent;return{text:e.text,extent:[s.minLon,s.minLat,s.maxLon,s.maxLat]}}));return this.requests.push(t),t}_items(e){const t=[];return e.forEach((e=>{this.searchResources.find((t=>t.id===e.resourceId))&&t.push({query:e.query,text:e.label,featureId:e.id,resourceId:e.resourceId})})),t}}class h extends i{constructor(e){super(e),this.searchUrl="https://nominatim.openstreetmap.org",this._requests=[]}abort(){this._requests.forEach((e=>e.cancel())),this._requests=[]}async*search(t){const r=s(`${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${t}`),o=new e(((e,s,o)=>{const c=new XMLHttpRequest;c.open("GET",r,!0),c.onload=()=>{try{const s=JSON.parse(c.responseText).features.map((e=>({geom:e,extent:e.bbox,text:e.properties&&e.properties.display_name,query:t})));e(s)}catch(r){s(r)}},c.onerror=e=>{s(e)},o((()=>{c.abort()})),c.send()})).catch((e=>{throw e}));this._requests.push(o);const c=await o;if(c)for(const e of c)e.result=()=>this.result(e),yield e}result(t){return e.resolve({text:t.text,extent:t.extent||[],geom:t.geom})}}function u(e){return new n(e)}export{i as BaseProvider,n as Geocoder,a as NgwProvider,h as NominatimProvider,u as create};
 //# sourceMappingURL=geocoder.esm-bundler.prod.js.map

package/lib/geocoder.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.9.4; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.8; author: NextGIS */
 var Geocoder = (function (exports) {
     'use strict';
 
@@ -94,10 +94,14 @@ var Geocoder = (function (exports) {
         throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
     }
 
-    function __spreadArray(to, from) {
-        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-            to[j] = from[i];
-        return to;
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || Array.prototype.slice.call(from));
     }
 
     function __await(v) {
@@ -1390,12 +1394,16 @@ var Geocoder = (function (exports) {
             var _this = _super.call(this) || this;
             _this.name = 'NetworkError';
             Object.setPrototypeOf(_this, NetworkError.prototype);
-            _this.message = "Unable to request " + url + ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from " + location.origin; // /control-panel/cors
+            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
             return _this;
         }
         return NetworkError;
     }(Error));
 
+    function isObject(val) {
+        return Object.prototype.toString.call(val) === '[object Object]';
+    }
+
     var loadData;
     // @ts-ignore
     {
@@ -1431,7 +1439,7 @@ var Geocoder = (function (exports) {
                 }
             };
             xhr.onload = function () {
-                if ([401, 403, 404, 500].indexOf(xhr.status) !== -1) {
+                if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
                     error(new NgwError(getResponseText()));
                 }
                 processingResponse();
@@ -1486,7 +1494,7 @@ var Geocoder = (function (exports) {
                 data = new FormData();
                 data.append('file', options.file);
                 if (options.data) {
-                    for (var d in data) {
+                    for (var d in options.data) {
                         data.append(d, data[d]);
                     }
                 }
@@ -1578,10 +1586,6 @@ var Geocoder = (function (exports) {
         }
     }
 
-    function isObject(val) {
-        return Object.prototype.toString.call(val) === '[object Object]';
-    }
-
     var exclude = ['description'];
     /**
      * @remarks
@@ -1832,7 +1836,7 @@ var Geocoder = (function (exports) {
         ResourcesControl.prototype._fetchResourceById = function (id, requestOptions) {
             var _this = this;
             var promise = function () {
-                return _this.connector.get('resource.item', requestOptions, { id: id }).catch();
+                return _this.connector.get('resource.item', requestOptions, { id: id });
             };
             return this.cache
                 .add('resource.item', promise, {
@@ -1879,7 +1883,7 @@ var Geocoder = (function (exports) {
                 .then(function (apiItems) {
                 var apiItem = apiItems && apiItems[opt.name];
                 if (apiItem) {
-                    apiItem = __spreadArray([], apiItem);
+                    apiItem = __spreadArray([], apiItem, true);
                     var url = apiItem.shift();
                     if (apiItem.length) {
                         var replaceParams = {};
@@ -1901,12 +1905,12 @@ var Geocoder = (function (exports) {
                         if (Array.isArray(paramList)) {
                             delete params.paramList;
                             paramList.forEach(function (x) {
-                                paramArray_1.push(x[0] + "=" + x[1]);
+                                paramArray_1.push("".concat(x[0], "=").concat(x[1]));
                             });
                         }
                         for (var p in params) {
                             if (apiItem.indexOf(p) === -1) {
-                                paramArray_1.push(p + "=" + params[p]);
+                                paramArray_1.push("".concat(p, "=").concat(params[p]));
                             }
                         }
                         if (paramArray_1.length) {
@@ -2040,7 +2044,7 @@ var Geocoder = (function (exports) {
                 headers: this.getAuthorizationHeaders(credentials),
                 // withCredentials: true
             };
-            // Do not use request('auth.current_user') to avoid circular-references
+            // Do not use apiRequest('auth.current_user') to avoid circular-references
             return this.makeQuery('/api/component/auth/current_user', {}, options)
                 .then(function (data) {
                 _this.user = data;
@@ -2067,7 +2071,7 @@ var Geocoder = (function (exports) {
             credentials = credentials || this.options.auth;
             if (credentials) {
                 var login = credentials.login, password = credentials.password;
-                var str = unescape(encodeURIComponent(login + ":" + password));
+                var str = unescape(encodeURIComponent("".concat(login, ":").concat(password)));
                 // @ts-ignore
                 {
                     return window.btoa(str);
@@ -2377,7 +2381,7 @@ var Geocoder = (function (exports) {
                                         case 0:
                                             limit = resource.limit || 300;
                                             request = this_1.connector.get('feature_layer.store', {
-                                                headers: { RANGE: "items=0-" + limit },
+                                                headers: { RANGE: "items=0-".concat(limit) },
                                             }, {
                                                 id: resource.id,
                                                 like: like,
@@ -2498,7 +2502,7 @@ var Geocoder = (function (exports) {
                         case 0:
                             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);
+                            "".concat(this.searchUrl, "/search?format=geojson&polygon_geojson=1&q=").concat(val));
                             request = new CancelablePromise(function (resolve, reject, onCancel) {
                                 var xhr = new XMLHttpRequest();
                                 xhr.open('GET', url, true);