@nextgis/geocoder 1.13.5 → 1.15.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/geocoder.cjs.js +2 -2
- package/lib/geocoder.cjs.js.map +1 -1
- package/lib/geocoder.cjs.prod.js +1 -1
- package/lib/geocoder.cjs.prod.js.map +1 -1
- package/lib/geocoder.esm-browser.js +39 -28
- package/lib/geocoder.esm-browser.js.map +1 -1
- package/lib/geocoder.esm-browser.prod.js +1 -15
- package/lib/geocoder.esm-browser.prod.js.map +1 -1
- package/lib/geocoder.esm-bundler.js +2 -2
- package/lib/geocoder.esm-bundler.js.map +1 -1
- package/lib/geocoder.esm-bundler.prod.js +1 -15
- package/lib/geocoder.esm-bundler.prod.js.map +1 -1
- package/lib/geocoder.global.js +39 -28
- package/lib/geocoder.global.js.map +1 -1
- package/lib/geocoder.global.prod.js +1 -15
- package/lib/geocoder.global.prod.js.map +1 -1
- package/package.json +6 -6
package/lib/geocoder.cjs.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** Bundle of @nextgis/geocoder; version: 1.
|
|
1
|
+
/** Bundle of @nextgis/geocoder; version: 1.15.1; author: NextGIS */
|
|
2
2
|
'use strict';
|
|
3
3
|
|
|
4
4
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
@@ -12,7 +12,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
12
12
|
var CancelablePromise__default = /*#__PURE__*/_interopDefaultLegacy(CancelablePromise);
|
|
13
13
|
var NgwConnector__default = /*#__PURE__*/_interopDefaultLegacy(NgwConnector);
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
/******************************************************************************
|
|
16
16
|
Copyright (c) Microsoft Corporation.
|
|
17
17
|
|
|
18
18
|
Permission to use, copy, modify, and/or distribute this software for any
|
package/lib/geocoder.cjs.js.map
CHANGED
|
@@ -1 +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.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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"}
|
|
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.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
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@nextgis/cancelable-promise"),t=require("@nextgis/utils"),r=require("@nextgis/ngw-connector");function n(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var o=n(e),s=n(r),u=function(e,t){return
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@nextgis/cancelable-promise"),t=require("@nextgis/utils"),r=require("@nextgis/ngw-connector");function n(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var o=n(e),s=n(r),u=function(e,t){return u=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])},u(e,t)};function c(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}u(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var i=function(){return i=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},i.apply(this,arguments)};function a(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 l(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 f(e){return this instanceof f?(this.v=e,this):new f(e)}function h(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 f?Promise.resolve(r.value.v).then(i,a):l(s[0][2],r)}catch(n){l(s[0][3],n)}var r}function i(e){c("next",e)}function a(e){c("throw",e)}function l(e,t){e(t),s.shift(),s.length&&c(s[0][0],s[0][1])}}function p(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t,r=e[Symbol.asyncIterator];return r?r.call(e):(e=l(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 y=function(e){e&&t.objectAssign(this,e)},b=0,d=function(e){function t(t){var r=e.call(this,t)||this;return r.providers=[],t&&t.providers&&(r.providers=t.providers),r}return c(t,e),t.prototype.abort=function(){this.providers.forEach((function(e){e.abort&&e.abort()}))},t.prototype.search=function(e){return h(this,arguments,(function(){var t,r,n,o,s,u,c,l,h;return a(this,(function(a){switch(a.label){case 0:t=0,r=this.providers,a.label=1;case 1:if(!(t<r.length))return[3,19];n=r[t],a.label=2;case 2:a.trys.push([2,17,,18]),o=n.search(e),a.label=3;case 3:a.trys.push([3,10,11,16]),l=void 0,s=p(o),a.label=4;case 4:return[4,f(s.next())];case 5:return(u=a.sent()).done?[3,9]:[4,f(i(i({},u.value),{provider:n,_id:b++}))];case 6:return[4,a.sent()];case 7:a.sent(),a.label=8;case 8:return[3,4];case 9:return[3,16];case 10:return c=a.sent(),l={error:c},[3,16];case 11:return a.trys.push([11,,14,15]),u&&!u.done&&(h=s.return)?[4,f(h.call(s))]:[3,13];case 12:a.sent(),a.label=13;case 13:return[3,15];case 14:if(l)throw l.error;return[7];case 15:return[7];case 16:return[3,18];case 17:return a.sent(),[3,18];case 18:return t++,[3,1];case 19:return[2]}}))}))},t.prototype.result=function(e){return e.provider?e.provider.result(e):o.resolve(void 0)},t}(y),v=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return c(t,e),t}(y),m=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 s({baseUrl:r.searchUrl}),r.searchResources=t.searchResources,r}return c(t,e),t.prototype.abort=function(){this.requests.forEach((function(e){e.cancel()})),this.requests=[]},t.prototype.search=function(e){return h(this,arguments,(function(){var t,r,n,o,s=this;return a(this,(function(u){switch(u.label){case 0:t=function(t){var n,o,u,c,l,h;return a(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,f(n)];case 1:o=p.sent(),u=[],o&&o.forEach((function(r){u.push(i({query:e,resourceId:t.id},r))})),c=function(e){return a(this,(function(t){switch(t.label){case 0:return e.result=function(){return s.result(e)},[4,f(e)];case 1:return[4,t.sent()];case 2:return t.sent(),[2]}}))},l=0,h=r._items(u),p.label=2;case 2:return l<h.length?[5,c(h[l])]:[3,5];case 3:p.sent(),p.label=4;case 4:return l++,[3,2];case 5:return[2]}}))},r=this,n=0,o=this.searchResources,u.label=1;case 1:return n<o.length?[5,t(o[n])]:[3,4];case 2:u.sent(),u.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}(v),w=function(e){function r(t){var r=e.call(this,t)||this;return r.searchUrl="https://nominatim.openstreetmap.org",r._requests=[],r}return c(r,e),r.prototype.abort=function(){this._requests.forEach((function(e){return e.cancel()})),this._requests=[]},r.prototype.search=function(e){return h(this,arguments,(function(){var r,n,s,u,c,i,l=this;return a(this,(function(h){switch(h.label){case 0:return r=t.fixUrlStr("".concat(this.searchUrl,"/search?format=geojson&polygon_geojson=1&q=").concat(e)),n=new o((function(t,n,o){var s=new XMLHttpRequest;s.open("GET",r,!0),s.onload=function(){try{var r=JSON.parse(s.responseText).features.map((function(t){return{geom:t,extent:t.bbox,text:t.properties&&t.properties.display_name,query:e}}));t(r)}catch(o){n(o)}},s.onerror=function(e){n(e)},o((function(){s.abort()})),s.send()})).catch((function(e){throw e})),this._requests.push(n),[4,f(n)];case 1:if(!(s=h.sent()))return[3,5];u=function(e){return a(this,(function(t){switch(t.label){case 0:return e.result=function(){return l.result(e)},[4,f(e)];case 1:return[4,t.sent()];case 2:return t.sent(),[2]}}))},c=0,i=s,h.label=2;case 2:return c<i.length?[5,u(i[c])]:[3,5];case 3:h.sent(),h.label=4;case 4:return c++,[3,2];case 5:return[2]}}))}))},r.prototype.result=function(e){return o.resolve({text:e.text,extent:e.extent||[],geom:e.geom})},r}(v);exports.BaseProvider=v,exports.Geocoder=d,exports.NgwProvider=m,exports.NominatimProvider=w,exports.create=function(e){return new d(e)};
|
|
2
2
|
//# sourceMappingURL=geocoder.cjs.prod.js.map
|
|
@@ -1 +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.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"],"mappings":"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"}
|
|
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.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","options","objectAssign","this","ID","Geocoder","_super","_this","call","providers","__extends","prototype","abort","forEach","x","search","query","_a","_i","provider","results","e_1","results_1","__asyncValues","__await","__assign","_id","_c","sent","result","item","CancelablePromise","resolve","undefined","BaseProvider","NgwProvider","caseInsensitive","searchUrl","searchResources","requests","connector","NgwConnector","baseUrl","cancel","like","resource","request","this_1","get","headers","RANGE","concat","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","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"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
/** Bundle of @nextgis/geocoder; version: 1.
|
|
2
|
-
|
|
1
|
+
/** Bundle of @nextgis/geocoder; version: 1.15.1; author: NextGIS */
|
|
2
|
+
/******************************************************************************
|
|
3
3
|
Copyright (c) Microsoft Corporation.
|
|
4
4
|
|
|
5
5
|
Permission to use, copy, modify, and/or distribute this software for any
|
|
@@ -1760,6 +1760,29 @@ var ResourcesControl = /** @class */ (function () {
|
|
|
1760
1760
|
return _this._getChildrenOf(parent, requestOptions);
|
|
1761
1761
|
});
|
|
1762
1762
|
};
|
|
1763
|
+
ResourcesControl.prototype.update = function (resource, data) {
|
|
1764
|
+
var _this = this;
|
|
1765
|
+
return this.getId(resource).then(function (id) {
|
|
1766
|
+
if (id !== undefined) {
|
|
1767
|
+
return _this.connector.put('resource.item', { data: data }, { id: id });
|
|
1768
|
+
}
|
|
1769
|
+
});
|
|
1770
|
+
};
|
|
1771
|
+
/**
|
|
1772
|
+
* Fast way to delete resource from NGW and clean cache.
|
|
1773
|
+
* @param resource - Resource definition
|
|
1774
|
+
*/
|
|
1775
|
+
ResourcesControl.prototype.delete = function (resource) {
|
|
1776
|
+
var _this = this;
|
|
1777
|
+
return this.getId(resource).then(function (id) {
|
|
1778
|
+
if (id !== undefined) {
|
|
1779
|
+
return _this.connector.delete('resource.item', null, { id: id }).then(function () {
|
|
1780
|
+
_this._cleanResourceItemCache(id);
|
|
1781
|
+
return undefined;
|
|
1782
|
+
});
|
|
1783
|
+
}
|
|
1784
|
+
});
|
|
1785
|
+
};
|
|
1763
1786
|
ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
|
|
1764
1787
|
var _this = this;
|
|
1765
1788
|
if (_items === void 0) { _items = []; }
|
|
@@ -1787,29 +1810,6 @@ var ResourcesControl = /** @class */ (function () {
|
|
|
1787
1810
|
return _items;
|
|
1788
1811
|
});
|
|
1789
1812
|
};
|
|
1790
|
-
ResourcesControl.prototype.update = function (resource, data) {
|
|
1791
|
-
var _this = this;
|
|
1792
|
-
return this.getId(resource).then(function (id) {
|
|
1793
|
-
if (id !== undefined) {
|
|
1794
|
-
return _this.connector.put('resource.item', { data: data }, { id: id });
|
|
1795
|
-
}
|
|
1796
|
-
});
|
|
1797
|
-
};
|
|
1798
|
-
/**
|
|
1799
|
-
* Fast way to delete resource from NGW and clean cache.
|
|
1800
|
-
* @param resource - Resource definition
|
|
1801
|
-
*/
|
|
1802
|
-
ResourcesControl.prototype.delete = function (resource) {
|
|
1803
|
-
var _this = this;
|
|
1804
|
-
return this.getId(resource).then(function (id) {
|
|
1805
|
-
if (id !== undefined) {
|
|
1806
|
-
return _this.connector.delete('resource.item', null, { id: id }).then(function () {
|
|
1807
|
-
_this._cleanResourceItemCache(id);
|
|
1808
|
-
return undefined;
|
|
1809
|
-
});
|
|
1810
|
-
}
|
|
1811
|
-
});
|
|
1812
|
-
};
|
|
1813
1813
|
ResourcesControl.prototype._cleanResourceItemCache = function (id) {
|
|
1814
1814
|
return __awaiter(this, void 0, void 0, function () {
|
|
1815
1815
|
var all, toDelete, _i, all_1, c, cid, rid, _a, toDelete_1, d;
|
|
@@ -1967,6 +1967,9 @@ var NgwConnector$1 = /** @class */ (function () {
|
|
|
1967
1967
|
if (this.options.route) {
|
|
1968
1968
|
this.routeStr = this.options.route;
|
|
1969
1969
|
}
|
|
1970
|
+
if (this.options.requestTransform) {
|
|
1971
|
+
this.requestTransform = this.options.requestTransform;
|
|
1972
|
+
}
|
|
1970
1973
|
this.resources = new ResourcesControl(this);
|
|
1971
1974
|
addConnector(this);
|
|
1972
1975
|
}
|
|
@@ -1974,6 +1977,9 @@ var NgwConnector$1 = /** @class */ (function () {
|
|
|
1974
1977
|
NgwConnector.create = function (options) {
|
|
1975
1978
|
return new this(options);
|
|
1976
1979
|
};
|
|
1980
|
+
NgwConnector.prototype.setRequestTransform = function (requestTransform) {
|
|
1981
|
+
this.requestTransform = requestTransform;
|
|
1982
|
+
};
|
|
1977
1983
|
/**
|
|
1978
1984
|
* Fast way to specify the connection address to NextGIS Web.
|
|
1979
1985
|
* The current connection will be severed.
|
|
@@ -2233,9 +2239,8 @@ var NgwConnector$1 = /** @class */ (function () {
|
|
|
2233
2239
|
if (params) {
|
|
2234
2240
|
url = template(url, params);
|
|
2235
2241
|
}
|
|
2236
|
-
|
|
2237
|
-
|
|
2238
|
-
return this._loadData(encodeURI(url), options);
|
|
2242
|
+
url = encodeURI(fixUrlStr(url));
|
|
2243
|
+
return this._loadData(url, options);
|
|
2239
2244
|
}
|
|
2240
2245
|
else {
|
|
2241
2246
|
throw new Error('Empty `url` not allowed');
|
|
@@ -2328,6 +2333,11 @@ var NgwConnector$1 = /** @class */ (function () {
|
|
|
2328
2333
|
// options.withCredentials = true;
|
|
2329
2334
|
options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
|
|
2330
2335
|
}
|
|
2336
|
+
if (_this.requestTransform) {
|
|
2337
|
+
var _a = _this.requestTransform(url, options), transUrl = _a[0], transOptions = _a[1];
|
|
2338
|
+
url = transUrl;
|
|
2339
|
+
options = transOptions;
|
|
2340
|
+
}
|
|
2331
2341
|
loadData(url, resolve, options, reject, onCancel);
|
|
2332
2342
|
})
|
|
2333
2343
|
.then(function (resp) {
|
|
@@ -2352,6 +2362,7 @@ var NgwConnector$1 = /** @class */ (function () {
|
|
|
2352
2362
|
typeof options.signal.addEventListener === 'function') {
|
|
2353
2363
|
options.signal.addEventListener('abort', function () {
|
|
2354
2364
|
request.cancel();
|
|
2365
|
+
_this._cleanActiveRequests(request);
|
|
2355
2366
|
});
|
|
2356
2367
|
}
|
|
2357
2368
|
this.activeRequests.push(request);
|