@nextgis/ngw-map 3.0.0-alpha.0 → 3.0.0-alpha.2
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 +164 -96
- 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 +164 -96
- 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.2; author: NextGIS */
|
|
2
2
|
var NgwMap = (function (exports) {
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -941,6 +941,62 @@ var NgwMap = (function (exports) {
|
|
|
941
941
|
__publicField$v(_Cache, "instance", {});
|
|
942
942
|
let Cache = _Cache;
|
|
943
943
|
|
|
944
|
+
var pkg = {
|
|
945
|
+
name: "@nextgis/ngw-connector",
|
|
946
|
+
version: "3.0.0-alpha.2",
|
|
947
|
+
_priority: 12,
|
|
948
|
+
description: "A lightweight HTTP client optimized for use with NextGIS Web API",
|
|
949
|
+
main: "index.js",
|
|
950
|
+
module: "lib/ngw-connector.esm-bundler.js",
|
|
951
|
+
unpkg: "lib/ngw-connector.global.prod.js",
|
|
952
|
+
jsdelivr: "lib/ngw-connector.global.prod.js",
|
|
953
|
+
types: "lib/index.d.ts",
|
|
954
|
+
dependencies: {
|
|
955
|
+
"@nextgis/cache": "^3.0.0-alpha.1",
|
|
956
|
+
"@nextgis/cancelable-promise": "^3.0.0-alpha.1",
|
|
957
|
+
"@nextgis/utils": "^3.0.0-alpha.1",
|
|
958
|
+
"@types/events": "^3.0.0",
|
|
959
|
+
events: "*",
|
|
960
|
+
"form-data": "^4.0.0"
|
|
961
|
+
},
|
|
962
|
+
devDependencies: {
|
|
963
|
+
"@nextgis/build-tools": "^3.0.0-alpha.1"
|
|
964
|
+
},
|
|
965
|
+
scripts: {
|
|
966
|
+
clean: "rimraf ./lib",
|
|
967
|
+
dev: "node ../build-tools/lib/build.js",
|
|
968
|
+
prod: "npm run dev -- --release",
|
|
969
|
+
lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
|
|
970
|
+
watch: "npm run dev -- --watch",
|
|
971
|
+
"gen:types": "node ./scripts/generator"
|
|
972
|
+
},
|
|
973
|
+
buildOptions: {
|
|
974
|
+
name: "NgwConnector",
|
|
975
|
+
formats: [
|
|
976
|
+
"esm-bundler",
|
|
977
|
+
"esm-browser",
|
|
978
|
+
"cjs",
|
|
979
|
+
"global"
|
|
980
|
+
]
|
|
981
|
+
},
|
|
982
|
+
keywords: [
|
|
983
|
+
"NextGIS",
|
|
984
|
+
"MAP"
|
|
985
|
+
],
|
|
986
|
+
author: "NextGIS",
|
|
987
|
+
files: [
|
|
988
|
+
"index.js",
|
|
989
|
+
"lib"
|
|
990
|
+
],
|
|
991
|
+
license: "MIT",
|
|
992
|
+
homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
|
|
993
|
+
repository: {
|
|
994
|
+
type: "git",
|
|
995
|
+
url: "git://github.com/nextgis/nextgis_frontend.git"
|
|
996
|
+
},
|
|
997
|
+
gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
|
|
998
|
+
};
|
|
999
|
+
|
|
944
1000
|
var __defProp$J = Object.defineProperty;
|
|
945
1001
|
var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
946
1002
|
var __publicField$u = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
@@ -1505,8 +1561,8 @@ var NgwMap = (function (exports) {
|
|
|
1505
1561
|
}
|
|
1506
1562
|
|
|
1507
1563
|
var __defProp$D = Object.defineProperty;
|
|
1508
|
-
var __defProps$
|
|
1509
|
-
var __getOwnPropDescs$
|
|
1564
|
+
var __defProps$f = Object.defineProperties;
|
|
1565
|
+
var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
|
|
1510
1566
|
var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
|
|
1511
1567
|
var __hasOwnProp$u = Object.prototype.hasOwnProperty;
|
|
1512
1568
|
var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
|
|
@@ -1522,7 +1578,7 @@ var NgwMap = (function (exports) {
|
|
|
1522
1578
|
}
|
|
1523
1579
|
return a;
|
|
1524
1580
|
};
|
|
1525
|
-
var __spreadProps$
|
|
1581
|
+
var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
|
|
1526
1582
|
var __objRest$2 = (source, exclude) => {
|
|
1527
1583
|
var target = {};
|
|
1528
1584
|
for (var prop in source)
|
|
@@ -1566,6 +1622,8 @@ var NgwMap = (function (exports) {
|
|
|
1566
1622
|
__publicField$p(this, "user");
|
|
1567
1623
|
__publicField$p(this, "resources");
|
|
1568
1624
|
__publicField$p(this, "cache");
|
|
1625
|
+
__publicField$p(this, "withCredentials");
|
|
1626
|
+
__publicField$p(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
|
|
1569
1627
|
__publicField$p(this, "routeStr", "/api/component/pyramid/route");
|
|
1570
1628
|
__publicField$p(this, "activeRequests", {});
|
|
1571
1629
|
__publicField$p(this, "requestTransform");
|
|
@@ -1574,11 +1632,15 @@ var NgwMap = (function (exports) {
|
|
|
1574
1632
|
if (exist) {
|
|
1575
1633
|
return exist;
|
|
1576
1634
|
} else {
|
|
1577
|
-
|
|
1578
|
-
|
|
1635
|
+
const { route, requestTransform, withCredentials } = this.options;
|
|
1636
|
+
if (route) {
|
|
1637
|
+
this.routeStr = route;
|
|
1579
1638
|
}
|
|
1580
|
-
if (
|
|
1581
|
-
this.requestTransform =
|
|
1639
|
+
if (requestTransform) {
|
|
1640
|
+
this.requestTransform = requestTransform;
|
|
1641
|
+
}
|
|
1642
|
+
if (withCredentials !== void 0) {
|
|
1643
|
+
this.withCredentials = withCredentials;
|
|
1582
1644
|
}
|
|
1583
1645
|
this.resources = new ResourcesControl({
|
|
1584
1646
|
connector: this,
|
|
@@ -1632,8 +1694,9 @@ var NgwMap = (function (exports) {
|
|
|
1632
1694
|
yield this._login({ login, password });
|
|
1633
1695
|
}
|
|
1634
1696
|
}
|
|
1697
|
+
const routeUrl = `${this.routeStr}?client=${this.client}`;
|
|
1635
1698
|
return yield this.makeQuery(
|
|
1636
|
-
|
|
1699
|
+
routeUrl,
|
|
1637
1700
|
{},
|
|
1638
1701
|
{
|
|
1639
1702
|
cacheName: "route",
|
|
@@ -1852,6 +1915,7 @@ var NgwMap = (function (exports) {
|
|
|
1852
1915
|
url = template(url, restParams);
|
|
1853
1916
|
}
|
|
1854
1917
|
url = encodeURI(fixUrlStr(url));
|
|
1918
|
+
options = __spreadValues$t({ withCredentials: this.withCredentials }, options);
|
|
1855
1919
|
const {
|
|
1856
1920
|
cache,
|
|
1857
1921
|
signal: externalSignal,
|
|
@@ -1883,7 +1947,7 @@ var NgwMap = (function (exports) {
|
|
|
1883
1947
|
}
|
|
1884
1948
|
});
|
|
1885
1949
|
if (cache && method === "GET") {
|
|
1886
|
-
const cacheOptions = cacheProps ? cacheProps : __spreadProps$
|
|
1950
|
+
const cacheOptions = cacheProps ? cacheProps : __spreadProps$f(__spreadValues$t({}, objectRemoveEmpty({
|
|
1887
1951
|
headers,
|
|
1888
1952
|
withCredentials,
|
|
1889
1953
|
responseType,
|
|
@@ -2145,8 +2209,8 @@ var NgwMap = (function (exports) {
|
|
|
2145
2209
|
}
|
|
2146
2210
|
|
|
2147
2211
|
var __defProp$B = Object.defineProperty;
|
|
2148
|
-
var __defProps$
|
|
2149
|
-
var __getOwnPropDescs$
|
|
2212
|
+
var __defProps$e = Object.defineProperties;
|
|
2213
|
+
var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
|
|
2150
2214
|
var __getOwnPropSymbols$s = Object.getOwnPropertySymbols;
|
|
2151
2215
|
var __hasOwnProp$s = Object.prototype.hasOwnProperty;
|
|
2152
2216
|
var __propIsEnum$s = Object.prototype.propertyIsEnumerable;
|
|
@@ -2162,7 +2226,7 @@ var NgwMap = (function (exports) {
|
|
|
2162
2226
|
}
|
|
2163
2227
|
return a;
|
|
2164
2228
|
};
|
|
2165
|
-
var __spreadProps$
|
|
2229
|
+
var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
|
|
2166
2230
|
var __async$p = (__this, __arguments, generator) => {
|
|
2167
2231
|
return new Promise((resolve, reject) => {
|
|
2168
2232
|
var fulfilled = (value) => {
|
|
@@ -2203,7 +2267,7 @@ var NgwMap = (function (exports) {
|
|
|
2203
2267
|
if (extensionsStr !== "*") {
|
|
2204
2268
|
params.extensions = extensionsStr;
|
|
2205
2269
|
}
|
|
2206
|
-
if (fields !== void 0) {
|
|
2270
|
+
if (fields !== void 0 && fields !== null) {
|
|
2207
2271
|
params.fields = Array.isArray(fields) ? fields.join(",") : "";
|
|
2208
2272
|
}
|
|
2209
2273
|
if (geom !== void 0) {
|
|
@@ -2267,13 +2331,13 @@ var NgwMap = (function (exports) {
|
|
|
2267
2331
|
for (const f of filters_) {
|
|
2268
2332
|
if (isPropertyFilter(f)) {
|
|
2269
2333
|
_queries.push(
|
|
2270
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2334
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2271
2335
|
paramList: [..._parentAllParams, ...paramList, createParam(f)]
|
|
2272
2336
|
}))
|
|
2273
2337
|
);
|
|
2274
2338
|
} else {
|
|
2275
2339
|
getQueries(
|
|
2276
|
-
__spreadProps$
|
|
2340
|
+
__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2277
2341
|
filters: f
|
|
2278
2342
|
}),
|
|
2279
2343
|
_queries,
|
|
@@ -2294,7 +2358,7 @@ var NgwMap = (function (exports) {
|
|
|
2294
2358
|
if (propertiesFilterList.length) {
|
|
2295
2359
|
for (const x of propertiesFilterList) {
|
|
2296
2360
|
getQueries(
|
|
2297
|
-
__spreadProps$
|
|
2361
|
+
__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2298
2362
|
filters: x
|
|
2299
2363
|
}),
|
|
2300
2364
|
_queries,
|
|
@@ -2303,7 +2367,7 @@ var NgwMap = (function (exports) {
|
|
|
2303
2367
|
}
|
|
2304
2368
|
} else {
|
|
2305
2369
|
_queries.push(
|
|
2306
|
-
fetchNgwLayerItemsRequest(__spreadProps$
|
|
2370
|
+
fetchNgwLayerItemsRequest(__spreadProps$e(__spreadValues$r({}, opt), {
|
|
2307
2371
|
paramList: [..._parentAllParams, ...paramList, ...filters2]
|
|
2308
2372
|
}))
|
|
2309
2373
|
);
|
|
@@ -2369,8 +2433,8 @@ var NgwMap = (function (exports) {
|
|
|
2369
2433
|
}
|
|
2370
2434
|
|
|
2371
2435
|
var __defProp$A = Object.defineProperty;
|
|
2372
|
-
var __defProps$
|
|
2373
|
-
var __getOwnPropDescs$
|
|
2436
|
+
var __defProps$d = Object.defineProperties;
|
|
2437
|
+
var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
|
|
2374
2438
|
var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
|
|
2375
2439
|
var __hasOwnProp$r = Object.prototype.hasOwnProperty;
|
|
2376
2440
|
var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
|
|
@@ -2386,7 +2450,7 @@ var NgwMap = (function (exports) {
|
|
|
2386
2450
|
}
|
|
2387
2451
|
return a;
|
|
2388
2452
|
};
|
|
2389
|
-
var __spreadProps$
|
|
2453
|
+
var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
|
|
2390
2454
|
var __async$o = (__this, __arguments, generator) => {
|
|
2391
2455
|
return new Promise((resolve, reject) => {
|
|
2392
2456
|
var fulfilled = (value) => {
|
|
@@ -2424,16 +2488,16 @@ var NgwMap = (function (exports) {
|
|
|
2424
2488
|
if (resp.geom) {
|
|
2425
2489
|
return createGeoJsonFeature(resp);
|
|
2426
2490
|
} else {
|
|
2427
|
-
const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$
|
|
2491
|
+
const onlyGeomItem = yield fetchNgwLayerItem(__spreadProps$d(__spreadValues$q({}, options), {
|
|
2428
2492
|
geom: true,
|
|
2429
2493
|
fields: null,
|
|
2430
2494
|
extensions: null
|
|
2431
2495
|
}));
|
|
2432
2496
|
const geom = onlyGeomItem.geom;
|
|
2433
|
-
return createGeoJsonFeature(__spreadProps$
|
|
2497
|
+
return createGeoJsonFeature(__spreadProps$d(__spreadValues$q({}, resp), { geom }));
|
|
2434
2498
|
}
|
|
2435
2499
|
});
|
|
2436
|
-
return __spreadProps$
|
|
2500
|
+
return __spreadProps$d(__spreadValues$q({}, resp), {
|
|
2437
2501
|
toGeojson
|
|
2438
2502
|
});
|
|
2439
2503
|
});
|
|
@@ -3090,8 +3154,8 @@ var NgwMap = (function (exports) {
|
|
|
3090
3154
|
}
|
|
3091
3155
|
|
|
3092
3156
|
var __defProp$t = Object.defineProperty;
|
|
3093
|
-
var __defProps$
|
|
3094
|
-
var __getOwnPropDescs$
|
|
3157
|
+
var __defProps$c = Object.defineProperties;
|
|
3158
|
+
var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
|
|
3095
3159
|
var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
|
|
3096
3160
|
var __hasOwnProp$m = Object.prototype.hasOwnProperty;
|
|
3097
3161
|
var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
|
|
@@ -3107,7 +3171,7 @@ var NgwMap = (function (exports) {
|
|
|
3107
3171
|
}
|
|
3108
3172
|
return a;
|
|
3109
3173
|
};
|
|
3110
|
-
var __spreadProps$
|
|
3174
|
+
var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
|
|
3111
3175
|
function getNgwWebmapExtent(webmap) {
|
|
3112
3176
|
const bottom = webmap["extent_bottom"];
|
|
3113
3177
|
const left = webmap["extent_left"];
|
|
@@ -3175,14 +3239,14 @@ var NgwMap = (function (exports) {
|
|
|
3175
3239
|
if (resource.cls && resource.cls.indexOf("style") !== -1) {
|
|
3176
3240
|
return connector.getResource(resource.parent.id, options).then((res) => {
|
|
3177
3241
|
if (res) {
|
|
3178
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3242
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3179
3243
|
resourceId: res.resource.id,
|
|
3180
3244
|
connector
|
|
3181
3245
|
}));
|
|
3182
3246
|
}
|
|
3183
3247
|
});
|
|
3184
3248
|
} else {
|
|
3185
|
-
return fetchNgwLayerExtent(__spreadProps$
|
|
3249
|
+
return fetchNgwLayerExtent(__spreadProps$c(__spreadValues$l({}, options), {
|
|
3186
3250
|
resourceId: resource.id,
|
|
3187
3251
|
connector
|
|
3188
3252
|
}));
|
|
@@ -3504,8 +3568,8 @@ var NgwMap = (function (exports) {
|
|
|
3504
3568
|
});
|
|
3505
3569
|
|
|
3506
3570
|
var __defProp$p = Object.defineProperty;
|
|
3507
|
-
var __defProps$
|
|
3508
|
-
var __getOwnPropDescs$
|
|
3571
|
+
var __defProps$b = Object.defineProperties;
|
|
3572
|
+
var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
|
|
3509
3573
|
var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
|
|
3510
3574
|
var __getProtoOf$2 = Object.getPrototypeOf;
|
|
3511
3575
|
var __hasOwnProp$j = Object.prototype.hasOwnProperty;
|
|
@@ -3523,7 +3587,7 @@ var NgwMap = (function (exports) {
|
|
|
3523
3587
|
}
|
|
3524
3588
|
return a;
|
|
3525
3589
|
};
|
|
3526
|
-
var __spreadProps$
|
|
3590
|
+
var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
|
|
3527
3591
|
var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
|
|
3528
3592
|
var __async$k = (__this, __arguments, generator) => {
|
|
3529
3593
|
return new Promise((resolve, reject) => {
|
|
@@ -3568,7 +3632,7 @@ var NgwMap = (function (exports) {
|
|
|
3568
3632
|
class BasemapTileAdapter extends TileAdapter {
|
|
3569
3633
|
addLayer(opt) {
|
|
3570
3634
|
return __async$k(this, null, function* () {
|
|
3571
|
-
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$
|
|
3635
|
+
return __superGet$2(BasemapTileAdapter.prototype, this, "addLayer").call(this, __spreadProps$b(__spreadValues$i({}, opt), { url }));
|
|
3572
3636
|
});
|
|
3573
3637
|
}
|
|
3574
3638
|
}
|
|
@@ -3648,8 +3712,8 @@ var NgwMap = (function (exports) {
|
|
|
3648
3712
|
}
|
|
3649
3713
|
|
|
3650
3714
|
var __defProp$o = Object.defineProperty;
|
|
3651
|
-
var __defProps$
|
|
3652
|
-
var __getOwnPropDescs$
|
|
3715
|
+
var __defProps$a = Object.defineProperties;
|
|
3716
|
+
var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
|
|
3653
3717
|
var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
|
|
3654
3718
|
var __hasOwnProp$i = Object.prototype.hasOwnProperty;
|
|
3655
3719
|
var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
|
|
@@ -3665,7 +3729,7 @@ var NgwMap = (function (exports) {
|
|
|
3665
3729
|
}
|
|
3666
3730
|
return a;
|
|
3667
3731
|
};
|
|
3668
|
-
var __spreadProps$
|
|
3732
|
+
var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
|
|
3669
3733
|
var __async$j = (__this, __arguments, generator) => {
|
|
3670
3734
|
return new Promise((resolve, reject) => {
|
|
3671
3735
|
var fulfilled = (value) => {
|
|
@@ -3691,13 +3755,13 @@ var NgwMap = (function (exports) {
|
|
|
3691
3755
|
var _a;
|
|
3692
3756
|
const filters = options.filters;
|
|
3693
3757
|
if (filters) {
|
|
3694
|
-
let data = yield createFeatureFieldFilterQueries(__spreadProps$
|
|
3758
|
+
let data = yield createFeatureFieldFilterQueries(__spreadProps$a(__spreadValues$h({}, options), {
|
|
3695
3759
|
filters
|
|
3696
3760
|
}));
|
|
3697
3761
|
const clientFilterValidate = (_a = options.clientFilterValidate) != null ? _a : isFilterWithAnyCase(filters);
|
|
3698
3762
|
if (clientFilterValidate) {
|
|
3699
3763
|
data = data.filter((y) => {
|
|
3700
|
-
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$
|
|
3764
|
+
const fields = prepareNgwFieldsToPropertiesFilter(__spreadProps$a(__spreadValues$h({}, y.fields), {
|
|
3701
3765
|
id: y.id
|
|
3702
3766
|
}));
|
|
3703
3767
|
const result = propertiesFilter(fields, filters);
|
|
@@ -3786,8 +3850,8 @@ var NgwMap = (function (exports) {
|
|
|
3786
3850
|
}
|
|
3787
3851
|
|
|
3788
3852
|
var __defProp$n = Object.defineProperty;
|
|
3789
|
-
var __defProps$
|
|
3790
|
-
var __getOwnPropDescs$
|
|
3853
|
+
var __defProps$9 = Object.defineProperties;
|
|
3854
|
+
var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
|
|
3791
3855
|
var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
|
|
3792
3856
|
var __getProtoOf$1 = Object.getPrototypeOf;
|
|
3793
3857
|
var __hasOwnProp$h = Object.prototype.hasOwnProperty;
|
|
@@ -3805,7 +3869,7 @@ var NgwMap = (function (exports) {
|
|
|
3805
3869
|
}
|
|
3806
3870
|
return a;
|
|
3807
3871
|
};
|
|
3808
|
-
var __spreadProps$
|
|
3872
|
+
var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
|
|
3809
3873
|
var __publicField$f = (obj, key, value) => __defNormalProp$n(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
3810
3874
|
var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
|
|
3811
3875
|
var __async$h = (__this, __arguments, generator) => {
|
|
@@ -3984,7 +4048,7 @@ var NgwMap = (function (exports) {
|
|
|
3984
4048
|
try {
|
|
3985
4049
|
this.emitter.emit("preupdate", filterArgs);
|
|
3986
4050
|
webMap._emitLayerEvent("layer:preupdate", options.id || "", filterArgs);
|
|
3987
|
-
const data = yield getData(filterArgs.filters, __spreadProps$
|
|
4051
|
+
const data = yield getData(filterArgs.filters, __spreadProps$9(__spreadValues$g({}, filterArgs.options), {
|
|
3988
4052
|
srs: this.options.srs
|
|
3989
4053
|
}));
|
|
3990
4054
|
let newData = data;
|
|
@@ -4037,7 +4101,7 @@ var NgwMap = (function (exports) {
|
|
|
4037
4101
|
if (this.clearLayer) {
|
|
4038
4102
|
this.clearLayer();
|
|
4039
4103
|
}
|
|
4040
|
-
const data = yield getData(filters, __spreadProps$
|
|
4104
|
+
const data = yield getData(filters, __spreadProps$9(__spreadValues$g({}, opt), {
|
|
4041
4105
|
srs: this.options.srs
|
|
4042
4106
|
}));
|
|
4043
4107
|
this.setData(data);
|
|
@@ -4227,8 +4291,8 @@ var NgwMap = (function (exports) {
|
|
|
4227
4291
|
}
|
|
4228
4292
|
|
|
4229
4293
|
var __defProp$m = Object.defineProperty;
|
|
4230
|
-
var __defProps$
|
|
4231
|
-
var __getOwnPropDescs$
|
|
4294
|
+
var __defProps$8 = Object.defineProperties;
|
|
4295
|
+
var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
|
|
4232
4296
|
var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
|
|
4233
4297
|
var __hasOwnProp$g = Object.prototype.hasOwnProperty;
|
|
4234
4298
|
var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
|
|
@@ -4244,7 +4308,7 @@ var NgwMap = (function (exports) {
|
|
|
4244
4308
|
}
|
|
4245
4309
|
return a;
|
|
4246
4310
|
};
|
|
4247
|
-
var __spreadProps$
|
|
4311
|
+
var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
|
|
4248
4312
|
var __publicField$e = (obj, key, value) => __defNormalProp$m(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4249
4313
|
var __async$f = (__this, __arguments, generator) => {
|
|
4250
4314
|
return new Promise((resolve, reject) => {
|
|
@@ -4308,7 +4372,7 @@ var NgwMap = (function (exports) {
|
|
|
4308
4372
|
baseUrl: connector.options.baseUrl || ""
|
|
4309
4373
|
});
|
|
4310
4374
|
if (opt) {
|
|
4311
|
-
const layerAdapterOptions = __spreadProps$
|
|
4375
|
+
const layerAdapterOptions = __spreadProps$8(__spreadValues$f(__spreadValues$f({}, opt), layerOptions.adapterOptions), {
|
|
4312
4376
|
params: { resource: resourceId },
|
|
4313
4377
|
layers: opt.layers || String(resourceId),
|
|
4314
4378
|
resourceId
|
|
@@ -4366,8 +4430,8 @@ var NgwMap = (function (exports) {
|
|
|
4366
4430
|
}
|
|
4367
4431
|
|
|
4368
4432
|
var __defProp$l = Object.defineProperty;
|
|
4369
|
-
var __defProps$
|
|
4370
|
-
var __getOwnPropDescs$
|
|
4433
|
+
var __defProps$7 = Object.defineProperties;
|
|
4434
|
+
var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
|
|
4371
4435
|
var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
|
|
4372
4436
|
var __hasOwnProp$f = Object.prototype.hasOwnProperty;
|
|
4373
4437
|
var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
|
|
@@ -4383,7 +4447,7 @@ var NgwMap = (function (exports) {
|
|
|
4383
4447
|
}
|
|
4384
4448
|
return a;
|
|
4385
4449
|
};
|
|
4386
|
-
var __spreadProps$
|
|
4450
|
+
var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
|
|
4387
4451
|
var __async$e = (__this, __arguments, generator) => {
|
|
4388
4452
|
return new Promise((resolve, reject) => {
|
|
4389
4453
|
var fulfilled = (value) => {
|
|
@@ -4431,7 +4495,7 @@ var NgwMap = (function (exports) {
|
|
|
4431
4495
|
const firstStyle = childrenStyles && childrenStyles[0];
|
|
4432
4496
|
if (firstStyle) {
|
|
4433
4497
|
return createAsyncAdapter(
|
|
4434
|
-
__spreadProps$
|
|
4498
|
+
__spreadProps$7(__spreadValues$e({}, layerOptions), { resource: firstStyle.resource.id }),
|
|
4435
4499
|
webMap,
|
|
4436
4500
|
connector
|
|
4437
4501
|
);
|
|
@@ -4454,13 +4518,13 @@ var NgwMap = (function (exports) {
|
|
|
4454
4518
|
}
|
|
4455
4519
|
if (item) {
|
|
4456
4520
|
const cls = item.resource.cls;
|
|
4457
|
-
const layerOptions = __spreadProps$
|
|
4521
|
+
const layerOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4458
4522
|
resource: resourceId
|
|
4459
4523
|
});
|
|
4460
4524
|
const adapterOptions = {
|
|
4461
4525
|
layerOptions,
|
|
4462
|
-
webMap,
|
|
4463
4526
|
connector,
|
|
4527
|
+
webMap,
|
|
4464
4528
|
item
|
|
4465
4529
|
};
|
|
4466
4530
|
if (supportCls.indexOf(cls) !== -1) {
|
|
@@ -4491,10 +4555,10 @@ var NgwMap = (function (exports) {
|
|
|
4491
4555
|
item.resource.parent.id
|
|
4492
4556
|
);
|
|
4493
4557
|
if (parentItem) {
|
|
4494
|
-
const parentOptions = __spreadProps$
|
|
4558
|
+
const parentOptions = __spreadProps$7(__spreadValues$e({}, options), {
|
|
4495
4559
|
resource: item.resource.parent.id
|
|
4496
4560
|
});
|
|
4497
|
-
adapter = createGeoJsonAdapter(__spreadProps$
|
|
4561
|
+
adapter = createGeoJsonAdapter(__spreadProps$7(__spreadValues$e({}, adapterOptions), {
|
|
4498
4562
|
item: parentItem,
|
|
4499
4563
|
layerOptions: parentOptions
|
|
4500
4564
|
}));
|
|
@@ -4583,6 +4647,9 @@ var NgwMap = (function (exports) {
|
|
|
4583
4647
|
if (headers) {
|
|
4584
4648
|
options.headers = headers;
|
|
4585
4649
|
}
|
|
4650
|
+
if (connector.withCredentials !== void 0) {
|
|
4651
|
+
options.withCredentials = connector.withCredentials;
|
|
4652
|
+
}
|
|
4586
4653
|
return createAsyncAdapter(options, webMap, connector);
|
|
4587
4654
|
}
|
|
4588
4655
|
function extendNgwWebmapLayerAdapter(opt) {
|
|
@@ -4620,6 +4687,8 @@ var NgwMap = (function (exports) {
|
|
|
4620
4687
|
}
|
|
4621
4688
|
|
|
4622
4689
|
var __defProp$j = Object.defineProperty;
|
|
4690
|
+
var __defProps$6 = Object.defineProperties;
|
|
4691
|
+
var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
|
|
4623
4692
|
var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
|
|
4624
4693
|
var __hasOwnProp$d = Object.prototype.hasOwnProperty;
|
|
4625
4694
|
var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
|
|
@@ -4635,6 +4704,7 @@ var NgwMap = (function (exports) {
|
|
|
4635
4704
|
}
|
|
4636
4705
|
return a;
|
|
4637
4706
|
};
|
|
4707
|
+
var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
|
|
4638
4708
|
var __publicField$d = (obj, key, value) => __defNormalProp$j(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
4639
4709
|
var __async$d = (__this, __arguments, generator) => {
|
|
4640
4710
|
return new Promise((resolve, reject) => {
|
|
@@ -4740,14 +4810,12 @@ var NgwMap = (function (exports) {
|
|
|
4740
4810
|
getItemOptions(item) {
|
|
4741
4811
|
const transparency = item.item_type === "layer" && item.layer_transparency;
|
|
4742
4812
|
const opacity = typeof transparency === "number" ? (100 - transparency) / 100 : void 0;
|
|
4743
|
-
const options = {
|
|
4813
|
+
const options = __spreadProps$6(__spreadValues$c({
|
|
4744
4814
|
visibility: false,
|
|
4745
|
-
name: item.display_name
|
|
4746
|
-
|
|
4747
|
-
crossOrigin: this.options.crossOrigin,
|
|
4748
|
-
setViewDelay: this.options.setViewDelay,
|
|
4815
|
+
name: item.display_name
|
|
4816
|
+
}, this.options), {
|
|
4749
4817
|
params: { resource: this.item.resourceId, item: this.item }
|
|
4750
|
-
};
|
|
4818
|
+
});
|
|
4751
4819
|
if (this.options.order) {
|
|
4752
4820
|
const subOrder = this.options.drawOrderEnabled && "draw_order_position" in item ? this._rootDescendantsCount - item.draw_order_position : this.id;
|
|
4753
4821
|
const subLevel = String(subOrder).padStart(4, "0");
|
|
@@ -4758,17 +4826,16 @@ var NgwMap = (function (exports) {
|
|
|
4758
4826
|
}
|
|
4759
4827
|
if (item.item_type === "layer") {
|
|
4760
4828
|
const { maxZoom, minZoom } = this._getZoomRange(item);
|
|
4761
|
-
Object.assign(options, {
|
|
4762
|
-
updateWmsParams: item.updateWmsParams
|
|
4829
|
+
Object.assign(options, __spreadProps$6(__spreadValues$c({
|
|
4830
|
+
updateWmsParams: item.updateWmsParams
|
|
4831
|
+
}, this.options), {
|
|
4763
4832
|
url: item.url,
|
|
4764
|
-
headers: this.options.headers,
|
|
4765
|
-
ratio: this.options.ratio,
|
|
4766
4833
|
maxZoom,
|
|
4767
4834
|
minZoom,
|
|
4768
4835
|
minScale: item.layer_min_scale_denom,
|
|
4769
4836
|
maxScale: item.layer_max_scale_denom,
|
|
4770
4837
|
interactive: item.layer_identifiable
|
|
4771
|
-
});
|
|
4838
|
+
}));
|
|
4772
4839
|
}
|
|
4773
4840
|
if (opacity !== void 0) {
|
|
4774
4841
|
options.opacity = opacity;
|
|
@@ -5074,6 +5141,8 @@ var NgwMap = (function (exports) {
|
|
|
5074
5141
|
const WEBMAP_BASELAYER_ID_PREFIX = "webmap-baselayer";
|
|
5075
5142
|
|
|
5076
5143
|
var __defProp$h = Object.defineProperty;
|
|
5144
|
+
var __defProps$5 = Object.defineProperties;
|
|
5145
|
+
var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
|
|
5077
5146
|
var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
|
|
5078
5147
|
var __hasOwnProp$b = Object.prototype.hasOwnProperty;
|
|
5079
5148
|
var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
|
|
@@ -5089,6 +5158,7 @@ var NgwMap = (function (exports) {
|
|
|
5089
5158
|
}
|
|
5090
5159
|
return a;
|
|
5091
5160
|
};
|
|
5161
|
+
var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
|
|
5092
5162
|
var __publicField$b = (obj, key, value) => __defNormalProp$h(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
5093
5163
|
var __async$a = (__this, __arguments, generator) => {
|
|
5094
5164
|
return new Promise((resolve, reject) => {
|
|
@@ -5287,35 +5357,32 @@ var NgwMap = (function (exports) {
|
|
|
5287
5357
|
}
|
|
5288
5358
|
_getWebMapLayerItem() {
|
|
5289
5359
|
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
|
-
}
|
|
5360
|
+
if (!this.resourceId) {
|
|
5361
|
+
return void 0;
|
|
5362
|
+
}
|
|
5363
|
+
const webmap = yield this.getWebMapConfig(this.resourceId);
|
|
5364
|
+
if (!webmap || !webmap.root_item) {
|
|
5365
|
+
return void 0;
|
|
5366
|
+
}
|
|
5367
|
+
return new Promise((resolve) => {
|
|
5368
|
+
const connector = this.options.connector;
|
|
5369
|
+
const headers = (connector == null ? void 0 : connector.options.auth) ? connector.getAuthorizationHeaders() : void 0;
|
|
5370
|
+
const withCredentials = connector.withCredentials;
|
|
5371
|
+
const options = __spreadProps$5(__spreadValues$a({}, this.options), {
|
|
5372
|
+
withCredentials,
|
|
5373
|
+
headers,
|
|
5374
|
+
drawOrderEnabled: webmap.draw_order_enabled
|
|
5375
|
+
});
|
|
5376
|
+
const layer = new this.NgwWebmapItem(
|
|
5377
|
+
this.options.webMap,
|
|
5378
|
+
webmap.root_item,
|
|
5379
|
+
options,
|
|
5380
|
+
connector
|
|
5381
|
+
);
|
|
5382
|
+
layer.emitter.on("init", () => {
|
|
5383
|
+
resolve(layer);
|
|
5384
|
+
});
|
|
5385
|
+
});
|
|
5319
5386
|
});
|
|
5320
5387
|
}
|
|
5321
5388
|
getWebMapConfig(id) {
|
|
@@ -8962,7 +9029,8 @@ var NgwMap = (function (exports) {
|
|
|
8962
9029
|
if (!options.connector) {
|
|
8963
9030
|
options.connector = new NgwConnector({
|
|
8964
9031
|
baseUrl: options.baseUrl || "",
|
|
8965
|
-
auth: options.auth
|
|
9032
|
+
auth: options.auth,
|
|
9033
|
+
withCredentials: options.withCredentials
|
|
8966
9034
|
});
|
|
8967
9035
|
} else if (options.connector) {
|
|
8968
9036
|
options.baseUrl = options.connector.options.baseUrl;
|