@nextgis/geocoder 1.11.8 → 1.12.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 +384 -135
- 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 +978 -598
- package/lib/geocoder.esm-browser.js.map +1 -1
- package/lib/geocoder.esm-browser.prod.js +15 -1
- package/lib/geocoder.esm-browser.prod.js.map +1 -1
- package/lib/geocoder.esm-bundler.js +384 -135
- package/lib/geocoder.esm-bundler.js.map +1 -1
- package/lib/geocoder.esm-bundler.prod.js +15 -1
- package/lib/geocoder.esm-bundler.prod.js.map +1 -1
- package/lib/geocoder.global.js +40 -15
- 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/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.12.1; author: NextGIS */
|
|
2
2
|
'use strict';
|
|
3
3
|
|
|
4
4
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
@@ -12,112 +12,325 @@ 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
|
-
|
|
16
|
-
|
|
15
|
+
/*! *****************************************************************************
|
|
16
|
+
Copyright (c) Microsoft Corporation.
|
|
17
|
+
|
|
18
|
+
Permission to use, copy, modify, and/or distribute this software for any
|
|
19
|
+
purpose with or without fee is hereby granted.
|
|
20
|
+
|
|
21
|
+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
22
|
+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
23
|
+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
24
|
+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
25
|
+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
26
|
+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
27
|
+
PERFORMANCE OF THIS SOFTWARE.
|
|
28
|
+
***************************************************************************** */
|
|
29
|
+
/* global Reflect, Promise */
|
|
30
|
+
|
|
31
|
+
var extendStatics = function(d, b) {
|
|
32
|
+
extendStatics = Object.setPrototypeOf ||
|
|
33
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
34
|
+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
35
|
+
return extendStatics(d, b);
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
function __extends(d, b) {
|
|
39
|
+
if (typeof b !== "function" && b !== null)
|
|
40
|
+
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
41
|
+
extendStatics(d, b);
|
|
42
|
+
function __() { this.constructor = d; }
|
|
43
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
var __assign = function() {
|
|
47
|
+
__assign = Object.assign || function __assign(t) {
|
|
48
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
49
|
+
s = arguments[i];
|
|
50
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
51
|
+
}
|
|
52
|
+
return t;
|
|
53
|
+
};
|
|
54
|
+
return __assign.apply(this, arguments);
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
function __generator(thisArg, body) {
|
|
58
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
59
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
60
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
61
|
+
function step(op) {
|
|
62
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
63
|
+
while (_) try {
|
|
64
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
65
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
66
|
+
switch (op[0]) {
|
|
67
|
+
case 0: case 1: t = op; break;
|
|
68
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
69
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
70
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
71
|
+
default:
|
|
72
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
73
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
74
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
75
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
76
|
+
if (t[2]) _.ops.pop();
|
|
77
|
+
_.trys.pop(); continue;
|
|
78
|
+
}
|
|
79
|
+
op = body.call(thisArg, _);
|
|
80
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
81
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function __values(o) {
|
|
86
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
87
|
+
if (m) return m.call(o);
|
|
88
|
+
if (o && typeof o.length === "number") return {
|
|
89
|
+
next: function () {
|
|
90
|
+
if (o && i >= o.length) o = void 0;
|
|
91
|
+
return { value: o && o[i++], done: !o };
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
function __await(v) {
|
|
98
|
+
return this instanceof __await ? (this.v = v, this) : new __await(v);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
function __asyncGenerator(thisArg, _arguments, generator) {
|
|
102
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
103
|
+
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
104
|
+
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
105
|
+
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
106
|
+
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
107
|
+
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
108
|
+
function fulfill(value) { resume("next", value); }
|
|
109
|
+
function reject(value) { resume("throw", value); }
|
|
110
|
+
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function __asyncValues(o) {
|
|
114
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
115
|
+
var m = o[Symbol.asyncIterator], i;
|
|
116
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
117
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
118
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
var BaseGeocoder = /** @class */ (function () {
|
|
122
|
+
function BaseGeocoder(options) {
|
|
17
123
|
if (options) {
|
|
18
124
|
utils.objectAssign(this, options);
|
|
19
125
|
}
|
|
20
126
|
}
|
|
21
|
-
|
|
127
|
+
return BaseGeocoder;
|
|
128
|
+
}());
|
|
22
129
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
130
|
+
var ID = 0;
|
|
131
|
+
var Geocoder = /** @class */ (function (_super) {
|
|
132
|
+
__extends(Geocoder, _super);
|
|
133
|
+
function Geocoder(options) {
|
|
134
|
+
var _this = _super.call(this, options) || this;
|
|
135
|
+
_this.providers = [];
|
|
28
136
|
if (options && options.providers) {
|
|
29
|
-
|
|
137
|
+
_this.providers = options.providers;
|
|
30
138
|
}
|
|
139
|
+
return _this;
|
|
31
140
|
}
|
|
32
|
-
abort() {
|
|
33
|
-
this.providers.forEach((x)
|
|
141
|
+
Geocoder.prototype.abort = function () {
|
|
142
|
+
this.providers.forEach(function (x) {
|
|
34
143
|
if (x.abort) {
|
|
35
144
|
x.abort();
|
|
36
145
|
}
|
|
37
146
|
});
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
147
|
+
};
|
|
148
|
+
Geocoder.prototype.search = function (query) {
|
|
149
|
+
return __asyncGenerator(this, arguments, function search_1() {
|
|
150
|
+
var _i, _a, provider, results, results_1, results_1_1, r, e_1_1;
|
|
151
|
+
var e_1, _b;
|
|
152
|
+
return __generator(this, function (_c) {
|
|
153
|
+
switch (_c.label) {
|
|
154
|
+
case 0:
|
|
155
|
+
_i = 0, _a = this.providers;
|
|
156
|
+
_c.label = 1;
|
|
157
|
+
case 1:
|
|
158
|
+
if (!(_i < _a.length)) return [3 /*break*/, 19];
|
|
159
|
+
provider = _a[_i];
|
|
160
|
+
_c.label = 2;
|
|
161
|
+
case 2:
|
|
162
|
+
_c.trys.push([2, 17, , 18]);
|
|
163
|
+
results = provider.search(query);
|
|
164
|
+
_c.label = 3;
|
|
165
|
+
case 3:
|
|
166
|
+
_c.trys.push([3, 10, 11, 16]);
|
|
167
|
+
results_1 = (e_1 = void 0, __asyncValues(results));
|
|
168
|
+
_c.label = 4;
|
|
169
|
+
case 4: return [4 /*yield*/, __await(results_1.next())];
|
|
170
|
+
case 5:
|
|
171
|
+
if (!(results_1_1 = _c.sent(), !results_1_1.done)) return [3 /*break*/, 9];
|
|
172
|
+
r = results_1_1.value;
|
|
173
|
+
return [4 /*yield*/, __await(__assign(__assign({}, r), { provider: provider, _id: ID++ }))];
|
|
174
|
+
case 6: return [4 /*yield*/, _c.sent()];
|
|
175
|
+
case 7:
|
|
176
|
+
_c.sent();
|
|
177
|
+
_c.label = 8;
|
|
178
|
+
case 8: return [3 /*break*/, 4];
|
|
179
|
+
case 9: return [3 /*break*/, 16];
|
|
180
|
+
case 10:
|
|
181
|
+
e_1_1 = _c.sent();
|
|
182
|
+
e_1 = { error: e_1_1 };
|
|
183
|
+
return [3 /*break*/, 16];
|
|
184
|
+
case 11:
|
|
185
|
+
_c.trys.push([11, , 14, 15]);
|
|
186
|
+
if (!(results_1_1 && !results_1_1.done && (_b = results_1.return))) return [3 /*break*/, 13];
|
|
187
|
+
return [4 /*yield*/, __await(_b.call(results_1))];
|
|
188
|
+
case 12:
|
|
189
|
+
_c.sent();
|
|
190
|
+
_c.label = 13;
|
|
191
|
+
case 13: return [3 /*break*/, 15];
|
|
192
|
+
case 14:
|
|
193
|
+
if (e_1) throw e_1.error;
|
|
194
|
+
return [7 /*endfinally*/];
|
|
195
|
+
case 15: return [7 /*endfinally*/];
|
|
196
|
+
case 16: return [3 /*break*/, 18];
|
|
197
|
+
case 17:
|
|
198
|
+
_c.sent();
|
|
199
|
+
return [3 /*break*/, 18];
|
|
200
|
+
case 18:
|
|
201
|
+
_i++;
|
|
202
|
+
return [3 /*break*/, 1];
|
|
203
|
+
case 19: return [2 /*return*/];
|
|
45
204
|
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
result(item) {
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
};
|
|
208
|
+
Geocoder.prototype.result = function (item) {
|
|
53
209
|
if (item.provider) {
|
|
54
210
|
return item.provider.result(item);
|
|
55
211
|
}
|
|
56
212
|
return CancelablePromise__default.resolve(undefined);
|
|
57
|
-
}
|
|
58
|
-
|
|
213
|
+
};
|
|
214
|
+
return Geocoder;
|
|
215
|
+
}(BaseGeocoder));
|
|
59
216
|
|
|
60
|
-
|
|
61
|
-
|
|
217
|
+
var BaseProvider = /** @class */ (function (_super) {
|
|
218
|
+
__extends(BaseProvider, _super);
|
|
219
|
+
function BaseProvider() {
|
|
220
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
221
|
+
}
|
|
222
|
+
return BaseProvider;
|
|
223
|
+
}(BaseGeocoder));
|
|
62
224
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
225
|
+
var NgwProvider = /** @class */ (function (_super) {
|
|
226
|
+
__extends(NgwProvider, _super);
|
|
227
|
+
function NgwProvider(options) {
|
|
228
|
+
var _this = _super.call(this, options) || this;
|
|
229
|
+
_this.caseInsensitive = true;
|
|
230
|
+
_this.searchUrl = 'https://maxim.nextgis.com';
|
|
231
|
+
_this.searchResources = [];
|
|
232
|
+
_this.requests = [];
|
|
233
|
+
_this.connector =
|
|
71
234
|
options.connector ||
|
|
72
235
|
new NgwConnector__default({
|
|
73
|
-
baseUrl:
|
|
236
|
+
baseUrl: _this.searchUrl,
|
|
74
237
|
});
|
|
75
|
-
|
|
238
|
+
_this.searchResources = options.searchResources;
|
|
239
|
+
return _this;
|
|
76
240
|
}
|
|
77
|
-
abort() {
|
|
78
|
-
this.requests.forEach((x)
|
|
241
|
+
NgwProvider.prototype.abort = function () {
|
|
242
|
+
this.requests.forEach(function (x) {
|
|
79
243
|
x.cancel();
|
|
80
244
|
});
|
|
81
245
|
this.requests = [];
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
246
|
+
};
|
|
247
|
+
NgwProvider.prototype.search = function (like) {
|
|
248
|
+
return __asyncGenerator(this, arguments, function search_1() {
|
|
249
|
+
var _loop_1, this_1, _i, _a, resource;
|
|
250
|
+
var _this = this;
|
|
251
|
+
return __generator(this, function (_b) {
|
|
252
|
+
switch (_b.label) {
|
|
253
|
+
case 0:
|
|
254
|
+
_loop_1 = function (resource) {
|
|
255
|
+
var limit, request, resp, entries, _loop_2, _c, _d, item;
|
|
256
|
+
return __generator(this, function (_e) {
|
|
257
|
+
switch (_e.label) {
|
|
258
|
+
case 0:
|
|
259
|
+
limit = resource.limit || 300;
|
|
260
|
+
request = this_1.connector.get('feature_layer.store', {
|
|
261
|
+
headers: { RANGE: "items=0-".concat(limit) },
|
|
262
|
+
}, {
|
|
263
|
+
id: resource.id,
|
|
264
|
+
like: like,
|
|
265
|
+
});
|
|
266
|
+
this_1.requests.push(request);
|
|
267
|
+
request.catch(function (er) {
|
|
268
|
+
console.warn(er);
|
|
269
|
+
});
|
|
270
|
+
return [4 /*yield*/, __await(request)];
|
|
271
|
+
case 1:
|
|
272
|
+
resp = _e.sent();
|
|
273
|
+
entries = [];
|
|
274
|
+
if (resp) {
|
|
275
|
+
resp.forEach(function (x) {
|
|
276
|
+
entries.push(__assign({ query: like, resourceId: resource.id }, x));
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
_loop_2 = function (item) {
|
|
280
|
+
return __generator(this, function (_f) {
|
|
281
|
+
switch (_f.label) {
|
|
282
|
+
case 0:
|
|
283
|
+
item.result = function () { return _this.result(item); };
|
|
284
|
+
return [4 /*yield*/, __await(item)];
|
|
285
|
+
case 1: return [4 /*yield*/, _f.sent()];
|
|
286
|
+
case 2:
|
|
287
|
+
_f.sent();
|
|
288
|
+
return [2 /*return*/];
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
};
|
|
292
|
+
_c = 0, _d = this_1._items(entries);
|
|
293
|
+
_e.label = 2;
|
|
294
|
+
case 2:
|
|
295
|
+
if (!(_c < _d.length)) return [3 /*break*/, 5];
|
|
296
|
+
item = _d[_c];
|
|
297
|
+
return [5 /*yield**/, _loop_2(item)];
|
|
298
|
+
case 3:
|
|
299
|
+
_e.sent();
|
|
300
|
+
_e.label = 4;
|
|
301
|
+
case 4:
|
|
302
|
+
_c++;
|
|
303
|
+
return [3 /*break*/, 2];
|
|
304
|
+
case 5: return [2 /*return*/];
|
|
305
|
+
}
|
|
306
|
+
});
|
|
307
|
+
};
|
|
308
|
+
this_1 = this;
|
|
309
|
+
_i = 0, _a = this.searchResources;
|
|
310
|
+
_b.label = 1;
|
|
311
|
+
case 1:
|
|
312
|
+
if (!(_i < _a.length)) return [3 /*break*/, 4];
|
|
313
|
+
resource = _a[_i];
|
|
314
|
+
return [5 /*yield**/, _loop_1(resource)];
|
|
315
|
+
case 2:
|
|
316
|
+
_b.sent();
|
|
317
|
+
_b.label = 3;
|
|
318
|
+
case 3:
|
|
319
|
+
_i++;
|
|
320
|
+
return [3 /*break*/, 1];
|
|
321
|
+
case 4: return [2 /*return*/];
|
|
322
|
+
}
|
|
95
323
|
});
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
entries.push({
|
|
101
|
-
query: like,
|
|
102
|
-
resourceId: resource.id,
|
|
103
|
-
...x,
|
|
104
|
-
});
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
|
-
for (const item of this._items(entries)) {
|
|
108
|
-
item.result = () => this.result(item);
|
|
109
|
-
yield item;
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
result(item) {
|
|
114
|
-
const req = this.connector
|
|
324
|
+
});
|
|
325
|
+
};
|
|
326
|
+
NgwProvider.prototype.result = function (item) {
|
|
327
|
+
var req = this.connector
|
|
115
328
|
.get('feature_layer.feature.item_extent', null, {
|
|
116
329
|
id: item.resourceId,
|
|
117
330
|
fid: item.featureId,
|
|
118
331
|
})
|
|
119
|
-
.then((x)
|
|
120
|
-
|
|
332
|
+
.then(function (x) {
|
|
333
|
+
var e = x.extent;
|
|
121
334
|
return {
|
|
122
335
|
text: item.text,
|
|
123
336
|
extent: [e.minLon, e.minLat, e.maxLon, e.maxLat],
|
|
@@ -125,11 +338,12 @@ class NgwProvider extends BaseProvider {
|
|
|
125
338
|
});
|
|
126
339
|
this.requests.push(req);
|
|
127
340
|
return req;
|
|
128
|
-
}
|
|
129
|
-
_items(entries) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
341
|
+
};
|
|
342
|
+
NgwProvider.prototype._items = function (entries) {
|
|
343
|
+
var _this = this;
|
|
344
|
+
var items = [];
|
|
345
|
+
entries.forEach(function (entry) {
|
|
346
|
+
var meta = _this.searchResources.find(function (x) { return x.id === entry.resourceId; });
|
|
133
347
|
if (meta) {
|
|
134
348
|
items.push({
|
|
135
349
|
query: entry.query,
|
|
@@ -140,72 +354,107 @@ class NgwProvider extends BaseProvider {
|
|
|
140
354
|
}
|
|
141
355
|
});
|
|
142
356
|
return items;
|
|
143
|
-
}
|
|
144
|
-
|
|
357
|
+
};
|
|
358
|
+
return NgwProvider;
|
|
359
|
+
}(BaseProvider));
|
|
145
360
|
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
361
|
+
var NominatimProvider = /** @class */ (function (_super) {
|
|
362
|
+
__extends(NominatimProvider, _super);
|
|
363
|
+
function NominatimProvider(options) {
|
|
364
|
+
var _this = _super.call(this, options) || this;
|
|
365
|
+
_this.searchUrl = 'https://nominatim.openstreetmap.org';
|
|
366
|
+
_this._requests = [];
|
|
367
|
+
return _this;
|
|
151
368
|
}
|
|
152
|
-
abort() {
|
|
153
|
-
this._requests.forEach((x)
|
|
369
|
+
NominatimProvider.prototype.abort = function () {
|
|
370
|
+
this._requests.forEach(function (x) { return x.cancel(); });
|
|
154
371
|
this._requests = [];
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
372
|
+
};
|
|
373
|
+
NominatimProvider.prototype.search = function (val) {
|
|
374
|
+
return __asyncGenerator(this, arguments, function search_1() {
|
|
375
|
+
var url, request, items, _loop_1, _i, items_1, i;
|
|
376
|
+
var _this = this;
|
|
377
|
+
return __generator(this, function (_a) {
|
|
378
|
+
switch (_a.label) {
|
|
379
|
+
case 0:
|
|
380
|
+
url = utils.fixUrlStr(
|
|
381
|
+
// `${this.baseUrl}/search?format=geojson&polygon_geojson=1${window.locale === 'ru' ? '&accept-language=ru-RU,en-US' : ''}&q=${val}`
|
|
382
|
+
"".concat(this.searchUrl, "/search?format=geojson&polygon_geojson=1&q=").concat(val));
|
|
383
|
+
request = new CancelablePromise__default(function (resolve, reject, onCancel) {
|
|
384
|
+
var xhr = new XMLHttpRequest();
|
|
385
|
+
xhr.open('GET', url, true);
|
|
386
|
+
xhr.onload = function () {
|
|
387
|
+
try {
|
|
388
|
+
var geojson = JSON.parse(xhr.responseText);
|
|
389
|
+
var features = geojson.features.map(function (x) {
|
|
390
|
+
return {
|
|
391
|
+
geom: x,
|
|
392
|
+
extent: x.bbox,
|
|
393
|
+
text: x.properties && x.properties.display_name,
|
|
394
|
+
query: val,
|
|
395
|
+
};
|
|
396
|
+
});
|
|
397
|
+
resolve(features);
|
|
398
|
+
}
|
|
399
|
+
catch (er) {
|
|
400
|
+
reject(er);
|
|
401
|
+
}
|
|
402
|
+
};
|
|
403
|
+
xhr.onerror = function (er) {
|
|
404
|
+
reject(er);
|
|
405
|
+
};
|
|
406
|
+
onCancel(function () {
|
|
407
|
+
xhr.abort();
|
|
408
|
+
});
|
|
409
|
+
xhr.send();
|
|
410
|
+
}).catch(function (er) {
|
|
411
|
+
if (er.name === 'CancelError') ;
|
|
412
|
+
throw er;
|
|
413
|
+
});
|
|
414
|
+
this._requests.push(request);
|
|
415
|
+
return [4 /*yield*/, __await(request)];
|
|
416
|
+
case 1:
|
|
417
|
+
items = _a.sent();
|
|
418
|
+
if (!items) return [3 /*break*/, 5];
|
|
419
|
+
_loop_1 = function (i) {
|
|
420
|
+
return __generator(this, function (_b) {
|
|
421
|
+
switch (_b.label) {
|
|
422
|
+
case 0:
|
|
423
|
+
i.result = function () { return _this.result(i); };
|
|
424
|
+
return [4 /*yield*/, __await(i)];
|
|
425
|
+
case 1: return [4 /*yield*/, _b.sent()];
|
|
426
|
+
case 2:
|
|
427
|
+
_b.sent();
|
|
428
|
+
return [2 /*return*/];
|
|
429
|
+
}
|
|
430
|
+
});
|
|
173
431
|
};
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
432
|
+
_i = 0, items_1 = items;
|
|
433
|
+
_a.label = 2;
|
|
434
|
+
case 2:
|
|
435
|
+
if (!(_i < items_1.length)) return [3 /*break*/, 5];
|
|
436
|
+
i = items_1[_i];
|
|
437
|
+
return [5 /*yield**/, _loop_1(i)];
|
|
438
|
+
case 3:
|
|
439
|
+
_a.sent();
|
|
440
|
+
_a.label = 4;
|
|
441
|
+
case 4:
|
|
442
|
+
_i++;
|
|
443
|
+
return [3 /*break*/, 2];
|
|
444
|
+
case 5: return [2 /*return*/];
|
|
179
445
|
}
|
|
180
|
-
};
|
|
181
|
-
xhr.onerror = (er) => {
|
|
182
|
-
reject(er);
|
|
183
|
-
};
|
|
184
|
-
onCancel(() => {
|
|
185
|
-
xhr.abort();
|
|
186
446
|
});
|
|
187
|
-
xhr.send();
|
|
188
|
-
}).catch((er) => {
|
|
189
|
-
if (er.name === 'CancelError') ;
|
|
190
|
-
throw er;
|
|
191
447
|
});
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
if (items) {
|
|
195
|
-
for (const i of items) {
|
|
196
|
-
i.result = () => this.result(i);
|
|
197
|
-
yield i;
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
result(model) {
|
|
448
|
+
};
|
|
449
|
+
NominatimProvider.prototype.result = function (model) {
|
|
202
450
|
return CancelablePromise__default.resolve({
|
|
203
451
|
text: model.text,
|
|
204
452
|
extent: model.extent || [],
|
|
205
453
|
geom: model.geom,
|
|
206
454
|
});
|
|
207
|
-
}
|
|
208
|
-
|
|
455
|
+
};
|
|
456
|
+
return NominatimProvider;
|
|
457
|
+
}(BaseProvider));
|
|
209
458
|
|
|
210
459
|
function create(options) {
|
|
211
460
|
return new Geocoder(options);
|
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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"}
|