@nextgis/geocoder 1.9.2 → 1.11.2

package/lib/geocoder.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.9.2; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.2; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -91,7 +91,7 @@ class NgwProvider extends BaseProvider {
             });
             this.requests.push(request);
             request.catch((er) => {
-                console.log(er);
+                console.warn(er);
             });
             const resp = await request;
             const entries = [];

package/lib/geocoder.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"geocoder.cjs.js","sources":["../src/BaseGeocoder.ts","../src/Geocoder.ts","../src/providers/BaseProvider.ts","../src/providers/NgwProvider.ts","../src/providers/NominatimProvider.ts","../src/index.ts"],"sourcesContent":["import { objectAssign } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { SearchItem } from './types/SearchItem';\n\nexport abstract class BaseGeocoder<\n  O extends Record<string, any> = Record<string, any>,\n> {\n  constructor(options?: O) {\n    if (options) {\n      objectAssign(this, options);\n    }\n  }\n\n  abstract search(query: string): AsyncGenerator<SearchItem>;\n\n  abstract result(item: SearchItem): CancelablePromise<any>;\n\n  abstract abort?(): void;\n}\n","import CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './providers/BaseProvider';\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { BaseGeocoder } from './BaseGeocoder';\nimport { SearchItem } from './types/SearchItem';\n\nlet ID = 0;\n\nexport class Geocoder extends BaseGeocoder<GeocoderOptions> {\n  providers: BaseProvider[] = [];\n\n  constructor(options: GeocoderOptions) {\n    super(options);\n    if (options && options.providers) {\n      this.providers = options.providers;\n    }\n  }\n\n  abort(): void {\n    this.providers.forEach((x) => {\n      if (x.abort) {\n        x.abort();\n      }\n    });\n  }\n\n  async *search(query: string): AsyncGenerator<SearchItem, void, unknown> {\n    for (const provider of this.providers) {\n      try {\n        const results = provider.search(query);\n\n        for await (const r of results) {\n          yield { ...r, provider, _id: ID++ };\n        }\n      } catch (er) {\n        //\n      }\n    }\n  }\n\n  result(item: SearchItem): CancelablePromise<any> {\n    if (item.provider) {\n      return item.provider.result(item);\n    }\n    return CancelablePromise.resolve(undefined);\n  }\n}\n","import { BaseProviderOptions } from './BaseProviderOptions';\nimport { BaseGeocoder } from '../BaseGeocoder';\n\nexport abstract class BaseProvider<\n  O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n  searchUrl?: string;\n  label?: string;\n}\n","import NgwConnector, { ResourceStoreItem } from '@nextgis/ngw-connector';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\ninterface NgwSearchItem extends SearchItem {\n  resourceId: number;\n  featureId: number;\n}\n\ninterface SearchResource {\n  id: number;\n  limit?: number;\n}\n\ninterface NgwProviderOptions extends BaseProviderOptions {\n  connector?: NgwConnector;\n  searchResources: SearchResource[];\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n  caseInsensitive = true;\n  searchUrl = 'https://maxim.nextgis.com';\n  searchResources: SearchResource[] = [];\n  private connector: NgwConnector;\n  private requests: CancelablePromise[] = [];\n\n  constructor(options: NgwProviderOptions) {\n    super(options);\n\n    this.connector =\n      options.connector ||\n      new NgwConnector({\n        baseUrl: this.searchUrl,\n      });\n    this.searchResources = options.searchResources;\n  }\n\n  abort(): void {\n    this.requests.forEach((x) => {\n      x.cancel();\n    });\n    this.requests = [];\n  }\n\n  async *search(like: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n    for (const resource of this.searchResources) {\n      const limit = resource.limit || 300;\n      const request = this.connector.get(\n        'feature_layer.store',\n        {\n          headers: { RANGE: `items=0-${limit}` },\n        },\n        {\n          id: resource.id,\n          like,\n        },\n      );\n      this.requests.push(request);\n      request.catch((er) => {\n        console.log(er);\n      });\n      const resp = await request;\n      const entries: ResourceStoreItem[] = [];\n      if (resp) {\n        resp.forEach((x) => {\n          entries.push({\n            query: like,\n            resourceId: resource.id,\n            ...x,\n          });\n        });\n      }\n      for (const item of this._items(entries)) {\n        item.result = () => this.result(item);\n        yield item;\n      }\n    }\n  }\n\n  result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n    const req = this.connector\n      .get('feature_layer.feature.item_extent', null, {\n        id: item.resourceId,\n        fid: item.featureId,\n      })\n      .then((x) => {\n        const e = x.extent;\n        return {\n          text: item.text,\n          extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],\n        };\n      });\n    this.requests.push(req);\n    return req;\n  }\n\n  _items(entries: ResourceStoreItem[]): NgwSearchItem[] {\n    const items: NgwSearchItem[] = [];\n    entries.forEach((entry) => {\n      const meta = this.searchResources.find((x) => x.id === entry.resourceId);\n      if (meta) {\n        items.push({\n          query: entry.query,\n          text: entry.label,\n          featureId: entry.id,\n          resourceId: entry.resourceId,\n        });\n      }\n    });\n    return items;\n  }\n}\n","import { fixUrlStr } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { FeatureCollection } from 'geojson';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\nexport class NominatimProvider extends BaseProvider {\n  searchUrl = 'https://nominatim.openstreetmap.org';\n\n  private _requests: CancelablePromise[] = [];\n\n  constructor(options?: BaseProviderOptions) {\n    super(options);\n  }\n\n  abort(): void {\n    this._requests.forEach((x) => x.cancel());\n    this._requests = [];\n  }\n\n  async *search(val: string): AsyncGenerator<SearchItem, void, unknown> {\n    // RFC2616 accept - language string\n    const url = fixUrlStr(\n      // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`\n      `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`,\n    );\n    const request = new CancelablePromise<SearchItem[]>(\n      (resolve, reject, onCancel) => {\n        const xhr = new XMLHttpRequest();\n        xhr.open('GET', url, true);\n        xhr.onload = () => {\n          try {\n            const geojson = JSON.parse(xhr.responseText) as FeatureCollection;\n            const features: SearchItem[] = geojson.features.map((x) => {\n              return {\n                geom: x,\n                extent: x.bbox,\n                text: x.properties && x.properties.display_name,\n                query: val,\n              };\n            });\n            resolve(features);\n          } catch (er) {\n            reject(er);\n          }\n        };\n\n        xhr.onerror = (er) => {\n          reject(er);\n        };\n\n        onCancel(() => {\n          xhr.abort();\n        });\n\n        xhr.send();\n      },\n    ).catch((er) => {\n      if (er.name === 'CancelError') {\n        //\n      }\n      throw er;\n    });\n    this._requests.push(request);\n    const items = await request;\n    if (items) {\n      for (const i of items) {\n        i.result = () => this.result(i);\n        yield i;\n      }\n    }\n  }\n\n  result(model: SearchItem): CancelablePromise<ResultItem> {\n    return CancelablePromise.resolve({\n      text: model.text,\n      extent: model.extent || [],\n      geom: model.geom,\n    });\n  }\n}\n","/**\n * Modern geocoder on async generators. May use different data providers.\n *\n * @packageDocumentation\n * @module geocoder\n */\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { Geocoder } from './Geocoder';\n\nexport { Geocoder, GeocoderOptions };\nexport { BaseProvider } from './providers/BaseProvider';\nexport { NgwProvider } from './providers/NgwProvider';\nexport { NominatimProvider } from './providers/NominatimProvider';\n\nexport * from './providers/BaseProviderOptions';\nexport * from './types/ResultItem';\nexport * from './types/SearchItem';\n\nexport function create(options: GeocoderOptions): Geocoder {\n  return new Geocoder(options);\n}\n"],"names":["objectAssign","CancelablePromise","NgwConnector","fixUrlStr"],"mappings":"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"}
+{"version":3,"file":"geocoder.cjs.js","sources":["../src/BaseGeocoder.ts","../src/Geocoder.ts","../src/providers/BaseProvider.ts","../src/providers/NgwProvider.ts","../src/providers/NominatimProvider.ts","../src/index.ts"],"sourcesContent":["import { objectAssign } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { SearchItem } from './types/SearchItem';\n\nexport abstract class BaseGeocoder<\n  O extends Record<string, any> = Record<string, any>,\n> {\n  constructor(options?: O) {\n    if (options) {\n      objectAssign(this, options);\n    }\n  }\n\n  abstract search(query: string): AsyncGenerator<SearchItem>;\n\n  abstract result(item: SearchItem): CancelablePromise<any>;\n\n  abstract abort?(): void;\n}\n","import CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './providers/BaseProvider';\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { BaseGeocoder } from './BaseGeocoder';\nimport { SearchItem } from './types/SearchItem';\n\nlet ID = 0;\n\nexport class Geocoder extends BaseGeocoder<GeocoderOptions> {\n  providers: BaseProvider[] = [];\n\n  constructor(options: GeocoderOptions) {\n    super(options);\n    if (options && options.providers) {\n      this.providers = options.providers;\n    }\n  }\n\n  abort(): void {\n    this.providers.forEach((x) => {\n      if (x.abort) {\n        x.abort();\n      }\n    });\n  }\n\n  async *search(query: string): AsyncGenerator<SearchItem, void, unknown> {\n    for (const provider of this.providers) {\n      try {\n        const results = provider.search(query);\n\n        for await (const r of results) {\n          yield { ...r, provider, _id: ID++ };\n        }\n      } catch (er) {\n        //\n      }\n    }\n  }\n\n  result(item: SearchItem): CancelablePromise<any> {\n    if (item.provider) {\n      return item.provider.result(item);\n    }\n    return CancelablePromise.resolve(undefined);\n  }\n}\n","import { BaseProviderOptions } from './BaseProviderOptions';\nimport { BaseGeocoder } from '../BaseGeocoder';\n\nexport abstract class BaseProvider<\n  O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n  searchUrl?: string;\n  label?: string;\n}\n","import NgwConnector, { ResourceStoreItem } from '@nextgis/ngw-connector';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\ninterface NgwSearchItem extends SearchItem {\n  resourceId: number;\n  featureId: number;\n}\n\ninterface SearchResource {\n  id: number;\n  limit?: number;\n}\n\ninterface NgwProviderOptions extends BaseProviderOptions {\n  connector?: NgwConnector;\n  searchResources: SearchResource[];\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n  caseInsensitive = true;\n  searchUrl = 'https://maxim.nextgis.com';\n  searchResources: SearchResource[] = [];\n  private connector: NgwConnector;\n  private requests: CancelablePromise[] = [];\n\n  constructor(options: NgwProviderOptions) {\n    super(options);\n\n    this.connector =\n      options.connector ||\n      new NgwConnector({\n        baseUrl: this.searchUrl,\n      });\n    this.searchResources = options.searchResources;\n  }\n\n  abort(): void {\n    this.requests.forEach((x) => {\n      x.cancel();\n    });\n    this.requests = [];\n  }\n\n  async *search(like: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n    for (const resource of this.searchResources) {\n      const limit = resource.limit || 300;\n      const request = this.connector.get(\n        'feature_layer.store',\n        {\n          headers: { RANGE: `items=0-${limit}` },\n        },\n        {\n          id: resource.id,\n          like,\n        },\n      );\n      this.requests.push(request);\n      request.catch((er) => {\n        console.warn(er);\n      });\n      const resp = await request;\n      const entries: ResourceStoreItem[] = [];\n      if (resp) {\n        resp.forEach((x) => {\n          entries.push({\n            query: like,\n            resourceId: resource.id,\n            ...x,\n          });\n        });\n      }\n      for (const item of this._items(entries)) {\n        item.result = () => this.result(item);\n        yield item;\n      }\n    }\n  }\n\n  result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n    const req = this.connector\n      .get('feature_layer.feature.item_extent', null, {\n        id: item.resourceId,\n        fid: item.featureId,\n      })\n      .then((x) => {\n        const e = x.extent;\n        return {\n          text: item.text,\n          extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],\n        };\n      });\n    this.requests.push(req);\n    return req;\n  }\n\n  _items(entries: ResourceStoreItem[]): NgwSearchItem[] {\n    const items: NgwSearchItem[] = [];\n    entries.forEach((entry) => {\n      const meta = this.searchResources.find((x) => x.id === entry.resourceId);\n      if (meta) {\n        items.push({\n          query: entry.query,\n          text: entry.label,\n          featureId: entry.id,\n          resourceId: entry.resourceId,\n        });\n      }\n    });\n    return items;\n  }\n}\n","import { fixUrlStr } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { FeatureCollection } from 'geojson';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\nexport class NominatimProvider extends BaseProvider {\n  searchUrl = 'https://nominatim.openstreetmap.org';\n\n  private _requests: CancelablePromise[] = [];\n\n  constructor(options?: BaseProviderOptions) {\n    super(options);\n  }\n\n  abort(): void {\n    this._requests.forEach((x) => x.cancel());\n    this._requests = [];\n  }\n\n  async *search(val: string): AsyncGenerator<SearchItem, void, unknown> {\n    // RFC2616 accept - language string\n    const url = fixUrlStr(\n      // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`\n      `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`,\n    );\n    const request = new CancelablePromise<SearchItem[]>(\n      (resolve, reject, onCancel) => {\n        const xhr = new XMLHttpRequest();\n        xhr.open('GET', url, true);\n        xhr.onload = () => {\n          try {\n            const geojson = JSON.parse(xhr.responseText) as FeatureCollection;\n            const features: SearchItem[] = geojson.features.map((x) => {\n              return {\n                geom: x,\n                extent: x.bbox,\n                text: x.properties && x.properties.display_name,\n                query: val,\n              };\n            });\n            resolve(features);\n          } catch (er) {\n            reject(er);\n          }\n        };\n\n        xhr.onerror = (er) => {\n          reject(er);\n        };\n\n        onCancel(() => {\n          xhr.abort();\n        });\n\n        xhr.send();\n      },\n    ).catch((er) => {\n      if (er.name === 'CancelError') {\n        //\n      }\n      throw er;\n    });\n    this._requests.push(request);\n    const items = await request;\n    if (items) {\n      for (const i of items) {\n        i.result = () => this.result(i);\n        yield i;\n      }\n    }\n  }\n\n  result(model: SearchItem): CancelablePromise<ResultItem> {\n    return CancelablePromise.resolve({\n      text: model.text,\n      extent: model.extent || [],\n      geom: model.geom,\n    });\n  }\n}\n","/**\n * Modern geocoder on async generators. May use different data providers.\n *\n * @packageDocumentation\n * @module geocoder\n */\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { Geocoder } from './Geocoder';\n\nexport { Geocoder, GeocoderOptions };\nexport { BaseProvider } from './providers/BaseProvider';\nexport { NgwProvider } from './providers/NgwProvider';\nexport { NominatimProvider } from './providers/NominatimProvider';\n\nexport * from './providers/BaseProviderOptions';\nexport * from './types/ResultItem';\nexport * from './types/SearchItem';\n\nexport function create(options: GeocoderOptions): Geocoder {\n  return new Geocoder(options);\n}\n"],"names":["objectAssign","CancelablePromise","NgwConnector","fixUrlStr"],"mappings":"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"}

package/lib/geocoder.cjs.prod.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@nextgis/cancelable-promise"),t=require("@nextgis/utils"),s=require("@nextgis/ngw-connector");function r(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var o=r(e),c=r(s);class i{constructor(e){e&&t.objectAssign(this,e)}}let n=0;class a extends i{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:n++}}catch(e){}}result(e){return e.provider?e.provider.result(e):o.resolve(void 0)}}class u extends i{}exports.BaseProvider=u,exports.Geocoder=a,exports.NgwProvider=class extends u{constructor(e){super(e),this.caseInsensitive=!0,this.searchUrl="https://maxim.nextgis.com",this.searchResources=[],this.requests=[],this.connector=e.connector||new c({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.log(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}},exports.NominatimProvider=class extends u{constructor(e){super(e),this.searchUrl="https://nominatim.openstreetmap.org",this._requests=[]}abort(){this._requests.forEach((e=>e.cancel())),this._requests=[]}async*search(e){const s=t.fixUrlStr(`${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${e}`),r=new o(((t,r,o)=>{const c=new XMLHttpRequest;c.open("GET",s,!0),c.onload=()=>{try{const s=JSON.parse(c.responseText).features.map((t=>({geom:t,extent:t.bbox,text:t.properties&&t.properties.display_name,query:e})));t(s)}catch(e){r(e)}},c.onerror=e=>{r(e)},o((()=>{c.abort()})),c.send()})).catch((e=>{throw e}));this._requests.push(r);const c=await r;if(c)for(const e of c)e.result=()=>this.result(e),yield e}result(e){return o.resolve({text:e.text,extent:e.extent||[],geom:e.geom})}},exports.create=function(e){return new a(e)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@nextgis/cancelable-promise"),t=require("@nextgis/utils"),s=require("@nextgis/ngw-connector");function r(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var o=r(e),c=r(s);class i{constructor(e){e&&t.objectAssign(this,e)}}let n=0;class a extends i{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:n++}}catch(t){}}result(e){return e.provider?e.provider.result(e):o.resolve(void 0)}}class u extends i{}exports.BaseProvider=u,exports.Geocoder=a,exports.NgwProvider=class extends u{constructor(e){super(e),this.caseInsensitive=!0,this.searchUrl="https://maxim.nextgis.com",this.searchResources=[],this.requests=[],this.connector=e.connector||new c({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}},exports.NominatimProvider=class extends u{constructor(e){super(e),this.searchUrl="https://nominatim.openstreetmap.org",this._requests=[]}abort(){this._requests.forEach((e=>e.cancel())),this._requests=[]}async*search(e){const s=t.fixUrlStr(`${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${e}`),r=new o(((t,r,o)=>{const c=new XMLHttpRequest;c.open("GET",s,!0),c.onload=()=>{try{const s=JSON.parse(c.responseText).features.map((t=>({geom:t,extent:t.bbox,text:t.properties&&t.properties.display_name,query:e})));t(s)}catch(s){r(s)}},c.onerror=e=>{r(e)},o((()=>{c.abort()})),c.send()})).catch((e=>{throw e}));this._requests.push(r);const c=await r;if(c)for(const t of c)t.result=()=>this.result(t),yield t}result(e){return o.resolve({text:e.text,extent:e.extent||[],geom:e.geom})}},exports.create=function(e){return new a(e)};
 //# sourceMappingURL=geocoder.cjs.prod.js.map

package/lib/geocoder.cjs.prod.js.map

@@ -1 +1 @@
-{"version":3,"file":"geocoder.cjs.prod.js","sources":["../src/BaseGeocoder.ts","../src/Geocoder.ts","../src/providers/BaseProvider.ts","../src/providers/NgwProvider.ts","../src/providers/NominatimProvider.ts","../src/index.ts"],"sourcesContent":["import { objectAssign } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { SearchItem } from './types/SearchItem';\n\nexport abstract class BaseGeocoder<\n  O extends Record<string, any> = Record<string, any>,\n> {\n  constructor(options?: O) {\n    if (options) {\n      objectAssign(this, options);\n    }\n  }\n\n  abstract search(query: string): AsyncGenerator<SearchItem>;\n\n  abstract result(item: SearchItem): CancelablePromise<any>;\n\n  abstract abort?(): void;\n}\n","import CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './providers/BaseProvider';\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { BaseGeocoder } from './BaseGeocoder';\nimport { SearchItem } from './types/SearchItem';\n\nlet ID = 0;\n\nexport class Geocoder extends BaseGeocoder<GeocoderOptions> {\n  providers: BaseProvider[] = [];\n\n  constructor(options: GeocoderOptions) {\n    super(options);\n    if (options && options.providers) {\n      this.providers = options.providers;\n    }\n  }\n\n  abort(): void {\n    this.providers.forEach((x) => {\n      if (x.abort) {\n        x.abort();\n      }\n    });\n  }\n\n  async *search(query: string): AsyncGenerator<SearchItem, void, unknown> {\n    for (const provider of this.providers) {\n      try {\n        const results = provider.search(query);\n\n        for await (const r of results) {\n          yield { ...r, provider, _id: ID++ };\n        }\n      } catch (er) {\n        //\n      }\n    }\n  }\n\n  result(item: SearchItem): CancelablePromise<any> {\n    if (item.provider) {\n      return item.provider.result(item);\n    }\n    return CancelablePromise.resolve(undefined);\n  }\n}\n","import { BaseProviderOptions } from './BaseProviderOptions';\nimport { BaseGeocoder } from '../BaseGeocoder';\n\nexport abstract class BaseProvider<\n  O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n  searchUrl?: string;\n  label?: string;\n}\n","import NgwConnector, { ResourceStoreItem } from '@nextgis/ngw-connector';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\ninterface NgwSearchItem extends SearchItem {\n  resourceId: number;\n  featureId: number;\n}\n\ninterface SearchResource {\n  id: number;\n  limit?: number;\n}\n\ninterface NgwProviderOptions extends BaseProviderOptions {\n  connector?: NgwConnector;\n  searchResources: SearchResource[];\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n  caseInsensitive = true;\n  searchUrl = 'https://maxim.nextgis.com';\n  searchResources: SearchResource[] = [];\n  private connector: NgwConnector;\n  private requests: CancelablePromise[] = [];\n\n  constructor(options: NgwProviderOptions) {\n    super(options);\n\n    this.connector =\n      options.connector ||\n      new NgwConnector({\n        baseUrl: this.searchUrl,\n      });\n    this.searchResources = options.searchResources;\n  }\n\n  abort(): void {\n    this.requests.forEach((x) => {\n      x.cancel();\n    });\n    this.requests = [];\n  }\n\n  async *search(like: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n    for (const resource of this.searchResources) {\n      const limit = resource.limit || 300;\n      const request = this.connector.get(\n        'feature_layer.store',\n        {\n          headers: { RANGE: `items=0-${limit}` },\n        },\n        {\n          id: resource.id,\n          like,\n        },\n      );\n      this.requests.push(request);\n      request.catch((er) => {\n        console.log(er);\n      });\n      const resp = await request;\n      const entries: ResourceStoreItem[] = [];\n      if (resp) {\n        resp.forEach((x) => {\n          entries.push({\n            query: like,\n            resourceId: resource.id,\n            ...x,\n          });\n        });\n      }\n      for (const item of this._items(entries)) {\n        item.result = () => this.result(item);\n        yield item;\n      }\n    }\n  }\n\n  result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n    const req = this.connector\n      .get('feature_layer.feature.item_extent', null, {\n        id: item.resourceId,\n        fid: item.featureId,\n      })\n      .then((x) => {\n        const e = x.extent;\n        return {\n          text: item.text,\n          extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],\n        };\n      });\n    this.requests.push(req);\n    return req;\n  }\n\n  _items(entries: ResourceStoreItem[]): NgwSearchItem[] {\n    const items: NgwSearchItem[] = [];\n    entries.forEach((entry) => {\n      const meta = this.searchResources.find((x) => x.id === entry.resourceId);\n      if (meta) {\n        items.push({\n          query: entry.query,\n          text: entry.label,\n          featureId: entry.id,\n          resourceId: entry.resourceId,\n        });\n      }\n    });\n    return items;\n  }\n}\n","import { fixUrlStr } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { FeatureCollection } from 'geojson';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\nexport class NominatimProvider extends BaseProvider {\n  searchUrl = 'https://nominatim.openstreetmap.org';\n\n  private _requests: CancelablePromise[] = [];\n\n  constructor(options?: BaseProviderOptions) {\n    super(options);\n  }\n\n  abort(): void {\n    this._requests.forEach((x) => x.cancel());\n    this._requests = [];\n  }\n\n  async *search(val: string): AsyncGenerator<SearchItem, void, unknown> {\n    // RFC2616 accept - language string\n    const url = fixUrlStr(\n      // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`\n      `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`,\n    );\n    const request = new CancelablePromise<SearchItem[]>(\n      (resolve, reject, onCancel) => {\n        const xhr = new XMLHttpRequest();\n        xhr.open('GET', url, true);\n        xhr.onload = () => {\n          try {\n            const geojson = JSON.parse(xhr.responseText) as FeatureCollection;\n            const features: SearchItem[] = geojson.features.map((x) => {\n              return {\n                geom: x,\n                extent: x.bbox,\n                text: x.properties && x.properties.display_name,\n                query: val,\n              };\n            });\n            resolve(features);\n          } catch (er) {\n            reject(er);\n          }\n        };\n\n        xhr.onerror = (er) => {\n          reject(er);\n        };\n\n        onCancel(() => {\n          xhr.abort();\n        });\n\n        xhr.send();\n      },\n    ).catch((er) => {\n      if (er.name === 'CancelError') {\n        //\n      }\n      throw er;\n    });\n    this._requests.push(request);\n    const items = await request;\n    if (items) {\n      for (const i of items) {\n        i.result = () => this.result(i);\n        yield i;\n      }\n    }\n  }\n\n  result(model: SearchItem): CancelablePromise<ResultItem> {\n    return CancelablePromise.resolve({\n      text: model.text,\n      extent: model.extent || [],\n      geom: model.geom,\n    });\n  }\n}\n","/**\n * Modern geocoder on async generators. May use different data providers.\n *\n * @packageDocumentation\n * @module geocoder\n */\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { Geocoder } from './Geocoder';\n\nexport { Geocoder, GeocoderOptions };\nexport { BaseProvider } from './providers/BaseProvider';\nexport { NgwProvider } from './providers/NgwProvider';\nexport { NominatimProvider } from './providers/NominatimProvider';\n\nexport * from './providers/BaseProviderOptions';\nexport * from './types/ResultItem';\nexport * from './types/SearchItem';\n\nexport function create(options: GeocoderOptions): Geocoder {\n  return new Geocoder(options);\n}\n"],"names":["BaseGeocoder","constructor","options","objectAssign","this","ID","Geocoder","super","providers","abort","forEach","x","search","query","provider","results","r","_id","er","result","item","CancelablePromise","resolve","undefined","BaseProvider","connector","NgwConnector","baseUrl","searchUrl","searchResources","requests","cancel","like","resource","request","get","headers","RANGE","limit","id","push","catch","console","log","resp","entries","resourceId","_items","req","fid","featureId","then","e","extent","text","minLon","minLat","maxLon","maxLat","items","entry","find","label","_requests","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","i","model"],"mappings":"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"}
+{"version":3,"file":"geocoder.cjs.prod.js","sources":["../src/BaseGeocoder.ts","../src/Geocoder.ts","../src/providers/BaseProvider.ts","../src/providers/NgwProvider.ts","../src/providers/NominatimProvider.ts","../src/index.ts"],"sourcesContent":["import { objectAssign } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { SearchItem } from './types/SearchItem';\n\nexport abstract class BaseGeocoder<\n  O extends Record<string, any> = Record<string, any>,\n> {\n  constructor(options?: O) {\n    if (options) {\n      objectAssign(this, options);\n    }\n  }\n\n  abstract search(query: string): AsyncGenerator<SearchItem>;\n\n  abstract result(item: SearchItem): CancelablePromise<any>;\n\n  abstract abort?(): void;\n}\n","import CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './providers/BaseProvider';\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { BaseGeocoder } from './BaseGeocoder';\nimport { SearchItem } from './types/SearchItem';\n\nlet ID = 0;\n\nexport class Geocoder extends BaseGeocoder<GeocoderOptions> {\n  providers: BaseProvider[] = [];\n\n  constructor(options: GeocoderOptions) {\n    super(options);\n    if (options && options.providers) {\n      this.providers = options.providers;\n    }\n  }\n\n  abort(): void {\n    this.providers.forEach((x) => {\n      if (x.abort) {\n        x.abort();\n      }\n    });\n  }\n\n  async *search(query: string): AsyncGenerator<SearchItem, void, unknown> {\n    for (const provider of this.providers) {\n      try {\n        const results = provider.search(query);\n\n        for await (const r of results) {\n          yield { ...r, provider, _id: ID++ };\n        }\n      } catch (er) {\n        //\n      }\n    }\n  }\n\n  result(item: SearchItem): CancelablePromise<any> {\n    if (item.provider) {\n      return item.provider.result(item);\n    }\n    return CancelablePromise.resolve(undefined);\n  }\n}\n","import { BaseProviderOptions } from './BaseProviderOptions';\nimport { BaseGeocoder } from '../BaseGeocoder';\n\nexport abstract class BaseProvider<\n  O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n  searchUrl?: string;\n  label?: string;\n}\n","import NgwConnector, { ResourceStoreItem } from '@nextgis/ngw-connector';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\ninterface NgwSearchItem extends SearchItem {\n  resourceId: number;\n  featureId: number;\n}\n\ninterface SearchResource {\n  id: number;\n  limit?: number;\n}\n\ninterface NgwProviderOptions extends BaseProviderOptions {\n  connector?: NgwConnector;\n  searchResources: SearchResource[];\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n  caseInsensitive = true;\n  searchUrl = 'https://maxim.nextgis.com';\n  searchResources: SearchResource[] = [];\n  private connector: NgwConnector;\n  private requests: CancelablePromise[] = [];\n\n  constructor(options: NgwProviderOptions) {\n    super(options);\n\n    this.connector =\n      options.connector ||\n      new NgwConnector({\n        baseUrl: this.searchUrl,\n      });\n    this.searchResources = options.searchResources;\n  }\n\n  abort(): void {\n    this.requests.forEach((x) => {\n      x.cancel();\n    });\n    this.requests = [];\n  }\n\n  async *search(like: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n    for (const resource of this.searchResources) {\n      const limit = resource.limit || 300;\n      const request = this.connector.get(\n        'feature_layer.store',\n        {\n          headers: { RANGE: `items=0-${limit}` },\n        },\n        {\n          id: resource.id,\n          like,\n        },\n      );\n      this.requests.push(request);\n      request.catch((er) => {\n        console.warn(er);\n      });\n      const resp = await request;\n      const entries: ResourceStoreItem[] = [];\n      if (resp) {\n        resp.forEach((x) => {\n          entries.push({\n            query: like,\n            resourceId: resource.id,\n            ...x,\n          });\n        });\n      }\n      for (const item of this._items(entries)) {\n        item.result = () => this.result(item);\n        yield item;\n      }\n    }\n  }\n\n  result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n    const req = this.connector\n      .get('feature_layer.feature.item_extent', null, {\n        id: item.resourceId,\n        fid: item.featureId,\n      })\n      .then((x) => {\n        const e = x.extent;\n        return {\n          text: item.text,\n          extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],\n        };\n      });\n    this.requests.push(req);\n    return req;\n  }\n\n  _items(entries: ResourceStoreItem[]): NgwSearchItem[] {\n    const items: NgwSearchItem[] = [];\n    entries.forEach((entry) => {\n      const meta = this.searchResources.find((x) => x.id === entry.resourceId);\n      if (meta) {\n        items.push({\n          query: entry.query,\n          text: entry.label,\n          featureId: entry.id,\n          resourceId: entry.resourceId,\n        });\n      }\n    });\n    return items;\n  }\n}\n","import { fixUrlStr } from '@nextgis/utils';\nimport CancelablePromise from '@nextgis/cancelable-promise';\nimport { BaseProvider } from './BaseProvider';\nimport { BaseProviderOptions } from './BaseProviderOptions';\nimport { FeatureCollection } from 'geojson';\nimport { SearchItem } from '../types/SearchItem';\nimport { ResultItem } from '../types/ResultItem';\n\nexport class NominatimProvider extends BaseProvider {\n  searchUrl = 'https://nominatim.openstreetmap.org';\n\n  private _requests: CancelablePromise[] = [];\n\n  constructor(options?: BaseProviderOptions) {\n    super(options);\n  }\n\n  abort(): void {\n    this._requests.forEach((x) => x.cancel());\n    this._requests = [];\n  }\n\n  async *search(val: string): AsyncGenerator<SearchItem, void, unknown> {\n    // RFC2616 accept - language string\n    const url = fixUrlStr(\n      // `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`\n      `${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${val}`,\n    );\n    const request = new CancelablePromise<SearchItem[]>(\n      (resolve, reject, onCancel) => {\n        const xhr = new XMLHttpRequest();\n        xhr.open('GET', url, true);\n        xhr.onload = () => {\n          try {\n            const geojson = JSON.parse(xhr.responseText) as FeatureCollection;\n            const features: SearchItem[] = geojson.features.map((x) => {\n              return {\n                geom: x,\n                extent: x.bbox,\n                text: x.properties && x.properties.display_name,\n                query: val,\n              };\n            });\n            resolve(features);\n          } catch (er) {\n            reject(er);\n          }\n        };\n\n        xhr.onerror = (er) => {\n          reject(er);\n        };\n\n        onCancel(() => {\n          xhr.abort();\n        });\n\n        xhr.send();\n      },\n    ).catch((er) => {\n      if (er.name === 'CancelError') {\n        //\n      }\n      throw er;\n    });\n    this._requests.push(request);\n    const items = await request;\n    if (items) {\n      for (const i of items) {\n        i.result = () => this.result(i);\n        yield i;\n      }\n    }\n  }\n\n  result(model: SearchItem): CancelablePromise<ResultItem> {\n    return CancelablePromise.resolve({\n      text: model.text,\n      extent: model.extent || [],\n      geom: model.geom,\n    });\n  }\n}\n","/**\n * Modern geocoder on async generators. May use different data providers.\n *\n * @packageDocumentation\n * @module geocoder\n */\nimport { GeocoderOptions } from './GeocoderOptions';\nimport { Geocoder } from './Geocoder';\n\nexport { Geocoder, GeocoderOptions };\nexport { BaseProvider } from './providers/BaseProvider';\nexport { NgwProvider } from './providers/NgwProvider';\nexport { NominatimProvider } from './providers/NominatimProvider';\n\nexport * from './providers/BaseProviderOptions';\nexport * from './types/ResultItem';\nexport * from './types/SearchItem';\n\nexport function create(options: GeocoderOptions): Geocoder {\n  return new Geocoder(options);\n}\n"],"names":["BaseGeocoder","constructor","options","objectAssign","this","ID","Geocoder","super","providers","abort","forEach","x","search","query","provider","results","r","_id","er","result","item","CancelablePromise","resolve","undefined","BaseProvider","connector","NgwConnector","baseUrl","searchUrl","searchResources","requests","cancel","like","resource","request","get","headers","RANGE","limit","id","push","catch","console","warn","resp","entries","resourceId","_items","req","fid","featureId","then","e","extent","text","minLon","minLat","maxLon","maxLat","items","entry","find","label","_requests","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","i","model"],"mappings":"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"}

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.9.2; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.11.2; author: NextGIS */
 class CancelError extends Error {
     constructor() {
         super();
@@ -356,6 +356,23 @@ var CancelablePromise = CancelablePromise$1;
  */
 function defined(val) {
     return val !== undefined && val !== null;
+}
+/**
+ * from https://github.com/CesiumGS/cesium/blob/master/Source/Core/defined.js
+ *
+ * @param val - The object.
+ * @returns Returns true if the object is defined and not empty string, returns false otherwise.
+ *
+ * @example
+ * ```javascript
+ * full('foo') // true
+ * full('') // false
+ * full(undefined) // false
+ * full(0) // true
+ * ```
+ */
+function full(val) {
+    return typeof val === 'string' ? !!val : defined(val);
 }
 
 /**
@@ -962,13 +979,45 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
   }
 }
 
+/**
+ * @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
+ * ```
+ */
 class Cache$1 {
-    constructor() {
+    constructor(options = {}) {
+        var _a;
         this.cache = [];
-        if (Cache$1.instance) {
-            return Cache$1.instance;
+        const namespace = (_a = options.namespace) !== null && _a !== void 0 ? _a : 'default';
+        if (Cache$1.instance[namespace]) {
+            return Cache$1.instance[namespace];
         }
-        Cache$1.instance = this;
+        Cache$1.instance[namespace] = this;
         return this;
     }
     clean() {
@@ -977,8 +1026,33 @@ class Cache$1 {
     all() {
         return this.cache;
     }
-    add(key, valueToSet, options) {
-        const exist = this._find(key, options);
+    /**
+     * 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'
+     * })
+     *
+     * ```
+     */
+    addFull(key, valueToSet, props) {
+        return this.add(key, valueToSet, props, true);
+    }
+    add(key, valueToSet, props, onlyFull) {
+        const exist = this._find(key, props);
         if (!exist) {
             let value;
             if (valueToSet instanceof Function) {
@@ -987,18 +1061,31 @@ class Cache$1 {
             else {
                 value = valueToSet;
             }
-            const options_ = options && JSON.parse(JSON.stringify(objectRemoveEmpty(options)));
+            const props_ = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
             const cacheItem = {
                 key,
                 value,
-                options: options_,
+                props: props_,
+                // TODO: remove backward compatibility use only props
+                options: props_,
             };
+            if (onlyFull && !full(value)) {
+                return value;
+            }
             this.cache.push(cacheItem);
             if (value instanceof Promise) {
                 value.catch((er) => {
-                    this.delete(key, options);
+                    this.delete(key, props);
                     throw er;
                 });
+                if (onlyFull) {
+                    value.then((x) => {
+                        if (!full(x)) {
+                            this.delete(key, props);
+                        }
+                        return x;
+                    });
+                }
                 return value;
             }
             return value;
@@ -1007,40 +1094,49 @@ class Cache$1 {
             return exist.value;
         }
     }
-    match(key, options) {
-        const cacheRecord = this._find(key, options);
+    match(key, props) {
+        const cacheRecord = this._find(key, props);
         if (cacheRecord) {
             return cacheRecord.value;
         }
     }
-    matchAll(key, options) {
+    matchAll(key, props) {
         if (key) {
             return this.cache
-                .filter((x) => this._filter(x, key, options))
+                .filter((x) => this._filter(x, key, props))
                 .map((x) => x.value);
         }
         return this.cache.map((x) => x.value);
     }
-    delete(key, options) {
-        const exist = this.cache.filter((x) => this._filter(x, key, options));
+    delete(keyOrItem, props) {
+        let exist = [];
+        if (typeof keyOrItem === 'string') {
+            exist = this.cache.filter((x) => this._filter(x, keyOrItem, props));
+        }
+        else {
+            exist.push(keyOrItem);
+        }
         for (const e of exist) {
             const index = this.cache.indexOf(e);
             this.cache.splice(index, 1);
         }
     }
-    _find(key, options) {
-        return this.cache.find((x) => this._filter(x, key, options));
+    _find(key, props) {
+        return this.cache.find((x) => this._filter(x, key, props));
     }
-    _filter(item, key, options) {
+    _filter(item, key, props) {
         if (item.key === key) {
-            if (options) {
-                return objectDeepEqual(item.options || {}, objectRemoveEmpty(options));
+            if (props) {
+                // TODO: remove backward compatibility
+                const itemProps = item.props || item.options;
+                return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
             }
             return true;
         }
         return false;
     }
-}
+}
+Cache$1.instance = {};
 
 /**
  * Caching for asynchronous functions
@@ -1075,6 +1171,10 @@ class NetworkError extends Error {
     }
 }
 
+function isObject(val) {
+    return Object.prototype.toString.call(val) === '[object Object]';
+}
+
 let loadData;
 // @ts-ignore
 {
@@ -1108,7 +1208,7 @@ let loadData;
             }
         };
         xhr.onload = () => {
-            if ([401, 403, 404, 500].indexOf(xhr.status) !== -1) {
+            if ([401, 403, 404, 422, 500].indexOf(xhr.status) !== -1) {
                 error(new NgwError(getResponseText()));
             }
             processingResponse();
@@ -1163,7 +1263,7 @@ let loadData;
             data = new FormData();
             data.append('file', options.file);
             if (options.data) {
-                for (const d in data) {
+                for (const d in options.data) {
                     data.append(d, data[d]);
                 }
             }
@@ -1249,28 +1349,36 @@ function removeConnector(connector) {
     }
 }
 
-function isObject(val) {
-    return Object.prototype.toString.call(val) === '[object Object]';
-}
-
+const exclude = ['description'];
 /**
+ * @remarks
+ * https://docs.nextgis.ru/docs_ngweb_dev/doc/developer/resource.html#search-resources
+ *
  * ```
- * { keyname, parent: { id }} > { keyname, parent__id }
+ * { keyname, owner_user: { id }} > { keyname, owner_user__id }
  * ```
+ *
  * @param resource - Any property from NGW resource item
  */
 function resourceToQuery(resource, prefix = '') {
     prefix = prefix ? prefix + '__' : '';
     const query = {};
-    Object.entries(resource).forEach(([key, value]) => {
-        if (isObject(value)) {
-            const children = resourceToQuery(value, key);
-            Object.assign(query, children);
-        }
-        else if (defined(value)) {
-            query[prefix + key] = value;
+    for (const [key, value] of Object.entries(resource)) {
+        if (exclude.indexOf(key) === -1) {
+            if (isObject(value)) {
+                if (key === 'owner_user') {
+                    const children = resourceToQuery(value, key);
+                    Object.assign(query, children);
+                }
+                else if (key === 'parent' && 'id' in value) {
+                    query.parent_id = value.id;
+                }
+            }
+            else if (defined(value)) {
+                query[prefix + key] = value;
+            }
         }
-    });
+    }
     return query;
 }
 
@@ -1295,19 +1403,30 @@ class ResourcesControl {
      */
     getOne(resource, requestOptions) {
         const cache = new Cache();
+        const forCache = {};
+        const opt = { ...requestOptions, cache: false };
+        if (typeof resource === 'string') {
+            forCache.keyname = resource;
+        }
+        else if (typeof resource === 'number') {
+            forCache.id = resource;
+        }
+        else if (isObject(resource)) {
+            forCache.id = resource.id;
+        }
         const makeRequest = () => {
             if (typeof resource === 'string') {
-                return this._fetchResourceBy({ keyname: resource }, requestOptions);
+                return this._fetchResourceBy({ keyname: resource }, opt);
             }
             else if (typeof resource === 'number') {
-                return this._fetchResourceById(resource, requestOptions);
+                return this._fetchResourceById(resource, opt);
             }
             else if (isObject(resource)) {
-                return this._fetchResourceBy(resource, requestOptions);
+                return this._fetchResourceBy(resource, opt);
             }
             return CancelablePromise.resolve(undefined);
         };
-        return cache.add('resource', makeRequest, { resource });
+        return cache.addFull('resource', makeRequest, forCache);
     }
     getOneOrFail(resource, requestOptions) {
         return this.getOne(resource, requestOptions).then((res) => {
@@ -1373,11 +1492,11 @@ class ResourcesControl {
                 })
                     .then((resources) => {
                     if (resources) {
-                        resources.forEach((x) => {
+                        for (const x of resources) {
                             this.cache.add('resource.item', CancelablePromise.resolve(x), {
                                 id: x.resource.id,
                             });
-                        });
+                        }
                     }
                     return resources;
                 });
@@ -1424,12 +1543,35 @@ class ResourcesControl {
         return this.getId(resource).then((id) => {
             if (id !== undefined) {
                 return this.connector.delete('resource.item', null, { id }).then(() => {
-                    this.cache.delete('resource.item', { id });
+                    this._cleanResourceItemCache(id);
                     return undefined;
                 });
             }
         });
     }
+    async _cleanResourceItemCache(id) {
+        const all = this.cache.all();
+        const toDelete = [];
+        for (const c of all) {
+            const cid = c.options && c.options.id;
+            if (['resource.item', 'resource'].includes(c.key) && cid !== undefined) {
+                if (typeof cid === 'number') {
+                    if (cid === id) {
+                        toDelete.push(c);
+                    }
+                }
+                else {
+                    const rid = await this.getId(cid);
+                    if (rid === id) {
+                        toDelete.push(c);
+                    }
+                }
+            }
+        }
+        for (const d of toDelete) {
+            this.cache.delete(d);
+        }
+    }
     _fetchResourceById(id, requestOptions) {
         const promise = () => this.connector.get('resource.item', requestOptions, { id });
         return this.cache
@@ -1633,7 +1775,7 @@ class NgwConnector$1 {
             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((data) => {
             this.user = data;
@@ -1791,7 +1933,7 @@ class NgwConnector$1 {
             }
             // remove double slash
             url = fixUrlStr(url);
-            return this._loadData(url, options);
+            return this._loadData(encodeURI(url), options);
         }
         else {
             throw new Error('Empty `url` not allowed');
@@ -1892,7 +2034,7 @@ class NgwConnector$1 {
             else {
                 // @ts-ignore
                 {
-                    console.warn(httpError);
+                    console.warn('DEV WARN', httpError);
                 }
                 const er = this._handleHttpError(httpError);
                 if (er) {
@@ -1963,7 +2105,7 @@ class NgwProvider extends BaseProvider {
             });
             this.requests.push(request);
             request.catch((er) => {
-                console.log(er);
+                console.warn(er);
             });
             const resp = await request;
             const entries = [];