@nextgis/ngw-map 2.4.0 → 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 +119 -114
- 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 +119 -114
- 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
|
@@ -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 domain;
|
|
3
3
|
|
|
4
4
|
// This constructor is used to store event handlers. Instantiating this is
|
|
@@ -473,7 +473,7 @@ function unwrapListeners(arr) {
|
|
|
473
473
|
|
|
474
474
|
var __defProp$N = Object.defineProperty;
|
|
475
475
|
var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
476
|
-
var __publicField$z = (obj, key, value) => __defNormalProp$N(obj,
|
|
476
|
+
var __publicField$z = (obj, key, value) => __defNormalProp$N(obj, key + "" , value);
|
|
477
477
|
class CancelError extends Error {
|
|
478
478
|
constructor() {
|
|
479
479
|
super();
|
|
@@ -484,7 +484,7 @@ class CancelError extends Error {
|
|
|
484
484
|
|
|
485
485
|
var __defProp$M = Object.defineProperty;
|
|
486
486
|
var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
487
|
-
var __publicField$y = (obj, key, value) => __defNormalProp$M(obj,
|
|
487
|
+
var __publicField$y = (obj, key, value) => __defNormalProp$M(obj, key + "" , value);
|
|
488
488
|
class PromiseControl {
|
|
489
489
|
constructor(options = {}) {
|
|
490
490
|
this.options = options;
|
|
@@ -566,7 +566,7 @@ class PromiseControl {
|
|
|
566
566
|
|
|
567
567
|
var __defProp$L = Object.defineProperty;
|
|
568
568
|
var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
569
|
-
var __publicField$x = (obj, key, value) => __defNormalProp$L(obj,
|
|
569
|
+
var __publicField$x = (obj, key, value) => __defNormalProp$L(obj, key + "" , value);
|
|
570
570
|
class TimeoutError extends Error {
|
|
571
571
|
constructor() {
|
|
572
572
|
super();
|
|
@@ -1111,7 +1111,7 @@ function objectRemoveEmpty(obj) {
|
|
|
1111
1111
|
}
|
|
1112
1112
|
|
|
1113
1113
|
function round(val, toFixed) {
|
|
1114
|
-
const n =
|
|
1114
|
+
const n = 1;
|
|
1115
1115
|
return Math.round((val + Number.EPSILON) * n) / n;
|
|
1116
1116
|
}
|
|
1117
1117
|
|
|
@@ -1314,8 +1314,8 @@ function resourceToQuery(resource, prefix = "") {
|
|
|
1314
1314
|
}
|
|
1315
1315
|
|
|
1316
1316
|
var __defProp$G = Object.defineProperty;
|
|
1317
|
-
var __defProps$
|
|
1318
|
-
var __getOwnPropDescs$
|
|
1317
|
+
var __defProps$f = Object.defineProperties;
|
|
1318
|
+
var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
|
|
1319
1319
|
var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
|
|
1320
1320
|
var __hasOwnProp$u = Object.prototype.hasOwnProperty;
|
|
1321
1321
|
var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
|
|
@@ -1331,7 +1331,7 @@ var __spreadValues$t = (a, b) => {
|
|
|
1331
1331
|
}
|
|
1332
1332
|
return a;
|
|
1333
1333
|
};
|
|
1334
|
-
var __spreadProps$
|
|
1334
|
+
var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
|
|
1335
1335
|
var __publicField$s = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1336
1336
|
var __async$l = (__this, __arguments, generator) => {
|
|
1337
1337
|
return new Promise((resolve, reject) => {
|
|
@@ -1376,7 +1376,7 @@ class ResourcesControl {
|
|
|
1376
1376
|
getOne(resource, requestOptions) {
|
|
1377
1377
|
const cache = this.cache;
|
|
1378
1378
|
const forCache = {};
|
|
1379
|
-
const opt = __spreadProps$
|
|
1379
|
+
const opt = __spreadProps$f(__spreadValues$t({}, requestOptions), { cache: false });
|
|
1380
1380
|
if (typeof resource === "string") {
|
|
1381
1381
|
forCache.keyname = resource;
|
|
1382
1382
|
} else if (typeof resource === "number") {
|
|
@@ -1711,7 +1711,7 @@ function apiRequest(opt) {
|
|
|
1711
1711
|
|
|
1712
1712
|
var __defProp$E = Object.defineProperty;
|
|
1713
1713
|
var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1714
|
-
var __publicField$q = (obj, key, value) => __defNormalProp$E(obj,
|
|
1714
|
+
var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, key + "" , value);
|
|
1715
1715
|
class NetworkError extends Error {
|
|
1716
1716
|
constructor(url) {
|
|
1717
1717
|
super();
|
|
@@ -1830,6 +1830,7 @@ class NgwConnector {
|
|
|
1830
1830
|
__publicField$p(this, "user");
|
|
1831
1831
|
__publicField$p(this, "resources");
|
|
1832
1832
|
__publicField$p(this, "cache");
|
|
1833
|
+
__publicField$p(this, "withCredentials");
|
|
1833
1834
|
__publicField$p(this, "routeStr", "/api/component/pyramid/route");
|
|
1834
1835
|
__publicField$p(this, "activeRequests", []);
|
|
1835
1836
|
__publicField$p(this, "requestTransform");
|
|
@@ -1838,11 +1839,15 @@ class NgwConnector {
|
|
|
1838
1839
|
if (exist) {
|
|
1839
1840
|
return exist;
|
|
1840
1841
|
} else {
|
|
1841
|
-
|
|
1842
|
-
|
|
1842
|
+
const { route, requestTransform, withCredentials } = this.options;
|
|
1843
|
+
if (route) {
|
|
1844
|
+
this.routeStr = route;
|
|
1843
1845
|
}
|
|
1844
|
-
if (
|
|
1845
|
-
this.requestTransform =
|
|
1846
|
+
if (requestTransform) {
|
|
1847
|
+
this.requestTransform = requestTransform;
|
|
1848
|
+
}
|
|
1849
|
+
if (withCredentials !== void 0) {
|
|
1850
|
+
this.withCredentials = withCredentials;
|
|
1846
1851
|
}
|
|
1847
1852
|
this.resources = new ResourcesControl({
|
|
1848
1853
|
connector: this,
|
|
@@ -2011,6 +2016,9 @@ class NgwConnector {
|
|
|
2011
2016
|
*/
|
|
2012
2017
|
apiRequest(name, params_ = {}, requestOptions = {}) {
|
|
2013
2018
|
var _a, _b;
|
|
2019
|
+
requestOptions = __spreadValues$s({
|
|
2020
|
+
withCredentials: this.withCredentials
|
|
2021
|
+
}, requestOptions);
|
|
2014
2022
|
const { method, headers, withCredentials, responseType } = requestOptions;
|
|
2015
2023
|
params_ = (_a = requestOptions.params) != null ? _a : params_;
|
|
2016
2024
|
const params = objectRemoveEmpty(params_);
|
|
@@ -2375,8 +2383,8 @@ function propertiesFilter(properties, filters) {
|
|
|
2375
2383
|
}
|
|
2376
2384
|
|
|
2377
2385
|
var __defProp$B = Object.defineProperty;
|
|
2378
|
-
var __defProps$
|
|
2379
|
-
var __getOwnPropDescs$
|
|
2386
|
+
var __defProps$e = Object.defineProperties;
|
|
2387
|
+
var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
|
|
2380
2388
|
var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
|
|
2381
2389
|
var __hasOwnProp$r = Object.prototype.hasOwnProperty;
|
|
2382
2390
|
var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
|
|
@@ -2392,7 +2400,7 @@ var __spreadValues$q = (a, b) => {
|
|
|
2392
2400
|
}
|
|
2393
2401
|
return a;
|
|
2394
2402
|
};
|
|
2395
|
-
var __spreadProps$
|
|
2403
|
+
var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
|
|
2396
2404
|
const FEATURE_REQUEST_PARAMS = {
|
|
2397
2405
|
srs: 4326,
|
|
2398
2406
|
geom_format: "geojson"
|
|
@@ -2469,20 +2477,22 @@ function createParam(pf) {
|
|
|
2469
2477
|
return [`${isFldStr}${field_}__${operation}`, v];
|
|
2470
2478
|
}
|
|
2471
2479
|
function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
2480
|
+
var _a;
|
|
2472
2481
|
const { filters } = opt;
|
|
2482
|
+
const paramList = (_a = opt.paramList) != null ? _a : [];
|
|
2473
2483
|
const logic = typeof filters[0] === "string" ? filters[0] : "all";
|
|
2474
2484
|
const filters_ = filters.filter((x) => Array.isArray(x));
|
|
2475
2485
|
if (logic === "any") {
|
|
2476
2486
|
for (const f of filters_) {
|
|
2477
2487
|
if (isPropertyFilter(f)) {
|
|
2478
2488
|
_queries.push(
|
|
2479
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2480
|
-
paramList: [..._parentAllParams, createParam(f)]
|
|
2489
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2490
|
+
paramList: [..._parentAllParams, ...paramList, createParam(f)]
|
|
2481
2491
|
}))
|
|
2482
2492
|
);
|
|
2483
2493
|
} else {
|
|
2484
2494
|
getQueries(
|
|
2485
|
-
__spreadProps$
|
|
2495
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2486
2496
|
filters: f
|
|
2487
2497
|
}),
|
|
2488
2498
|
_queries,
|
|
@@ -2503,7 +2513,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
|
2503
2513
|
if (propertiesFilterList.length) {
|
|
2504
2514
|
for (const x of propertiesFilterList) {
|
|
2505
2515
|
getQueries(
|
|
2506
|
-
__spreadProps$
|
|
2516
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2507
2517
|
filters: x
|
|
2508
2518
|
}),
|
|
2509
2519
|
_queries,
|
|
@@ -2512,8 +2522,8 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
|
2512
2522
|
}
|
|
2513
2523
|
} else {
|
|
2514
2524
|
_queries.push(
|
|
2515
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2516
|
-
paramList: [..._parentAllParams, ...filters2]
|
|
2525
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2526
|
+
paramList: [..._parentAllParams, ...paramList, ...filters2]
|
|
2517
2527
|
}))
|
|
2518
2528
|
);
|
|
2519
2529
|
}
|
|
@@ -2578,8 +2588,8 @@ function fetchNgwLayerItemsRequest(options) {
|
|
|
2578
2588
|
}
|
|
2579
2589
|
|
|
2580
2590
|
var __defProp$A = Object.defineProperty;
|
|
2581
|
-
var __defProps$
|
|
2582
|
-
var __getOwnPropDescs$
|
|
2591
|
+
var __defProps$d = Object.defineProperties;
|
|
2592
|
+
var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
|
|
2583
2593
|
var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
|
|
2584
2594
|
var __hasOwnProp$q = Object.prototype.hasOwnProperty;
|
|
2585
2595
|
var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
|
|
@@ -2595,7 +2605,7 @@ var __spreadValues$p = (a, b) => {
|
|
|
2595
2605
|
}
|
|
2596
2606
|
return a;
|
|
2597
2607
|
};
|
|
2598
|
-
var __spreadProps$
|
|
2608
|
+
var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
|
|
2599
2609
|
function fetchNgwLayerItem(options) {
|
|
2600
2610
|
const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
|
|
2601
2611
|
updateItemRequestParam(params, options);
|
|
@@ -2605,18 +2615,18 @@ function fetchNgwLayerItem(options) {
|
|
|
2605
2615
|
}, params);
|
|
2606
2616
|
const cache = options.cache || true;
|
|
2607
2617
|
return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
|
|
2608
|
-
return __spreadProps$
|
|
2618
|
+
return __spreadProps$d(__spreadValues$p({}, resp), {
|
|
2609
2619
|
toGeojson: () => {
|
|
2610
2620
|
if (resp.geom) {
|
|
2611
2621
|
return CancelablePromise.resolve(createGeoJsonFeature(resp));
|
|
2612
2622
|
} else {
|
|
2613
|
-
return fetchNgwLayerItem(__spreadProps$
|
|
2623
|
+
return fetchNgwLayerItem(__spreadProps$d(__spreadValues$p({}, options), {
|
|
2614
2624
|
geom: true,
|
|
2615
2625
|
fields: null,
|
|
2616
2626
|
extensions: null
|
|
2617
2627
|
})).then((onlyGeomItem) => {
|
|
2618
2628
|
const geom = onlyGeomItem.geom;
|
|
2619
|
-
return createGeoJsonFeature(__spreadProps$
|
|
2629
|
+
return createGeoJsonFeature(__spreadProps$d(__spreadValues$p({}, resp), { geom }));
|
|
2620
2630
|
});
|
|
2621
2631
|
}
|
|
2622
2632
|
}
|
|
@@ -2678,22 +2688,20 @@ class BookmarkItem {
|
|
|
2678
2688
|
}
|
|
2679
2689
|
|
|
2680
2690
|
function treeEvery(item, filter, relation, itemPrepare) {
|
|
2681
|
-
return !!treeWrapper(item, filter, relation, treeEvery_
|
|
2691
|
+
return !!treeWrapper(item, filter, relation, treeEvery_);
|
|
2682
2692
|
}
|
|
2683
2693
|
function treeSome(item, filter, relation, itemPrepare) {
|
|
2684
|
-
return !!treeWrapper(item, filter, relation, treeFind_
|
|
2694
|
+
return !!treeWrapper(item, filter, relation, treeFind_);
|
|
2685
2695
|
}
|
|
2686
2696
|
function treeFind(item, filter, relation, itemPrepare) {
|
|
2687
|
-
return treeWrapper(item, filter, relation, treeFind_
|
|
2697
|
+
return treeWrapper(item, filter, relation, treeFind_);
|
|
2688
2698
|
}
|
|
2689
2699
|
function treeFilter(item, filter, relation, itemPrepare) {
|
|
2690
2700
|
return treeWrapper(
|
|
2691
2701
|
item,
|
|
2692
2702
|
filter,
|
|
2693
2703
|
relation,
|
|
2694
|
-
treeFilter_
|
|
2695
|
-
itemPrepare
|
|
2696
|
-
);
|
|
2704
|
+
treeFilter_);
|
|
2697
2705
|
}
|
|
2698
2706
|
function getChildren(item, relation = "children") {
|
|
2699
2707
|
let children = [];
|
|
@@ -2710,13 +2718,6 @@ function getChildren(item, relation = "children") {
|
|
|
2710
2718
|
}
|
|
2711
2719
|
function treeWrapper(item, filter = (x) => !!x, relation = "children", treeFunction, itemPrepare) {
|
|
2712
2720
|
const filterFunction = typeof filter === "function" ? filter : (i) => propertiesFilter(i, filter);
|
|
2713
|
-
if (itemPrepare) {
|
|
2714
|
-
return treeFunction(
|
|
2715
|
-
item,
|
|
2716
|
-
(i) => filterFunction(itemPrepare(i)),
|
|
2717
|
-
relation
|
|
2718
|
-
);
|
|
2719
|
-
}
|
|
2720
2721
|
return treeFunction(item, filterFunction, relation);
|
|
2721
2722
|
}
|
|
2722
2723
|
function treeFind_(item, filterFunc = (x) => !!x, relation, _filtered = []) {
|
|
@@ -2983,7 +2984,7 @@ var __spreadValues$o = (a, b) => {
|
|
|
2983
2984
|
}
|
|
2984
2985
|
return a;
|
|
2985
2986
|
};
|
|
2986
|
-
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj,
|
|
2987
|
+
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
|
|
2987
2988
|
const _CheckProperty = class _CheckProperty extends BaseProperty {
|
|
2988
2989
|
constructor(name, item, options) {
|
|
2989
2990
|
super(name, item, __spreadValues$o(__spreadValues$o({}, _CheckProperty.options), options));
|
|
@@ -3270,8 +3271,8 @@ class WebmapLayerOpacityPropertyHandler extends BaseProperty {
|
|
|
3270
3271
|
}
|
|
3271
3272
|
|
|
3272
3273
|
var __defProp$t = Object.defineProperty;
|
|
3273
|
-
var __defProps$
|
|
3274
|
-
var __getOwnPropDescs$
|
|
3274
|
+
var __defProps$c = Object.defineProperties;
|
|
3275
|
+
var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
|
|
3275
3276
|
var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
|
|
3276
3277
|
var __hasOwnProp$m = Object.prototype.hasOwnProperty;
|
|
3277
3278
|
var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
|
|
@@ -3287,7 +3288,7 @@ var __spreadValues$l = (a, b) => {
|
|
|
3287
3288
|
}
|
|
3288
3289
|
return a;
|
|
3289
3290
|
};
|
|
3290
|
-
var __spreadProps$
|
|
3291
|
+
var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
|
|
3291
3292
|
function getNgwWebmapExtent(webmap) {
|
|
3292
3293
|
const bottom = webmap["extent_bottom"];
|
|
3293
3294
|
const left = webmap["extent_left"];
|
|
@@ -3350,14 +3351,14 @@ function fetchNgwResourceExtent(item, connector, options) {
|
|
|
3350
3351
|
if (resource.cls && resource.cls.indexOf("style") !== -1) {
|
|
3351
3352
|
return connector.getResource(resource.parent.id).then((res) => {
|
|
3352
3353
|
if (res) {
|
|
3353
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3354
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3354
3355
|
resourceId: res.resource.id,
|
|
3355
3356
|
connector
|
|
3356
3357
|
}));
|
|
3357
3358
|
}
|
|
3358
3359
|
});
|
|
3359
3360
|
} else {
|
|
3360
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3361
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3361
3362
|
resourceId: resource.id,
|
|
3362
3363
|
connector
|
|
3363
3364
|
}));
|
|
@@ -3679,8 +3680,8 @@ __publicField$g(QmsKit, "utils", {
|
|
|
3679
3680
|
});
|
|
3680
3681
|
|
|
3681
3682
|
var __defProp$p = Object.defineProperty;
|
|
3682
|
-
var __defProps$
|
|
3683
|
-
var __getOwnPropDescs$
|
|
3683
|
+
var __defProps$b = Object.defineProperties;
|
|
3684
|
+
var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
|
|
3684
3685
|
var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
|
|
3685
3686
|
var __getProtoOf$2 = Object.getPrototypeOf;
|
|
3686
3687
|
var __hasOwnProp$j = Object.prototype.hasOwnProperty;
|
|
@@ -3698,7 +3699,7 @@ var __spreadValues$i = (a, b) => {
|
|
|
3698
3699
|
}
|
|
3699
3700
|
return a;
|
|
3700
3701
|
};
|
|
3701
|
-
var __spreadProps$
|
|
3702
|
+
var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
|
|
3702
3703
|
var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
|
|
3703
3704
|
var __async$h = (__this, __arguments, generator) => {
|
|
3704
3705
|
return new Promise((resolve, reject) => {
|
|
@@ -3743,7 +3744,7 @@ function createBasemapLayerAdapter(_0) {
|
|
|
3743
3744
|
class BasemapTileAdapter extends TileAdapter {
|
|
3744
3745
|
addLayer(opt) {
|
|
3745
3746
|
return __async$h(this, null, function* () {
|
|
3746
|
-
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$
|
|
3747
|
+
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
|
|
3747
3748
|
});
|
|
3748
3749
|
}
|
|
3749
3750
|
}
|
|
@@ -3822,8 +3823,8 @@ function prepareNgwFieldsToPropertiesFilter(fields) {
|
|
|
3822
3823
|
}
|
|
3823
3824
|
|
|
3824
3825
|
var __defProp$o = Object.defineProperty;
|
|
3825
|
-
var __defProps$
|
|
3826
|
-
var __getOwnPropDescs$
|
|
3826
|
+
var __defProps$a = Object.defineProperties;
|
|
3827
|
+
var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
|
|
3827
3828
|
var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
|
|
3828
3829
|
var __hasOwnProp$i = Object.prototype.hasOwnProperty;
|
|
3829
3830
|
var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
|
|
@@ -3839,18 +3840,18 @@ var __spreadValues$h = (a, b) => {
|
|
|
3839
3840
|
}
|
|
3840
3841
|
return a;
|
|
3841
3842
|
};
|
|
3842
|
-
var __spreadProps$
|
|
3843
|
+
var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
|
|
3843
3844
|
function fetchNgwLayerItems(options) {
|
|
3844
3845
|
const filters = options.filters;
|
|
3845
3846
|
if (filters) {
|
|
3846
|
-
return createFeatureFieldFilterQueries(__spreadProps$
|
|
3847
|
+
return createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
|
|
3847
3848
|
filters
|
|
3848
3849
|
})).then((data) => {
|
|
3849
3850
|
var _a;
|
|
3850
3851
|
const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
|
|
3851
3852
|
if (clientFilterValidate) {
|
|
3852
3853
|
data = data.filter((y) => {
|
|
3853
|
-
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$
|
|
3854
|
+
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
|
|
3854
3855
|
id: y.id
|
|
3855
3856
|
}));
|
|
3856
3857
|
const result = propertiesFilter(fields, filters);
|
|
@@ -3918,8 +3919,8 @@ function getLayerFilterOptions(options) {
|
|
|
3918
3919
|
}
|
|
3919
3920
|
|
|
3920
3921
|
var __defProp$n = Object.defineProperty;
|
|
3921
|
-
var __defProps$
|
|
3922
|
-
var __getOwnPropDescs$
|
|
3922
|
+
var __defProps$9 = Object.defineProperties;
|
|
3923
|
+
var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
|
|
3923
3924
|
var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
|
|
3924
3925
|
var __getProtoOf$1 = Object.getPrototypeOf;
|
|
3925
3926
|
var __hasOwnProp$h = Object.prototype.hasOwnProperty;
|
|
@@ -3937,7 +3938,7 @@ var __spreadValues$g = (a, b) => {
|
|
|
3937
3938
|
}
|
|
3938
3939
|
return a;
|
|
3939
3940
|
};
|
|
3940
|
-
var __spreadProps$
|
|
3941
|
+
var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
|
|
3941
3942
|
var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
3942
3943
|
var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
|
|
3943
3944
|
var __async$g = (__this, __arguments, generator) => {
|
|
@@ -4110,7 +4111,7 @@ function createGeoJsonAdapter(props) {
|
|
|
4110
4111
|
try {
|
|
4111
4112
|
this.emitter.emit("preupdate", filterArgs);
|
|
4112
4113
|
webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
|
|
4113
|
-
const data = yield getData(filterArgs.filters, __spreadProps$
|
|
4114
|
+
const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
|
|
4114
4115
|
srs: this.options.srs
|
|
4115
4116
|
}));
|
|
4116
4117
|
let newData = data;
|
|
@@ -4163,7 +4164,7 @@ function createGeoJsonAdapter(props) {
|
|
|
4163
4164
|
if (this.clearLayer) {
|
|
4164
4165
|
this.clearLayer();
|
|
4165
4166
|
}
|
|
4166
|
-
const data = yield getData(filters, __spreadProps$
|
|
4167
|
+
const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
|
|
4167
4168
|
srs: this.options.srs
|
|
4168
4169
|
}));
|
|
4169
4170
|
this.setData(data);
|
|
@@ -4353,8 +4354,8 @@ function ngwApiToAdapterOptions({
|
|
|
4353
4354
|
}
|
|
4354
4355
|
|
|
4355
4356
|
var __defProp$m = Object.defineProperty;
|
|
4356
|
-
var __defProps$
|
|
4357
|
-
var __getOwnPropDescs$
|
|
4357
|
+
var __defProps$8 = Object.defineProperties;
|
|
4358
|
+
var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
|
|
4358
4359
|
var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
|
|
4359
4360
|
var __hasOwnProp$g = Object.prototype.hasOwnProperty;
|
|
4360
4361
|
var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
|
|
@@ -4370,7 +4371,7 @@ var __spreadValues$f = (a, b) => {
|
|
|
4370
4371
|
}
|
|
4371
4372
|
return a;
|
|
4372
4373
|
};
|
|
4373
|
-
var __spreadProps$
|
|
4374
|
+
var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
|
|
4374
4375
|
var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4375
4376
|
var __async$e = (__this, __arguments, generator) => {
|
|
4376
4377
|
return new Promise((resolve, reject) => {
|
|
@@ -4434,7 +4435,7 @@ function createRasterAdapter(_0) {
|
|
|
4434
4435
|
baseUrl: connector.options.baseUrl || ""
|
|
4435
4436
|
});
|
|
4436
4437
|
if (opt) {
|
|
4437
|
-
const layerAdapterOptions = __spreadProps$
|
|
4438
|
+
const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
|
|
4438
4439
|
params: { resource: resourceId },
|
|
4439
4440
|
layers: opt.layers || String(resourceId),
|
|
4440
4441
|
resourceId
|
|
@@ -4492,8 +4493,8 @@ function createRasterAdapter(_0) {
|
|
|
4492
4493
|
}
|
|
4493
4494
|
|
|
4494
4495
|
var __defProp$l = Object.defineProperty;
|
|
4495
|
-
var __defProps$
|
|
4496
|
-
var __getOwnPropDescs$
|
|
4496
|
+
var __defProps$7 = Object.defineProperties;
|
|
4497
|
+
var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
|
|
4497
4498
|
var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
|
|
4498
4499
|
var __hasOwnProp$f = Object.prototype.hasOwnProperty;
|
|
4499
4500
|
var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
|
|
@@ -4509,7 +4510,7 @@ var __spreadValues$e = (a, b) => {
|
|
|
4509
4510
|
}
|
|
4510
4511
|
return a;
|
|
4511
4512
|
};
|
|
4512
|
-
var __spreadProps$
|
|
4513
|
+
var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
|
|
4513
4514
|
var __async$d = (__this, __arguments, generator) => {
|
|
4514
4515
|
return new Promise((resolve, reject) => {
|
|
4515
4516
|
var fulfilled = (value) => {
|
|
@@ -4557,7 +4558,7 @@ function createAdapterFromFirstStyle(_0) {
|
|
|
4557
4558
|
const firstStyle = childrenStyles && childrenStyles[0];
|
|
4558
4559
|
if (firstStyle) {
|
|
4559
4560
|
return createAsyncAdapter(
|
|
4560
|
-
__spreadProps$
|
|
4561
|
+
__spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
|
|
4561
4562
|
webMap,
|
|
4562
4563
|
connector
|
|
4563
4564
|
);
|
|
@@ -4580,13 +4581,13 @@ function createAsyncAdapter(options, webMap, connector) {
|
|
|
4580
4581
|
}
|
|
4581
4582
|
if (item) {
|
|
4582
4583
|
const cls = item.resource.cls;
|
|
4583
|
-
const layerOptions = __spreadProps$
|
|
4584
|
+
const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4584
4585
|
resource: resourceId
|
|
4585
4586
|
});
|
|
4586
4587
|
const adapterOptions = {
|
|
4587
4588
|
layerOptions,
|
|
4588
|
-
webMap,
|
|
4589
4589
|
connector,
|
|
4590
|
+
webMap,
|
|
4590
4591
|
item
|
|
4591
4592
|
};
|
|
4592
4593
|
if (supportCls.indexOf(cls) !== -1) {
|
|
@@ -4617,10 +4618,10 @@ function createAsyncAdapter(options, webMap, connector) {
|
|
|
4617
4618
|
item.resource.parent.id
|
|
4618
4619
|
);
|
|
4619
4620
|
if (parentItem) {
|
|
4620
|
-
const parentOptions = __spreadProps$
|
|
4621
|
+
const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4621
4622
|
resource: item.resource.parent.id
|
|
4622
4623
|
});
|
|
4623
|
-
adapter = createGeoJsonAdapter(__spreadProps$
|
|
4624
|
+
adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
|
|
4624
4625
|
item: parentItem,
|
|
4625
4626
|
layerOptions: parentOptions
|
|
4626
4627
|
}));
|
|
@@ -4709,6 +4710,9 @@ function createNgwLayerAdapter(options, webMap, connector) {
|
|
|
4709
4710
|
if (headers) {
|
|
4710
4711
|
options.headers = headers;
|
|
4711
4712
|
}
|
|
4713
|
+
if (connector.withCredentials !== void 0) {
|
|
4714
|
+
options.withCredentials = connector.withCredentials;
|
|
4715
|
+
}
|
|
4712
4716
|
return createAsyncAdapter(options, webMap, connector);
|
|
4713
4717
|
}
|
|
4714
4718
|
function extendNgwWebmapLayerAdapter(opt) {
|
|
@@ -4746,6 +4750,8 @@ function setScaleRatio(scale, lat = 0) {
|
|
|
4746
4750
|
}
|
|
4747
4751
|
|
|
4748
4752
|
var __defProp$j = Object.defineProperty;
|
|
4753
|
+
var __defProps$6 = Object.defineProperties;
|
|
4754
|
+
var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
|
|
4749
4755
|
var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
|
|
4750
4756
|
var __hasOwnProp$d = Object.prototype.hasOwnProperty;
|
|
4751
4757
|
var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
|
|
@@ -4761,6 +4767,7 @@ var __spreadValues$c = (a, b) => {
|
|
|
4761
4767
|
}
|
|
4762
4768
|
return a;
|
|
4763
4769
|
};
|
|
4770
|
+
var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
|
|
4764
4771
|
var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4765
4772
|
var __async$c = (__this, __arguments, generator) => {
|
|
4766
4773
|
return new Promise((resolve, reject) => {
|
|
@@ -4867,14 +4874,12 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
|
|
|
4867
4874
|
getItemOptions(item) {
|
|
4868
4875
|
const transparency = item.item_type === "layer" && item.layer_transparency;
|
|
4869
4876
|
const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
|
|
4870
|
-
const options = {
|
|
4877
|
+
const options = __spreadProps$6(__spreadValues$c({
|
|
4871
4878
|
visibility: false,
|
|
4872
|
-
name: item.display_name
|
|
4873
|
-
|
|
4874
|
-
crossOrigin: this.options.crossOrigin,
|
|
4875
|
-
setViewDelay: this.options.setViewDelay,
|
|
4879
|
+
name: item.display_name
|
|
4880
|
+
}, this.options), {
|
|
4876
4881
|
params: { resource: this.item.resourceId, item: this.item }
|
|
4877
|
-
};
|
|
4882
|
+
});
|
|
4878
4883
|
if (this.options.order) {
|
|
4879
4884
|
const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
|
|
4880
4885
|
const subLevel = String(subOrder).padStart(4, "0");
|
|
@@ -4885,17 +4890,16 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
|
|
|
4885
4890
|
}
|
|
4886
4891
|
if (item.item_type === "layer") {
|
|
4887
4892
|
const { maxZoom, minZoom } = this._getZoomRange(item);
|
|
4888
|
-
Object.assign(options, {
|
|
4889
|
-
updateWmsParams: item.updateWmsParams
|
|
4893
|
+
Object.assign(options, __spreadProps$6(__spreadValues$c({
|
|
4894
|
+
updateWmsParams: item.updateWmsParams
|
|
4895
|
+
}, this.options), {
|
|
4890
4896
|
url: item.url,
|
|
4891
|
-
headers: this.options.headers,
|
|
4892
|
-
ratio: this.options.ratio,
|
|
4893
4897
|
maxZoom,
|
|
4894
4898
|
minZoom,
|
|
4895
4899
|
minScale: item.layer_min_scale_denom,
|
|
4896
4900
|
maxScale: item.layer_max_scale_denom,
|
|
4897
4901
|
interactive: item.layer_identifiable
|
|
4898
|
-
});
|
|
4902
|
+
}));
|
|
4899
4903
|
}
|
|
4900
4904
|
if (opacity !== void 0) {
|
|
4901
4905
|
options.opacity = opacity;
|
|
@@ -5201,6 +5205,8 @@ function createOnFirstShowNgwAdapter(_0) {
|
|
|
5201
5205
|
const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
|
|
5202
5206
|
|
|
5203
5207
|
var __defProp$h = Object.defineProperty;
|
|
5208
|
+
var __defProps$5 = Object.defineProperties;
|
|
5209
|
+
var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
|
|
5204
5210
|
var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
|
|
5205
5211
|
var __hasOwnProp$b = Object.prototype.hasOwnProperty;
|
|
5206
5212
|
var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
|
|
@@ -5216,6 +5222,7 @@ var __spreadValues$a = (a, b) => {
|
|
|
5216
5222
|
}
|
|
5217
5223
|
return a;
|
|
5218
5224
|
};
|
|
5225
|
+
var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
|
|
5219
5226
|
var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
5220
5227
|
var __async$9 = (__this, __arguments, generator) => {
|
|
5221
5228
|
return new Promise((resolve, reject) => {
|
|
@@ -5414,35 +5421,32 @@ class NgwWebmapLayerAdapter {
|
|
|
5414
5421
|
}
|
|
5415
5422
|
_getWebMapLayerItem() {
|
|
5416
5423
|
return __async$9(this, null, function* () {
|
|
5417
|
-
if (this.resourceId) {
|
|
5418
|
-
|
|
5419
|
-
if (webmap && webmap.root_item) {
|
|
5420
|
-
return new Promise((resolve) => {
|
|
5421
|
-
const options = {};
|
|
5422
|
-
if (this.options.connector && this.options.connector.options.auth) {
|
|
5423
|
-
const headers = this.options.connector.getAuthorizationHeaders();
|
|
5424
|
-
if (headers) {
|
|
5425
|
-
options.headers = headers;
|
|
5426
|
-
}
|
|
5427
|
-
}
|
|
5428
|
-
options.setViewDelay = this.options.setViewDelay;
|
|
5429
|
-
options.order = this.options.order;
|
|
5430
|
-
options.ratio = this.options.ratio;
|
|
5431
|
-
options.crossOrigin = this.options.crossOrigin;
|
|
5432
|
-
options.minZoom = this.options.minZoom;
|
|
5433
|
-
options.maxZoom = this.options.maxZoom;
|
|
5434
|
-
options.drawOrderEnabled = webmap.draw_order_enabled;
|
|
5435
|
-
options.popupOptions = this.options.popupOptions;
|
|
5436
|
-
const layer = new this.NgwWebmapItem(
|
|
5437
|
-
this.options.webMap,
|
|
5438
|
-
webmap.root_item,
|
|
5439
|
-
options,
|
|
5440
|
-
this.options.connector
|
|
5441
|
-
);
|
|
5442
|
-
layer.emitter.on("init", () => resolve(layer));
|
|
5443
|
-
});
|
|
5444
|
-
}
|
|
5424
|
+
if (!this.resourceId) {
|
|
5425
|
+
return void 0;
|
|
5445
5426
|
}
|
|
5427
|
+
const webmap = yield this.getWebMapConfig(this.resourceId);
|
|
5428
|
+
if (!webmap || !webmap.root_item) {
|
|
5429
|
+
return void 0;
|
|
5430
|
+
}
|
|
5431
|
+
return new Promise((resolve) => {
|
|
5432
|
+
const connector = this.options.connector;
|
|
5433
|
+
const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
|
|
5434
|
+
const withCredentials = connector.withCredentials;
|
|
5435
|
+
const options = __spreadProps$5(__spreadValues$a({}, this.options), {
|
|
5436
|
+
withCredentials,
|
|
5437
|
+
headers,
|
|
5438
|
+
drawOrderEnabled: webmap.draw_order_enabled
|
|
5439
|
+
});
|
|
5440
|
+
const layer = new this.NgwWebmapItem(
|
|
5441
|
+
this.options.webMap,
|
|
5442
|
+
webmap.root_item,
|
|
5443
|
+
options,
|
|
5444
|
+
connector
|
|
5445
|
+
);
|
|
5446
|
+
layer.emitter.on("init", () => {
|
|
5447
|
+
resolve(layer);
|
|
5448
|
+
});
|
|
5449
|
+
});
|
|
5446
5450
|
});
|
|
5447
5451
|
}
|
|
5448
5452
|
getWebMapConfig(id) {
|
|
@@ -9070,7 +9074,8 @@ function prepareWebMapOptions(options) {
|
|
|
9070
9074
|
if (!options.connector) {
|
|
9071
9075
|
options.connector = new NgwConnector({
|
|
9072
9076
|
baseUrl: options.baseUrl || "",
|
|
9073
|
-
auth: options.auth
|
|
9077
|
+
auth: options.auth,
|
|
9078
|
+
withCredentials: options.withCredentials
|
|
9074
9079
|
});
|
|
9075
9080
|
} else if (options.connector) {
|
|
9076
9081
|
options.baseUrl = options.connector.options.baseUrl;
|