@nextgis/geocoder 1.11.8 → 1.12.1

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

@@ -1,2 +1,16 @@
-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};
+import e from"@nextgis/cancelable-promise";import{objectAssign as t,fixUrlStr as r}from"@nextgis/utils";import n from"@nextgis/ngw-connector";
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */var o=function(e,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])})(e,t)};function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var u=function(){return(u=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function c(e,t){var r,n,o,s,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return s={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(s[Symbol.iterator]=function(){return this}),s;function c(s){return function(c){return function(s){if(r)throw new TypeError("Generator is already executing.");for(;u;)try{if(r=1,n&&(o=2&s[0]?n.return:s[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,s[1])).done)return o;switch(n=0,o&&(s=[2&s[0],o.value]),s[0]){case 0:case 1:o=s;break;case 4:return u.label++,{value:s[1],done:!1};case 5:u.label++,n=s[1],s=[0];continue;case 7:s=u.ops.pop(),u.trys.pop();continue;default:if(!(o=u.trys,(o=o.length>0&&o[o.length-1])||6!==s[0]&&2!==s[0])){u=0;continue}if(3===s[0]&&(!o||s[1]>o[0]&&s[1]<o[3])){u.label=s[1];break}if(6===s[0]&&u.label<o[1]){u.label=o[1],o=s;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(s);break}o[2]&&u.ops.pop(),u.trys.pop();continue}s=t.call(e,u)}catch(c){s=[6,c],n=0}finally{r=o=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,c])}}}function i(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}function a(e){return this instanceof a?(this.v=e,this):new a(e)}function l(e,t,r){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var n,o=r.apply(e,t||[]),s=[];return n={},u("next"),u("throw"),u("return"),n[Symbol.asyncIterator]=function(){return this},n;function u(e){o[e]&&(n[e]=function(t){return new Promise((function(r,n){s.push([e,t,r,n])>1||c(e,t)}))})}function c(e,t){try{(r=o[e](t)).value instanceof a?Promise.resolve(r.value.v).then(i,l):f(s[0][2],r)}catch(n){f(s[0][3],n)}var r}function i(e){c("next",e)}function l(e){c("throw",e)}function f(e,t){e(t),s.shift(),s.length&&c(s[0][0],s[0][1])}}function f(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t,r=e[Symbol.asyncIterator];return r?r.call(e):(e=i(e),t={},n("next"),n("throw"),n("return"),t[Symbol.asyncIterator]=function(){return this},t);function n(r){t[r]=e[r]&&function(t){return new Promise((function(n,o){(function(e,t,r,n){Promise.resolve(n).then((function(t){e({value:t,done:r})}),t)})(n,o,(t=e[r](t)).done,t.value)}))}}}var h=function(e){e&&t(this,e)},p=0,y=function(t){function r(e){var r=t.call(this,e)||this;return r.providers=[],e&&e.providers&&(r.providers=e.providers),r}return s(r,t),r.prototype.abort=function(){this.providers.forEach((function(e){e.abort&&e.abort()}))},r.prototype.search=function(e){return l(this,arguments,(function(){var t,r,n,o,s,i,l,h,y;return c(this,(function(c){switch(c.label){case 0:t=0,r=this.providers,c.label=1;case 1:if(!(t<r.length))return[3,19];n=r[t],c.label=2;case 2:c.trys.push([2,17,,18]),o=n.search(e),c.label=3;case 3:c.trys.push([3,10,11,16]),h=void 0,s=f(o),c.label=4;case 4:return[4,a(s.next())];case 5:return(i=c.sent()).done?[3,9]:[4,a(u(u({},i.value),{provider:n,_id:p++}))];case 6:return[4,c.sent()];case 7:c.sent(),c.label=8;case 8:return[3,4];case 9:return[3,16];case 10:return l=c.sent(),h={error:l},[3,16];case 11:return c.trys.push([11,,14,15]),i&&!i.done&&(y=s.return)?[4,a(y.call(s))]:[3,13];case 12:c.sent(),c.label=13;case 13:return[3,15];case 14:if(h)throw h.error;return[7];case 15:return[7];case 16:return[3,18];case 17:return c.sent(),[3,18];case 18:return t++,[3,1];case 19:return[2]}}))}))},r.prototype.result=function(t){return t.provider?t.provider.result(t):e.resolve(void 0)},r}(h),b=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return s(t,e),t}(h),v=function(e){function t(t){var r=e.call(this,t)||this;return r.caseInsensitive=!0,r.searchUrl="https://maxim.nextgis.com",r.searchResources=[],r.requests=[],r.connector=t.connector||new n({baseUrl:r.searchUrl}),r.searchResources=t.searchResources,r}return s(t,e),t.prototype.abort=function(){this.requests.forEach((function(e){e.cancel()})),this.requests=[]},t.prototype.search=function(e){return l(this,arguments,(function(){var t,r,n,o,s=this;return c(this,(function(i){switch(i.label){case 0:t=function(t){var n,o,i,l,f,h;return c(this,(function(p){switch(p.label){case 0:return n=r.connector.get("feature_layer.store",{headers:{RANGE:"items=0-".concat(t.limit||300)}},{id:t.id,like:e}),r.requests.push(n),n.catch((function(e){console.warn(e)})),[4,a(n)];case 1:o=p.sent(),i=[],o&&o.forEach((function(r){i.push(u({query:e,resourceId:t.id},r))})),l=function(e){return c(this,(function(t){switch(t.label){case 0:return e.result=function(){return s.result(e)},[4,a(e)];case 1:return[4,t.sent()];case 2:return t.sent(),[2]}}))},f=0,h=r._items(i),p.label=2;case 2:return f<h.length?[5,l(h[f])]:[3,5];case 3:p.sent(),p.label=4;case 4:return f++,[3,2];case 5:return[2]}}))},r=this,n=0,o=this.searchResources,i.label=1;case 1:return n<o.length?[5,t(o[n])]:[3,4];case 2:i.sent(),i.label=3;case 3:return n++,[3,1];case 4:return[2]}}))}))},t.prototype.result=function(e){var t=this.connector.get("feature_layer.feature.item_extent",null,{id:e.resourceId,fid:e.featureId}).then((function(t){var r=t.extent;return{text:e.text,extent:[r.minLon,r.minLat,r.maxLon,r.maxLat]}}));return this.requests.push(t),t},t.prototype._items=function(e){var t=this,r=[];return e.forEach((function(e){t.searchResources.find((function(t){return t.id===e.resourceId}))&&r.push({query:e.query,text:e.label,featureId:e.id,resourceId:e.resourceId})})),r},t}(b),d=function(t){function n(e){var r=t.call(this,e)||this;return r.searchUrl="https://nominatim.openstreetmap.org",r._requests=[],r}return s(n,t),n.prototype.abort=function(){this._requests.forEach((function(e){return e.cancel()})),this._requests=[]},n.prototype.search=function(t){return l(this,arguments,(function(){var n,o,s,u,i,l,f=this;return c(this,(function(h){switch(h.label){case 0:return n=r("".concat(this.searchUrl,"/search?format=geojson&polygon_geojson=1&q=").concat(t)),o=new e((function(e,r,o){var s=new XMLHttpRequest;s.open("GET",n,!0),s.onload=function(){try{var n=JSON.parse(s.responseText).features.map((function(e){return{geom:e,extent:e.bbox,text:e.properties&&e.properties.display_name,query:t}}));e(n)}catch(o){r(o)}},s.onerror=function(e){r(e)},o((function(){s.abort()})),s.send()})).catch((function(e){throw e})),this._requests.push(o),[4,a(o)];case 1:if(!(s=h.sent()))return[3,5];u=function(e){return c(this,(function(t){switch(t.label){case 0:return e.result=function(){return f.result(e)},[4,a(e)];case 1:return[4,t.sent()];case 2:return t.sent(),[2]}}))},i=0,l=s,h.label=2;case 2:return i<l.length?[5,u(l[i])]:[3,5];case 3:h.sent(),h.label=4;case 4:return i++,[3,2];case 5:return[2]}}))}))},n.prototype.result=function(t){return e.resolve({text:t.text,extent:t.extent||[],geom:t.geom})},n}(b);function m(e){return new y(e)}export{b as BaseProvider,y as Geocoder,v as NgwProvider,d as NominatimProvider,m as create};
 //# sourceMappingURL=geocoder.esm-bundler.prod.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"geocoder.esm-bundler.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","NgwProvider","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","NominatimProvider","_requests","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","i","model","create"],"mappings":"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"}
+{"version":3,"file":"geocoder.esm-bundler.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":["options","objectAssign","this","ID","_super","_this","providers","__extends","Geocoder","forEach","x","abort","query","_a","_i","provider","results","search","results_1","__asyncValues","_id","_c","item","result","CancelablePromise","resolve","undefined","BaseGeocoder","connector","NgwConnector","baseUrl","searchUrl","searchResources","NgwProvider","requests","cancel","like","resource","request","this_1","get","headers","RANGE","limit","id","push","catch","er","console","warn","resp","_e","entries","resourceId","_f","_d","_items","req","fid","featureId","then","e","extent","text","minLon","minLat","maxLon","maxLat","items","entry","find","label","BaseProvider","NominatimProvider","_requests","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","i","_b","items_1","model","create"],"mappings":"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"}

package/lib/geocoder.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.11.8; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.12.1; author: NextGIS */
 var Geocoder = (function (exports) {
     'use strict';
 
@@ -1511,6 +1511,11 @@ var Geocoder = (function (exports) {
                     xhr.abort();
                 });
             }
+            if (options.signal) {
+                options.signal.addEventListener('abort', function () {
+                    xhr.abort();
+                });
+            }
             xhr.send(data);
         };
     }
@@ -1652,7 +1657,12 @@ var Geocoder = (function (exports) {
                 forCache.id = resource;
             }
             else if (isObject(resource)) {
-                forCache.id = resource.id;
+                if (resource.id !== undefined) {
+                    forCache.id = resource.id;
+                }
+                else if (resource.keyname) {
+                    forCache.keyname = resource.keyname;
+                }
             }
             var makeRequest = function () {
                 if (typeof resource === 'string') {
@@ -1754,20 +1764,35 @@ var Geocoder = (function (exports) {
         };
         ResourcesControl.prototype.getChildrenOf = function (resource, requestOptions) {
             var _this = this;
-            return this.getId(resource).then(function (parent) {
-                return _this.connector
-                    .get('resource.collection', __assign({ cache: true }, requestOptions), {
-                    parent: parent,
-                })
-                    .then(function (items) {
-                    for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-                        var i = items_1[_i];
-                        _this.cache.add('resource.item', CancelablePromise.resolve(i), {
-                            id: i.resource.id,
-                        });
+            return this.getIdOrFail(resource).then(function (parent) {
+                return _this._getChildrenOf(parent, requestOptions);
+            });
+        };
+        ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
+            var _this = this;
+            if (_items === void 0) { _items = []; }
+            return this.connector
+                .get('resource.collection', __assign({ cache: true }, requestOptions), {
+                parent: parent,
+            })
+                .then(function (items) {
+                var recursivePromises = [];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var item = items_1[_i];
+                    _this.cache.add('resource.item', CancelablePromise.resolve(item), {
+                        id: item.resource.id,
+                    });
+                    _items.push(item);
+                    if ((requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.recursive) && item.resource.children) {
+                        recursivePromises.push(_this._getChildrenOf(item.resource.id, requestOptions, _items));
                     }
-                    return items;
-                });
+                }
+                if (recursivePromises.length) {
+                    return CancelablePromise.all(recursivePromises).then(function () {
+                        return _items;
+                    });
+                }
+                return _items;
             });
         };
         ResourcesControl.prototype.update = function (resource, data) {