@nextgis/geocoder 1.9.3 → 1.11.3

package/lib/geocoder.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.9.3; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.3; 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.3; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.3; 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) {
@@ -1192,13 +1196,46 @@ var Geocoder = (function (exports) {
       }
     }
 
+    /**
+     * @example
+     * ```javascript
+     * const cache1 = new Cache();
+     * cache1.add('foo', 'value');
+     *
+     * const cache2 = new Cache();
+     * cache2.match('foo'); // value
+     *
+     * const cache3 = new Cache({ namespace: 'foo' });
+     * cache3.match('foo'); // undefined
+     * ```
+     *
+     * @example
+     * ```javascript
+     * let COUNTER = 0;
+     * const createPromise = () => new Promise((res) => {
+     *   COUNTER++
+     *   setTimeout(() => res('Ok'), 300)
+     * });
+     *
+     * const cache = new Cache();
+     * for (let i = 0; i < 10; i++) {
+     *   cache.add('foo', createPromise).then((data) => {
+     *     console.log(data); // 'Ok'
+     *   });
+     * }
+     * console.log(COUNTER); // 1
+     * ```
+     */
     var Cache$1 = /** @class */ (function () {
-        function Cache() {
+        function Cache(options) {
+            if (options === void 0) { options = {}; }
+            var _a;
             this.cache = [];
-            if (Cache.instance) {
-                return Cache.instance;
+            var namespace = (_a = options.namespace) !== null && _a !== void 0 ? _a : 'default';
+            if (Cache.instance[namespace]) {
+                return Cache.instance[namespace];
             }
-            Cache.instance = this;
+            Cache.instance[namespace] = this;
             return this;
         }
         Cache.prototype.clean = function () {
@@ -1207,12 +1244,34 @@ var Geocoder = (function (exports) {
         Cache.prototype.all = function () {
             return this.cache;
         };
-        Cache.prototype.addFull = function (key, valueToSet, options) {
-            return this.add(key, valueToSet, options, true);
+        /**
+         * Caching only a non-empty value.
+         *
+         * Useful for get or create strategy
+         * @example
+         * ```javascript
+         * const cache = new Cache();
+         * const getItemFunc = () => fetch(url).then((data) => {
+         *  return data.json(); // undefined
+         * });
+         * const item = await cache.addFull('foo', getItemFunc);
+         * if (!item) {
+         *   await createItem(); // 'New item'
+         * }
+         *
+         * // somewhere else in the code
+         * const item = await cache.addFull('foo', getItemFunc).then((resp) => {
+         *   console.log(resp); // 'New item'
+         * })
+         *
+         * ```
+         */
+        Cache.prototype.addFull = function (key, valueToSet, props) {
+            return this.add(key, valueToSet, props, true);
         };
-        Cache.prototype.add = function (key, valueToSet, options, onlyFull) {
+        Cache.prototype.add = function (key, valueToSet, props, onlyFull) {
             var _this = this;
-            var exist = this._find(key, options);
+            var exist = this._find(key, props);
             if (!exist) {
                 var value = void 0;
                 if (valueToSet instanceof Function) {
@@ -1221,11 +1280,13 @@ var Geocoder = (function (exports) {
                 else {
                     value = valueToSet;
                 }
-                var options_ = options && JSON.parse(JSON.stringify(objectRemoveEmpty(options)));
+                var props_ = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
                 var cacheItem = {
                     key: key,
                     value: value,
-                    options: options_,
+                    props: props_,
+                    // TODO: remove backward compatibility use only props
+                    options: props_,
                 };
                 if (onlyFull && !full(value)) {
                     return value;
@@ -1233,13 +1294,13 @@ var Geocoder = (function (exports) {
                 this.cache.push(cacheItem);
                 if (value instanceof Promise) {
                     value.catch(function (er) {
-                        _this.delete(key, options);
+                        _this.delete(key, props);
                         throw er;
                     });
                     if (onlyFull) {
                         value.then(function (x) {
                             if (!full(x)) {
-                                _this.delete(key, options);
+                                _this.delete(key, props);
                             }
                             return x;
                         });
@@ -1252,26 +1313,26 @@ var Geocoder = (function (exports) {
                 return exist.value;
             }
         };
-        Cache.prototype.match = function (key, options) {
-            var cacheRecord = this._find(key, options);
+        Cache.prototype.match = function (key, props) {
+            var cacheRecord = this._find(key, props);
             if (cacheRecord) {
                 return cacheRecord.value;
             }
         };
-        Cache.prototype.matchAll = function (key, options) {
+        Cache.prototype.matchAll = function (key, props) {
             var _this = this;
             if (key) {
                 return this.cache
-                    .filter(function (x) { return _this._filter(x, key, options); })
+                    .filter(function (x) { return _this._filter(x, key, props); })
                     .map(function (x) { return x.value; });
             }
             return this.cache.map(function (x) { return x.value; });
         };
-        Cache.prototype.delete = function (keyOrItem, options) {
+        Cache.prototype.delete = function (keyOrItem, props) {
             var _this = this;
             var exist = [];
             if (typeof keyOrItem === 'string') {
-                exist = this.cache.filter(function (x) { return _this._filter(x, keyOrItem, options); });
+                exist = this.cache.filter(function (x) { return _this._filter(x, keyOrItem, props); });
             }
             else {
                 exist.push(keyOrItem);
@@ -1282,19 +1343,22 @@ var Geocoder = (function (exports) {
                 this.cache.splice(index, 1);
             }
         };
-        Cache.prototype._find = function (key, options) {
+        Cache.prototype._find = function (key, props) {
             var _this = this;
-            return this.cache.find(function (x) { return _this._filter(x, key, options); });
+            return this.cache.find(function (x) { return _this._filter(x, key, props); });
         };
-        Cache.prototype._filter = function (item, key, options) {
+        Cache.prototype._filter = function (item, key, props) {
             if (item.key === key) {
-                if (options) {
-                    return objectDeepEqual(item.options || {}, objectRemoveEmpty(options));
+                if (props) {
+                    // TODO: remove backward compatibility
+                    var itemProps = item.props || item.options;
+                    return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
                 }
                 return true;
             }
             return false;
         };
+        Cache.instance = {};
         return Cache;
     }());
 
@@ -1330,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
     {
@@ -1371,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();
@@ -1426,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]);
                     }
                 }
@@ -1518,10 +1586,6 @@ var Geocoder = (function (exports) {
         }
     }
 
-    function isObject(val) {
-        return Object.prototype.toString.call(val) === '[object Object]';
-    }
-
     var exclude = ['description'];
     /**
      * @remarks
@@ -1772,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, {
@@ -1819,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 = {};
@@ -1841,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) {
@@ -1980,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;
@@ -2007,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);
@@ -2317,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,
@@ -2438,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);