@nextgis/geocoder 1.18.3 → 1.18.9
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 +1 -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 +9 -6
- package/lib/geocoder.esm-browser.js.map +1 -1
- package/lib/geocoder.esm-browser.prod.js +1 -1
- package/lib/geocoder.esm-browser.prod.js.map +1 -1
- package/lib/geocoder.esm-bundler.js +1 -2
- package/lib/geocoder.esm-bundler.js.map +1 -1
- package/lib/geocoder.esm-bundler.prod.js +1 -1
- package/lib/geocoder.esm-bundler.prod.js.map +1 -1
- package/lib/geocoder.global.js +9 -6
- package/lib/geocoder.global.js.map +1 -1
- package/lib/geocoder.global.prod.js +1 -1
- package/lib/geocoder.global.prod.js.map +1 -1
- package/lib/index.d.ts +0 -1
- package/package.json +4 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** Bundle of @nextgis/geocoder; version: 1.18.
|
|
1
|
+
/** Bundle of @nextgis/geocoder; version: 1.18.9; author: NextGIS */
|
|
2
2
|
import CancelablePromise from '@nextgis/cancelable-promise';
|
|
3
3
|
import { objectAssign, fixUrlStr } from '@nextgis/utils';
|
|
4
4
|
import NgwConnector from '@nextgis/ngw-connector';
|
|
@@ -67,7 +67,6 @@ class NgwProvider extends BaseProvider {
|
|
|
67
67
|
constructor(options) {
|
|
68
68
|
var _a;
|
|
69
69
|
super(options);
|
|
70
|
-
this.caseInsensitive = true;
|
|
71
70
|
this.searchResources = [];
|
|
72
71
|
this._abortControllers = [];
|
|
73
72
|
if (!options.searchUrl && !((_a = options.connectorOptions) === null || _a === void 0 ? void 0 : _a.baseUrl)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geocoder.esm-bundler.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 type CancelablePromise from '@nextgis/cancelable-promise';\nimport type { SearchItem } from './types/SearchItem';\n\n/**\n * Represents the base class for a geocoder.\n * This abstract class provides the basic methods that every geocoder should implement.\n *\n * @template O - The type of options that can be passed to the geocoder.\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 /**\n * Search method to retrieve geocoding results.\n *\n * @abstract\n * @param {string} query - The search string to geocode.\n * @yields {AsyncGenerator<SearchItem>} - An async generator that yields search results.\n */\n abstract search(query: string): AsyncGenerator<SearchItem>;\n\n /**\n * Method to retrieve detailed result for a specific search item.\n *\n * @abstract\n * @param {SearchItem} item - The search item to get detailed result for.\n * @returns {CancelablePromise<any>} - A promise that resolves to the detailed result.\n */\n abstract result(item: SearchItem): CancelablePromise<any>;\n\n /**\n * Optional method to abort any ongoing geocoding requests.\n *\n * @abstract\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\n/**\n * Abstract base class representing a search provider.\n * It builds upon the BaseGeocoder functionalities with provider-specific properties.\n * @template O - Options type which extends BaseProviderOptions.\n */\nexport abstract class BaseProvider<\n O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n /**\n * URL endpoint for the search service.\n * This is where queries will be sent to obtain search results.\n */\n searchUrl?: string;\n\n /**\n * Label to represent the provider.\n * Useful for user interfaces to display the source of search results.\n */\n label?: string;\n}\n","import NgwConnector from '@nextgis/ngw-connector';\nimport { fetchNgwLayerItems } from '@nextgis/ngw-kit';\n\nimport { BaseProvider } from './BaseProvider';\n\nimport type CancelablePromise from '@nextgis/cancelable-promise';\nimport type {\n FeatureItem,\n NgwConnectorOptions,\n ResourceItem,\n} from '@nextgis/ngw-connector';\nimport type { FetchNgwItemsOptions } from '@nextgis/ngw-kit';\n\nimport type { ResultItem } from '../types/ResultItem';\nimport type { SearchItem } from '../types/SearchItem';\nimport type { BaseProviderOptions } from './BaseProviderOptions';\n\n/**\n * Extends the basic search item with NGW-specific properties.\n */\ninterface NgwSearchItem extends SearchItem {\n /** ID of the NGW resource */\n resourceId: number;\n /** ID of the feature in the NGW resource */\n featureId: number;\n /** The specific feature item from NGW */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Defines the structure for a rendered search item.\n */\ninterface RenderSearchItem {\n /** The specific feature item */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Options for searching within a NGW resource.\n */\ninterface SearchResource extends FetchNgwItemsOptions {\n /** The search method used ('ilike' is case-insensitive) */\n searchMethod?: 'ilike' | 'like';\n /** Custom rendering function for search results */\n renderSearch?: (item: RenderSearchItem) => string | HTMLElement;\n}\n\n/**\n * Options required to initialize an NGW provider.\n */\ninterface NgwProviderOptions extends BaseProviderOptions {\n /** Connector instance for NGW. If not provided, will be created internally */\n connector?: NgwConnector;\n /** List of NGW resources to search within */\n searchResources: SearchResource[];\n /** Options for the internal NgwConnector (if one needs to be created) */\n connectorOptions?: NgwConnectorOptions;\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n static limit = 300;\n\n caseInsensitive = true;\n searchResources: SearchResource[] = [];\n\n private connector: NgwConnector;\n private _abortControllers: AbortController[] = [];\n\n constructor(options: NgwProviderOptions) {\n super(options);\n if (!options.searchUrl && !options.connectorOptions?.baseUrl) {\n throw new Error(\n 'The `searchUrl` of `connectorOptions.baseUrl` are required',\n );\n }\n\n this.connector =\n options.connector ||\n new NgwConnector({\n baseUrl: this.searchUrl,\n ...options.connectorOptions,\n });\n this.searchResources = options.searchResources;\n }\n\n abort(): void {\n this._abortControllers.forEach((a) => {\n a.abort();\n });\n this._abortControllers.length = 0;\n }\n\n async *search(query: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n const signal = this._makeSignal();\n for (const config of this.searchResources) {\n if (signal.aborted) {\n break;\n }\n const { searchMethod } = config;\n\n const limit = config.limit ?? NgwProvider.limit;\n //\n const resourceId = (config as any).id ?? config.resourceId;\n\n try {\n const resource = await this.connector.getResourceOrFail(resourceId, {\n cache: true,\n });\n\n const options: FetchNgwItemsOptions = {\n connector: this.connector,\n resourceId,\n signal,\n limit,\n };\n\n if (searchMethod === 'like') {\n options.like = query;\n } else {\n options.ilike = query;\n }\n\n const request = fetchNgwLayerItems(options);\n\n const entries = await request;\n\n for (const item of this._items({\n entries,\n query,\n config,\n resourceItem: resource,\n })) {\n item.result = () => this.result(item);\n yield item;\n }\n } catch (er) {\n if (\n er &&\n 'name' in (er as Error) &&\n (er as Error).name !== 'CancelError'\n ) {\n console.warn(er);\n }\n }\n }\n }\n\n result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n const signal = this._makeSignal();\n const req = this.connector\n .get(\n 'feature_layer.feature.item_extent',\n { signal },\n {\n id: item.resourceId,\n fid: item.featureId,\n },\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 return req;\n }\n\n private _makeSignal() {\n const abortController = new AbortController();\n this._abortControllers.push(abortController);\n return abortController.signal;\n }\n\n private _items({\n entries,\n query,\n config,\n resourceItem,\n }: {\n config: SearchResource;\n entries: FeatureItem[];\n query: string;\n resourceItem: ResourceItem;\n }): NgwSearchItem[] {\n const items: NgwSearchItem[] = [];\n\n let labelField: string | undefined = undefined;\n\n if (resourceItem.feature_layer) {\n labelField = resourceItem.feature_layer.fields.find(\n (f) => f.label_field,\n )?.keyname;\n }\n\n const meta = this.searchResources.find(\n (x) => (x as any).id ?? x.resourceId === resourceItem.resource.id,\n );\n if (meta) {\n entries.forEach((entry) => {\n let text = labelField ? entry.fields[labelField] : entry.id;\n if (config.renderSearch) {\n text = config.renderSearch({\n item: entry,\n resourceItem,\n });\n } else if (labelField) {\n text = entry.fields[labelField];\n }\n\n items.push({\n query: query,\n text,\n featureId: entry.id,\n resourceId: resourceItem.resource.id,\n item: entry,\n resourceItem,\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 { Geocoder } from './Geocoder';\nimport type { GeocoderOptions } from './GeocoderOptions';\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":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"geocoder.esm-bundler.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 type CancelablePromise from '@nextgis/cancelable-promise';\nimport type { SearchItem } from './types/SearchItem';\n\n/**\n * Represents the base class for a geocoder.\n * This abstract class provides the basic methods that every geocoder should implement.\n *\n * @template O - The type of options that can be passed to the geocoder.\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 /**\n * Search method to retrieve geocoding results.\n *\n * @abstract\n * @param {string} query - The search string to geocode.\n * @yields {AsyncGenerator<SearchItem>} - An async generator that yields search results.\n */\n abstract search(query: string): AsyncGenerator<SearchItem>;\n\n /**\n * Method to retrieve detailed result for a specific search item.\n *\n * @abstract\n * @param {SearchItem} item - The search item to get detailed result for.\n * @returns {CancelablePromise<any>} - A promise that resolves to the detailed result.\n */\n abstract result(item: SearchItem): CancelablePromise<any>;\n\n /**\n * Optional method to abort any ongoing geocoding requests.\n *\n * @abstract\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\n/**\n * Abstract base class representing a search provider.\n * It builds upon the BaseGeocoder functionalities with provider-specific properties.\n * @template O - Options type which extends BaseProviderOptions.\n */\nexport abstract class BaseProvider<\n O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n /**\n * URL endpoint for the search service.\n * This is where queries will be sent to obtain search results.\n */\n searchUrl?: string;\n\n /**\n * Label to represent the provider.\n * Useful for user interfaces to display the source of search results.\n */\n label?: string;\n}\n","import NgwConnector from '@nextgis/ngw-connector';\nimport { fetchNgwLayerItems } from '@nextgis/ngw-kit';\n\nimport { BaseProvider } from './BaseProvider';\n\nimport type CancelablePromise from '@nextgis/cancelable-promise';\nimport type {\n FeatureItem,\n NgwConnectorOptions,\n ResourceItem,\n} from '@nextgis/ngw-connector';\nimport type { FetchNgwItemsOptions } from '@nextgis/ngw-kit';\n\nimport type { ResultItem } from '../types/ResultItem';\nimport type { SearchItem } from '../types/SearchItem';\nimport type { BaseProviderOptions } from './BaseProviderOptions';\n\n/**\n * Extends the basic search item with NGW-specific properties.\n */\ninterface NgwSearchItem extends SearchItem {\n /** ID of the NGW resource */\n resourceId: number;\n /** ID of the feature in the NGW resource */\n featureId: number;\n /** The specific feature item from NGW */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Defines the structure for a rendered search item.\n */\ninterface RenderSearchItem {\n /** The specific feature item */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Options for searching within a NGW resource.\n */\ninterface SearchResource extends FetchNgwItemsOptions {\n /** The search method used ('ilike' is case-insensitive) */\n searchMethod?: 'ilike' | 'like';\n /** Custom rendering function for search results */\n renderSearch?: (item: RenderSearchItem) => string | HTMLElement;\n}\n\n/**\n * Options required to initialize an NGW provider.\n */\ninterface NgwProviderOptions extends BaseProviderOptions {\n /** Connector instance for NGW. If not provided, will be created internally */\n connector?: NgwConnector;\n /** List of NGW resources to search within */\n searchResources: SearchResource[];\n /** Options for the internal NgwConnector (if one needs to be created) */\n connectorOptions?: NgwConnectorOptions;\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n static limit = 300;\n\n searchResources: SearchResource[] = [];\n\n private connector: NgwConnector;\n private _abortControllers: AbortController[] = [];\n\n constructor(options: NgwProviderOptions) {\n super(options);\n if (!options.searchUrl && !options.connectorOptions?.baseUrl) {\n throw new Error(\n 'The `searchUrl` of `connectorOptions.baseUrl` are required',\n );\n }\n\n this.connector =\n options.connector ||\n new NgwConnector({\n baseUrl: this.searchUrl,\n ...options.connectorOptions,\n });\n this.searchResources = options.searchResources;\n }\n\n abort(): void {\n this._abortControllers.forEach((a) => {\n a.abort();\n });\n this._abortControllers.length = 0;\n }\n\n async *search(query: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n const signal = this._makeSignal();\n for (const config of this.searchResources) {\n if (signal.aborted) {\n break;\n }\n const { searchMethod } = config;\n\n const limit = config.limit ?? NgwProvider.limit;\n //\n const resourceId = (config as any).id ?? config.resourceId;\n\n try {\n const resource = await this.connector.getResourceOrFail(resourceId, {\n cache: true,\n });\n\n const options: FetchNgwItemsOptions = {\n connector: this.connector,\n resourceId,\n signal,\n limit,\n };\n\n if (searchMethod === 'like') {\n options.like = query;\n } else {\n options.ilike = query;\n }\n\n const request = fetchNgwLayerItems(options);\n\n const entries = await request;\n\n for (const item of this._items({\n entries,\n query,\n config,\n resourceItem: resource,\n })) {\n item.result = () => this.result(item);\n yield item;\n }\n } catch (er) {\n if (\n er &&\n 'name' in (er as Error) &&\n (er as Error).name !== 'CancelError'\n ) {\n console.warn(er);\n }\n }\n }\n }\n\n result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n const signal = this._makeSignal();\n const req = this.connector\n .get(\n 'feature_layer.feature.item_extent',\n { signal },\n {\n id: item.resourceId,\n fid: item.featureId,\n },\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 return req;\n }\n\n private _makeSignal() {\n const abortController = new AbortController();\n this._abortControllers.push(abortController);\n return abortController.signal;\n }\n\n private _items({\n entries,\n query,\n config,\n resourceItem,\n }: {\n config: SearchResource;\n entries: FeatureItem[];\n query: string;\n resourceItem: ResourceItem;\n }): NgwSearchItem[] {\n const items: NgwSearchItem[] = [];\n\n let labelField: string | undefined = undefined;\n\n if (resourceItem.feature_layer) {\n labelField = resourceItem.feature_layer.fields.find(\n (f) => f.label_field,\n )?.keyname;\n }\n\n const meta = this.searchResources.find(\n (x) => (x as any).id ?? x.resourceId === resourceItem.resource.id,\n );\n if (meta) {\n entries.forEach((entry) => {\n let text = labelField ? entry.fields[labelField] : entry.id;\n if (config.renderSearch) {\n text = config.renderSearch({\n item: entry,\n resourceItem,\n });\n } else if (labelField) {\n text = entry.fields[labelField];\n }\n\n items.push({\n query: query,\n text,\n featureId: entry.id,\n resourceId: resourceItem.resource.id,\n item: entry,\n resourceItem,\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 { Geocoder } from './Geocoder';\nimport type { GeocoderOptions } from './GeocoderOptions';\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":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import e from"@nextgis/cancelable-promise";import{objectAssign as r,fixUrlStr as t}from"@nextgis/utils";import s from"@nextgis/ngw-connector";import{fetchNgwLayerItems as o}from"@nextgis/ngw-kit";class n{constructor(e){e&&r(this,e)}}let i=0;class c extends n{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 r=t.search(e);for await(const e of r)yield{...e,provider:t,_id:i++}}catch(r){}}result(r){return r.provider?r.provider.result(r):e.resolve(void 0)}}class a extends n{}class l extends a{constructor(e){var r;if(super(e),this.
|
|
1
|
+
import e from"@nextgis/cancelable-promise";import{objectAssign as r,fixUrlStr as t}from"@nextgis/utils";import s from"@nextgis/ngw-connector";import{fetchNgwLayerItems as o}from"@nextgis/ngw-kit";class n{constructor(e){e&&r(this,e)}}let i=0;class c extends n{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 r=t.search(e);for await(const e of r)yield{...e,provider:t,_id:i++}}catch(r){}}result(r){return r.provider?r.provider.result(r):e.resolve(void 0)}}class a extends n{}class l extends a{constructor(e){var r;if(super(e),this.searchResources=[],this._abortControllers=[],!e.searchUrl&&!(null===(r=e.connectorOptions)||void 0===r?void 0:r.baseUrl))throw new Error("The `searchUrl` of `connectorOptions.baseUrl` are required");this.connector=e.connector||new s({baseUrl:this.searchUrl,...e.connectorOptions}),this.searchResources=e.searchResources}abort(){this._abortControllers.forEach((e=>{e.abort()})),this._abortControllers.length=0}async*search(e){var r,t;const s=this._makeSignal();for(const i of this.searchResources){if(s.aborted)break;const{searchMethod:c}=i,a=null!==(r=i.limit)&&void 0!==r?r:l.limit,u=null!==(t=i.id)&&void 0!==t?t:i.resourceId;try{const r=await this.connector.getResourceOrFail(u,{cache:!0}),t={connector:this.connector,resourceId:u,signal:s,limit:a};"like"===c?t.like=e:t.ilike=e;const n=o(t),l=await n;for(const s of this._items({entries:l,query:e,config:i,resourceItem:r}))s.result=()=>this.result(s),yield s}catch(n){n&&"name"in n&&"CancelError"!==n.name&&console.warn(n)}}}result(e){const r=this._makeSignal();return this.connector.get("feature_layer.feature.item_extent",{signal:r},{id:e.resourceId,fid:e.featureId}).then((r=>{const t=r.extent;return{text:e.text,extent:[t.minLon,t.minLat,t.maxLon,t.maxLat]}}))}_makeSignal(){const e=new AbortController;return this._abortControllers.push(e),e.signal}_items({entries:e,query:r,config:t,resourceItem:s}){var o;const n=[];let i;s.feature_layer&&(i=null===(o=s.feature_layer.fields.find((e=>e.label_field)))||void 0===o?void 0:o.keyname);const c=this.searchResources.find((e=>{var r;return null!==(r=e.id)&&void 0!==r?r:e.resourceId===s.resource.id}));return c&&e.forEach((e=>{let o=i?e.fields[i]:e.id;t.renderSearch?o=t.renderSearch({item:e,resourceItem:s}):i&&(o=e.fields[i]),n.push({query:r,text:o,featureId:e.id,resourceId:s.resource.id,item:e,resourceItem:s})})),n}}l.limit=300;class u extends a{constructor(e){super(e),this.searchUrl="https://nominatim.openstreetmap.org",this._requests=[]}abort(){this._requests.forEach((e=>e.cancel())),this._requests=[]}async*search(r){const s=t(`${this.searchUrl}/search?format=geojson&polygon_geojson=1&q=${r}`),o=new e(((e,t,o)=>{const n=new XMLHttpRequest;n.open("GET",s,!0),n.onload=()=>{try{const t=JSON.parse(n.responseText).features.map((e=>({geom:e,extent:e.bbox,text:e.properties&&e.properties.display_name,query:r})));e(t)}catch(s){t(s)}},n.onerror=e=>{t(e)},o((()=>{n.abort()})),n.send()})).catch((e=>{throw e}));this._requests.push(o);const n=await o;if(n)for(const e of n)e.result=()=>this.result(e),yield e}result(r){return e.resolve({text:r.text,extent:r.extent||[],geom:r.geom})}}function h(e){return new c(e)}export{a as BaseProvider,c as Geocoder,l as NgwProvider,u as NominatimProvider,h as create};
|
|
2
2
|
//# sourceMappingURL=geocoder.esm-bundler.prod.js.map
|
|
@@ -1 +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 type CancelablePromise from '@nextgis/cancelable-promise';\nimport type { SearchItem } from './types/SearchItem';\n\n/**\n * Represents the base class for a geocoder.\n * This abstract class provides the basic methods that every geocoder should implement.\n *\n * @template O - The type of options that can be passed to the geocoder.\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 /**\n * Search method to retrieve geocoding results.\n *\n * @abstract\n * @param {string} query - The search string to geocode.\n * @yields {AsyncGenerator<SearchItem>} - An async generator that yields search results.\n */\n abstract search(query: string): AsyncGenerator<SearchItem>;\n\n /**\n * Method to retrieve detailed result for a specific search item.\n *\n * @abstract\n * @param {SearchItem} item - The search item to get detailed result for.\n * @returns {CancelablePromise<any>} - A promise that resolves to the detailed result.\n */\n abstract result(item: SearchItem): CancelablePromise<any>;\n\n /**\n * Optional method to abort any ongoing geocoding requests.\n *\n * @abstract\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\n/**\n * Abstract base class representing a search provider.\n * It builds upon the BaseGeocoder functionalities with provider-specific properties.\n * @template O - Options type which extends BaseProviderOptions.\n */\nexport abstract class BaseProvider<\n O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n /**\n * URL endpoint for the search service.\n * This is where queries will be sent to obtain search results.\n */\n searchUrl?: string;\n\n /**\n * Label to represent the provider.\n * Useful for user interfaces to display the source of search results.\n */\n label?: string;\n}\n","import NgwConnector from '@nextgis/ngw-connector';\nimport { fetchNgwLayerItems } from '@nextgis/ngw-kit';\n\nimport { BaseProvider } from './BaseProvider';\n\nimport type CancelablePromise from '@nextgis/cancelable-promise';\nimport type {\n FeatureItem,\n NgwConnectorOptions,\n ResourceItem,\n} from '@nextgis/ngw-connector';\nimport type { FetchNgwItemsOptions } from '@nextgis/ngw-kit';\n\nimport type { ResultItem } from '../types/ResultItem';\nimport type { SearchItem } from '../types/SearchItem';\nimport type { BaseProviderOptions } from './BaseProviderOptions';\n\n/**\n * Extends the basic search item with NGW-specific properties.\n */\ninterface NgwSearchItem extends SearchItem {\n /** ID of the NGW resource */\n resourceId: number;\n /** ID of the feature in the NGW resource */\n featureId: number;\n /** The specific feature item from NGW */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Defines the structure for a rendered search item.\n */\ninterface RenderSearchItem {\n /** The specific feature item */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Options for searching within a NGW resource.\n */\ninterface SearchResource extends FetchNgwItemsOptions {\n /** The search method used ('ilike' is case-insensitive) */\n searchMethod?: 'ilike' | 'like';\n /** Custom rendering function for search results */\n renderSearch?: (item: RenderSearchItem) => string | HTMLElement;\n}\n\n/**\n * Options required to initialize an NGW provider.\n */\ninterface NgwProviderOptions extends BaseProviderOptions {\n /** Connector instance for NGW. If not provided, will be created internally */\n connector?: NgwConnector;\n /** List of NGW resources to search within */\n searchResources: SearchResource[];\n /** Options for the internal NgwConnector (if one needs to be created) */\n connectorOptions?: NgwConnectorOptions;\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n static limit = 300;\n\n caseInsensitive = true;\n searchResources: SearchResource[] = [];\n\n private connector: NgwConnector;\n private _abortControllers: AbortController[] = [];\n\n constructor(options: NgwProviderOptions) {\n super(options);\n if (!options.searchUrl && !options.connectorOptions?.baseUrl) {\n throw new Error(\n 'The `searchUrl` of `connectorOptions.baseUrl` are required',\n );\n }\n\n this.connector =\n options.connector ||\n new NgwConnector({\n baseUrl: this.searchUrl,\n ...options.connectorOptions,\n });\n this.searchResources = options.searchResources;\n }\n\n abort(): void {\n this._abortControllers.forEach((a) => {\n a.abort();\n });\n this._abortControllers.length = 0;\n }\n\n async *search(query: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n const signal = this._makeSignal();\n for (const config of this.searchResources) {\n if (signal.aborted) {\n break;\n }\n const { searchMethod } = config;\n\n const limit = config.limit ?? NgwProvider.limit;\n //\n const resourceId = (config as any).id ?? config.resourceId;\n\n try {\n const resource = await this.connector.getResourceOrFail(resourceId, {\n cache: true,\n });\n\n const options: FetchNgwItemsOptions = {\n connector: this.connector,\n resourceId,\n signal,\n limit,\n };\n\n if (searchMethod === 'like') {\n options.like = query;\n } else {\n options.ilike = query;\n }\n\n const request = fetchNgwLayerItems(options);\n\n const entries = await request;\n\n for (const item of this._items({\n entries,\n query,\n config,\n resourceItem: resource,\n })) {\n item.result = () => this.result(item);\n yield item;\n }\n } catch (er) {\n if (\n er &&\n 'name' in (er as Error) &&\n (er as Error).name !== 'CancelError'\n ) {\n console.warn(er);\n }\n }\n }\n }\n\n result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n const signal = this._makeSignal();\n const req = this.connector\n .get(\n 'feature_layer.feature.item_extent',\n { signal },\n {\n id: item.resourceId,\n fid: item.featureId,\n },\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 return req;\n }\n\n private _makeSignal() {\n const abortController = new AbortController();\n this._abortControllers.push(abortController);\n return abortController.signal;\n }\n\n private _items({\n entries,\n query,\n config,\n resourceItem,\n }: {\n config: SearchResource;\n entries: FeatureItem[];\n query: string;\n resourceItem: ResourceItem;\n }): NgwSearchItem[] {\n const items: NgwSearchItem[] = [];\n\n let labelField: string | undefined = undefined;\n\n if (resourceItem.feature_layer) {\n labelField = resourceItem.feature_layer.fields.find(\n (f) => f.label_field,\n )?.keyname;\n }\n\n const meta = this.searchResources.find(\n (x) => (x as any).id ?? x.resourceId === resourceItem.resource.id,\n );\n if (meta) {\n entries.forEach((entry) => {\n let text = labelField ? entry.fields[labelField] : entry.id;\n if (config.renderSearch) {\n text = config.renderSearch({\n item: entry,\n resourceItem,\n });\n } else if (labelField) {\n text = entry.fields[labelField];\n }\n\n items.push({\n query: query,\n text,\n featureId: entry.id,\n resourceId: resourceItem.resource.id,\n item: entry,\n resourceItem,\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 { Geocoder } from './Geocoder';\nimport type { GeocoderOptions } from './GeocoderOptions';\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","caseInsensitive","searchResources","_abortControllers","searchUrl","_a","connectorOptions","baseUrl","Error","connector","NgwConnector","a","length","signal","_makeSignal","config","aborted","searchMethod","limit","resourceId","_b","id","resource","getResourceOrFail","cache","like","ilike","request","fetchNgwLayerItems","entries","_items","resourceItem","name","console","warn","get","fid","featureId","then","e","extent","text","minLon","minLat","maxLon","maxLat","abortController","AbortController","push","items","labelField","feature_layer","fields","find","f","label_field","keyname","meta","entry","renderSearch","NominatimProvider","_requests","cancel","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","catch","i","model","create"],"mappings":"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"}
|
|
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 type CancelablePromise from '@nextgis/cancelable-promise';\nimport type { SearchItem } from './types/SearchItem';\n\n/**\n * Represents the base class for a geocoder.\n * This abstract class provides the basic methods that every geocoder should implement.\n *\n * @template O - The type of options that can be passed to the geocoder.\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 /**\n * Search method to retrieve geocoding results.\n *\n * @abstract\n * @param {string} query - The search string to geocode.\n * @yields {AsyncGenerator<SearchItem>} - An async generator that yields search results.\n */\n abstract search(query: string): AsyncGenerator<SearchItem>;\n\n /**\n * Method to retrieve detailed result for a specific search item.\n *\n * @abstract\n * @param {SearchItem} item - The search item to get detailed result for.\n * @returns {CancelablePromise<any>} - A promise that resolves to the detailed result.\n */\n abstract result(item: SearchItem): CancelablePromise<any>;\n\n /**\n * Optional method to abort any ongoing geocoding requests.\n *\n * @abstract\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\n/**\n * Abstract base class representing a search provider.\n * It builds upon the BaseGeocoder functionalities with provider-specific properties.\n * @template O - Options type which extends BaseProviderOptions.\n */\nexport abstract class BaseProvider<\n O extends BaseProviderOptions = BaseProviderOptions,\n> extends BaseGeocoder<O> {\n /**\n * URL endpoint for the search service.\n * This is where queries will be sent to obtain search results.\n */\n searchUrl?: string;\n\n /**\n * Label to represent the provider.\n * Useful for user interfaces to display the source of search results.\n */\n label?: string;\n}\n","import NgwConnector from '@nextgis/ngw-connector';\nimport { fetchNgwLayerItems } from '@nextgis/ngw-kit';\n\nimport { BaseProvider } from './BaseProvider';\n\nimport type CancelablePromise from '@nextgis/cancelable-promise';\nimport type {\n FeatureItem,\n NgwConnectorOptions,\n ResourceItem,\n} from '@nextgis/ngw-connector';\nimport type { FetchNgwItemsOptions } from '@nextgis/ngw-kit';\n\nimport type { ResultItem } from '../types/ResultItem';\nimport type { SearchItem } from '../types/SearchItem';\nimport type { BaseProviderOptions } from './BaseProviderOptions';\n\n/**\n * Extends the basic search item with NGW-specific properties.\n */\ninterface NgwSearchItem extends SearchItem {\n /** ID of the NGW resource */\n resourceId: number;\n /** ID of the feature in the NGW resource */\n featureId: number;\n /** The specific feature item from NGW */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Defines the structure for a rendered search item.\n */\ninterface RenderSearchItem {\n /** The specific feature item */\n item: FeatureItem;\n /** The NGW resource item */\n resourceItem: ResourceItem;\n}\n\n/**\n * Options for searching within a NGW resource.\n */\ninterface SearchResource extends FetchNgwItemsOptions {\n /** The search method used ('ilike' is case-insensitive) */\n searchMethod?: 'ilike' | 'like';\n /** Custom rendering function for search results */\n renderSearch?: (item: RenderSearchItem) => string | HTMLElement;\n}\n\n/**\n * Options required to initialize an NGW provider.\n */\ninterface NgwProviderOptions extends BaseProviderOptions {\n /** Connector instance for NGW. If not provided, will be created internally */\n connector?: NgwConnector;\n /** List of NGW resources to search within */\n searchResources: SearchResource[];\n /** Options for the internal NgwConnector (if one needs to be created) */\n connectorOptions?: NgwConnectorOptions;\n}\n\nexport class NgwProvider extends BaseProvider<NgwProviderOptions> {\n static limit = 300;\n\n searchResources: SearchResource[] = [];\n\n private connector: NgwConnector;\n private _abortControllers: AbortController[] = [];\n\n constructor(options: NgwProviderOptions) {\n super(options);\n if (!options.searchUrl && !options.connectorOptions?.baseUrl) {\n throw new Error(\n 'The `searchUrl` of `connectorOptions.baseUrl` are required',\n );\n }\n\n this.connector =\n options.connector ||\n new NgwConnector({\n baseUrl: this.searchUrl,\n ...options.connectorOptions,\n });\n this.searchResources = options.searchResources;\n }\n\n abort(): void {\n this._abortControllers.forEach((a) => {\n a.abort();\n });\n this._abortControllers.length = 0;\n }\n\n async *search(query: string): AsyncGenerator<NgwSearchItem, void, unknown> {\n const signal = this._makeSignal();\n for (const config of this.searchResources) {\n if (signal.aborted) {\n break;\n }\n const { searchMethod } = config;\n\n const limit = config.limit ?? NgwProvider.limit;\n //\n const resourceId = (config as any).id ?? config.resourceId;\n\n try {\n const resource = await this.connector.getResourceOrFail(resourceId, {\n cache: true,\n });\n\n const options: FetchNgwItemsOptions = {\n connector: this.connector,\n resourceId,\n signal,\n limit,\n };\n\n if (searchMethod === 'like') {\n options.like = query;\n } else {\n options.ilike = query;\n }\n\n const request = fetchNgwLayerItems(options);\n\n const entries = await request;\n\n for (const item of this._items({\n entries,\n query,\n config,\n resourceItem: resource,\n })) {\n item.result = () => this.result(item);\n yield item;\n }\n } catch (er) {\n if (\n er &&\n 'name' in (er as Error) &&\n (er as Error).name !== 'CancelError'\n ) {\n console.warn(er);\n }\n }\n }\n }\n\n result(item: NgwSearchItem): CancelablePromise<ResultItem> {\n const signal = this._makeSignal();\n const req = this.connector\n .get(\n 'feature_layer.feature.item_extent',\n { signal },\n {\n id: item.resourceId,\n fid: item.featureId,\n },\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 return req;\n }\n\n private _makeSignal() {\n const abortController = new AbortController();\n this._abortControllers.push(abortController);\n return abortController.signal;\n }\n\n private _items({\n entries,\n query,\n config,\n resourceItem,\n }: {\n config: SearchResource;\n entries: FeatureItem[];\n query: string;\n resourceItem: ResourceItem;\n }): NgwSearchItem[] {\n const items: NgwSearchItem[] = [];\n\n let labelField: string | undefined = undefined;\n\n if (resourceItem.feature_layer) {\n labelField = resourceItem.feature_layer.fields.find(\n (f) => f.label_field,\n )?.keyname;\n }\n\n const meta = this.searchResources.find(\n (x) => (x as any).id ?? x.resourceId === resourceItem.resource.id,\n );\n if (meta) {\n entries.forEach((entry) => {\n let text = labelField ? entry.fields[labelField] : entry.id;\n if (config.renderSearch) {\n text = config.renderSearch({\n item: entry,\n resourceItem,\n });\n } else if (labelField) {\n text = entry.fields[labelField];\n }\n\n items.push({\n query: query,\n text,\n featureId: entry.id,\n resourceId: resourceItem.resource.id,\n item: entry,\n resourceItem,\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 { Geocoder } from './Geocoder';\nimport type { GeocoderOptions } from './GeocoderOptions';\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","searchResources","_abortControllers","searchUrl","_a","connectorOptions","baseUrl","Error","connector","NgwConnector","a","length","signal","_makeSignal","config","aborted","searchMethod","limit","resourceId","_b","id","resource","getResourceOrFail","cache","like","ilike","request","fetchNgwLayerItems","entries","_items","resourceItem","name","console","warn","get","fid","featureId","then","e","extent","text","minLon","minLat","maxLon","maxLat","abortController","AbortController","push","items","labelField","feature_layer","fields","find","f","label_field","keyname","meta","entry","renderSearch","NominatimProvider","_requests","cancel","val","url","fixUrlStr","reject","onCancel","xhr","XMLHttpRequest","open","onload","features","JSON","parse","responseText","map","geom","bbox","properties","display_name","onerror","send","catch","i","model","create"],"mappings":"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"}
|
package/lib/geocoder.global.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** Bundle of @nextgis/geocoder; version: 1.18.
|
|
1
|
+
/** Bundle of @nextgis/geocoder; version: 1.18.9; author: NextGIS */
|
|
2
2
|
var Geocoder = (function (exports) {
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -2209,10 +2209,11 @@ var Geocoder = (function (exports) {
|
|
|
2209
2209
|
*/
|
|
2210
2210
|
NgwConnector.prototype.apiRequest = function (name, params_, requestOptions) {
|
|
2211
2211
|
var _this = this;
|
|
2212
|
-
var _a;
|
|
2212
|
+
var _a, _b;
|
|
2213
2213
|
if (params_ === void 0) { params_ = {}; }
|
|
2214
2214
|
if (requestOptions === void 0) { requestOptions = {}; }
|
|
2215
2215
|
var method = requestOptions.method, headers = requestOptions.headers, withCredentials = requestOptions.withCredentials, responseType = requestOptions.responseType;
|
|
2216
|
+
params_ = (_a = requestOptions.params) !== null && _a !== void 0 ? _a : params_;
|
|
2216
2217
|
var params = objectRemoveEmpty(params_);
|
|
2217
2218
|
var makeApiRequest = function () {
|
|
2218
2219
|
return apiRequest({ name: name, params: params, requestOptions: requestOptions, connector: _this });
|
|
@@ -2224,7 +2225,7 @@ var Geocoder = (function (exports) {
|
|
|
2224
2225
|
withCredentials: withCredentials,
|
|
2225
2226
|
responseType: responseType,
|
|
2226
2227
|
baseUrl: this.options.baseUrl,
|
|
2227
|
-
userId: (
|
|
2228
|
+
userId: (_b = this.user) === null || _b === void 0 ? void 0 : _b.id,
|
|
2228
2229
|
})));
|
|
2229
2230
|
}
|
|
2230
2231
|
return makeApiRequest();
|
|
@@ -2566,8 +2567,11 @@ var Geocoder = (function (exports) {
|
|
|
2566
2567
|
};
|
|
2567
2568
|
function updateItemRequestParam(params, options) {
|
|
2568
2569
|
var extensions = options.extensions, geom = options.geom, fields = options.fields, srs = options.srs, ilike = options.ilike, like = options.like;
|
|
2569
|
-
|
|
2570
|
-
|
|
2570
|
+
// Empty extesions by default
|
|
2571
|
+
var extensionsStr = extensions ? extensions.join(',') : '';
|
|
2572
|
+
// Use character * to set all extensions
|
|
2573
|
+
if (extensionsStr !== '*') {
|
|
2574
|
+
params.extensions = extensionsStr;
|
|
2571
2575
|
}
|
|
2572
2576
|
if (fields !== undefined) {
|
|
2573
2577
|
params.fields = Array.isArray(fields) ? fields.join(',') : '';
|
|
@@ -2790,7 +2794,6 @@ var Geocoder = (function (exports) {
|
|
|
2790
2794
|
var _this = this;
|
|
2791
2795
|
var _a;
|
|
2792
2796
|
_this = _super.call(this, options) || this;
|
|
2793
|
-
_this.caseInsensitive = true;
|
|
2794
2797
|
_this.searchResources = [];
|
|
2795
2798
|
_this._abortControllers = [];
|
|
2796
2799
|
if (!options.searchUrl && !((_a = options.connectorOptions) === null || _a === void 0 ? void 0 : _a.baseUrl)) {
|