@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
|
@@ -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"
|
|
@@ -2478,13 +2486,13 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
|
2478
2486
|
for (const f of filters_) {
|
|
2479
2487
|
if (isPropertyFilter(f)) {
|
|
2480
2488
|
_queries.push(
|
|
2481
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2489
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2482
2490
|
paramList: [..._parentAllParams, ...paramList, createParam(f)]
|
|
2483
2491
|
}))
|
|
2484
2492
|
);
|
|
2485
2493
|
} else {
|
|
2486
2494
|
getQueries(
|
|
2487
|
-
__spreadProps$
|
|
2495
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2488
2496
|
filters: f
|
|
2489
2497
|
}),
|
|
2490
2498
|
_queries,
|
|
@@ -2505,7 +2513,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
|
2505
2513
|
if (propertiesFilterList.length) {
|
|
2506
2514
|
for (const x of propertiesFilterList) {
|
|
2507
2515
|
getQueries(
|
|
2508
|
-
__spreadProps$
|
|
2516
|
+
__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2509
2517
|
filters: x
|
|
2510
2518
|
}),
|
|
2511
2519
|
_queries,
|
|
@@ -2514,7 +2522,7 @@ function getQueries(opt, _queries = [], _parentAllParams = []) {
|
|
|
2514
2522
|
}
|
|
2515
2523
|
} else {
|
|
2516
2524
|
_queries.push(
|
|
2517
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2525
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$q({}, opt), {
|
|
2518
2526
|
paramList: [..._parentAllParams, ...paramList, ...filters2]
|
|
2519
2527
|
}))
|
|
2520
2528
|
);
|
|
@@ -2580,8 +2588,8 @@ function fetchNgwLayerItemsRequest(options) {
|
|
|
2580
2588
|
}
|
|
2581
2589
|
|
|
2582
2590
|
var __defProp$A = Object.defineProperty;
|
|
2583
|
-
var __defProps$
|
|
2584
|
-
var __getOwnPropDescs$
|
|
2591
|
+
var __defProps$d = Object.defineProperties;
|
|
2592
|
+
var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
|
|
2585
2593
|
var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
|
|
2586
2594
|
var __hasOwnProp$q = Object.prototype.hasOwnProperty;
|
|
2587
2595
|
var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
|
|
@@ -2597,7 +2605,7 @@ var __spreadValues$p = (a, b) => {
|
|
|
2597
2605
|
}
|
|
2598
2606
|
return a;
|
|
2599
2607
|
};
|
|
2600
|
-
var __spreadProps$
|
|
2608
|
+
var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
|
|
2601
2609
|
function fetchNgwLayerItem(options) {
|
|
2602
2610
|
const params = __spreadValues$p({}, FEATURE_REQUEST_PARAMS);
|
|
2603
2611
|
updateItemRequestParam(params, options);
|
|
@@ -2607,18 +2615,18 @@ function fetchNgwLayerItem(options) {
|
|
|
2607
2615
|
}, params);
|
|
2608
2616
|
const cache = options.cache || true;
|
|
2609
2617
|
return options.connector.get("feature_layer.feature.item", { cache }, queryParams).then((resp) => {
|
|
2610
|
-
return __spreadProps$
|
|
2618
|
+
return __spreadProps$d(__spreadValues$p({}, resp), {
|
|
2611
2619
|
toGeojson: () => {
|
|
2612
2620
|
if (resp.geom) {
|
|
2613
2621
|
return CancelablePromise.resolve(createGeoJsonFeature(resp));
|
|
2614
2622
|
} else {
|
|
2615
|
-
return fetchNgwLayerItem(__spreadProps$
|
|
2623
|
+
return fetchNgwLayerItem(__spreadProps$d(__spreadValues$p({}, options), {
|
|
2616
2624
|
geom: true,
|
|
2617
2625
|
fields: null,
|
|
2618
2626
|
extensions: null
|
|
2619
2627
|
})).then((onlyGeomItem) => {
|
|
2620
2628
|
const geom = onlyGeomItem.geom;
|
|
2621
|
-
return createGeoJsonFeature(__spreadProps$
|
|
2629
|
+
return createGeoJsonFeature(__spreadProps$d(__spreadValues$p({}, resp), { geom }));
|
|
2622
2630
|
});
|
|
2623
2631
|
}
|
|
2624
2632
|
}
|
|
@@ -2680,22 +2688,20 @@ class BookmarkItem {
|
|
|
2680
2688
|
}
|
|
2681
2689
|
|
|
2682
2690
|
function treeEvery(item, filter, relation, itemPrepare) {
|
|
2683
|
-
return !!treeWrapper(item, filter, relation, treeEvery_
|
|
2691
|
+
return !!treeWrapper(item, filter, relation, treeEvery_);
|
|
2684
2692
|
}
|
|
2685
2693
|
function treeSome(item, filter, relation, itemPrepare) {
|
|
2686
|
-
return !!treeWrapper(item, filter, relation, treeFind_
|
|
2694
|
+
return !!treeWrapper(item, filter, relation, treeFind_);
|
|
2687
2695
|
}
|
|
2688
2696
|
function treeFind(item, filter, relation, itemPrepare) {
|
|
2689
|
-
return treeWrapper(item, filter, relation, treeFind_
|
|
2697
|
+
return treeWrapper(item, filter, relation, treeFind_);
|
|
2690
2698
|
}
|
|
2691
2699
|
function treeFilter(item, filter, relation, itemPrepare) {
|
|
2692
2700
|
return treeWrapper(
|
|
2693
2701
|
item,
|
|
2694
2702
|
filter,
|
|
2695
2703
|
relation,
|
|
2696
|
-
treeFilter_
|
|
2697
|
-
itemPrepare
|
|
2698
|
-
);
|
|
2704
|
+
treeFilter_);
|
|
2699
2705
|
}
|
|
2700
2706
|
function getChildren(item, relation = "children") {
|
|
2701
2707
|
let children = [];
|
|
@@ -2712,13 +2718,6 @@ function getChildren(item, relation = "children") {
|
|
|
2712
2718
|
}
|
|
2713
2719
|
function treeWrapper(item, filter = (x) => !!x, relation = "children", treeFunction, itemPrepare) {
|
|
2714
2720
|
const filterFunction = typeof filter === "function" ? filter : (i) => propertiesFilter(i, filter);
|
|
2715
|
-
if (itemPrepare) {
|
|
2716
|
-
return treeFunction(
|
|
2717
|
-
item,
|
|
2718
|
-
(i) => filterFunction(itemPrepare(i)),
|
|
2719
|
-
relation
|
|
2720
|
-
);
|
|
2721
|
-
}
|
|
2722
2721
|
return treeFunction(item, filterFunction, relation);
|
|
2723
2722
|
}
|
|
2724
2723
|
function treeFind_(item, filterFunc = (x) => !!x, relation, _filtered = []) {
|
|
@@ -2985,7 +2984,7 @@ var __spreadValues$o = (a, b) => {
|
|
|
2985
2984
|
}
|
|
2986
2985
|
return a;
|
|
2987
2986
|
};
|
|
2988
|
-
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj,
|
|
2987
|
+
var __publicField$l = (obj, key, value) => __defNormalProp$w(obj, key + "" , value);
|
|
2989
2988
|
const _CheckProperty = class _CheckProperty extends BaseProperty {
|
|
2990
2989
|
constructor(name, item, options) {
|
|
2991
2990
|
super(name, item, __spreadValues$o(__spreadValues$o({}, _CheckProperty.options), options));
|
|
@@ -3272,8 +3271,8 @@ class WebmapLayerOpacityPropertyHandler extends BaseProperty {
|
|
|
3272
3271
|
}
|
|
3273
3272
|
|
|
3274
3273
|
var __defProp$t = Object.defineProperty;
|
|
3275
|
-
var __defProps$
|
|
3276
|
-
var __getOwnPropDescs$
|
|
3274
|
+
var __defProps$c = Object.defineProperties;
|
|
3275
|
+
var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
|
|
3277
3276
|
var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
|
|
3278
3277
|
var __hasOwnProp$m = Object.prototype.hasOwnProperty;
|
|
3279
3278
|
var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
|
|
@@ -3289,7 +3288,7 @@ var __spreadValues$l = (a, b) => {
|
|
|
3289
3288
|
}
|
|
3290
3289
|
return a;
|
|
3291
3290
|
};
|
|
3292
|
-
var __spreadProps$
|
|
3291
|
+
var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
|
|
3293
3292
|
function getNgwWebmapExtent(webmap) {
|
|
3294
3293
|
const bottom = webmap["extent_bottom"];
|
|
3295
3294
|
const left = webmap["extent_left"];
|
|
@@ -3352,14 +3351,14 @@ function fetchNgwResourceExtent(item, connector, options) {
|
|
|
3352
3351
|
if (resource.cls && resource.cls.indexOf("style") !== -1) {
|
|
3353
3352
|
return connector.getResource(resource.parent.id).then((res) => {
|
|
3354
3353
|
if (res) {
|
|
3355
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3354
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3356
3355
|
resourceId: res.resource.id,
|
|
3357
3356
|
connector
|
|
3358
3357
|
}));
|
|
3359
3358
|
}
|
|
3360
3359
|
});
|
|
3361
3360
|
} else {
|
|
3362
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3361
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3363
3362
|
resourceId: resource.id,
|
|
3364
3363
|
connector
|
|
3365
3364
|
}));
|
|
@@ -3681,8 +3680,8 @@ __publicField$g(QmsKit, "utils", {
|
|
|
3681
3680
|
});
|
|
3682
3681
|
|
|
3683
3682
|
var __defProp$p = Object.defineProperty;
|
|
3684
|
-
var __defProps$
|
|
3685
|
-
var __getOwnPropDescs$
|
|
3683
|
+
var __defProps$b = Object.defineProperties;
|
|
3684
|
+
var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
|
|
3686
3685
|
var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
|
|
3687
3686
|
var __getProtoOf$2 = Object.getPrototypeOf;
|
|
3688
3687
|
var __hasOwnProp$j = Object.prototype.hasOwnProperty;
|
|
@@ -3700,7 +3699,7 @@ var __spreadValues$i = (a, b) => {
|
|
|
3700
3699
|
}
|
|
3701
3700
|
return a;
|
|
3702
3701
|
};
|
|
3703
|
-
var __spreadProps$
|
|
3702
|
+
var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
|
|
3704
3703
|
var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
|
|
3705
3704
|
var __async$h = (__this, __arguments, generator) => {
|
|
3706
3705
|
return new Promise((resolve, reject) => {
|
|
@@ -3745,7 +3744,7 @@ function createBasemapLayerAdapter(_0) {
|
|
|
3745
3744
|
class BasemapTileAdapter extends TileAdapter {
|
|
3746
3745
|
addLayer(opt) {
|
|
3747
3746
|
return __async$h(this, null, function* () {
|
|
3748
|
-
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 }));
|
|
3749
3748
|
});
|
|
3750
3749
|
}
|
|
3751
3750
|
}
|
|
@@ -3824,8 +3823,8 @@ function prepareNgwFieldsToPropertiesFilter(fields) {
|
|
|
3824
3823
|
}
|
|
3825
3824
|
|
|
3826
3825
|
var __defProp$o = Object.defineProperty;
|
|
3827
|
-
var __defProps$
|
|
3828
|
-
var __getOwnPropDescs$
|
|
3826
|
+
var __defProps$a = Object.defineProperties;
|
|
3827
|
+
var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
|
|
3829
3828
|
var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
|
|
3830
3829
|
var __hasOwnProp$i = Object.prototype.hasOwnProperty;
|
|
3831
3830
|
var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
|
|
@@ -3841,18 +3840,18 @@ var __spreadValues$h = (a, b) => {
|
|
|
3841
3840
|
}
|
|
3842
3841
|
return a;
|
|
3843
3842
|
};
|
|
3844
|
-
var __spreadProps$
|
|
3843
|
+
var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
|
|
3845
3844
|
function fetchNgwLayerItems(options) {
|
|
3846
3845
|
const filters = options.filters;
|
|
3847
3846
|
if (filters) {
|
|
3848
|
-
return createFeatureFieldFilterQueries(__spreadProps$
|
|
3847
|
+
return createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
|
|
3849
3848
|
filters
|
|
3850
3849
|
})).then((data) => {
|
|
3851
3850
|
var _a;
|
|
3852
3851
|
const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
|
|
3853
3852
|
if (clientFilterValidate) {
|
|
3854
3853
|
data = data.filter((y) => {
|
|
3855
|
-
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$
|
|
3854
|
+
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
|
|
3856
3855
|
id: y.id
|
|
3857
3856
|
}));
|
|
3858
3857
|
const result = propertiesFilter(fields, filters);
|
|
@@ -3920,8 +3919,8 @@ function getLayerFilterOptions(options) {
|
|
|
3920
3919
|
}
|
|
3921
3920
|
|
|
3922
3921
|
var __defProp$n = Object.defineProperty;
|
|
3923
|
-
var __defProps$
|
|
3924
|
-
var __getOwnPropDescs$
|
|
3922
|
+
var __defProps$9 = Object.defineProperties;
|
|
3923
|
+
var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
|
|
3925
3924
|
var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
|
|
3926
3925
|
var __getProtoOf$1 = Object.getPrototypeOf;
|
|
3927
3926
|
var __hasOwnProp$h = Object.prototype.hasOwnProperty;
|
|
@@ -3939,7 +3938,7 @@ var __spreadValues$g = (a, b) => {
|
|
|
3939
3938
|
}
|
|
3940
3939
|
return a;
|
|
3941
3940
|
};
|
|
3942
|
-
var __spreadProps$
|
|
3941
|
+
var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
|
|
3943
3942
|
var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
3944
3943
|
var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
|
|
3945
3944
|
var __async$g = (__this, __arguments, generator) => {
|
|
@@ -4112,7 +4111,7 @@ function createGeoJsonAdapter(props) {
|
|
|
4112
4111
|
try {
|
|
4113
4112
|
this.emitter.emit("preupdate", filterArgs);
|
|
4114
4113
|
webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
|
|
4115
|
-
const data = yield getData(filterArgs.filters, __spreadProps$
|
|
4114
|
+
const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
|
|
4116
4115
|
srs: this.options.srs
|
|
4117
4116
|
}));
|
|
4118
4117
|
let newData = data;
|
|
@@ -4165,7 +4164,7 @@ function createGeoJsonAdapter(props) {
|
|
|
4165
4164
|
if (this.clearLayer) {
|
|
4166
4165
|
this.clearLayer();
|
|
4167
4166
|
}
|
|
4168
|
-
const data = yield getData(filters, __spreadProps$
|
|
4167
|
+
const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
|
|
4169
4168
|
srs: this.options.srs
|
|
4170
4169
|
}));
|
|
4171
4170
|
this.setData(data);
|
|
@@ -4355,8 +4354,8 @@ function ngwApiToAdapterOptions({
|
|
|
4355
4354
|
}
|
|
4356
4355
|
|
|
4357
4356
|
var __defProp$m = Object.defineProperty;
|
|
4358
|
-
var __defProps$
|
|
4359
|
-
var __getOwnPropDescs$
|
|
4357
|
+
var __defProps$8 = Object.defineProperties;
|
|
4358
|
+
var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
|
|
4360
4359
|
var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
|
|
4361
4360
|
var __hasOwnProp$g = Object.prototype.hasOwnProperty;
|
|
4362
4361
|
var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
|
|
@@ -4372,7 +4371,7 @@ var __spreadValues$f = (a, b) => {
|
|
|
4372
4371
|
}
|
|
4373
4372
|
return a;
|
|
4374
4373
|
};
|
|
4375
|
-
var __spreadProps$
|
|
4374
|
+
var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
|
|
4376
4375
|
var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4377
4376
|
var __async$e = (__this, __arguments, generator) => {
|
|
4378
4377
|
return new Promise((resolve, reject) => {
|
|
@@ -4436,7 +4435,7 @@ function createRasterAdapter(_0) {
|
|
|
4436
4435
|
baseUrl: connector.options.baseUrl || ""
|
|
4437
4436
|
});
|
|
4438
4437
|
if (opt) {
|
|
4439
|
-
const layerAdapterOptions = __spreadProps$
|
|
4438
|
+
const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
|
|
4440
4439
|
params: { resource: resourceId },
|
|
4441
4440
|
layers: opt.layers || String(resourceId),
|
|
4442
4441
|
resourceId
|
|
@@ -4494,8 +4493,8 @@ function createRasterAdapter(_0) {
|
|
|
4494
4493
|
}
|
|
4495
4494
|
|
|
4496
4495
|
var __defProp$l = Object.defineProperty;
|
|
4497
|
-
var __defProps$
|
|
4498
|
-
var __getOwnPropDescs$
|
|
4496
|
+
var __defProps$7 = Object.defineProperties;
|
|
4497
|
+
var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
|
|
4499
4498
|
var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
|
|
4500
4499
|
var __hasOwnProp$f = Object.prototype.hasOwnProperty;
|
|
4501
4500
|
var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
|
|
@@ -4511,7 +4510,7 @@ var __spreadValues$e = (a, b) => {
|
|
|
4511
4510
|
}
|
|
4512
4511
|
return a;
|
|
4513
4512
|
};
|
|
4514
|
-
var __spreadProps$
|
|
4513
|
+
var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
|
|
4515
4514
|
var __async$d = (__this, __arguments, generator) => {
|
|
4516
4515
|
return new Promise((resolve, reject) => {
|
|
4517
4516
|
var fulfilled = (value) => {
|
|
@@ -4559,7 +4558,7 @@ function createAdapterFromFirstStyle(_0) {
|
|
|
4559
4558
|
const firstStyle = childrenStyles && childrenStyles[0];
|
|
4560
4559
|
if (firstStyle) {
|
|
4561
4560
|
return createAsyncAdapter(
|
|
4562
|
-
__spreadProps$
|
|
4561
|
+
__spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
|
|
4563
4562
|
webMap,
|
|
4564
4563
|
connector
|
|
4565
4564
|
);
|
|
@@ -4582,13 +4581,13 @@ function createAsyncAdapter(options, webMap, connector) {
|
|
|
4582
4581
|
}
|
|
4583
4582
|
if (item) {
|
|
4584
4583
|
const cls = item.resource.cls;
|
|
4585
|
-
const layerOptions = __spreadProps$
|
|
4584
|
+
const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4586
4585
|
resource: resourceId
|
|
4587
4586
|
});
|
|
4588
4587
|
const adapterOptions = {
|
|
4589
4588
|
layerOptions,
|
|
4590
|
-
webMap,
|
|
4591
4589
|
connector,
|
|
4590
|
+
webMap,
|
|
4592
4591
|
item
|
|
4593
4592
|
};
|
|
4594
4593
|
if (supportCls.indexOf(cls) !== -1) {
|
|
@@ -4619,10 +4618,10 @@ function createAsyncAdapter(options, webMap, connector) {
|
|
|
4619
4618
|
item.resource.parent.id
|
|
4620
4619
|
);
|
|
4621
4620
|
if (parentItem) {
|
|
4622
|
-
const parentOptions = __spreadProps$
|
|
4621
|
+
const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4623
4622
|
resource: item.resource.parent.id
|
|
4624
4623
|
});
|
|
4625
|
-
adapter = createGeoJsonAdapter(__spreadProps$
|
|
4624
|
+
adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
|
|
4626
4625
|
item: parentItem,
|
|
4627
4626
|
layerOptions: parentOptions
|
|
4628
4627
|
}));
|
|
@@ -4711,6 +4710,9 @@ function createNgwLayerAdapter(options, webMap, connector) {
|
|
|
4711
4710
|
if (headers) {
|
|
4712
4711
|
options.headers = headers;
|
|
4713
4712
|
}
|
|
4713
|
+
if (connector.withCredentials !== void 0) {
|
|
4714
|
+
options.withCredentials = connector.withCredentials;
|
|
4715
|
+
}
|
|
4714
4716
|
return createAsyncAdapter(options, webMap, connector);
|
|
4715
4717
|
}
|
|
4716
4718
|
function extendNgwWebmapLayerAdapter(opt) {
|
|
@@ -4748,6 +4750,8 @@ function setScaleRatio(scale, lat = 0) {
|
|
|
4748
4750
|
}
|
|
4749
4751
|
|
|
4750
4752
|
var __defProp$j = Object.defineProperty;
|
|
4753
|
+
var __defProps$6 = Object.defineProperties;
|
|
4754
|
+
var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
|
|
4751
4755
|
var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
|
|
4752
4756
|
var __hasOwnProp$d = Object.prototype.hasOwnProperty;
|
|
4753
4757
|
var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
|
|
@@ -4763,6 +4767,7 @@ var __spreadValues$c = (a, b) => {
|
|
|
4763
4767
|
}
|
|
4764
4768
|
return a;
|
|
4765
4769
|
};
|
|
4770
|
+
var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
|
|
4766
4771
|
var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4767
4772
|
var __async$c = (__this, __arguments, generator) => {
|
|
4768
4773
|
return new Promise((resolve, reject) => {
|
|
@@ -4869,14 +4874,12 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
|
|
|
4869
4874
|
getItemOptions(item) {
|
|
4870
4875
|
const transparency = item.item_type === "layer" && item.layer_transparency;
|
|
4871
4876
|
const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
|
|
4872
|
-
const options = {
|
|
4877
|
+
const options = __spreadProps$6(__spreadValues$c({
|
|
4873
4878
|
visibility: false,
|
|
4874
|
-
name: item.display_name
|
|
4875
|
-
|
|
4876
|
-
crossOrigin: this.options.crossOrigin,
|
|
4877
|
-
setViewDelay: this.options.setViewDelay,
|
|
4879
|
+
name: item.display_name
|
|
4880
|
+
}, this.options), {
|
|
4878
4881
|
params: { resource: this.item.resourceId, item: this.item }
|
|
4879
|
-
};
|
|
4882
|
+
});
|
|
4880
4883
|
if (this.options.order) {
|
|
4881
4884
|
const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
|
|
4882
4885
|
const subLevel = String(subOrder).padStart(4, "0");
|
|
@@ -4887,17 +4890,16 @@ const _NgwWebmapItem = class _NgwWebmapItem extends Item {
|
|
|
4887
4890
|
}
|
|
4888
4891
|
if (item.item_type === "layer") {
|
|
4889
4892
|
const { maxZoom, minZoom } = this._getZoomRange(item);
|
|
4890
|
-
Object.assign(options, {
|
|
4891
|
-
updateWmsParams: item.updateWmsParams
|
|
4893
|
+
Object.assign(options, __spreadProps$6(__spreadValues$c({
|
|
4894
|
+
updateWmsParams: item.updateWmsParams
|
|
4895
|
+
}, this.options), {
|
|
4892
4896
|
url: item.url,
|
|
4893
|
-
headers: this.options.headers,
|
|
4894
|
-
ratio: this.options.ratio,
|
|
4895
4897
|
maxZoom,
|
|
4896
4898
|
minZoom,
|
|
4897
4899
|
minScale: item.layer_min_scale_denom,
|
|
4898
4900
|
maxScale: item.layer_max_scale_denom,
|
|
4899
4901
|
interactive: item.layer_identifiable
|
|
4900
|
-
});
|
|
4902
|
+
}));
|
|
4901
4903
|
}
|
|
4902
4904
|
if (opacity !== void 0) {
|
|
4903
4905
|
options.opacity = opacity;
|
|
@@ -5203,6 +5205,8 @@ function createOnFirstShowNgwAdapter(_0) {
|
|
|
5203
5205
|
const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
|
|
5204
5206
|
|
|
5205
5207
|
var __defProp$h = Object.defineProperty;
|
|
5208
|
+
var __defProps$5 = Object.defineProperties;
|
|
5209
|
+
var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
|
|
5206
5210
|
var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
|
|
5207
5211
|
var __hasOwnProp$b = Object.prototype.hasOwnProperty;
|
|
5208
5212
|
var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
|
|
@@ -5218,6 +5222,7 @@ var __spreadValues$a = (a, b) => {
|
|
|
5218
5222
|
}
|
|
5219
5223
|
return a;
|
|
5220
5224
|
};
|
|
5225
|
+
var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
|
|
5221
5226
|
var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
5222
5227
|
var __async$9 = (__this, __arguments, generator) => {
|
|
5223
5228
|
return new Promise((resolve, reject) => {
|
|
@@ -5416,35 +5421,32 @@ class NgwWebmapLayerAdapter {
|
|
|
5416
5421
|
}
|
|
5417
5422
|
_getWebMapLayerItem() {
|
|
5418
5423
|
return __async$9(this, null, function* () {
|
|
5419
|
-
if (this.resourceId) {
|
|
5420
|
-
|
|
5421
|
-
if (webmap && webmap.root_item) {
|
|
5422
|
-
return new Promise((resolve) => {
|
|
5423
|
-
const options = {};
|
|
5424
|
-
if (this.options.connector && this.options.connector.options.auth) {
|
|
5425
|
-
const headers = this.options.connector.getAuthorizationHeaders();
|
|
5426
|
-
if (headers) {
|
|
5427
|
-
options.headers = headers;
|
|
5428
|
-
}
|
|
5429
|
-
}
|
|
5430
|
-
options.setViewDelay = this.options.setViewDelay;
|
|
5431
|
-
options.order = this.options.order;
|
|
5432
|
-
options.ratio = this.options.ratio;
|
|
5433
|
-
options.crossOrigin = this.options.crossOrigin;
|
|
5434
|
-
options.minZoom = this.options.minZoom;
|
|
5435
|
-
options.maxZoom = this.options.maxZoom;
|
|
5436
|
-
options.drawOrderEnabled = webmap.draw_order_enabled;
|
|
5437
|
-
options.popupOptions = this.options.popupOptions;
|
|
5438
|
-
const layer = new this.NgwWebmapItem(
|
|
5439
|
-
this.options.webMap,
|
|
5440
|
-
webmap.root_item,
|
|
5441
|
-
options,
|
|
5442
|
-
this.options.connector
|
|
5443
|
-
);
|
|
5444
|
-
layer.emitter.on("init", () => resolve(layer));
|
|
5445
|
-
});
|
|
5446
|
-
}
|
|
5424
|
+
if (!this.resourceId) {
|
|
5425
|
+
return void 0;
|
|
5447
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
|
+
});
|
|
5448
5450
|
});
|
|
5449
5451
|
}
|
|
5450
5452
|
getWebMapConfig(id) {
|
|
@@ -9072,7 +9074,8 @@ function prepareWebMapOptions(options) {
|
|
|
9072
9074
|
if (!options.connector) {
|
|
9073
9075
|
options.connector = new NgwConnector({
|
|
9074
9076
|
baseUrl: options.baseUrl || "",
|
|
9075
|
-
auth: options.auth
|
|
9077
|
+
auth: options.auth,
|
|
9078
|
+
withCredentials: options.withCredentials
|
|
9076
9079
|
});
|
|
9077
9080
|
} else if (options.connector) {
|
|
9078
9081
|
options.baseUrl = options.connector.options.baseUrl;
|