@nextgis/ngw-map 3.0.0-alpha.0 → 3.0.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/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 +104 -94
- 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 +104 -94
- 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: 3.0.0-alpha.
|
|
1
|
+
/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.1; author: NextGIS */
|
|
2
2
|
var NgwMap = (function (exports) {
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -1505,8 +1505,8 @@ var NgwMap = (function (exports) {
|
|
|
1505
1505
|
}
|
|
1506
1506
|
|
|
1507
1507
|
var __defProp$D = Object.defineProperty;
|
|
1508
|
-
var __defProps$
|
|
1509
|
-
var __getOwnPropDescs$
|
|
1508
|
+
var __defProps$f = Object.defineProperties;
|
|
1509
|
+
var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
|
|
1510
1510
|
var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
|
|
1511
1511
|
var __hasOwnProp$u = Object.prototype.hasOwnProperty;
|
|
1512
1512
|
var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
|
|
@@ -1522,7 +1522,7 @@ var NgwMap = (function (exports) {
|
|
|
1522
1522
|
}
|
|
1523
1523
|
return a;
|
|
1524
1524
|
};
|
|
1525
|
-
var __spreadProps$
|
|
1525
|
+
var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
|
|
1526
1526
|
var __objRest$2 = (source, exclude) => {
|
|
1527
1527
|
var target = {};
|
|
1528
1528
|
for (var prop in source)
|
|
@@ -1566,6 +1566,7 @@ var NgwMap = (function (exports) {
|
|
|
1566
1566
|
__publicField$p(this, "user");
|
|
1567
1567
|
__publicField$p(this, "resources");
|
|
1568
1568
|
__publicField$p(this, "cache");
|
|
1569
|
+
__publicField$p(this, "withCredentials");
|
|
1569
1570
|
__publicField$p(this, "routeStr", "/api/component/pyramid/route");
|
|
1570
1571
|
__publicField$p(this, "activeRequests", {});
|
|
1571
1572
|
__publicField$p(this, "requestTransform");
|
|
@@ -1574,11 +1575,15 @@ var NgwMap = (function (exports) {
|
|
|
1574
1575
|
if (exist) {
|
|
1575
1576
|
return exist;
|
|
1576
1577
|
} else {
|
|
1577
|
-
|
|
1578
|
-
|
|
1578
|
+
const { route, requestTransform, withCredentials } = this.options;
|
|
1579
|
+
if (route) {
|
|
1580
|
+
this.routeStr = route;
|
|
1579
1581
|
}
|
|
1580
|
-
if (
|
|
1581
|
-
this.requestTransform =
|
|
1582
|
+
if (requestTransform) {
|
|
1583
|
+
this.requestTransform = requestTransform;
|
|
1584
|
+
}
|
|
1585
|
+
if (withCredentials !== void 0) {
|
|
1586
|
+
this.withCredentials = withCredentials;
|
|
1582
1587
|
}
|
|
1583
1588
|
this.resources = new ResourcesControl({
|
|
1584
1589
|
connector: this,
|
|
@@ -1852,6 +1857,7 @@ var NgwMap = (function (exports) {
|
|
|
1852
1857
|
url = template(url, restParams);
|
|
1853
1858
|
}
|
|
1854
1859
|
url = encodeURI(fixUrlStr(url));
|
|
1860
|
+
options = __spreadValues$t({ withCredentials: this.withCredentials }, options);
|
|
1855
1861
|
const {
|
|
1856
1862
|
cache,
|
|
1857
1863
|
signal: externalSignal,
|
|
@@ -1883,7 +1889,7 @@ var NgwMap = (function (exports) {
|
|
|
1883
1889
|
}
|
|
1884
1890
|
});
|
|
1885
1891
|
if (cache && method === "GET") {
|
|
1886
|
-
const cacheOptions = cacheProps ? cacheProps : __spreadProps$
|
|
1892
|
+
const cacheOptions = cacheProps ? cacheProps : __spreadProps$f(__spreadValues$t({}, objectRemoveEmpty({
|
|
1887
1893
|
headers,
|
|
1888
1894
|
withCredentials,
|
|
1889
1895
|
responseType,
|
|
@@ -2145,8 +2151,8 @@ var NgwMap = (function (exports) {
|
|
|
2145
2151
|
}
|
|
2146
2152
|
|
|
2147
2153
|
var __defProp$B = Object.defineProperty;
|
|
2148
|
-
var __defProps$
|
|
2149
|
-
var __getOwnPropDescs$
|
|
2154
|
+
var __defProps$e = Object.defineProperties;
|
|
2155
|
+
var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
|
|
2150
2156
|
var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
|
|
2151
2157
|
var __hasOwnProp$s = Object.prototype.hasOwnProperty;
|
|
2152
2158
|
var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
|
|
@@ -2162,7 +2168,7 @@ var NgwMap = (function (exports) {
|
|
|
2162
2168
|
}
|
|
2163
2169
|
return a;
|
|
2164
2170
|
};
|
|
2165
|
-
var __spreadProps$
|
|
2171
|
+
var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
|
|
2166
2172
|
var __async$p = (__this, __arguments, generator) => {
|
|
2167
2173
|
return new Promise((resolve, reject) => {
|
|
2168
2174
|
var fulfilled = (value) => {
|
|
@@ -2267,13 +2273,13 @@ var NgwMap = (function (exports) {
|
|
|
2267
2273
|
for (const f of filters_) {
|
|
2268
2274
|
if (isPropertyFilter(f)) {
|
|
2269
2275
|
_queries.push(
|
|
2270
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2276
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2271
2277
|
paramList: [..._parentAllParams, ...paramList, createParam(f)]
|
|
2272
2278
|
}))
|
|
2273
2279
|
);
|
|
2274
2280
|
} else {
|
|
2275
2281
|
getQueries(
|
|
2276
|
-
__spreadProps$
|
|
2282
|
+
__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2277
2283
|
filters: f
|
|
2278
2284
|
}),
|
|
2279
2285
|
_queries,
|
|
@@ -2294,7 +2300,7 @@ var NgwMap = (function (exports) {
|
|
|
2294
2300
|
if (propertiesFilterList.length) {
|
|
2295
2301
|
for (const x of propertiesFilterList) {
|
|
2296
2302
|
getQueries(
|
|
2297
|
-
__spreadProps$
|
|
2303
|
+
__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2298
2304
|
filters: x
|
|
2299
2305
|
}),
|
|
2300
2306
|
_queries,
|
|
@@ -2303,7 +2309,7 @@ var NgwMap = (function (exports) {
|
|
|
2303
2309
|
}
|
|
2304
2310
|
} else {
|
|
2305
2311
|
_queries.push(
|
|
2306
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2312
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2307
2313
|
paramList: [..._parentAllParams, ...paramList, ...filters2]
|
|
2308
2314
|
}))
|
|
2309
2315
|
);
|
|
@@ -2369,8 +2375,8 @@ var NgwMap = (function (exports) {
|
|
|
2369
2375
|
}
|
|
2370
2376
|
|
|
2371
2377
|
var __defProp$A = Object.defineProperty;
|
|
2372
|
-
var __defProps$
|
|
2373
|
-
var __getOwnPropDescs$
|
|
2378
|
+
var __defProps$d = Object.defineProperties;
|
|
2379
|
+
var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
|
|
2374
2380
|
var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
|
|
2375
2381
|
var __hasOwnProp$r = Object.prototype.hasOwnProperty;
|
|
2376
2382
|
var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
|
|
@@ -2386,7 +2392,7 @@ var NgwMap = (function (exports) {
|
|
|
2386
2392
|
}
|
|
2387
2393
|
return a;
|
|
2388
2394
|
};
|
|
2389
|
-
var __spreadProps$
|
|
2395
|
+
var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
|
|
2390
2396
|
var __async$o = (__this, __arguments, generator) => {
|
|
2391
2397
|
return new Promise((resolve, reject) => {
|
|
2392
2398
|
var fulfilled = (value) => {
|
|
@@ -2424,16 +2430,16 @@ var NgwMap = (function (exports) {
|
|
|
2424
2430
|
if (resp.geom) {
|
|
2425
2431
|
return createGeoJsonFeature(resp);
|
|
2426
2432
|
} else {
|
|
2427
|
-
const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$
|
|
2433
|
+
const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$d(__spreadValues$q({}, options), {
|
|
2428
2434
|
geom: true,
|
|
2429
2435
|
fields: null,
|
|
2430
2436
|
extensions: null
|
|
2431
2437
|
}));
|
|
2432
2438
|
const geom = onlyGeomItem.geom;
|
|
2433
|
-
return createGeoJsonFeature(__spreadProps$
|
|
2439
|
+
return createGeoJsonFeature(__spreadProps$d(__spreadValues$q({}, resp), { geom }));
|
|
2434
2440
|
}
|
|
2435
2441
|
});
|
|
2436
|
-
return __spreadProps$
|
|
2442
|
+
return __spreadProps$d(__spreadValues$q({}, resp), {
|
|
2437
2443
|
toGeojson
|
|
2438
2444
|
});
|
|
2439
2445
|
});
|
|
@@ -3090,8 +3096,8 @@ var NgwMap = (function (exports) {
|
|
|
3090
3096
|
}
|
|
3091
3097
|
|
|
3092
3098
|
var __defProp$t = Object.defineProperty;
|
|
3093
|
-
var __defProps$
|
|
3094
|
-
var __getOwnPropDescs$
|
|
3099
|
+
var __defProps$c = Object.defineProperties;
|
|
3100
|
+
var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
|
|
3095
3101
|
var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
|
|
3096
3102
|
var __hasOwnProp$m = Object.prototype.hasOwnProperty;
|
|
3097
3103
|
var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
|
|
@@ -3107,7 +3113,7 @@ var NgwMap = (function (exports) {
|
|
|
3107
3113
|
}
|
|
3108
3114
|
return a;
|
|
3109
3115
|
};
|
|
3110
|
-
var __spreadProps$
|
|
3116
|
+
var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
|
|
3111
3117
|
function getNgwWebmapExtent(webmap) {
|
|
3112
3118
|
const bottom = webmap["extent_bottom"];
|
|
3113
3119
|
const left = webmap["extent_left"];
|
|
@@ -3175,14 +3181,14 @@ var NgwMap = (function (exports) {
|
|
|
3175
3181
|
if (resource.cls && resource.cls.indexOf("style") !== -1) {
|
|
3176
3182
|
return connector.getResource(resource.parent.id, options).then((res) => {
|
|
3177
3183
|
if (res) {
|
|
3178
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3184
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3179
3185
|
resourceId: res.resource.id,
|
|
3180
3186
|
connector
|
|
3181
3187
|
}));
|
|
3182
3188
|
}
|
|
3183
3189
|
});
|
|
3184
3190
|
} else {
|
|
3185
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3191
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3186
3192
|
resourceId: resource.id,
|
|
3187
3193
|
connector
|
|
3188
3194
|
}));
|
|
@@ -3504,8 +3510,8 @@ var NgwMap = (function (exports) {
|
|
|
3504
3510
|
});
|
|
3505
3511
|
|
|
3506
3512
|
var __defProp$p = Object.defineProperty;
|
|
3507
|
-
var __defProps$
|
|
3508
|
-
var __getOwnPropDescs$
|
|
3513
|
+
var __defProps$b = Object.defineProperties;
|
|
3514
|
+
var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
|
|
3509
3515
|
var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
|
|
3510
3516
|
var __getProtoOf$2 = Object.getPrototypeOf;
|
|
3511
3517
|
var __hasOwnProp$j = Object.prototype.hasOwnProperty;
|
|
@@ -3523,7 +3529,7 @@ var NgwMap = (function (exports) {
|
|
|
3523
3529
|
}
|
|
3524
3530
|
return a;
|
|
3525
3531
|
};
|
|
3526
|
-
var __spreadProps$
|
|
3532
|
+
var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
|
|
3527
3533
|
var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
|
|
3528
3534
|
var __async$k = (__this, __arguments, generator) => {
|
|
3529
3535
|
return new Promise((resolve, reject) => {
|
|
@@ -3568,7 +3574,7 @@ var NgwMap = (function (exports) {
|
|
|
3568
3574
|
class BasemapTileAdapter extends TileAdapter {
|
|
3569
3575
|
addLayer(opt) {
|
|
3570
3576
|
return __async$k(this, null, function* () {
|
|
3571
|
-
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$
|
|
3577
|
+
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
|
|
3572
3578
|
});
|
|
3573
3579
|
}
|
|
3574
3580
|
}
|
|
@@ -3648,8 +3654,8 @@ var NgwMap = (function (exports) {
|
|
|
3648
3654
|
}
|
|
3649
3655
|
|
|
3650
3656
|
var __defProp$o = Object.defineProperty;
|
|
3651
|
-
var __defProps$
|
|
3652
|
-
var __getOwnPropDescs$
|
|
3657
|
+
var __defProps$a = Object.defineProperties;
|
|
3658
|
+
var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
|
|
3653
3659
|
var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
|
|
3654
3660
|
var __hasOwnProp$i = Object.prototype.hasOwnProperty;
|
|
3655
3661
|
var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
|
|
@@ -3665,7 +3671,7 @@ var NgwMap = (function (exports) {
|
|
|
3665
3671
|
}
|
|
3666
3672
|
return a;
|
|
3667
3673
|
};
|
|
3668
|
-
var __spreadProps$
|
|
3674
|
+
var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
|
|
3669
3675
|
var __async$j = (__this, __arguments, generator) => {
|
|
3670
3676
|
return new Promise((resolve, reject) => {
|
|
3671
3677
|
var fulfilled = (value) => {
|
|
@@ -3691,13 +3697,13 @@ var NgwMap = (function (exports) {
|
|
|
3691
3697
|
var _a;
|
|
3692
3698
|
const filters = options.filters;
|
|
3693
3699
|
if (filters) {
|
|
3694
|
-
let data = yield createFeatureFieldFilterQueries(__spreadProps$
|
|
3700
|
+
let data = yield createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
|
|
3695
3701
|
filters
|
|
3696
3702
|
}));
|
|
3697
3703
|
const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
|
|
3698
3704
|
if (clientFilterValidate) {
|
|
3699
3705
|
data = data.filter((y) => {
|
|
3700
|
-
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$
|
|
3706
|
+
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
|
|
3701
3707
|
id: y.id
|
|
3702
3708
|
}));
|
|
3703
3709
|
const result = propertiesFilter(fields, filters);
|
|
@@ -3786,8 +3792,8 @@ var NgwMap = (function (exports) {
|
|
|
3786
3792
|
}
|
|
3787
3793
|
|
|
3788
3794
|
var __defProp$n = Object.defineProperty;
|
|
3789
|
-
var __defProps$
|
|
3790
|
-
var __getOwnPropDescs$
|
|
3795
|
+
var __defProps$9 = Object.defineProperties;
|
|
3796
|
+
var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
|
|
3791
3797
|
var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
|
|
3792
3798
|
var __getProtoOf$1 = Object.getPrototypeOf;
|
|
3793
3799
|
var __hasOwnProp$h = Object.prototype.hasOwnProperty;
|
|
@@ -3805,7 +3811,7 @@ var NgwMap = (function (exports) {
|
|
|
3805
3811
|
}
|
|
3806
3812
|
return a;
|
|
3807
3813
|
};
|
|
3808
|
-
var __spreadProps$
|
|
3814
|
+
var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
|
|
3809
3815
|
var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
3810
3816
|
var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
|
|
3811
3817
|
var __async$h = (__this, __arguments, generator) => {
|
|
@@ -3984,7 +3990,7 @@ var NgwMap = (function (exports) {
|
|
|
3984
3990
|
try {
|
|
3985
3991
|
this.emitter.emit("preupdate", filterArgs);
|
|
3986
3992
|
webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
|
|
3987
|
-
const data = yield getData(filterArgs.filters, __spreadProps$
|
|
3993
|
+
const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
|
|
3988
3994
|
srs: this.options.srs
|
|
3989
3995
|
}));
|
|
3990
3996
|
let newData = data;
|
|
@@ -4037,7 +4043,7 @@ var NgwMap = (function (exports) {
|
|
|
4037
4043
|
if (this.clearLayer) {
|
|
4038
4044
|
this.clearLayer();
|
|
4039
4045
|
}
|
|
4040
|
-
const data = yield getData(filters, __spreadProps$
|
|
4046
|
+
const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
|
|
4041
4047
|
srs: this.options.srs
|
|
4042
4048
|
}));
|
|
4043
4049
|
this.setData(data);
|
|
@@ -4227,8 +4233,8 @@ var NgwMap = (function (exports) {
|
|
|
4227
4233
|
}
|
|
4228
4234
|
|
|
4229
4235
|
var __defProp$m = Object.defineProperty;
|
|
4230
|
-
var __defProps$
|
|
4231
|
-
var __getOwnPropDescs$
|
|
4236
|
+
var __defProps$8 = Object.defineProperties;
|
|
4237
|
+
var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
|
|
4232
4238
|
var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
|
|
4233
4239
|
var __hasOwnProp$g = Object.prototype.hasOwnProperty;
|
|
4234
4240
|
var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
|
|
@@ -4244,7 +4250,7 @@ var NgwMap = (function (exports) {
|
|
|
4244
4250
|
}
|
|
4245
4251
|
return a;
|
|
4246
4252
|
};
|
|
4247
|
-
var __spreadProps$
|
|
4253
|
+
var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
|
|
4248
4254
|
var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4249
4255
|
var __async$f = (__this, __arguments, generator) => {
|
|
4250
4256
|
return new Promise((resolve, reject) => {
|
|
@@ -4308,7 +4314,7 @@ var NgwMap = (function (exports) {
|
|
|
4308
4314
|
baseUrl: connector.options.baseUrl || ""
|
|
4309
4315
|
});
|
|
4310
4316
|
if (opt) {
|
|
4311
|
-
const layerAdapterOptions = __spreadProps$
|
|
4317
|
+
const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
|
|
4312
4318
|
params: { resource: resourceId },
|
|
4313
4319
|
layers: opt.layers || String(resourceId),
|
|
4314
4320
|
resourceId
|
|
@@ -4366,8 +4372,8 @@ var NgwMap = (function (exports) {
|
|
|
4366
4372
|
}
|
|
4367
4373
|
|
|
4368
4374
|
var __defProp$l = Object.defineProperty;
|
|
4369
|
-
var __defProps$
|
|
4370
|
-
var __getOwnPropDescs$
|
|
4375
|
+
var __defProps$7 = Object.defineProperties;
|
|
4376
|
+
var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
|
|
4371
4377
|
var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
|
|
4372
4378
|
var __hasOwnProp$f = Object.prototype.hasOwnProperty;
|
|
4373
4379
|
var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
|
|
@@ -4383,7 +4389,7 @@ var NgwMap = (function (exports) {
|
|
|
4383
4389
|
}
|
|
4384
4390
|
return a;
|
|
4385
4391
|
};
|
|
4386
|
-
var __spreadProps$
|
|
4392
|
+
var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
|
|
4387
4393
|
var __async$e = (__this, __arguments, generator) => {
|
|
4388
4394
|
return new Promise((resolve, reject) => {
|
|
4389
4395
|
var fulfilled = (value) => {
|
|
@@ -4431,7 +4437,7 @@ var NgwMap = (function (exports) {
|
|
|
4431
4437
|
const firstStyle = childrenStyles && childrenStyles[0];
|
|
4432
4438
|
if (firstStyle) {
|
|
4433
4439
|
return createAsyncAdapter(
|
|
4434
|
-
__spreadProps$
|
|
4440
|
+
__spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
|
|
4435
4441
|
webMap,
|
|
4436
4442
|
connector
|
|
4437
4443
|
);
|
|
@@ -4454,13 +4460,13 @@ var NgwMap = (function (exports) {
|
|
|
4454
4460
|
}
|
|
4455
4461
|
if (item) {
|
|
4456
4462
|
const cls = item.resource.cls;
|
|
4457
|
-
const layerOptions = __spreadProps$
|
|
4463
|
+
const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4458
4464
|
resource: resourceId
|
|
4459
4465
|
});
|
|
4460
4466
|
const adapterOptions = {
|
|
4461
4467
|
layerOptions,
|
|
4462
|
-
webMap,
|
|
4463
4468
|
connector,
|
|
4469
|
+
webMap,
|
|
4464
4470
|
item
|
|
4465
4471
|
};
|
|
4466
4472
|
if (supportCls.indexOf(cls) !== -1) {
|
|
@@ -4491,10 +4497,10 @@ var NgwMap = (function (exports) {
|
|
|
4491
4497
|
item.resource.parent.id
|
|
4492
4498
|
);
|
|
4493
4499
|
if (parentItem) {
|
|
4494
|
-
const parentOptions = __spreadProps$
|
|
4500
|
+
const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4495
4501
|
resource: item.resource.parent.id
|
|
4496
4502
|
});
|
|
4497
|
-
adapter = createGeoJsonAdapter(__spreadProps$
|
|
4503
|
+
adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
|
|
4498
4504
|
item: parentItem,
|
|
4499
4505
|
layerOptions: parentOptions
|
|
4500
4506
|
}));
|
|
@@ -4583,6 +4589,9 @@ var NgwMap = (function (exports) {
|
|
|
4583
4589
|
if (headers) {
|
|
4584
4590
|
options.headers = headers;
|
|
4585
4591
|
}
|
|
4592
|
+
if (connector.withCredentials !== void 0) {
|
|
4593
|
+
options.withCredentials = connector.withCredentials;
|
|
4594
|
+
}
|
|
4586
4595
|
return createAsyncAdapter(options, webMap, connector);
|
|
4587
4596
|
}
|
|
4588
4597
|
function extendNgwWebmapLayerAdapter(opt) {
|
|
@@ -4620,6 +4629,8 @@ var NgwMap = (function (exports) {
|
|
|
4620
4629
|
}
|
|
4621
4630
|
|
|
4622
4631
|
var __defProp$j = Object.defineProperty;
|
|
4632
|
+
var __defProps$6 = Object.defineProperties;
|
|
4633
|
+
var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
|
|
4623
4634
|
var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
|
|
4624
4635
|
var __hasOwnProp$d = Object.prototype.hasOwnProperty;
|
|
4625
4636
|
var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
|
|
@@ -4635,6 +4646,7 @@ var NgwMap = (function (exports) {
|
|
|
4635
4646
|
}
|
|
4636
4647
|
return a;
|
|
4637
4648
|
};
|
|
4649
|
+
var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
|
|
4638
4650
|
var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4639
4651
|
var __async$d = (__this, __arguments, generator) => {
|
|
4640
4652
|
return new Promise((resolve, reject) => {
|
|
@@ -4740,14 +4752,12 @@ var NgwMap = (function (exports) {
|
|
|
4740
4752
|
getItemOptions(item) {
|
|
4741
4753
|
const transparency = item.item_type === "layer" && item.layer_transparency;
|
|
4742
4754
|
const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
|
|
4743
|
-
const options = {
|
|
4755
|
+
const options = __spreadProps$6(__spreadValues$c({
|
|
4744
4756
|
visibility: false,
|
|
4745
|
-
name: item.display_name
|
|
4746
|
-
|
|
4747
|
-
crossOrigin: this.options.crossOrigin,
|
|
4748
|
-
setViewDelay: this.options.setViewDelay,
|
|
4757
|
+
name: item.display_name
|
|
4758
|
+
}, this.options), {
|
|
4749
4759
|
params: { resource: this.item.resourceId, item: this.item }
|
|
4750
|
-
};
|
|
4760
|
+
});
|
|
4751
4761
|
if (this.options.order) {
|
|
4752
4762
|
const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
|
|
4753
4763
|
const subLevel = String(subOrder).padStart(4, "0");
|
|
@@ -4758,17 +4768,16 @@ var NgwMap = (function (exports) {
|
|
|
4758
4768
|
}
|
|
4759
4769
|
if (item.item_type === "layer") {
|
|
4760
4770
|
const { maxZoom, minZoom } = this._getZoomRange(item);
|
|
4761
|
-
Object.assign(options, {
|
|
4762
|
-
updateWmsParams: item.updateWmsParams
|
|
4771
|
+
Object.assign(options, __spreadProps$6(__spreadValues$c({
|
|
4772
|
+
updateWmsParams: item.updateWmsParams
|
|
4773
|
+
}, this.options), {
|
|
4763
4774
|
url: item.url,
|
|
4764
|
-
headers: this.options.headers,
|
|
4765
|
-
ratio: this.options.ratio,
|
|
4766
4775
|
maxZoom,
|
|
4767
4776
|
minZoom,
|
|
4768
4777
|
minScale: item.layer_min_scale_denom,
|
|
4769
4778
|
maxScale: item.layer_max_scale_denom,
|
|
4770
4779
|
interactive: item.layer_identifiable
|
|
4771
|
-
});
|
|
4780
|
+
}));
|
|
4772
4781
|
}
|
|
4773
4782
|
if (opacity !== void 0) {
|
|
4774
4783
|
options.opacity = opacity;
|
|
@@ -5074,6 +5083,8 @@ var NgwMap = (function (exports) {
|
|
|
5074
5083
|
const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
|
|
5075
5084
|
|
|
5076
5085
|
var __defProp$h = Object.defineProperty;
|
|
5086
|
+
var __defProps$5 = Object.defineProperties;
|
|
5087
|
+
var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
|
|
5077
5088
|
var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
|
|
5078
5089
|
var __hasOwnProp$b = Object.prototype.hasOwnProperty;
|
|
5079
5090
|
var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
|
|
@@ -5089,6 +5100,7 @@ var NgwMap = (function (exports) {
|
|
|
5089
5100
|
}
|
|
5090
5101
|
return a;
|
|
5091
5102
|
};
|
|
5103
|
+
var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
|
|
5092
5104
|
var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
5093
5105
|
var __async$a = (__this, __arguments, generator) => {
|
|
5094
5106
|
return new Promise((resolve, reject) => {
|
|
@@ -5287,35 +5299,32 @@ var NgwMap = (function (exports) {
|
|
|
5287
5299
|
}
|
|
5288
5300
|
_getWebMapLayerItem() {
|
|
5289
5301
|
return __async$a(this, null, function* () {
|
|
5290
|
-
if (this.resourceId) {
|
|
5291
|
-
|
|
5292
|
-
|
|
5293
|
-
|
|
5294
|
-
|
|
5295
|
-
|
|
5296
|
-
|
|
5297
|
-
|
|
5298
|
-
|
|
5299
|
-
|
|
5300
|
-
|
|
5301
|
-
|
|
5302
|
-
|
|
5303
|
-
|
|
5304
|
-
|
|
5305
|
-
|
|
5306
|
-
|
|
5307
|
-
|
|
5308
|
-
|
|
5309
|
-
|
|
5310
|
-
|
|
5311
|
-
|
|
5312
|
-
|
|
5313
|
-
|
|
5314
|
-
|
|
5315
|
-
|
|
5316
|
-
});
|
|
5317
|
-
}
|
|
5318
|
-
}
|
|
5302
|
+
if (!this.resourceId) {
|
|
5303
|
+
return void 0;
|
|
5304
|
+
}
|
|
5305
|
+
const webmap = yield this.getWebMapConfig(this.resourceId);
|
|
5306
|
+
if (!webmap || !webmap.root_item) {
|
|
5307
|
+
return void 0;
|
|
5308
|
+
}
|
|
5309
|
+
return new Promise((resolve) => {
|
|
5310
|
+
const connector = this.options.connector;
|
|
5311
|
+
const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
|
|
5312
|
+
const withCredentials = connector.withCredentials;
|
|
5313
|
+
const options = __spreadProps$5(__spreadValues$a({}, this.options), {
|
|
5314
|
+
withCredentials,
|
|
5315
|
+
headers,
|
|
5316
|
+
drawOrderEnabled: webmap.draw_order_enabled
|
|
5317
|
+
});
|
|
5318
|
+
const layer = new this.NgwWebmapItem(
|
|
5319
|
+
this.options.webMap,
|
|
5320
|
+
webmap.root_item,
|
|
5321
|
+
options,
|
|
5322
|
+
connector
|
|
5323
|
+
);
|
|
5324
|
+
layer.emitter.on("init", () => {
|
|
5325
|
+
resolve(layer);
|
|
5326
|
+
});
|
|
5327
|
+
});
|
|
5319
5328
|
});
|
|
5320
5329
|
}
|
|
5321
5330
|
getWebMapConfig(id) {
|
|
@@ -8962,7 +8971,8 @@ var NgwMap = (function (exports) {
|
|
|
8962
8971
|
if (!options.connector) {
|
|
8963
8972
|
options.connector = new NgwConnector({
|
|
8964
8973
|
baseUrl: options.baseUrl || "",
|
|
8965
|
-
auth: options.auth
|
|
8974
|
+
auth: options.auth,
|
|
8975
|
+
withCredentials: options.withCredentials
|
|
8966
8976
|
});
|
|
8967
8977
|
} else if (options.connector) {
|
|
8968
8978
|
options.baseUrl = options.connector.options.baseUrl;
|