@nextgis/ngw-map 2.4.1 → 2.5.0
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/index.d.ts +5 -0
- package/lib/ngw-map.cjs.js +3 -2
- package/lib/ngw-map.cjs.js.map +1 -1
- package/lib/ngw-map.cjs.prod.js +1 -1
- package/lib/ngw-map.cjs.prod.js.map +1 -1
- package/lib/ngw-map.esm-browser.js +115 -112
- package/lib/ngw-map.esm-browser.js.map +1 -1
- package/lib/ngw-map.esm-browser.prod.js +1 -1
- package/lib/ngw-map.esm-browser.prod.js.map +1 -1
- package/lib/ngw-map.esm-bundler.js +3 -2
- package/lib/ngw-map.esm-bundler.js.map +1 -1
- package/lib/ngw-map.esm-bundler.prod.js +1 -1
- package/lib/ngw-map.esm-bundler.prod.js.map +1 -1
- package/lib/ngw-map.global.js +115 -112
- package/lib/ngw-map.global.js.map +1 -1
- package/lib/ngw-map.global.prod.js +1 -1
- package/lib/ngw-map.global.prod.js.map +1 -1
- package/package.json +9 -9
package/lib/ngw-map.global.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** Bundle of @nextgis/ngw-map; version: 2.
|
|
1
|
+
/** Bundle of @nextgis/ngw-map; version: 2.5.0; author: NextGIS */
|
|
2
2
|
var NgwMap = (function (exports) {
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -476,7 +476,7 @@ var NgwMap = (function (exports) {
|
|
|
476
476
|
|
|
477
477
|
var __defProp$N = Object.defineProperty;
|
|
478
478
|
var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
479
|
-
var __publicField$z = (obj, key, value) => __defNormalProp$N(obj,
|
|
479
|
+
var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, key + "" , value);
|
|
480
480
|
class CancelError extends Error {
|
|
481
481
|
constructor() {
|
|
482
482
|
super();
|
|
@@ -487,7 +487,7 @@ var NgwMap = (function (exports) {
|
|
|
487
487
|
|
|
488
488
|
var __defProp$M = Object.defineProperty;
|
|
489
489
|
var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
490
|
-
var __publicField$y = (obj, key, value) => __defNormalProp$M(obj,
|
|
490
|
+
var __publicField$y = (obj, key, value) => __defNormalProp$M(obj, key + "" , value);
|
|
491
491
|
class PromiseControl {
|
|
492
492
|
constructor(options = {}) {
|
|
493
493
|
this.options = options;
|
|
@@ -569,7 +569,7 @@ var NgwMap = (function (exports) {
|
|
|
569
569
|
|
|
570
570
|
var __defProp$L = Object.defineProperty;
|
|
571
571
|
var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
572
|
-
var __publicField$x = (obj, key, value) => __defNormalProp$L(obj,
|
|
572
|
+
var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, key + "" , value);
|
|
573
573
|
class TimeoutError extends Error {
|
|
574
574
|
constructor() {
|
|
575
575
|
super();
|
|
@@ -1114,7 +1114,7 @@ var NgwMap = (function (exports) {
|
|
|
1114
1114
|
}
|
|
1115
1115
|
|
|
1116
1116
|
function round(val, toFixed) {
|
|
1117
|
-
const n =
|
|
1117
|
+
const n = 1;
|
|
1118
1118
|
return Math.round((val + Number.EPSILON) * n) / n;
|
|
1119
1119
|
}
|
|
1120
1120
|
|
|
@@ -1317,8 +1317,8 @@ var NgwMap = (function (exports) {
|
|
|
1317
1317
|
}
|
|
1318
1318
|
|
|
1319
1319
|
var __defProp$G = Object.defineProperty;
|
|
1320
|
-
var __defProps$
|
|
1321
|
-
var __getOwnPropDescs$
|
|
1320
|
+
var __defProps$f = Object.defineProperties;
|
|
1321
|
+
var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
|
|
1322
1322
|
var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
|
|
1323
1323
|
var __hasOwnProp$u = Object.prototype.hasOwnProperty;
|
|
1324
1324
|
var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
|
|
@@ -1334,7 +1334,7 @@ var NgwMap = (function (exports) {
|
|
|
1334
1334
|
}
|
|
1335
1335
|
return a;
|
|
1336
1336
|
};
|
|
1337
|
-
var __spreadProps$
|
|
1337
|
+
var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
|
|
1338
1338
|
var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1339
1339
|
var __async$l = (__this, __arguments, generator) => {
|
|
1340
1340
|
return new Promise((resolve, reject) => {
|
|
@@ -1379,7 +1379,7 @@ var NgwMap = (function (exports) {
|
|
|
1379
1379
|
getOne(resource, requestOptions) {
|
|
1380
1380
|
const cache = this.cache;
|
|
1381
1381
|
const forCache = {};
|
|
1382
|
-
const opt = __spreadProps$
|
|
1382
|
+
const opt = __spreadProps$f(__spreadValues$t({}, requestOptions), { cache: false });
|
|
1383
1383
|
if (typeof resource === "string") {
|
|
1384
1384
|
forCache.keyname = resource;
|
|
1385
1385
|
} else if (typeof resource === "number") {
|
|
@@ -1714,7 +1714,7 @@ var NgwMap = (function (exports) {
|
|
|
1714
1714
|
|
|
1715
1715
|
var __defProp$E = Object.defineProperty;
|
|
1716
1716
|
var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1717
|
-
var __publicField$q = (obj, key, value) => __defNormalProp$E(obj,
|
|
1717
|
+
var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, key + "" , value);
|
|
1718
1718
|
class NetworkError extends Error {
|
|
1719
1719
|
constructor(url) {
|
|
1720
1720
|
super();
|
|
@@ -1833,6 +1833,7 @@ var NgwMap = (function (exports) {
|
|
|
1833
1833
|
__publicField$p(this, "user");
|
|
1834
1834
|
__publicField$p(this, "resources");
|
|
1835
1835
|
__publicField$p(this, "cache");
|
|
1836
|
+
__publicField$p(this, "withCredentials");
|
|
1836
1837
|
__publicField$p(this, "routeStr", "/api/component/pyramid/route");
|
|
1837
1838
|
__publicField$p(this, "activeRequests", []);
|
|
1838
1839
|
__publicField$p(this, "requestTransform");
|
|
@@ -1841,11 +1842,15 @@ var NgwMap = (function (exports) {
|
|
|
1841
1842
|
if (exist) {
|
|
1842
1843
|
return exist;
|
|
1843
1844
|
} else {
|
|
1844
|
-
|
|
1845
|
-
|
|
1845
|
+
const { route, requestTransform, withCredentials } = this.options;
|
|
1846
|
+
if (route) {
|
|
1847
|
+
this.routeStr = route;
|
|
1846
1848
|
}
|
|
1847
|
-
if (
|
|
1848
|
-
this.requestTransform =
|
|
1849
|
+
if (requestTransform) {
|
|
1850
|
+
this.requestTransform = requestTransform;
|
|
1851
|
+
}
|
|
1852
|
+
if (withCredentials !== void 0) {
|
|
1853
|
+
this.withCredentials = withCredentials;
|
|
1849
1854
|
}
|
|
1850
1855
|
this.resources = new ResourcesControl({
|
|
1851
1856
|
connector: this,
|
|
@@ -2014,6 +2019,9 @@ var NgwMap = (function (exports) {
|
|
|
2014
2019
|
*/
|
|
2015
2020
|
apiRequest(name, params_ = {}, requestOptions = {}) {
|
|
2016
2021
|
var _a, _b;
|
|
2022
|
+
requestOptions = __spreadValues$s({
|
|
2023
|
+
withCredentials: this.withCredentials
|
|
2024
|
+
}, requestOptions);
|
|
2017
2025
|
const { method, headers, withCredentials, responseType } = requestOptions;
|
|
2018
2026
|
params_ = (_a = requestOptions.params) != null ? _a : params_;
|
|
2019
2027
|
const params = objectRemoveEmpty(params_);
|
|
@@ -2378,8 +2386,8 @@ var NgwMap = (function (exports) {
|
|
|
2378
2386
|
}
|
|
2379
2387
|
|
|
2380
2388
|
var __defProp$B = Object.defineProperty;
|
|
2381
|
-
var __defProps$
|
|
2382
|
-
var __getOwnPropDescs$
|
|
2389
|
+
var __defProps$e = Object.defineProperties;
|
|
2390
|
+
var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
|
|
2383
2391
|
var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
|
|
2384
2392
|
var __hasOwnProp$r = Object.prototype.hasOwnProperty;
|
|
2385
2393
|
var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
|
|
@@ -2395,7 +2403,7 @@ var NgwMap = (function (exports) {
|
|
|
2395
2403
|
}
|
|
2396
2404
|
return a;
|
|
2397
2405
|
};
|
|
2398
|
-
var __spreadProps$
|
|
2406
|
+
var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
|
|
2399
2407
|
const FEATURE_REQUEST_PARAMS = {
|
|
2400
2408
|
srs: 4326,
|
|
2401
2409
|
geom_format: "geojson"
|
|
@@ -2481,13 +2489,13 @@ var NgwMap = (function (exports) {
|
|
|
2481
2489
|
for (const f of filters_) {
|
|
2482
2490
|
if (isPropertyFilter(f)) {
|
|
2483
2491
|
_queries.push(
|
|
2484
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2492
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2485
2493
|
paramList: [..._parentAllParams, ...paramList, createParam(f)]
|
|
2486
2494
|
}))
|
|
2487
2495
|
);
|
|
2488
2496
|
} else {
|
|
2489
2497
|
getQueries(
|
|
2490
|
-
__spreadProps$
|
|
2498
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2491
2499
|
filters: f
|
|
2492
2500
|
}),
|
|
2493
2501
|
_queries,
|
|
@@ -2508,7 +2516,7 @@ var NgwMap = (function (exports) {
|
|
|
2508
2516
|
if (propertiesFilterList.length) {
|
|
2509
2517
|
for (const x of propertiesFilterList) {
|
|
2510
2518
|
getQueries(
|
|
2511
|
-
__spreadProps$
|
|
2519
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2512
2520
|
filters: x
|
|
2513
2521
|
}),
|
|
2514
2522
|
_queries,
|
|
@@ -2517,7 +2525,7 @@ var NgwMap = (function (exports) {
|
|
|
2517
2525
|
}
|
|
2518
2526
|
} else {
|
|
2519
2527
|
_queries.push(
|
|
2520
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2528
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2521
2529
|
paramList: [..._parentAllParams, ...paramList, ...filters2]
|
|
2522
2530
|
}))
|
|
2523
2531
|
);
|
|
@@ -2583,8 +2591,8 @@ var NgwMap = (function (exports) {
|
|
|
2583
2591
|
}
|
|
2584
2592
|
|
|
2585
2593
|
var __defProp$A = Object.defineProperty;
|
|
2586
|
-
var __defProps$
|
|
2587
|
-
var __getOwnPropDescs$
|
|
2594
|
+
var __defProps$d = Object.defineProperties;
|
|
2595
|
+
var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
|
|
2588
2596
|
var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
|
|
2589
2597
|
var __hasOwnProp$q = Object.prototype.hasOwnProperty;
|
|
2590
2598
|
var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
|
|
@@ -2600,7 +2608,7 @@ var NgwMap = (function (exports) {
|
|
|
2600
2608
|
}
|
|
2601
2609
|
return a;
|
|
2602
2610
|
};
|
|
2603
|
-
var __spreadProps$
|
|
2611
|
+
var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
|
|
2604
2612
|
function fetchNgwLayerItem(options) {
|
|
2605
2613
|
const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
|
|
2606
2614
|
updateItemRequestParam(params, options);
|
|
@@ -2610,18 +2618,18 @@ var NgwMap = (function (exports) {
|
|
|
2610
2618
|
}, params);
|
|
2611
2619
|
const cache = options.cache || true;
|
|
2612
2620
|
return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
|
|
2613
|
-
return __spreadProps$
|
|
2621
|
+
return __spreadProps$d(__spreadValues$p({}, resp), {
|
|
2614
2622
|
toGeojson: () => {
|
|
2615
2623
|
if (resp.geom) {
|
|
2616
2624
|
return CancelablePromise.resolve(createGeoJsonFeature(resp));
|
|
2617
2625
|
} else {
|
|
2618
|
-
return fetchNgwLayerItem(__spreadProps$
|
|
2626
|
+
return fetchNgwLayerItem(__spreadProps$d(__spreadValues$p({}, options), {
|
|
2619
2627
|
geom: true,
|
|
2620
2628
|
fields: null,
|
|
2621
2629
|
extensions: null
|
|
2622
2630
|
})).then((onlyGeomItem) => {
|
|
2623
2631
|
const geom = onlyGeomItem.geom;
|
|
2624
|
-
return createGeoJsonFeature(__spreadProps$
|
|
2632
|
+
return createGeoJsonFeature(__spreadProps$d(__spreadValues$p({}, resp), { geom }));
|
|
2625
2633
|
});
|
|
2626
2634
|
}
|
|
2627
2635
|
}
|
|
@@ -2683,22 +2691,20 @@ var NgwMap = (function (exports) {
|
|
|
2683
2691
|
}
|
|
2684
2692
|
|
|
2685
2693
|
function treeEvery(item, filter, relation, itemPrepare) {
|
|
2686
|
-
return !!treeWrapper(item, filter, relation, treeEvery_
|
|
2694
|
+
return !!treeWrapper(item, filter, relation, treeEvery_);
|
|
2687
2695
|
}
|
|
2688
2696
|
function treeSome(item, filter, relation, itemPrepare) {
|
|
2689
|
-
return !!treeWrapper(item, filter, relation, treeFind_
|
|
2697
|
+
return !!treeWrapper(item, filter, relation, treeFind_);
|
|
2690
2698
|
}
|
|
2691
2699
|
function treeFind(item, filter, relation, itemPrepare) {
|
|
2692
|
-
return treeWrapper(item, filter, relation, treeFind_
|
|
2700
|
+
return treeWrapper(item, filter, relation, treeFind_);
|
|
2693
2701
|
}
|
|
2694
2702
|
function treeFilter(item, filter, relation, itemPrepare) {
|
|
2695
2703
|
return treeWrapper(
|
|
2696
2704
|
item,
|
|
2697
2705
|
filter,
|
|
2698
2706
|
relation,
|
|
2699
|
-
treeFilter_
|
|
2700
|
-
itemPrepare
|
|
2701
|
-
);
|
|
2707
|
+
treeFilter_);
|
|
2702
2708
|
}
|
|
2703
2709
|
function getChildren(item, relation = "children") {
|
|
2704
2710
|
let children = [];
|
|
@@ -2715,13 +2721,6 @@ var NgwMap = (function (exports) {
|
|
|
2715
2721
|
}
|
|
2716
2722
|
function treeWrapper(item, filter = (x) => !!x, relation = "children", treeFunction, itemPrepare) {
|
|
2717
2723
|
const filterFunction = typeof filter === "function" ? filter : (i) => propertiesFilter(i, filter);
|
|
2718
|
-
if (itemPrepare) {
|
|
2719
|
-
return treeFunction(
|
|
2720
|
-
item,
|
|
2721
|
-
(i) => filterFunction(itemPrepare(i)),
|
|
2722
|
-
relation
|
|
2723
|
-
);
|
|
2724
|
-
}
|
|
2725
2724
|
return treeFunction(item, filterFunction, relation);
|
|
2726
2725
|
}
|
|
2727
2726
|
function treeFind_(item, filterFunc = (x) => !!x, relation, _filtered = []) {
|
|
@@ -2988,7 +2987,7 @@ var NgwMap = (function (exports) {
|
|
|
2988
2987
|
}
|
|
2989
2988
|
return a;
|
|
2990
2989
|
};
|
|
2991
|
-
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj,
|
|
2990
|
+
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
|
|
2992
2991
|
const _CheckProperty = class _CheckProperty extends BaseProperty {
|
|
2993
2992
|
constructor(name, item, options) {
|
|
2994
2993
|
super(name, item, __spreadValues$o(__spreadValues$o({}, _CheckProperty.options), options));
|
|
@@ -3275,8 +3274,8 @@ var NgwMap = (function (exports) {
|
|
|
3275
3274
|
}
|
|
3276
3275
|
|
|
3277
3276
|
var __defProp$t = Object.defineProperty;
|
|
3278
|
-
var __defProps$
|
|
3279
|
-
var __getOwnPropDescs$
|
|
3277
|
+
var __defProps$c = Object.defineProperties;
|
|
3278
|
+
var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
|
|
3280
3279
|
var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
|
|
3281
3280
|
var __hasOwnProp$m = Object.prototype.hasOwnProperty;
|
|
3282
3281
|
var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
|
|
@@ -3292,7 +3291,7 @@ var NgwMap = (function (exports) {
|
|
|
3292
3291
|
}
|
|
3293
3292
|
return a;
|
|
3294
3293
|
};
|
|
3295
|
-
var __spreadProps$
|
|
3294
|
+
var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
|
|
3296
3295
|
function getNgwWebmapExtent(webmap) {
|
|
3297
3296
|
const bottom = webmap["extent_bottom"];
|
|
3298
3297
|
const left = webmap["extent_left"];
|
|
@@ -3355,14 +3354,14 @@ var NgwMap = (function (exports) {
|
|
|
3355
3354
|
if (resource.cls && resource.cls.indexOf("style") !== -1) {
|
|
3356
3355
|
return connector.getResource(resource.parent.id).then((res) => {
|
|
3357
3356
|
if (res) {
|
|
3358
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3357
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3359
3358
|
resourceId: res.resource.id,
|
|
3360
3359
|
connector
|
|
3361
3360
|
}));
|
|
3362
3361
|
}
|
|
3363
3362
|
});
|
|
3364
3363
|
} else {
|
|
3365
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3364
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3366
3365
|
resourceId: resource.id,
|
|
3367
3366
|
connector
|
|
3368
3367
|
}));
|
|
@@ -3684,8 +3683,8 @@ var NgwMap = (function (exports) {
|
|
|
3684
3683
|
});
|
|
3685
3684
|
|
|
3686
3685
|
var __defProp$p = Object.defineProperty;
|
|
3687
|
-
var __defProps$
|
|
3688
|
-
var __getOwnPropDescs$
|
|
3686
|
+
var __defProps$b = Object.defineProperties;
|
|
3687
|
+
var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
|
|
3689
3688
|
var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
|
|
3690
3689
|
var __getProtoOf$2 = Object.getPrototypeOf;
|
|
3691
3690
|
var __hasOwnProp$j = Object.prototype.hasOwnProperty;
|
|
@@ -3703,7 +3702,7 @@ var NgwMap = (function (exports) {
|
|
|
3703
3702
|
}
|
|
3704
3703
|
return a;
|
|
3705
3704
|
};
|
|
3706
|
-
var __spreadProps$
|
|
3705
|
+
var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
|
|
3707
3706
|
var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
|
|
3708
3707
|
var __async$h = (__this, __arguments, generator) => {
|
|
3709
3708
|
return new Promise((resolve, reject) => {
|
|
@@ -3748,7 +3747,7 @@ var NgwMap = (function (exports) {
|
|
|
3748
3747
|
class BasemapTileAdapter extends TileAdapter {
|
|
3749
3748
|
addLayer(opt) {
|
|
3750
3749
|
return __async$h(this, null, function* () {
|
|
3751
|
-
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$
|
|
3750
|
+
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
|
|
3752
3751
|
});
|
|
3753
3752
|
}
|
|
3754
3753
|
}
|
|
@@ -3827,8 +3826,8 @@ var NgwMap = (function (exports) {
|
|
|
3827
3826
|
}
|
|
3828
3827
|
|
|
3829
3828
|
var __defProp$o = Object.defineProperty;
|
|
3830
|
-
var __defProps$
|
|
3831
|
-
var __getOwnPropDescs$
|
|
3829
|
+
var __defProps$a = Object.defineProperties;
|
|
3830
|
+
var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
|
|
3832
3831
|
var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
|
|
3833
3832
|
var __hasOwnProp$i = Object.prototype.hasOwnProperty;
|
|
3834
3833
|
var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
|
|
@@ -3844,18 +3843,18 @@ var NgwMap = (function (exports) {
|
|
|
3844
3843
|
}
|
|
3845
3844
|
return a;
|
|
3846
3845
|
};
|
|
3847
|
-
var __spreadProps$
|
|
3846
|
+
var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
|
|
3848
3847
|
function fetchNgwLayerItems(options) {
|
|
3849
3848
|
const filters = options.filters;
|
|
3850
3849
|
if (filters) {
|
|
3851
|
-
return createFeatureFieldFilterQueries(__spreadProps$
|
|
3850
|
+
return createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
|
|
3852
3851
|
filters
|
|
3853
3852
|
})).then((data) => {
|
|
3854
3853
|
var _a;
|
|
3855
3854
|
const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
|
|
3856
3855
|
if (clientFilterValidate) {
|
|
3857
3856
|
data = data.filter((y) => {
|
|
3858
|
-
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$
|
|
3857
|
+
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
|
|
3859
3858
|
id: y.id
|
|
3860
3859
|
}));
|
|
3861
3860
|
const result = propertiesFilter(fields, filters);
|
|
@@ -3923,8 +3922,8 @@ var NgwMap = (function (exports) {
|
|
|
3923
3922
|
}
|
|
3924
3923
|
|
|
3925
3924
|
var __defProp$n = Object.defineProperty;
|
|
3926
|
-
var __defProps$
|
|
3927
|
-
var __getOwnPropDescs$
|
|
3925
|
+
var __defProps$9 = Object.defineProperties;
|
|
3926
|
+
var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
|
|
3928
3927
|
var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
|
|
3929
3928
|
var __getProtoOf$1 = Object.getPrototypeOf;
|
|
3930
3929
|
var __hasOwnProp$h = Object.prototype.hasOwnProperty;
|
|
@@ -3942,7 +3941,7 @@ var NgwMap = (function (exports) {
|
|
|
3942
3941
|
}
|
|
3943
3942
|
return a;
|
|
3944
3943
|
};
|
|
3945
|
-
var __spreadProps$
|
|
3944
|
+
var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
|
|
3946
3945
|
var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
3947
3946
|
var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
|
|
3948
3947
|
var __async$g = (__this, __arguments, generator) => {
|
|
@@ -4115,7 +4114,7 @@ var NgwMap = (function (exports) {
|
|
|
4115
4114
|
try {
|
|
4116
4115
|
this.emitter.emit("preupdate", filterArgs);
|
|
4117
4116
|
webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
|
|
4118
|
-
const data = yield getData(filterArgs.filters, __spreadProps$
|
|
4117
|
+
const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
|
|
4119
4118
|
srs: this.options.srs
|
|
4120
4119
|
}));
|
|
4121
4120
|
let newData = data;
|
|
@@ -4168,7 +4167,7 @@ var NgwMap = (function (exports) {
|
|
|
4168
4167
|
if (this.clearLayer) {
|
|
4169
4168
|
this.clearLayer();
|
|
4170
4169
|
}
|
|
4171
|
-
const data = yield getData(filters, __spreadProps$
|
|
4170
|
+
const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
|
|
4172
4171
|
srs: this.options.srs
|
|
4173
4172
|
}));
|
|
4174
4173
|
this.setData(data);
|
|
@@ -4358,8 +4357,8 @@ var NgwMap = (function (exports) {
|
|
|
4358
4357
|
}
|
|
4359
4358
|
|
|
4360
4359
|
var __defProp$m = Object.defineProperty;
|
|
4361
|
-
var __defProps$
|
|
4362
|
-
var __getOwnPropDescs$
|
|
4360
|
+
var __defProps$8 = Object.defineProperties;
|
|
4361
|
+
var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
|
|
4363
4362
|
var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
|
|
4364
4363
|
var __hasOwnProp$g = Object.prototype.hasOwnProperty;
|
|
4365
4364
|
var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
|
|
@@ -4375,7 +4374,7 @@ var NgwMap = (function (exports) {
|
|
|
4375
4374
|
}
|
|
4376
4375
|
return a;
|
|
4377
4376
|
};
|
|
4378
|
-
var __spreadProps$
|
|
4377
|
+
var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
|
|
4379
4378
|
var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4380
4379
|
var __async$e = (__this, __arguments, generator) => {
|
|
4381
4380
|
return new Promise((resolve, reject) => {
|
|
@@ -4439,7 +4438,7 @@ var NgwMap = (function (exports) {
|
|
|
4439
4438
|
baseUrl: connector.options.baseUrl || ""
|
|
4440
4439
|
});
|
|
4441
4440
|
if (opt) {
|
|
4442
|
-
const layerAdapterOptions = __spreadProps$
|
|
4441
|
+
const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
|
|
4443
4442
|
params: { resource: resourceId },
|
|
4444
4443
|
layers: opt.layers || String(resourceId),
|
|
4445
4444
|
resourceId
|
|
@@ -4497,8 +4496,8 @@ var NgwMap = (function (exports) {
|
|
|
4497
4496
|
}
|
|
4498
4497
|
|
|
4499
4498
|
var __defProp$l = Object.defineProperty;
|
|
4500
|
-
var __defProps$
|
|
4501
|
-
var __getOwnPropDescs$
|
|
4499
|
+
var __defProps$7 = Object.defineProperties;
|
|
4500
|
+
var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
|
|
4502
4501
|
var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
|
|
4503
4502
|
var __hasOwnProp$f = Object.prototype.hasOwnProperty;
|
|
4504
4503
|
var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
|
|
@@ -4514,7 +4513,7 @@ var NgwMap = (function (exports) {
|
|
|
4514
4513
|
}
|
|
4515
4514
|
return a;
|
|
4516
4515
|
};
|
|
4517
|
-
var __spreadProps$
|
|
4516
|
+
var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
|
|
4518
4517
|
var __async$d = (__this, __arguments, generator) => {
|
|
4519
4518
|
return new Promise((resolve, reject) => {
|
|
4520
4519
|
var fulfilled = (value) => {
|
|
@@ -4562,7 +4561,7 @@ var NgwMap = (function (exports) {
|
|
|
4562
4561
|
const firstStyle = childrenStyles && childrenStyles[0];
|
|
4563
4562
|
if (firstStyle) {
|
|
4564
4563
|
return createAsyncAdapter(
|
|
4565
|
-
__spreadProps$
|
|
4564
|
+
__spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
|
|
4566
4565
|
webMap,
|
|
4567
4566
|
connector
|
|
4568
4567
|
);
|
|
@@ -4585,13 +4584,13 @@ var NgwMap = (function (exports) {
|
|
|
4585
4584
|
}
|
|
4586
4585
|
if (item) {
|
|
4587
4586
|
const cls = item.resource.cls;
|
|
4588
|
-
const layerOptions = __spreadProps$
|
|
4587
|
+
const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4589
4588
|
resource: resourceId
|
|
4590
4589
|
});
|
|
4591
4590
|
const adapterOptions = {
|
|
4592
4591
|
layerOptions,
|
|
4593
|
-
webMap,
|
|
4594
4592
|
connector,
|
|
4593
|
+
webMap,
|
|
4595
4594
|
item
|
|
4596
4595
|
};
|
|
4597
4596
|
if (supportCls.indexOf(cls) !== -1) {
|
|
@@ -4622,10 +4621,10 @@ var NgwMap = (function (exports) {
|
|
|
4622
4621
|
item.resource.parent.id
|
|
4623
4622
|
);
|
|
4624
4623
|
if (parentItem) {
|
|
4625
|
-
const parentOptions = __spreadProps$
|
|
4624
|
+
const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4626
4625
|
resource: item.resource.parent.id
|
|
4627
4626
|
});
|
|
4628
|
-
adapter = createGeoJsonAdapter(__spreadProps$
|
|
4627
|
+
adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
|
|
4629
4628
|
item: parentItem,
|
|
4630
4629
|
layerOptions: parentOptions
|
|
4631
4630
|
}));
|
|
@@ -4714,6 +4713,9 @@ var NgwMap = (function (exports) {
|
|
|
4714
4713
|
if (headers) {
|
|
4715
4714
|
options.headers = headers;
|
|
4716
4715
|
}
|
|
4716
|
+
if (connector.withCredentials !== void 0) {
|
|
4717
|
+
options.withCredentials = connector.withCredentials;
|
|
4718
|
+
}
|
|
4717
4719
|
return createAsyncAdapter(options, webMap, connector);
|
|
4718
4720
|
}
|
|
4719
4721
|
function extendNgwWebmapLayerAdapter(opt) {
|
|
@@ -4751,6 +4753,8 @@ var NgwMap = (function (exports) {
|
|
|
4751
4753
|
}
|
|
4752
4754
|
|
|
4753
4755
|
var __defProp$j = Object.defineProperty;
|
|
4756
|
+
var __defProps$6 = Object.defineProperties;
|
|
4757
|
+
var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
|
|
4754
4758
|
var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
|
|
4755
4759
|
var __hasOwnProp$d = Object.prototype.hasOwnProperty;
|
|
4756
4760
|
var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
|
|
@@ -4766,6 +4770,7 @@ var NgwMap = (function (exports) {
|
|
|
4766
4770
|
}
|
|
4767
4771
|
return a;
|
|
4768
4772
|
};
|
|
4773
|
+
var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
|
|
4769
4774
|
var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4770
4775
|
var __async$c = (__this, __arguments, generator) => {
|
|
4771
4776
|
return new Promise((resolve, reject) => {
|
|
@@ -4872,14 +4877,12 @@ var NgwMap = (function (exports) {
|
|
|
4872
4877
|
getItemOptions(item) {
|
|
4873
4878
|
const transparency = item.item_type === "layer" && item.layer_transparency;
|
|
4874
4879
|
const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
|
|
4875
|
-
const options = {
|
|
4880
|
+
const options = __spreadProps$6(__spreadValues$c({
|
|
4876
4881
|
visibility: false,
|
|
4877
|
-
name: item.display_name
|
|
4878
|
-
|
|
4879
|
-
crossOrigin: this.options.crossOrigin,
|
|
4880
|
-
setViewDelay: this.options.setViewDelay,
|
|
4882
|
+
name: item.display_name
|
|
4883
|
+
}, this.options), {
|
|
4881
4884
|
params: { resource: this.item.resourceId, item: this.item }
|
|
4882
|
-
};
|
|
4885
|
+
});
|
|
4883
4886
|
if (this.options.order) {
|
|
4884
4887
|
const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
|
|
4885
4888
|
const subLevel = String(subOrder).padStart(4, "0");
|
|
@@ -4890,17 +4893,16 @@ var NgwMap = (function (exports) {
|
|
|
4890
4893
|
}
|
|
4891
4894
|
if (item.item_type === "layer") {
|
|
4892
4895
|
const { maxZoom, minZoom } = this._getZoomRange(item);
|
|
4893
|
-
Object.assign(options, {
|
|
4894
|
-
updateWmsParams: item.updateWmsParams
|
|
4896
|
+
Object.assign(options, __spreadProps$6(__spreadValues$c({
|
|
4897
|
+
updateWmsParams: item.updateWmsParams
|
|
4898
|
+
}, this.options), {
|
|
4895
4899
|
url: item.url,
|
|
4896
|
-
headers: this.options.headers,
|
|
4897
|
-
ratio: this.options.ratio,
|
|
4898
4900
|
maxZoom,
|
|
4899
4901
|
minZoom,
|
|
4900
4902
|
minScale: item.layer_min_scale_denom,
|
|
4901
4903
|
maxScale: item.layer_max_scale_denom,
|
|
4902
4904
|
interactive: item.layer_identifiable
|
|
4903
|
-
});
|
|
4905
|
+
}));
|
|
4904
4906
|
}
|
|
4905
4907
|
if (opacity !== void 0) {
|
|
4906
4908
|
options.opacity = opacity;
|
|
@@ -5206,6 +5208,8 @@ var NgwMap = (function (exports) {
|
|
|
5206
5208
|
const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
|
|
5207
5209
|
|
|
5208
5210
|
var __defProp$h = Object.defineProperty;
|
|
5211
|
+
var __defProps$5 = Object.defineProperties;
|
|
5212
|
+
var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
|
|
5209
5213
|
var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
|
|
5210
5214
|
var __hasOwnProp$b = Object.prototype.hasOwnProperty;
|
|
5211
5215
|
var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
|
|
@@ -5221,6 +5225,7 @@ var NgwMap = (function (exports) {
|
|
|
5221
5225
|
}
|
|
5222
5226
|
return a;
|
|
5223
5227
|
};
|
|
5228
|
+
var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
|
|
5224
5229
|
var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
5225
5230
|
var __async$9 = (__this, __arguments, generator) => {
|
|
5226
5231
|
return new Promise((resolve, reject) => {
|
|
@@ -5419,35 +5424,32 @@ var NgwMap = (function (exports) {
|
|
|
5419
5424
|
}
|
|
5420
5425
|
_getWebMapLayerItem() {
|
|
5421
5426
|
return __async$9(this, null, function* () {
|
|
5422
|
-
if (this.resourceId) {
|
|
5423
|
-
|
|
5424
|
-
if (webmap && webmap.root_item) {
|
|
5425
|
-
return new Promise((resolve) => {
|
|
5426
|
-
const options = {};
|
|
5427
|
-
if (this.options.connector && this.options.connector.options.auth) {
|
|
5428
|
-
const headers = this.options.connector.getAuthorizationHeaders();
|
|
5429
|
-
if (headers) {
|
|
5430
|
-
options.headers = headers;
|
|
5431
|
-
}
|
|
5432
|
-
}
|
|
5433
|
-
options.setViewDelay = this.options.setViewDelay;
|
|
5434
|
-
options.order = this.options.order;
|
|
5435
|
-
options.ratio = this.options.ratio;
|
|
5436
|
-
options.crossOrigin = this.options.crossOrigin;
|
|
5437
|
-
options.minZoom = this.options.minZoom;
|
|
5438
|
-
options.maxZoom = this.options.maxZoom;
|
|
5439
|
-
options.drawOrderEnabled = webmap.draw_order_enabled;
|
|
5440
|
-
options.popupOptions = this.options.popupOptions;
|
|
5441
|
-
const layer = new this.NgwWebmapItem(
|
|
5442
|
-
this.options.webMap,
|
|
5443
|
-
webmap.root_item,
|
|
5444
|
-
options,
|
|
5445
|
-
this.options.connector
|
|
5446
|
-
);
|
|
5447
|
-
layer.emitter.on("init", () => resolve(layer));
|
|
5448
|
-
});
|
|
5449
|
-
}
|
|
5427
|
+
if (!this.resourceId) {
|
|
5428
|
+
return void 0;
|
|
5450
5429
|
}
|
|
5430
|
+
const webmap = yield this.getWebMapConfig(this.resourceId);
|
|
5431
|
+
if (!webmap || !webmap.root_item) {
|
|
5432
|
+
return void 0;
|
|
5433
|
+
}
|
|
5434
|
+
return new Promise((resolve) => {
|
|
5435
|
+
const connector = this.options.connector;
|
|
5436
|
+
const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
|
|
5437
|
+
const withCredentials = connector.withCredentials;
|
|
5438
|
+
const options = __spreadProps$5(__spreadValues$a({}, this.options), {
|
|
5439
|
+
withCredentials,
|
|
5440
|
+
headers,
|
|
5441
|
+
drawOrderEnabled: webmap.draw_order_enabled
|
|
5442
|
+
});
|
|
5443
|
+
const layer = new this.NgwWebmapItem(
|
|
5444
|
+
this.options.webMap,
|
|
5445
|
+
webmap.root_item,
|
|
5446
|
+
options,
|
|
5447
|
+
connector
|
|
5448
|
+
);
|
|
5449
|
+
layer.emitter.on("init", () => {
|
|
5450
|
+
resolve(layer);
|
|
5451
|
+
});
|
|
5452
|
+
});
|
|
5451
5453
|
});
|
|
5452
5454
|
}
|
|
5453
5455
|
getWebMapConfig(id) {
|
|
@@ -9075,7 +9077,8 @@ var NgwMap = (function (exports) {
|
|
|
9075
9077
|
if (!options.connector) {
|
|
9076
9078
|
options.connector = new NgwConnector({
|
|
9077
9079
|
baseUrl: options.baseUrl || "",
|
|
9078
|
-
auth: options.auth
|
|
9080
|
+
auth: options.auth,
|
|
9081
|
+
withCredentials: options.withCredentials
|
|
9079
9082
|
});
|
|
9080
9083
|
} else if (options.connector) {
|
|
9081
9084
|
options.baseUrl = options.connector.options.baseUrl;
|