@maptalks/vt 0.57.2 → 0.58.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/dist/maptalks.vt.js +227 -230
- package/package.json +3 -3
package/dist/maptalks.vt.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* @maptalks/vt v0.
|
|
2
|
+
* @maptalks/vt v0.58.0
|
|
3
3
|
* LICENSE : undefined
|
|
4
4
|
* (c) 2016-2021 maptalks.org
|
|
5
5
|
*/
|
|
@@ -210,10 +210,10 @@
|
|
|
210
210
|
function _(t) {
|
|
211
211
|
return !C(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
|
|
212
212
|
}
|
|
213
|
-
function
|
|
213
|
+
function S(t) {
|
|
214
214
|
return "number" == typeof t && !isNaN(t);
|
|
215
215
|
}
|
|
216
|
-
function
|
|
216
|
+
function P(t) {
|
|
217
217
|
return !C(t) && ("function" == typeof t || null !== t.constructor && t.constructor === Function);
|
|
218
218
|
}
|
|
219
219
|
function O(t) {
|
|
@@ -269,7 +269,7 @@
|
|
|
269
269
|
}, document.getElementsByTagName("head")[0].appendChild(e), this;
|
|
270
270
|
},
|
|
271
271
|
get: function(t, i, n) {
|
|
272
|
-
if (
|
|
272
|
+
if (P(i)) {
|
|
273
273
|
const t = n;
|
|
274
274
|
n = i, i = t;
|
|
275
275
|
}
|
|
@@ -348,7 +348,7 @@
|
|
|
348
348
|
return i.onreadystatechange = R.u(i, t), i;
|
|
349
349
|
},
|
|
350
350
|
getArrayBuffer(t, i, n) {
|
|
351
|
-
if (
|
|
351
|
+
if (P(i)) {
|
|
352
352
|
const t = n;
|
|
353
353
|
n = i, i = t;
|
|
354
354
|
}
|
|
@@ -647,7 +647,7 @@
|
|
|
647
647
|
return r === o && (r < 0 || r > e) || s === h && (s < 0 || s > e);
|
|
648
648
|
}
|
|
649
649
|
R.getJSON = function(t, i, n) {
|
|
650
|
-
if (
|
|
650
|
+
if (P(i)) {
|
|
651
651
|
const t = n;
|
|
652
652
|
n = i, i = t;
|
|
653
653
|
}
|
|
@@ -842,7 +842,7 @@
|
|
|
842
842
|
const r = gt(e, t, i), s = r[4], o = r[s], h = r[s + 1], a = r[s + 2], l = (h[1] - o[1]) / (h[0] - o[0]), u = (a[1] - h[1]) / (a[0] - h[0]), c = At(o, h), f = At(h, a);
|
|
843
843
|
for (let r = t; r < i; r += 3) {
|
|
844
844
|
const t = r / 3 * 2, i = e[r], s = e[r + 1];
|
|
845
|
-
n[t] =
|
|
845
|
+
n[t] = St(i, s, o, l, c), n[t + 1] = -St(i, s, h, u, f);
|
|
846
846
|
}
|
|
847
847
|
}(i, n, e, r);
|
|
848
848
|
}
|
|
@@ -858,11 +858,11 @@
|
|
|
858
858
|
}();
|
|
859
859
|
}();
|
|
860
860
|
const _t = [];
|
|
861
|
-
function
|
|
861
|
+
function St(t, i, n, e, r) {
|
|
862
862
|
return _t[0] = (e * e * n[0] + e * (i - n[1]) + t) / (e * e + 1), _t[1] = e * (_t[0] - n[0]) + n[1],
|
|
863
863
|
At(n, _t) / r;
|
|
864
864
|
}
|
|
865
|
-
function
|
|
865
|
+
function Pt(t, i, n, e, r) {
|
|
866
866
|
const s = 3 * i[n - 1], o = 3 * i[n - 1] + 1, h = t[s], a = t[o];
|
|
867
867
|
return l = e, u = r, c = h, f = a, Math.sqrt((c - l) * (c - l) + (f - u) * (f - u));
|
|
868
868
|
var l, u, c, f;
|
|
@@ -892,10 +892,10 @@
|
|
|
892
892
|
return this.clone().k(t);
|
|
893
893
|
},
|
|
894
894
|
div: function(t) {
|
|
895
|
-
return this.clone().
|
|
895
|
+
return this.clone().S(t);
|
|
896
896
|
},
|
|
897
897
|
rotate: function(t) {
|
|
898
|
-
return this.clone().
|
|
898
|
+
return this.clone().P(t);
|
|
899
899
|
},
|
|
900
900
|
rotateAround: function(t, i) {
|
|
901
901
|
return this.clone().O(t, i);
|
|
@@ -950,7 +950,7 @@
|
|
|
950
950
|
k: function(t) {
|
|
951
951
|
return this.x *= t, this.y *= t, this;
|
|
952
952
|
},
|
|
953
|
-
|
|
953
|
+
S: function(t) {
|
|
954
954
|
return this.x /= t, this.y /= t, this;
|
|
955
955
|
},
|
|
956
956
|
F: function(t) {
|
|
@@ -960,13 +960,13 @@
|
|
|
960
960
|
return this.x /= t.x, this.y /= t.y, this;
|
|
961
961
|
},
|
|
962
962
|
I: function() {
|
|
963
|
-
return this.
|
|
963
|
+
return this.S(this.mag()), this;
|
|
964
964
|
},
|
|
965
965
|
T: function() {
|
|
966
966
|
var t = this.y;
|
|
967
967
|
return this.y = this.x, this.x = -t, this;
|
|
968
968
|
},
|
|
969
|
-
|
|
969
|
+
P: function(t) {
|
|
970
970
|
var i = Math.cos(t), n = Math.sin(t), e = i * this.x - n * this.y, r = n * this.x + i * this.y;
|
|
971
971
|
return this.x = e, this.y = r, this;
|
|
972
972
|
},
|
|
@@ -1693,16 +1693,16 @@
|
|
|
1693
1693
|
};
|
|
1694
1694
|
}
|
|
1695
1695
|
const bi = /\{([\w_]+)\}/g;
|
|
1696
|
-
const Mi = t => t >= 128 && t <= 255, xi = t => t >= 1536 && t <= 1791, Fi = t => t >= 1872 && t <= 1919, Ai = t => t >= 2208 && t <= 2303, ki = t => t >= 4352 && t <= 4607, _i = t => t >= 5120 && t <= 5759,
|
|
1696
|
+
const Mi = t => t >= 128 && t <= 255, xi = t => t >= 1536 && t <= 1791, Fi = t => t >= 1872 && t <= 1919, Ai = t => t >= 2208 && t <= 2303, ki = t => t >= 4352 && t <= 4607, _i = t => t >= 5120 && t <= 5759, Si = t => t >= 6320 && t <= 6399, Pi = t => t >= 8192 && t <= 8303, Oi = t => t >= 8448 && t <= 8527, Ci = t => t >= 8528 && t <= 8591, Ii = t => t >= 8960 && t <= 9215, Ti = t => t >= 9216 && t <= 9279, Di = t => t >= 9280 && t <= 9311, Li = t => t >= 9312 && t <= 9471, Ui = t => t >= 9632 && t <= 9727, Ei = t => t >= 9728 && t <= 9983, ji = t => t >= 11008 && t <= 11263, Ri = t => t >= 11904 && t <= 12031, Ni = t => t >= 12032 && t <= 12255, zi = t => t >= 12272 && t <= 12287, Wi = t => t >= 12288 && t <= 12351, Hi = t => t >= 12352 && t <= 12447, Vi = t => t >= 12448 && t <= 12543, $i = t => t >= 12544 && t <= 12591, Gi = t => t >= 12592 && t <= 12687, Ji = t => t >= 12688 && t <= 12703, qi = t => t >= 12704 && t <= 12735, Bi = t => t >= 12736 && t <= 12783, Xi = t => t >= 12784 && t <= 12799, Zi = t => t >= 12800 && t <= 13055, Yi = t => t >= 13056 && t <= 13311, Ki = t => t >= 13312 && t <= 19903, Qi = t => t >= 19904 && t <= 19967, tn = t => t >= 19968 && t <= 40959, nn = t => t >= 40960 && t <= 42127, en = t => t >= 42128 && t <= 42191, rn = t => t >= 43360 && t <= 43391, sn = t => t >= 44032 && t <= 55215, on = t => t >= 55216 && t <= 55295, hn = t => t >= 57344 && t <= 63743, an = t => t >= 63744 && t <= 64255, ln = t => t >= 64336 && t <= 65023, un = t => t >= 65040 && t <= 65055, cn = t => t >= 65072 && t <= 65103, fn = t => t >= 65104 && t <= 65135, dn = t => t >= 65136 && t <= 65279, yn = t => t >= 65280 && t <= 65519;
|
|
1697
1697
|
function pn(t) {
|
|
1698
1698
|
return !xi(t) && (!Fi(t) && (!Ai(t) && (!ln(t) && !dn(t))));
|
|
1699
1699
|
}
|
|
1700
1700
|
function mn(t) {
|
|
1701
|
-
return 746 === t || 747 === t || !(t < 4352) && (!!qi(t) || (!!$i(t) || (!(!cn(t) || t >= 65097 && t <= 65103) || (!!an(t) || (!!Yi(t) || (!!Ri(t) || (!!Bi(t) || (!(!Wi(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!Ki(t) || (!!tn(t) || (!!Zi(t) || (!!Gi(t) || (!!rn(t) || (!!on(t) || (!!ki(t) || (!!sn(t) || (!!Hi(t) || (!!zi(t) || (!!Ji(t) || (!!Ni(t) || (!!Xi(t) || (!(!Vi(t) || 12540 === t) || (!(!yn(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!fn(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!_i(t) || (!!
|
|
1701
|
+
return 746 === t || 747 === t || !(t < 4352) && (!!qi(t) || (!!$i(t) || (!(!cn(t) || t >= 65097 && t <= 65103) || (!!an(t) || (!!Yi(t) || (!!Ri(t) || (!!Bi(t) || (!(!Wi(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!Ki(t) || (!!tn(t) || (!!Zi(t) || (!!Gi(t) || (!!rn(t) || (!!on(t) || (!!ki(t) || (!!sn(t) || (!!Hi(t) || (!!zi(t) || (!!Ji(t) || (!!Ni(t) || (!!Xi(t) || (!(!Vi(t) || 12540 === t) || (!(!yn(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!fn(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!_i(t) || (!!Si(t) || (!!un(t) || (!!Qi(t) || (!!nn(t) || !!en(t))))))))))))))))))))))))))))));
|
|
1702
1702
|
}
|
|
1703
1703
|
function vn(t) {
|
|
1704
1704
|
return !(mn(t) || function(t) {
|
|
1705
|
-
return !(!Mi(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!
|
|
1705
|
+
return !(!Mi(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!Pi(t) || 8214 !== t && 8224 !== t && 8225 !== t && 8240 !== t && 8241 !== t && 8251 !== t && 8252 !== t && 8258 !== t && 8263 !== t && 8264 !== t && 8265 !== t && 8273 !== t) || (!!Oi(t) || (!!Ci(t) || (!(!Ii(t) || !(t >= 8960 && t <= 8967 || t >= 8972 && t <= 8991 || t >= 8996 && t <= 9e3 || 9003 === t || t >= 9085 && t <= 9114 || t >= 9150 && t <= 9165 || 9167 === t || t >= 9169 && t <= 9179 || t >= 9186 && t <= 9215)) || (!(!Ti(t) || 9251 === t) || (!!Di(t) || (!!Li(t) || (!!Ui(t) || (!(!Ei(t) || t >= 9754 && t <= 9759) || (!(!ji(t) || !(t >= 11026 && t <= 11055 || t >= 11088 && t <= 11097 || t >= 11192 && t <= 11243)) || (!!Wi(t) || (!!Vi(t) || (!!hn(t) || (!!cn(t) || (!!fn(t) || (!!yn(t) || (8734 === t || 8756 === t || 8757 === t || t >= 9984 && t <= 10087 || t >= 10102 && t <= 10131 || 65532 === t || 65533 === t)))))))))))))))));
|
|
1706
1706
|
}(t));
|
|
1707
1707
|
}
|
|
1708
1708
|
function gn(t) {
|
|
@@ -1842,7 +1842,7 @@
|
|
|
1842
1842
|
let o = 0;
|
|
1843
1843
|
for (let n = 0; n < t.length; n++) {
|
|
1844
1844
|
const a = t.charCodeAt(n), l = e[a];
|
|
1845
|
-
l && !kn[a] && (o += l.metrics.advance + i), n < t.length - 1 && (_n[a] || !((h = a) < 11904) && (qi(h) || $i(h) || cn(h) || an(h) || Yi(h) || Ri(h) || Bi(h) || Wi(h) || Ki(h) || tn(h) || Zi(h) || yn(h) || Hi(h) || zi(h) || Ni(h) || Xi(h) || Vi(h) || un(h) || en(h) || nn(h))) && r.push(On(n + 1, o, s, r,
|
|
1845
|
+
l && !kn[a] && (o += l.metrics.advance + i), n < t.length - 1 && (_n[a] || !((h = a) < 11904) && (qi(h) || $i(h) || cn(h) || an(h) || Yi(h) || Ri(h) || Bi(h) || Wi(h) || Ki(h) || tn(h) || Zi(h) || yn(h) || Hi(h) || zi(h) || Ni(h) || Xi(h) || Vi(h) || un(h) || en(h) || nn(h))) && r.push(On(n + 1, o, s, r, Pn(a, t.charCodeAt(n + 1)), !1));
|
|
1846
1846
|
}
|
|
1847
1847
|
var h;
|
|
1848
1848
|
return function t(i) {
|
|
@@ -1912,19 +1912,19 @@
|
|
|
1912
1912
|
8211: !0,
|
|
1913
1913
|
8231: !0
|
|
1914
1914
|
};
|
|
1915
|
-
function
|
|
1915
|
+
function Sn(t, i, n, e) {
|
|
1916
1916
|
const r = Math.pow(t - i, 2);
|
|
1917
1917
|
return e ? t < i ? r / 2 : 2 * r : r + Math.abs(n) * n;
|
|
1918
1918
|
}
|
|
1919
|
-
function
|
|
1919
|
+
function Pn(t, i) {
|
|
1920
1920
|
let n = 0;
|
|
1921
1921
|
return 10 === t && (n -= 1e4), 40 !== t && 65288 !== t || (n += 50), 41 !== i && 65289 !== i || (n += 50),
|
|
1922
1922
|
n;
|
|
1923
1923
|
}
|
|
1924
1924
|
function On(t, i, n, e, r, s) {
|
|
1925
|
-
let o = null, h =
|
|
1925
|
+
let o = null, h = Sn(i, n, r, s);
|
|
1926
1926
|
for (let t = 0; t < e.length; t++) {
|
|
1927
|
-
const a = e[t], l =
|
|
1927
|
+
const a = e[t], l = Sn(i - a.x, n, r, s) + a.badness;
|
|
1928
1928
|
l <= h && (o = a, h = l);
|
|
1929
1929
|
}
|
|
1930
1930
|
return {
|
|
@@ -2989,23 +2989,23 @@
|
|
|
2989
2989
|
e = Ae(xe[i[r].parent][r], e), r = i[r].parent;
|
|
2990
2990
|
return e.conversion = n, e;
|
|
2991
2991
|
}
|
|
2992
|
-
var _e = ye.exports,
|
|
2992
|
+
var _e = ye.exports, Se = function(t) {
|
|
2993
2993
|
for (var i = Fe(t), n = {}, e = Object.keys(i), r = e.length, s = 0; s < r; s++) {
|
|
2994
2994
|
var o = e[s];
|
|
2995
2995
|
null !== i[o].parent && (n[o] = ke(o, i));
|
|
2996
2996
|
}
|
|
2997
2997
|
return n;
|
|
2998
|
-
},
|
|
2998
|
+
}, Pe = {};
|
|
2999
2999
|
Object.keys(_e).forEach((function(t) {
|
|
3000
|
-
|
|
3000
|
+
Pe[t] = {}, Object.defineProperty(Pe[t], "channels", {
|
|
3001
3001
|
value: _e[t].channels
|
|
3002
|
-
}), Object.defineProperty(
|
|
3002
|
+
}), Object.defineProperty(Pe[t], "labels", {
|
|
3003
3003
|
value: _e[t].labels
|
|
3004
3004
|
});
|
|
3005
|
-
var i =
|
|
3005
|
+
var i = Se(t);
|
|
3006
3006
|
Object.keys(i).forEach((function(n) {
|
|
3007
3007
|
var e = i[n];
|
|
3008
|
-
|
|
3008
|
+
Pe[t][n] = function(t) {
|
|
3009
3009
|
var i = function(i) {
|
|
3010
3010
|
if (null == i) return i;
|
|
3011
3011
|
arguments.length > 1 && (i = Array.prototype.slice.call(arguments));
|
|
@@ -3014,7 +3014,7 @@
|
|
|
3014
3014
|
return n;
|
|
3015
3015
|
};
|
|
3016
3016
|
return "conversion" in t && (i.conversion = t.conversion), i;
|
|
3017
|
-
}(e),
|
|
3017
|
+
}(e), Pe[t][n].raw = function(t) {
|
|
3018
3018
|
var i = function(i) {
|
|
3019
3019
|
return null == i ? i : (arguments.length > 1 && (i = Array.prototype.slice.call(arguments)),
|
|
3020
3020
|
t(i));
|
|
@@ -3023,7 +3023,7 @@
|
|
|
3023
3023
|
}(e);
|
|
3024
3024
|
}));
|
|
3025
3025
|
}));
|
|
3026
|
-
var Oe =
|
|
3026
|
+
var Oe = Pe, Ce = te.exports, Ie = Oe, Te = [].slice, De = [ "keyword", "gray", "hex" ], Le = {};
|
|
3027
3027
|
Object.keys(Ie).forEach((function(t) {
|
|
3028
3028
|
Le[Te.call(Ie[t].labels).sort().join("")] = t;
|
|
3029
3029
|
}));
|
|
@@ -3281,35 +3281,34 @@
|
|
|
3281
3281
|
const Ve = 14;
|
|
3282
3282
|
class $e extends gi {
|
|
3283
3283
|
static needMerge(t) {
|
|
3284
|
-
|
|
3285
|
-
return !(!t.mergeOnProperty || !n && !e && "line" !== t.textPlacement && "line" !== t.markerPlacement);
|
|
3284
|
+
return t.mergeOnProperty && ("line" === t.textPlacement || "line" === t.markerPlacement);
|
|
3286
3285
|
}
|
|
3287
3286
|
static mergeLineFeatures(t, i, n) {
|
|
3288
3287
|
const e = function(t, i, n) {
|
|
3289
|
-
const e = gi.genFnTypes(i), {
|
|
3290
|
-
if (!i.mergeOnProperty ||
|
|
3291
|
-
if (!(
|
|
3288
|
+
const e = gi.genFnTypes(i), {mergeOnPropertyFn: r} = e;
|
|
3289
|
+
if (!i.mergeOnProperty || "line" !== i.textPlacement && "line" !== i.markerPlacement) return [];
|
|
3290
|
+
if (!(s = i.mergeOnProperty, yi(s) || "string" != typeof s && (null === s.constructor || s.constructor !== String) || "line" !== i.textPlacement && "line" !== i.markerPlacement)) return [ {
|
|
3292
3291
|
features: t,
|
|
3293
3292
|
property: i.mergeOnProperty
|
|
3294
3293
|
} ];
|
|
3295
|
-
var
|
|
3296
|
-
const
|
|
3294
|
+
var s;
|
|
3295
|
+
const o = [], h = {}, a = [];
|
|
3297
3296
|
for (let e = 0; e < t.length; e++) {
|
|
3298
3297
|
t[e].__index = e;
|
|
3299
|
-
const
|
|
3300
|
-
|
|
3301
|
-
let
|
|
3302
|
-
"line" !==
|
|
3303
|
-
const
|
|
3304
|
-
"line" !==
|
|
3298
|
+
const s = t[e].properties = t[e].properties || {};
|
|
3299
|
+
s.$layer = t[e].layer, s.$type = t[e].type;
|
|
3300
|
+
let l = i.markerPlacement;
|
|
3301
|
+
"line" !== l && (l = i.textPlacement);
|
|
3302
|
+
const u = r ? r(n, s) : i.mergeOnProperty;
|
|
3303
|
+
"line" !== l || yi(u) ? a.push(t[e]) : (void 0 === h[u] && (h[u] = o.length, o.push({
|
|
3305
3304
|
features: [],
|
|
3306
|
-
property:
|
|
3307
|
-
})),
|
|
3305
|
+
property: u
|
|
3306
|
+
})), o[h[u]].features.push(t[e]));
|
|
3308
3307
|
}
|
|
3309
|
-
|
|
3310
|
-
features:
|
|
3308
|
+
a.length && o.push({
|
|
3309
|
+
features: a
|
|
3311
3310
|
});
|
|
3312
|
-
return
|
|
3311
|
+
return o;
|
|
3313
3312
|
}(t, i, n);
|
|
3314
3313
|
if (e.length) {
|
|
3315
3314
|
const i = [];
|
|
@@ -3527,7 +3526,7 @@
|
|
|
3527
3526
|
if (mn(t.charAt(n).charCodeAt(0))) i = 0; else if (i++, i >= 1) return !1;
|
|
3528
3527
|
}
|
|
3529
3528
|
return !0;
|
|
3530
|
-
}(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: w, textRotationAlignmentFn: b, textRotationFn: M, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn:
|
|
3529
|
+
}(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: w, textRotationAlignmentFn: b, textRotationFn: M, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: S, markerDyFn: P, markerPitchAlignmentFn: O, markerRotationAlignmentFn: C, markerRotationFn: I, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
|
|
3531
3530
|
let U, E, j, R, N, z, W, H, V, $, G, J, q, B, X, Z, Y;
|
|
3532
3531
|
if (l) {
|
|
3533
3532
|
const i = t.getIconAndGlyph().glyph.font;
|
|
@@ -3593,7 +3592,7 @@
|
|
|
3593
3592
|
writingMode: void 0,
|
|
3594
3593
|
glyphOffset: [ 0, 0 ]
|
|
3595
3594
|
} ];
|
|
3596
|
-
}(), k && (V = k(null, h)), _ && ($ = _(null, h)),
|
|
3595
|
+
}(), k && (V = k(null, h)), _ && ($ = _(null, h)), S && (G = S(null, h)), P && (J = P(null, h)),
|
|
3597
3596
|
O && (q = +("map" === O(null, h))), C && (B = +("map" === C(null, h))), I && (X = pi(I(null, h), 0, 360) * Math.PI / 180);
|
|
3598
3597
|
const K = T || x;
|
|
3599
3598
|
K && (Z = K(null, h) || 0);
|
|
@@ -3632,14 +3631,14 @@
|
|
|
3632
3631
|
}
|
|
3633
3632
|
}
|
|
3634
3633
|
K(t, i, n, e, r, s, o, h, a, l, u, c, f, d, y, p, m, v) {
|
|
3635
|
-
const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn:
|
|
3634
|
+
const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: S, textAllowOverlapFn: P, textIgnorePlacementFn: O, textOpacityFn: C, markerWidthFn: I, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: U, markerRotationAlignmentFn: E, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
|
|
3636
3635
|
g && t.aTextFill.push(...i), w && t.aTextSize.push(n), b && t.aTextHaloFill.push(...e),
|
|
3637
3636
|
M && t.aTextHaloRadius.push(r), x && t.aTextHaloOpacity.push(s), F && t.aTextDx.push(o),
|
|
3638
3637
|
A && t.aTextDy.push(h), I && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l),
|
|
3639
3638
|
D && t.aMarkerDx.push(u), L && t.aMarkerDy.push(c);
|
|
3640
3639
|
(z || C) && t.aColorOpacity.push(f), (k || U) && t.aPitchAlign.push(d), (E || _) && t.aRotationAlign.push(y),
|
|
3641
|
-
(j ||
|
|
3642
|
-
const W = R ||
|
|
3640
|
+
(j || S) && t.aRotation.push(9362 * p);
|
|
3641
|
+
const W = R || P, H = N || O;
|
|
3643
3642
|
if (W || H) {
|
|
3644
3643
|
const i = (W ? 8 : 0) + 4 * m, n = (H ? 2 : 0) + v;
|
|
3645
3644
|
t.aOverlap.push(i + n);
|
|
@@ -3647,7 +3646,7 @@
|
|
|
3647
3646
|
r > 0 && (this.properties.hasHalo = 1);
|
|
3648
3647
|
}
|
|
3649
3648
|
X(t, i, n) {
|
|
3650
|
-
const {feature: e, symbol: r} = t, s = this.tt(r
|
|
3649
|
+
const {feature: e, symbol: r} = t, s = this.tt(r), o = e.properties, {markerSpacingFn: h, textSpacingFn: a} = this.j, l = ((h ? h(null, o) : r.markerSpacing) || (a ? a(null, o) : r.textSpacing) || 250) * n, u = this.options.EXTENT;
|
|
3651
3650
|
return function(t, i, n, e, r, s, o) {
|
|
3652
3651
|
const {feature: h, size: a, symbol: l} = t, u = a ? 24 : 0, c = e * (a ? a[0] / u : 1), f = [];
|
|
3653
3652
|
if ("line" === s) {
|
|
@@ -3677,10 +3676,8 @@
|
|
|
3677
3676
|
return f;
|
|
3678
3677
|
}(t, this.lineVertex, i, n, u, s, l);
|
|
3679
3678
|
}
|
|
3680
|
-
tt(t
|
|
3681
|
-
|
|
3682
|
-
let s;
|
|
3683
|
-
return n && (s = n(null, r)), !s && e && (s = e(null, r)), s || t.markerPlacement || t.textPlacement;
|
|
3679
|
+
tt(t) {
|
|
3680
|
+
return t.markerPlacement || t.textPlacement;
|
|
3684
3681
|
}
|
|
3685
3682
|
}
|
|
3686
3683
|
const Ge = Math.cos(Math.PI / 180 * 37.5), Je = Math.pow(2, 16) / 1;
|
|
@@ -4408,10 +4405,10 @@
|
|
|
4408
4405
|
return !1;
|
|
4409
4406
|
}
|
|
4410
4407
|
}
|
|
4411
|
-
var
|
|
4408
|
+
var Sr = {
|
|
4412
4409
|
exports: {}
|
|
4413
4410
|
};
|
|
4414
|
-
function
|
|
4411
|
+
function Pr(t, i, n) {
|
|
4415
4412
|
n = n || 2;
|
|
4416
4413
|
var e, r, s, o, h, a, l, u = i && i.length, c = u ? i[0] * n : t.length, f = Or(t, 0, c, n, !0), d = [];
|
|
4417
4414
|
if (!f || f.next === f.prev) return d;
|
|
@@ -4633,7 +4630,7 @@
|
|
|
4633
4630
|
o = s;
|
|
4634
4631
|
return r;
|
|
4635
4632
|
}
|
|
4636
|
-
|
|
4633
|
+
Sr.exports = Pr, Sr.exports.default = Pr, Pr.deviation = function(t, i, n, e) {
|
|
4637
4634
|
var r = i && i.length, s = r ? i[0] * n : t.length, o = Math.abs(Qr(t, 0, s, n));
|
|
4638
4635
|
if (r) for (var h = 0, a = i.length; h < a; h++) {
|
|
4639
4636
|
var l = i[h] * n, u = h < a - 1 ? i[h + 1] * n : t.length;
|
|
@@ -4645,7 +4642,7 @@
|
|
|
4645
4642
|
c += Math.abs((t[f] - t[y]) * (t[d + 1] - t[f + 1]) - (t[f] - t[d]) * (t[y + 1] - t[f + 1]));
|
|
4646
4643
|
}
|
|
4647
4644
|
return 0 === o && 0 === c ? 0 : Math.abs((c - o) / o);
|
|
4648
|
-
},
|
|
4645
|
+
}, Pr.flatten = function(t) {
|
|
4649
4646
|
for (var i = t[0][0].length, n = {
|
|
4650
4647
|
vertices: [],
|
|
4651
4648
|
holes: [],
|
|
@@ -4656,7 +4653,7 @@
|
|
|
4656
4653
|
}
|
|
4657
4654
|
return n;
|
|
4658
4655
|
};
|
|
4659
|
-
var ts =
|
|
4656
|
+
var ts = Sr.exports;
|
|
4660
4657
|
/*!
|
|
4661
4658
|
* from @turf/bboxClip
|
|
4662
4659
|
* https://github.com/Turfjs/turf
|
|
@@ -4838,7 +4835,7 @@
|
|
|
4838
4835
|
l = u - c);
|
|
4839
4836
|
let M = f;
|
|
4840
4837
|
const x = y % 6;
|
|
4841
|
-
0 === t ? (5 === x && (d =
|
|
4838
|
+
0 === t ? (5 === x && (d = Pt(n, e, y, g, w)), M = 2 === x || 3 === x || 4 === x ? f : f + d) : 1 === t && (2 === x || 3 === x || 4 === x ? M = 0 : 5 === x ? (d = Pt(n, e, y, g, w),
|
|
4842
4839
|
M = d) : M = d);
|
|
4843
4840
|
const F = M * o * h / r, A = b === u ? 0 : l * a / s;
|
|
4844
4841
|
i[p / 3 * 2] = F, i[p / 3 * 2 + 1] = -A, 0 === x && (f += d);
|
|
@@ -4848,7 +4845,7 @@
|
|
|
4848
4845
|
function us(t, i, n, e, r, s, o, h, a, l) {
|
|
4849
4846
|
void 0 === i.top && (i.top = !0), void 0 === i.side && (i.side = !0);
|
|
4850
4847
|
const {altitudeScale: u, altitudeProperty: c, defaultAltitude: f, heightProperty: d, minHeightProperty: y, defaultHeight: p, tangent: m, uv: v, uvScale: g, topUVMode: M, sideUVMode: x, top: F, side: A, topThickness: k} = i, _ = function(t, i, {altitudeScale: n, altitudeProperty: e, defaultAltitude: r, heightProperty: s, minHeightProperty: o, defaultHeight: h}, {side: a, top: l, topThickness: u, uvOrigin: c, uv: f, uvSize: d, topUVMode: y, sideUVMode: p, glScale: m, localScale: v, vScale: g}, w) {
|
|
4851
|
-
const b = i / t[0].extent, M = [], x = [], F = [], A = [], k = [], _ = [],
|
|
4848
|
+
const b = i / t[0].extent, M = [], x = [], F = [], A = [], k = [], _ = [], P = !!f, O = !!l, C = !!a, T = P ? [] : null;
|
|
4852
4849
|
function U(t, n, e, r) {
|
|
4853
4850
|
if (O) {
|
|
4854
4851
|
const r = ts(A, e, 3);
|
|
@@ -4857,9 +4854,9 @@
|
|
|
4857
4854
|
I(k, A), n += A.length;
|
|
4858
4855
|
for (let i = 2, n = r.length; i < n; i += 3) s = r[i - 1], r[i - 1] = r[i] + t / 3,
|
|
4859
4856
|
r[i] = s + t / 3, r[i - 2] += t / 3;
|
|
4860
|
-
I(_, r),
|
|
4857
|
+
I(_, r), P && kt(y || 0, t, n, T, k, 0, m, v, d[0], d[1]), u > 0 && !C && (n = as(k, A, e, _, n, 0, u, i, P, p || 0, T, d, m, v, g));
|
|
4861
4858
|
}
|
|
4862
|
-
return C && (O && (u = 0), n = as(k, A, e, _, n, u, r, i,
|
|
4859
|
+
return C && (O && (u = 0), n = as(k, A, e, _, n, u, r, i, P, p || 0, T, d, m, v, g)),
|
|
4863
4860
|
n;
|
|
4864
4861
|
}
|
|
4865
4862
|
let E = 0, j = 0;
|
|
@@ -4869,7 +4866,7 @@
|
|
|
4869
4866
|
let W = 0, H = !1;
|
|
4870
4867
|
for (;N < z; N++) {
|
|
4871
4868
|
const a = t[N], l = a.id;
|
|
4872
|
-
|
|
4869
|
+
S(l) && (Math.abs(l) > W && (W = Math.abs(l)), l < 0 && (H = !0));
|
|
4873
4870
|
const u = a.geometry, {altitude: c, height: f} = fi(a, n, e, r, s, h, o);
|
|
4874
4871
|
E = Math.max(Math.abs(c), E);
|
|
4875
4872
|
const d = k.length;
|
|
@@ -4888,7 +4885,7 @@
|
|
|
4888
4885
|
e && p.push(A.length / 3), ft(A, A.length, r, b, c), t === n - 1 && (j = U(y, j, p, f * b));
|
|
4889
4886
|
}
|
|
4890
4887
|
const m = k.length - d, v = "__fea_idx".trim();
|
|
4891
|
-
for (let t = 0; t < m / 3; t++) x.push(void 0 === a[v] ? N : a[v]), M.push(N),
|
|
4888
|
+
for (let t = 0; t < m / 3; t++) x.push(void 0 === a[v] ? N : a[v]), M.push(N), S(l) && F.push(l);
|
|
4892
4889
|
}
|
|
4893
4890
|
const V = D(x.length ? x[x.length - 1] : 0), $ = {
|
|
4894
4891
|
maxAltitude: E,
|
|
@@ -4921,8 +4918,8 @@
|
|
|
4921
4918
|
glScale: r,
|
|
4922
4919
|
localScale: o,
|
|
4923
4920
|
vScale: s
|
|
4924
|
-
}, l),
|
|
4925
|
-
delete _.indices,
|
|
4921
|
+
}, l), P = [], O = new (T(_.vertices.length / 3))(_.indices);
|
|
4922
|
+
delete _.indices, P.push(O.buffer, _.vertices.buffer, _.pickingIds.buffer);
|
|
4926
4923
|
const C = wr(_.vertices, O);
|
|
4927
4924
|
let U = !0;
|
|
4928
4925
|
for (let t = 0; t < C.length; t++) C[t] = -C[t], C[t] % 1 != 0 && (U = !1);
|
|
@@ -4959,12 +4956,12 @@
|
|
|
4959
4956
|
gr(s, r, e), xt(n.subarray(o, o + 4), s);
|
|
4960
4957
|
}
|
|
4961
4958
|
return n;
|
|
4962
|
-
}(_.normals, t), _.tangents = t,
|
|
4959
|
+
}(_.normals, t), _.tangents = t, P.push(t.buffer), delete _.normals;
|
|
4963
4960
|
}
|
|
4964
4961
|
if (_.normals && (_.normals = U ? new Int8Array(_.normals) : new Float32Array(_.normals),
|
|
4965
|
-
|
|
4962
|
+
P.push(_.normals.buffer)), _.uvs) {
|
|
4966
4963
|
const t = _.uvs;
|
|
4967
|
-
_.uvs = new Float32Array(t),
|
|
4964
|
+
_.uvs = new Float32Array(t), P.push(_.uvs.buffer);
|
|
4968
4965
|
}
|
|
4969
4966
|
const j = function(t, i, n, e) {
|
|
4970
4967
|
const r = {};
|
|
@@ -5008,9 +5005,9 @@
|
|
|
5008
5005
|
maxAltitude: _.maxAltitude
|
|
5009
5006
|
}
|
|
5010
5007
|
},
|
|
5011
|
-
buffers:
|
|
5008
|
+
buffers: P
|
|
5012
5009
|
};
|
|
5013
|
-
return _.featureIds.length ? (R.data.featureIds = _.featureIds,
|
|
5010
|
+
return _.featureIds.length ? (R.data.featureIds = _.featureIds, P.push(R.data.featureIds.buffer)) : R.data.featureIds = [],
|
|
5014
5011
|
j.aColor && (R.data.data.aColor = j.aColor, R.buffers.push(j.aColor.buffer)), j.aOpacity && (R.data.data.aOpacity = j.aOpacity,
|
|
5015
5012
|
R.buffers.push(j.aOpacity.buffer)), R;
|
|
5016
5013
|
}
|
|
@@ -5020,7 +5017,7 @@
|
|
|
5020
5017
|
let n = 0;
|
|
5021
5018
|
for (let e = 0, r = t.length; e < r; e++) {
|
|
5022
5019
|
const r = t[e];
|
|
5023
|
-
if (
|
|
5020
|
+
if (S(r.geometry[0][0])) {
|
|
5024
5021
|
const t = 3 * r.geometry.length;
|
|
5025
5022
|
n += i ? 2 * t - 6 : t;
|
|
5026
5023
|
} else for (let t = 0, e = r.geometry.length; t < e; t++) {
|
|
@@ -5424,7 +5421,7 @@
|
|
|
5424
5421
|
const i = {};
|
|
5425
5422
|
for (const n in t) {
|
|
5426
5423
|
const e = t[n];
|
|
5427
|
-
_(e) ? i[n] = "string" :
|
|
5424
|
+
_(e) ? i[n] = "string" : S(e) ? i[n] = "number" : !0 === e || !1 === e ? i[n] = "boolean" : Array.isArray(e) ? i[n] = "array" : i[n] = "object";
|
|
5428
5425
|
}
|
|
5429
5426
|
return i;
|
|
5430
5427
|
}
|
|
@@ -5506,7 +5503,10 @@
|
|
|
5506
5503
|
indexMaxPoints: 1e5
|
|
5507
5504
|
};
|
|
5508
5505
|
if (_(t) && "{" != t.substring(0, 1) || t.url) R.getJSON(t.url ? t.url : t, t.url ? t : {}, (t, e) => {
|
|
5509
|
-
t && i(t)
|
|
5506
|
+
if (t && i(t), !e) return void i(null, {
|
|
5507
|
+
extent: null,
|
|
5508
|
+
idMap: {}
|
|
5509
|
+
});
|
|
5510
5510
|
const r = e, {first1000: s, idMap: o} = this.xt(r);
|
|
5511
5511
|
this.index = lt(e, this.options.geojsonvt || n);
|
|
5512
5512
|
const h = s.length ? xs({
|
|
@@ -5535,8 +5535,8 @@
|
|
|
5535
5535
|
const i = [], n = {};
|
|
5536
5536
|
let e = 0;
|
|
5537
5537
|
function r(t) {
|
|
5538
|
-
t && (
|
|
5539
|
-
n[t.id].geometry.coordinates = null) : t.coordinates && (n[t.id].coordinates = null),
|
|
5538
|
+
t && ("Feature" !== t.type || t.geometry) && (void 0 !== t.id && null !== t.id || (t.id = e++),
|
|
5539
|
+
n[t.id] = k({}, t), t.geometry ? (n[t.id].geometry = k({}, t.geometry), n[t.id].geometry.coordinates = null) : t.coordinates && (n[t.id].coordinates = null),
|
|
5540
5540
|
i.length < 1e3 && i.push(t));
|
|
5541
5541
|
}
|
|
5542
5542
|
return Array.isArray(t) ? t.forEach(t => {
|
|
@@ -5607,15 +5607,15 @@
|
|
|
5607
5607
|
for (o = o << r | h, l += r; l > 0; t[n + d] = 255 & o, d += y, o /= 256, l -= 8) ;
|
|
5608
5608
|
t[n + d - y] |= 128 * p;
|
|
5609
5609
|
}
|
|
5610
|
-
}, ks =
|
|
5611
|
-
function
|
|
5610
|
+
}, ks = Ss, _s = As;
|
|
5611
|
+
function Ss(t) {
|
|
5612
5612
|
this.buf = ArrayBuffer.isView && ArrayBuffer.isView(t) ? t : new Uint8Array(t || 0),
|
|
5613
5613
|
this.pos = 0, this.type = 0, this.length = this.buf.length;
|
|
5614
5614
|
}
|
|
5615
|
-
|
|
5616
|
-
var
|
|
5615
|
+
Ss.Varint = 0, Ss.Fixed64 = 1, Ss.Bytes = 2, Ss.Fixed32 = 5;
|
|
5616
|
+
var Ps = "undefined" == typeof TextDecoder ? null : new TextDecoder("utf8");
|
|
5617
5617
|
function Os(t) {
|
|
5618
|
-
return t.type ===
|
|
5618
|
+
return t.type === Ss.Bytes ? t.readVarint() + t.pos : t.pos + 1;
|
|
5619
5619
|
}
|
|
5620
5620
|
function Cs(t, i, n) {
|
|
5621
5621
|
return n ? 4294967296 * i + (t >>> 0) : 4294967296 * (i >>> 0) + (t >>> 0);
|
|
@@ -5661,7 +5661,7 @@
|
|
|
5661
5661
|
function Vs(t, i) {
|
|
5662
5662
|
return (t[i] | t[i + 1] << 8 | t[i + 2] << 16) + (t[i + 3] << 24);
|
|
5663
5663
|
}
|
|
5664
|
-
|
|
5664
|
+
Ss.prototype = {
|
|
5665
5665
|
destroy: function() {
|
|
5666
5666
|
this.buf = null;
|
|
5667
5667
|
},
|
|
@@ -5726,8 +5726,8 @@
|
|
|
5726
5726
|
},
|
|
5727
5727
|
readString: function() {
|
|
5728
5728
|
var t = this.readVarint() + this.pos, i = this.pos;
|
|
5729
|
-
return this.pos = t, t - i >= 12 &&
|
|
5730
|
-
return
|
|
5729
|
+
return this.pos = t, t - i >= 12 && Ps ? function(t, i, n) {
|
|
5730
|
+
return Ps.decode(t.subarray(i, n));
|
|
5731
5731
|
}(this.buf, i, t) : function(t, i, n) {
|
|
5732
5732
|
var e = "", r = i;
|
|
5733
5733
|
for (;r < n; ) {
|
|
@@ -5747,63 +5747,63 @@
|
|
|
5747
5747
|
return this.pos = t, i;
|
|
5748
5748
|
},
|
|
5749
5749
|
readPackedVarint: function(t, i) {
|
|
5750
|
-
if (this.type !==
|
|
5750
|
+
if (this.type !== Ss.Bytes) return t.push(this.readVarint(i));
|
|
5751
5751
|
var n = Os(this);
|
|
5752
5752
|
for (t = t || []; this.pos < n; ) t.push(this.readVarint(i));
|
|
5753
5753
|
return t;
|
|
5754
5754
|
},
|
|
5755
5755
|
readPackedSVarint: function(t) {
|
|
5756
|
-
if (this.type !==
|
|
5756
|
+
if (this.type !== Ss.Bytes) return t.push(this.readSVarint());
|
|
5757
5757
|
var i = Os(this);
|
|
5758
5758
|
for (t = t || []; this.pos < i; ) t.push(this.readSVarint());
|
|
5759
5759
|
return t;
|
|
5760
5760
|
},
|
|
5761
5761
|
readPackedBoolean: function(t) {
|
|
5762
|
-
if (this.type !==
|
|
5762
|
+
if (this.type !== Ss.Bytes) return t.push(this.readBoolean());
|
|
5763
5763
|
var i = Os(this);
|
|
5764
5764
|
for (t = t || []; this.pos < i; ) t.push(this.readBoolean());
|
|
5765
5765
|
return t;
|
|
5766
5766
|
},
|
|
5767
5767
|
readPackedFloat: function(t) {
|
|
5768
|
-
if (this.type !==
|
|
5768
|
+
if (this.type !== Ss.Bytes) return t.push(this.readFloat());
|
|
5769
5769
|
var i = Os(this);
|
|
5770
5770
|
for (t = t || []; this.pos < i; ) t.push(this.readFloat());
|
|
5771
5771
|
return t;
|
|
5772
5772
|
},
|
|
5773
5773
|
readPackedDouble: function(t) {
|
|
5774
|
-
if (this.type !==
|
|
5774
|
+
if (this.type !== Ss.Bytes) return t.push(this.readDouble());
|
|
5775
5775
|
var i = Os(this);
|
|
5776
5776
|
for (t = t || []; this.pos < i; ) t.push(this.readDouble());
|
|
5777
5777
|
return t;
|
|
5778
5778
|
},
|
|
5779
5779
|
readPackedFixed32: function(t) {
|
|
5780
|
-
if (this.type !==
|
|
5780
|
+
if (this.type !== Ss.Bytes) return t.push(this.readFixed32());
|
|
5781
5781
|
var i = Os(this);
|
|
5782
5782
|
for (t = t || []; this.pos < i; ) t.push(this.readFixed32());
|
|
5783
5783
|
return t;
|
|
5784
5784
|
},
|
|
5785
5785
|
readPackedSFixed32: function(t) {
|
|
5786
|
-
if (this.type !==
|
|
5786
|
+
if (this.type !== Ss.Bytes) return t.push(this.readSFixed32());
|
|
5787
5787
|
var i = Os(this);
|
|
5788
5788
|
for (t = t || []; this.pos < i; ) t.push(this.readSFixed32());
|
|
5789
5789
|
return t;
|
|
5790
5790
|
},
|
|
5791
5791
|
readPackedFixed64: function(t) {
|
|
5792
|
-
if (this.type !==
|
|
5792
|
+
if (this.type !== Ss.Bytes) return t.push(this.readFixed64());
|
|
5793
5793
|
var i = Os(this);
|
|
5794
5794
|
for (t = t || []; this.pos < i; ) t.push(this.readFixed64());
|
|
5795
5795
|
return t;
|
|
5796
5796
|
},
|
|
5797
5797
|
readPackedSFixed64: function(t) {
|
|
5798
|
-
if (this.type !==
|
|
5798
|
+
if (this.type !== Ss.Bytes) return t.push(this.readSFixed64());
|
|
5799
5799
|
var i = Os(this);
|
|
5800
5800
|
for (t = t || []; this.pos < i; ) t.push(this.readSFixed64());
|
|
5801
5801
|
return t;
|
|
5802
5802
|
},
|
|
5803
5803
|
skip: function(t) {
|
|
5804
5804
|
var i = 7 & t;
|
|
5805
|
-
if (i ===
|
|
5806
|
-
if (i !==
|
|
5805
|
+
if (i === Ss.Varint) for (;this.buf[this.pos++] > 127; ) ; else if (i === Ss.Bytes) this.pos = this.readVarint() + this.pos; else if (i === Ss.Fixed32) this.pos += 4; else {
|
|
5806
|
+
if (i !== Ss.Fixed64) throw new Error("Unimplemented type: " + i);
|
|
5807
5807
|
this.pos += 8;
|
|
5808
5808
|
}
|
|
5809
5809
|
},
|
|
@@ -5906,7 +5906,7 @@
|
|
|
5906
5906
|
e >= 128 && Is(n, e, this), this.pos = n - 1, this.writeVarint(e), this.pos += e;
|
|
5907
5907
|
},
|
|
5908
5908
|
writeMessage: function(t, i, n) {
|
|
5909
|
-
this.writeTag(t,
|
|
5909
|
+
this.writeTag(t, Ss.Bytes), this.writeRawMessage(i, n);
|
|
5910
5910
|
},
|
|
5911
5911
|
writePackedVarint: function(t, i) {
|
|
5912
5912
|
i.length && this.writeMessage(t, Ts, i);
|
|
@@ -5936,34 +5936,34 @@
|
|
|
5936
5936
|
i.length && this.writeMessage(t, zs, i);
|
|
5937
5937
|
},
|
|
5938
5938
|
writeBytesField: function(t, i) {
|
|
5939
|
-
this.writeTag(t,
|
|
5939
|
+
this.writeTag(t, Ss.Bytes), this.writeBytes(i);
|
|
5940
5940
|
},
|
|
5941
5941
|
writeFixed32Field: function(t, i) {
|
|
5942
|
-
this.writeTag(t,
|
|
5942
|
+
this.writeTag(t, Ss.Fixed32), this.writeFixed32(i);
|
|
5943
5943
|
},
|
|
5944
5944
|
writeSFixed32Field: function(t, i) {
|
|
5945
|
-
this.writeTag(t,
|
|
5945
|
+
this.writeTag(t, Ss.Fixed32), this.writeSFixed32(i);
|
|
5946
5946
|
},
|
|
5947
5947
|
writeFixed64Field: function(t, i) {
|
|
5948
|
-
this.writeTag(t,
|
|
5948
|
+
this.writeTag(t, Ss.Fixed64), this.writeFixed64(i);
|
|
5949
5949
|
},
|
|
5950
5950
|
writeSFixed64Field: function(t, i) {
|
|
5951
|
-
this.writeTag(t,
|
|
5951
|
+
this.writeTag(t, Ss.Fixed64), this.writeSFixed64(i);
|
|
5952
5952
|
},
|
|
5953
5953
|
writeVarintField: function(t, i) {
|
|
5954
|
-
this.writeTag(t,
|
|
5954
|
+
this.writeTag(t, Ss.Varint), this.writeVarint(i);
|
|
5955
5955
|
},
|
|
5956
5956
|
writeSVarintField: function(t, i) {
|
|
5957
|
-
this.writeTag(t,
|
|
5957
|
+
this.writeTag(t, Ss.Varint), this.writeSVarint(i);
|
|
5958
5958
|
},
|
|
5959
5959
|
writeStringField: function(t, i) {
|
|
5960
|
-
this.writeTag(t,
|
|
5960
|
+
this.writeTag(t, Ss.Bytes), this.writeString(i);
|
|
5961
5961
|
},
|
|
5962
5962
|
writeFloatField: function(t, i) {
|
|
5963
|
-
this.writeTag(t,
|
|
5963
|
+
this.writeTag(t, Ss.Fixed32), this.writeFloat(i);
|
|
5964
5964
|
},
|
|
5965
5965
|
writeDoubleField: function(t, i) {
|
|
5966
|
-
this.writeTag(t,
|
|
5966
|
+
this.writeTag(t, Ss.Fixed64), this.writeDouble(i);
|
|
5967
5967
|
},
|
|
5968
5968
|
writeBooleanField: function(t, i) {
|
|
5969
5969
|
this.writeVarintField(t, Boolean(i));
|
|
@@ -6060,10 +6060,10 @@
|
|
|
6060
6060
|
var Xs = Gs, Zs = Ys;
|
|
6061
6061
|
function Ys(t, i) {
|
|
6062
6062
|
this.version = 1, this.name = null, this.extent = 4096, this.length = 0, this.Ft = t,
|
|
6063
|
-
this.kt = [], this._t = [], this.
|
|
6063
|
+
this.kt = [], this._t = [], this.St = [], t.readFields(Ks, this, i), this.length = this.St.length;
|
|
6064
6064
|
}
|
|
6065
6065
|
function Ks(t, i, n) {
|
|
6066
|
-
15 === t ? i.version = n.readVarint() : 1 === t ? i.name = n.readString() : 5 === t ? i.extent = n.readVarint() : 2 === t ? i.
|
|
6066
|
+
15 === t ? i.version = n.readVarint() : 1 === t ? i.name = n.readString() : 5 === t ? i.extent = n.readVarint() : 2 === t ? i.St.push(n.pos) : 3 === t ? i.kt.push(n.readString()) : 4 === t && i._t.push(function(t) {
|
|
6067
6067
|
var i = null, n = t.readVarint() + t.pos;
|
|
6068
6068
|
for (;t.pos < n; ) {
|
|
6069
6069
|
var e = t.readVarint() >> 3;
|
|
@@ -6073,8 +6073,8 @@
|
|
|
6073
6073
|
}(n));
|
|
6074
6074
|
}
|
|
6075
6075
|
Ys.prototype.feature = function(t) {
|
|
6076
|
-
if (t < 0 || t >= this.
|
|
6077
|
-
this.Ft.pos = this.
|
|
6076
|
+
if (t < 0 || t >= this.St.length) throw new Error("feature index out of bounds");
|
|
6077
|
+
this.Ft.pos = this.St[t];
|
|
6078
6078
|
var i = this.Ft.readVarint() + this.Ft.pos;
|
|
6079
6079
|
return new Xs(this.Ft, i, this.extent, this.kt, this._t);
|
|
6080
6080
|
};
|
|
@@ -6172,16 +6172,16 @@
|
|
|
6172
6172
|
}(128), so = {};
|
|
6173
6173
|
class oo {
|
|
6174
6174
|
constructor(t) {
|
|
6175
|
-
this.
|
|
6175
|
+
this.Pt = {}, this.Ot = {}, this.workerId = t;
|
|
6176
6176
|
}
|
|
6177
6177
|
addLayer({actorId: t, mapId: i, layerId: n, params: e}, r) {
|
|
6178
6178
|
if (this.Ct(i, n)) return;
|
|
6179
6179
|
const s = this.It(i, n), o = e.type, h = e.options, a = this.send.bind(this, t);
|
|
6180
|
-
this.
|
|
6180
|
+
this.Pt[s] = "GeoJSONVectorTileLayer" === o ? new Fs(n, h, a, ro, so, r) : new no(n, h, a, ro, so, r);
|
|
6181
6181
|
}
|
|
6182
6182
|
removeLayer({mapId: t, layerId: i}, n) {
|
|
6183
6183
|
const e = this.Ct(t, i), r = this.It(t, i);
|
|
6184
|
-
delete this.
|
|
6184
|
+
delete this.Pt[r], e && (e.onRemove(n), this.Tt());
|
|
6185
6185
|
}
|
|
6186
6186
|
loadTile({mapId: t, layerId: i, params: n}, e) {
|
|
6187
6187
|
const r = this.Ct(t, i);
|
|
@@ -6227,7 +6227,7 @@
|
|
|
6227
6227
|
}
|
|
6228
6228
|
Ct(t, i) {
|
|
6229
6229
|
const n = this.It(t, i);
|
|
6230
|
-
return this.
|
|
6230
|
+
return this.Pt[n];
|
|
6231
6231
|
}
|
|
6232
6232
|
Tt() {
|
|
6233
6233
|
const t = Object.keys(so);
|
|
@@ -6431,7 +6431,7 @@
|
|
|
6431
6431
|
}
|
|
6432
6432
|
let k = 0;
|
|
6433
6433
|
const _ = "function" == typeof Object.assign;
|
|
6434
|
-
function
|
|
6434
|
+
function S(t, ...i) {
|
|
6435
6435
|
if (_) return Object.assign(t, ...i), t;
|
|
6436
6436
|
for (let n = 0; n < i.length; n++) {
|
|
6437
6437
|
const e = i[n];
|
|
@@ -6439,7 +6439,7 @@
|
|
|
6439
6439
|
}
|
|
6440
6440
|
return t;
|
|
6441
6441
|
}
|
|
6442
|
-
function
|
|
6442
|
+
function P(t) {
|
|
6443
6443
|
return !I(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
|
|
6444
6444
|
}
|
|
6445
6445
|
function O(t) {
|
|
@@ -6477,7 +6477,7 @@
|
|
|
6477
6477
|
}
|
|
6478
6478
|
return n;
|
|
6479
6479
|
}(t = t.map(t => {
|
|
6480
|
-
const i =
|
|
6480
|
+
const i = S({}, t);
|
|
6481
6481
|
return i.filter && i.filter.value && (i.filter = i.filter.value), i;
|
|
6482
6482
|
}));
|
|
6483
6483
|
}
|
|
@@ -6509,10 +6509,10 @@
|
|
|
6509
6509
|
return this.clone().k(t);
|
|
6510
6510
|
},
|
|
6511
6511
|
div: function(t) {
|
|
6512
|
-
return this.clone().
|
|
6512
|
+
return this.clone().S(t);
|
|
6513
6513
|
},
|
|
6514
6514
|
rotate: function(t) {
|
|
6515
|
-
return this.clone().
|
|
6515
|
+
return this.clone().P(t);
|
|
6516
6516
|
},
|
|
6517
6517
|
rotateAround: function(t, i) {
|
|
6518
6518
|
return this.clone().O(t, i);
|
|
@@ -6567,7 +6567,7 @@
|
|
|
6567
6567
|
k: function(t) {
|
|
6568
6568
|
return this.x *= t, this.y *= t, this;
|
|
6569
6569
|
},
|
|
6570
|
-
|
|
6570
|
+
S: function(t) {
|
|
6571
6571
|
return this.x /= t, this.y /= t, this;
|
|
6572
6572
|
},
|
|
6573
6573
|
F: function(t) {
|
|
@@ -6577,13 +6577,13 @@
|
|
|
6577
6577
|
return this.x /= t.x, this.y /= t.y, this;
|
|
6578
6578
|
},
|
|
6579
6579
|
I: function() {
|
|
6580
|
-
return this.
|
|
6580
|
+
return this.S(this.mag()), this;
|
|
6581
6581
|
},
|
|
6582
6582
|
T: function() {
|
|
6583
6583
|
var t = this.y;
|
|
6584
6584
|
return this.y = this.x, this.x = -t, this;
|
|
6585
6585
|
},
|
|
6586
|
-
|
|
6586
|
+
P: function(t) {
|
|
6587
6587
|
var i = Math.cos(t), n = Math.sin(t), e = i * this.x - n * this.y, r = n * this.x + i * this.y;
|
|
6588
6588
|
return this.x = e, this.y = r, this;
|
|
6589
6589
|
},
|
|
@@ -7297,9 +7297,9 @@
|
|
|
7297
7297
|
};
|
|
7298
7298
|
}
|
|
7299
7299
|
const kt = /\{([\w_]+)\}/g;
|
|
7300
|
-
const _t = t => t >= 128 && t <= 255,
|
|
7300
|
+
const _t = t => t >= 128 && t <= 255, St = t => t >= 1536 && t <= 1791, Pt = t => t >= 1872 && t <= 1919, Ot = t => t >= 2208 && t <= 2303, Ct = t => t >= 4352 && t <= 4607, It = t => t >= 5120 && t <= 5759, Tt = t => t >= 6320 && t <= 6399, Dt = t => t >= 8192 && t <= 8303, Lt = t => t >= 8448 && t <= 8527, Ut = t => t >= 8528 && t <= 8591, Et = t => t >= 8960 && t <= 9215, jt = t => t >= 9216 && t <= 9279, Rt = t => t >= 9280 && t <= 9311, Nt = t => t >= 9312 && t <= 9471, zt = t => t >= 9632 && t <= 9727, Wt = t => t >= 9728 && t <= 9983, Ht = t => t >= 11008 && t <= 11263, Vt = t => t >= 11904 && t <= 12031, $t = t => t >= 12032 && t <= 12255, Gt = t => t >= 12272 && t <= 12287, Jt = t => t >= 12288 && t <= 12351, qt = t => t >= 12352 && t <= 12447, Bt = t => t >= 12448 && t <= 12543, Xt = t => t >= 12544 && t <= 12591, Zt = t => t >= 12592 && t <= 12687, Yt = t => t >= 12688 && t <= 12703, Kt = t => t >= 12704 && t <= 12735, Qt = t => t >= 12736 && t <= 12783, ti = t => t >= 12784 && t <= 12799, ii = t => t >= 12800 && t <= 13055, ni = t => t >= 13056 && t <= 13311, ei = t => t >= 13312 && t <= 19903, ri = t => t >= 19904 && t <= 19967, si = t => t >= 19968 && t <= 40959, oi = t => t >= 40960 && t <= 42127, hi = t => t >= 42128 && t <= 42191, ai = t => t >= 43360 && t <= 43391, li = t => t >= 44032 && t <= 55215, ui = t => t >= 55216 && t <= 55295, ci = t => t >= 57344 && t <= 63743, fi = t => t >= 63744 && t <= 64255, di = t => t >= 64336 && t <= 65023, yi = t => t >= 65040 && t <= 65055, pi = t => t >= 65072 && t <= 65103, mi = t => t >= 65104 && t <= 65135, vi = t => t >= 65136 && t <= 65279, gi = t => t >= 65280 && t <= 65519;
|
|
7301
7301
|
function wi(t) {
|
|
7302
|
-
return !
|
|
7302
|
+
return !St(t) && (!Pt(t) && (!Ot(t) && (!di(t) && !vi(t))));
|
|
7303
7303
|
}
|
|
7304
7304
|
function bi(t) {
|
|
7305
7305
|
return 746 === t || 747 === t || !(t < 4352) && (!!Kt(t) || (!!Xt(t) || (!(!pi(t) || t >= 65097 && t <= 65103) || (!!fi(t) || (!!ni(t) || (!!Vt(t) || (!!Qt(t) || (!(!Jt(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!ei(t) || (!!si(t) || (!!ii(t) || (!!Zt(t) || (!!ai(t) || (!!ui(t) || (!!Ct(t) || (!!li(t) || (!!qt(t) || (!!Gt(t) || (!!Yt(t) || (!!$t(t) || (!!ti(t) || (!(!Bt(t) || 12540 === t) || (!(!gi(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!mi(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!It(t) || (!!Tt(t) || (!!yi(t) || (!!ri(t) || (!!oi(t) || !!hi(t))))))))))))))))))))))))))))));
|
|
@@ -7402,10 +7402,10 @@
|
|
|
7402
7402
|
"「": "﹁",
|
|
7403
7403
|
"」": "﹂"
|
|
7404
7404
|
};
|
|
7405
|
-
const _i = 1,
|
|
7406
|
-
function
|
|
7405
|
+
const _i = 1, Si = 2;
|
|
7406
|
+
function Pi(t, i, n, e, r, s, o, h, a, l) {
|
|
7407
7407
|
let u = t.trim();
|
|
7408
|
-
l ===
|
|
7408
|
+
l === Si && (u = function(t) {
|
|
7409
7409
|
let i = "";
|
|
7410
7410
|
for (let n = 0; n < t.length; n++) {
|
|
7411
7411
|
const e = t.charCodeAt(n + 1) || null, r = t.charCodeAt(n - 1) || null;
|
|
@@ -7617,7 +7617,7 @@
|
|
|
7617
7617
|
}
|
|
7618
7618
|
return !0;
|
|
7619
7619
|
}(r), w = g && a.textLetterSpacing / c || 0, b = [ a.textDx / c || 0, a.textDy / c || 0 ], M = ((o ? o(null, u) : a.textWrapWidth) || 10 * f) / c;
|
|
7620
|
-
h = {}, h.horizontal =
|
|
7620
|
+
h = {}, h.horizontal = Pi(r, p, M, v, m, "center", w, b, f, _i), g && y && d && (h.vertical = Pi(r, p, M, v, m, "center", w, b, f, Si));
|
|
7621
7621
|
} else if (l && l.icon) {
|
|
7622
7622
|
if (!t.positions[l.icon]) return null;
|
|
7623
7623
|
const i = Ni(r ? r(null, u) : a.markerHorizontalAlignment, s ? s(null, u) : a.markerVerticalAlignment);
|
|
@@ -8568,16 +8568,16 @@
|
|
|
8568
8568
|
}, Fn.rgb.gray = function(t) {
|
|
8569
8569
|
return [ (t[0] + t[1] + t[2]) / 3 / 255 * 100 ];
|
|
8570
8570
|
};
|
|
8571
|
-
var
|
|
8572
|
-
function
|
|
8571
|
+
var Sn = wn.exports;
|
|
8572
|
+
function Pn(t) {
|
|
8573
8573
|
var i = function() {
|
|
8574
|
-
for (var t = {}, i = Object.keys(
|
|
8574
|
+
for (var t = {}, i = Object.keys(Sn), n = i.length, e = 0; e < n; e++) t[i[e]] = {
|
|
8575
8575
|
distance: -1,
|
|
8576
8576
|
parent: null
|
|
8577
8577
|
};
|
|
8578
8578
|
return t;
|
|
8579
8579
|
}(), n = [ t ];
|
|
8580
|
-
for (i[t].distance = 0; n.length; ) for (var e = n.pop(), r = Object.keys(
|
|
8580
|
+
for (i[t].distance = 0; n.length; ) for (var e = n.pop(), r = Object.keys(Sn[e]), s = r.length, o = 0; o < s; o++) {
|
|
8581
8581
|
var h = r[o], a = i[h];
|
|
8582
8582
|
-1 === a.distance && (a.distance = i[e].distance + 1, a.parent = e, n.unshift(h));
|
|
8583
8583
|
}
|
|
@@ -8589,12 +8589,12 @@
|
|
|
8589
8589
|
};
|
|
8590
8590
|
}
|
|
8591
8591
|
function Cn(t, i) {
|
|
8592
|
-
for (var n = [ i[t].parent, t ], e =
|
|
8593
|
-
e = On(
|
|
8592
|
+
for (var n = [ i[t].parent, t ], e = Sn[i[t].parent][t], r = i[t].parent; i[r].parent; ) n.unshift(i[r].parent),
|
|
8593
|
+
e = On(Sn[i[r].parent][r], e), r = i[r].parent;
|
|
8594
8594
|
return e.conversion = n, e;
|
|
8595
8595
|
}
|
|
8596
8596
|
var In = wn.exports, Tn = function(t) {
|
|
8597
|
-
for (var i =
|
|
8597
|
+
for (var i = Pn(t), n = {}, e = Object.keys(i), r = e.length, s = 0; s < r; s++) {
|
|
8598
8598
|
var o = e[s];
|
|
8599
8599
|
null !== i[o].parent && (n[o] = Cn(o, i));
|
|
8600
8600
|
}
|
|
@@ -8885,35 +8885,34 @@
|
|
|
8885
8885
|
const Bn = 14;
|
|
8886
8886
|
class Xn extends Ft {
|
|
8887
8887
|
static needMerge(t) {
|
|
8888
|
-
|
|
8889
|
-
return !(!t.mergeOnProperty || !n && !e && "line" !== t.textPlacement && "line" !== t.markerPlacement);
|
|
8888
|
+
return t.mergeOnProperty && ("line" === t.textPlacement || "line" === t.markerPlacement);
|
|
8890
8889
|
}
|
|
8891
8890
|
static mergeLineFeatures(t, i, n) {
|
|
8892
8891
|
const e = function(t, i, n) {
|
|
8893
|
-
const e = Ft.genFnTypes(i), {
|
|
8894
|
-
if (!i.mergeOnProperty ||
|
|
8895
|
-
if (!(
|
|
8892
|
+
const e = Ft.genFnTypes(i), {mergeOnPropertyFn: r} = e;
|
|
8893
|
+
if (!i.mergeOnProperty || "line" !== i.textPlacement && "line" !== i.markerPlacement) return [];
|
|
8894
|
+
if (!(s = i.mergeOnProperty, wt(s) || "string" != typeof s && (null === s.constructor || s.constructor !== String) || "line" !== i.textPlacement && "line" !== i.markerPlacement)) return [ {
|
|
8896
8895
|
features: t,
|
|
8897
8896
|
property: i.mergeOnProperty
|
|
8898
8897
|
} ];
|
|
8899
|
-
var
|
|
8900
|
-
const
|
|
8898
|
+
var s;
|
|
8899
|
+
const o = [], h = {}, a = [];
|
|
8901
8900
|
for (let e = 0; e < t.length; e++) {
|
|
8902
8901
|
t[e].__index = e;
|
|
8903
|
-
const
|
|
8904
|
-
|
|
8905
|
-
let
|
|
8906
|
-
"line" !==
|
|
8907
|
-
const
|
|
8908
|
-
"line" !==
|
|
8902
|
+
const s = t[e].properties = t[e].properties || {};
|
|
8903
|
+
s.$layer = t[e].layer, s.$type = t[e].type;
|
|
8904
|
+
let l = i.markerPlacement;
|
|
8905
|
+
"line" !== l && (l = i.textPlacement);
|
|
8906
|
+
const u = r ? r(n, s) : i.mergeOnProperty;
|
|
8907
|
+
"line" !== l || wt(u) ? a.push(t[e]) : (void 0 === h[u] && (h[u] = o.length, o.push({
|
|
8909
8908
|
features: [],
|
|
8910
|
-
property:
|
|
8911
|
-
})),
|
|
8909
|
+
property: u
|
|
8910
|
+
})), o[h[u]].features.push(t[e]));
|
|
8912
8911
|
}
|
|
8913
|
-
|
|
8914
|
-
features:
|
|
8912
|
+
a.length && o.push({
|
|
8913
|
+
features: a
|
|
8915
8914
|
});
|
|
8916
|
-
return
|
|
8915
|
+
return o;
|
|
8917
8916
|
}(t, i, n);
|
|
8918
8917
|
if (e.length) {
|
|
8919
8918
|
const i = [];
|
|
@@ -9131,7 +9130,7 @@
|
|
|
9131
9130
|
if (bi(t.charAt(n).charCodeAt(0))) i = 0; else if (i++, i >= 1) return !1;
|
|
9132
9131
|
}
|
|
9133
9132
|
return !0;
|
|
9134
|
-
}(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: g, textRotationAlignmentFn: w, textRotationFn: b, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn:
|
|
9133
|
+
}(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: g, textRotationAlignmentFn: w, textRotationFn: b, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: S, markerDyFn: P, markerPitchAlignmentFn: O, markerRotationAlignmentFn: C, markerRotationFn: I, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
|
|
9135
9134
|
let U, j, R, N, z, W, H, V, $, G, J, q, B, X, Z, Y, K;
|
|
9136
9135
|
if (l) {
|
|
9137
9136
|
const i = t.getIconAndGlyph().glyph.font;
|
|
@@ -9197,7 +9196,7 @@
|
|
|
9197
9196
|
writingMode: void 0,
|
|
9198
9197
|
glyphOffset: [ 0, 0 ]
|
|
9199
9198
|
} ];
|
|
9200
|
-
}(), k && ($ = k(null, h)), _ && (G = _(null, h)),
|
|
9199
|
+
}(), k && ($ = k(null, h)), _ && (G = _(null, h)), S && (J = S(null, h)), P && (q = P(null, h)),
|
|
9201
9200
|
O && (B = +("map" === O(null, h))), C && (X = +("map" === C(null, h))), I && (Z = bt(I(null, h), 0, 360) * Math.PI / 180);
|
|
9202
9201
|
const Q = T || x;
|
|
9203
9202
|
Q && (Y = Q(null, h) || 0);
|
|
@@ -9236,14 +9235,14 @@
|
|
|
9236
9235
|
}
|
|
9237
9236
|
}
|
|
9238
9237
|
K(t, i, n, e, r, s, o, h, a, l, u, c, f, d, y, p, m, v) {
|
|
9239
|
-
const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn:
|
|
9238
|
+
const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: S, textAllowOverlapFn: P, textIgnorePlacementFn: O, textOpacityFn: C, markerWidthFn: I, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: U, markerRotationAlignmentFn: E, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
|
|
9240
9239
|
g && t.aTextFill.push(...i), w && t.aTextSize.push(n), b && t.aTextHaloFill.push(...e),
|
|
9241
9240
|
M && t.aTextHaloRadius.push(r), x && t.aTextHaloOpacity.push(s), F && t.aTextDx.push(o),
|
|
9242
9241
|
A && t.aTextDy.push(h), I && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l),
|
|
9243
9242
|
D && t.aMarkerDx.push(u), L && t.aMarkerDy.push(c);
|
|
9244
9243
|
(z || C) && t.aColorOpacity.push(f), (k || U) && t.aPitchAlign.push(d), (E || _) && t.aRotationAlign.push(y),
|
|
9245
|
-
(j ||
|
|
9246
|
-
const W = R ||
|
|
9244
|
+
(j || S) && t.aRotation.push(9362 * p);
|
|
9245
|
+
const W = R || P, H = N || O;
|
|
9247
9246
|
if (W || H) {
|
|
9248
9247
|
const i = (W ? 8 : 0) + 4 * m, n = (H ? 2 : 0) + v;
|
|
9249
9248
|
t.aOverlap.push(i + n);
|
|
@@ -9251,7 +9250,7 @@
|
|
|
9251
9250
|
r > 0 && (this.properties.hasHalo = 1);
|
|
9252
9251
|
}
|
|
9253
9252
|
X(t, i, n) {
|
|
9254
|
-
const {feature: e, symbol: r} = t, s = this.tt(r
|
|
9253
|
+
const {feature: e, symbol: r} = t, s = this.tt(r), o = e.properties, {markerSpacingFn: h, textSpacingFn: a} = this.j, l = ((h ? h(null, o) : r.markerSpacing) || (a ? a(null, o) : r.textSpacing) || 250) * n, u = this.options.EXTENT;
|
|
9255
9254
|
return function(t, i, n, e, r, s, o) {
|
|
9256
9255
|
const {feature: h, size: a, symbol: l} = t, u = a ? 24 : 0, c = e * (a ? a[0] / u : 1), f = [];
|
|
9257
9256
|
if ("line" === s) {
|
|
@@ -9281,10 +9280,8 @@
|
|
|
9281
9280
|
return f;
|
|
9282
9281
|
}(t, this.lineVertex, i, n, u, s, l);
|
|
9283
9282
|
}
|
|
9284
|
-
tt(t
|
|
9285
|
-
|
|
9286
|
-
let s;
|
|
9287
|
-
return n && (s = n(null, r)), !s && e && (s = e(null, r)), s || t.markerPlacement || t.textPlacement;
|
|
9283
|
+
tt(t) {
|
|
9284
|
+
return t.markerPlacement || t.textPlacement;
|
|
9288
9285
|
}
|
|
9289
9286
|
}
|
|
9290
9287
|
const Zn = Math.cos(Math.PI / 180 * 37.5), Yn = Math.pow(2, 16) / 1;
|
|
@@ -9624,7 +9621,7 @@
|
|
|
9624
9621
|
}
|
|
9625
9622
|
function re(t, i, n, e, r) {
|
|
9626
9623
|
var s, o;
|
|
9627
|
-
if (r ===
|
|
9624
|
+
if (r === Pe(t, i, n, e) > 0) for (s = i; s < n; s += e) o = ke(s, t[s], t[s + 1], o); else for (s = n - e; s >= i; s -= e) o = ke(s, t[s], t[s + 1], o);
|
|
9628
9625
|
return o && we(o, o.next) && (_e(o), o = o.next), o;
|
|
9629
9626
|
}
|
|
9630
9627
|
function se(t, i) {
|
|
@@ -9804,12 +9801,12 @@
|
|
|
9804
9801
|
return ge(t.prev, t, t.next) < 0 ? ge(t, i, t.next) >= 0 && ge(t, t.prev, i) >= 0 : ge(t, i, t.prev) < 0 || ge(t, t.next, i) < 0;
|
|
9805
9802
|
}
|
|
9806
9803
|
function Ae(t, i) {
|
|
9807
|
-
var n = new
|
|
9804
|
+
var n = new Se(t.i, t.x, t.y), e = new Se(i.i, i.x, i.y), r = t.next, s = i.prev;
|
|
9808
9805
|
return t.next = i, i.prev = t, n.next = r, r.prev = n, e.next = n, n.prev = e, s.next = e,
|
|
9809
9806
|
e.prev = s, e;
|
|
9810
9807
|
}
|
|
9811
9808
|
function ke(t, i, n, e) {
|
|
9812
|
-
var r = new
|
|
9809
|
+
var r = new Se(t, i, n);
|
|
9813
9810
|
return e ? (r.next = e.next, r.prev = e, e.next.prev = r, e.next = r) : (r.prev = r,
|
|
9814
9811
|
r.next = r), r;
|
|
9815
9812
|
}
|
|
@@ -9817,20 +9814,20 @@
|
|
|
9817
9814
|
t.next.prev = t.prev, t.prev.next = t.next, t.prevZ && (t.prevZ.nextZ = t.nextZ),
|
|
9818
9815
|
t.nextZ && (t.nextZ.prevZ = t.prevZ);
|
|
9819
9816
|
}
|
|
9820
|
-
function
|
|
9817
|
+
function Se(t, i, n) {
|
|
9821
9818
|
this.i = t, this.x = i, this.y = n, this.prev = null, this.next = null, this.z = null,
|
|
9822
9819
|
this.prevZ = null, this.nextZ = null, this.steiner = !1;
|
|
9823
9820
|
}
|
|
9824
|
-
function
|
|
9821
|
+
function Pe(t, i, n, e) {
|
|
9825
9822
|
for (var r = 0, s = i, o = n - e; s < n; s += e) r += (t[o] - t[s]) * (t[s + 1] + t[o + 1]),
|
|
9826
9823
|
o = s;
|
|
9827
9824
|
return r;
|
|
9828
9825
|
}
|
|
9829
9826
|
ne.exports = ee, ne.exports.default = ee, ee.deviation = function(t, i, n, e) {
|
|
9830
|
-
var r = i && i.length, s = r ? i[0] * n : t.length, o = Math.abs(
|
|
9827
|
+
var r = i && i.length, s = r ? i[0] * n : t.length, o = Math.abs(Pe(t, 0, s, n));
|
|
9831
9828
|
if (r) for (var h = 0, a = i.length; h < a; h++) {
|
|
9832
9829
|
var l = i[h] * n, u = h < a - 1 ? i[h + 1] * n : t.length;
|
|
9833
|
-
o -= Math.abs(
|
|
9830
|
+
o -= Math.abs(Pe(t, l, u, n));
|
|
9834
9831
|
}
|
|
9835
9832
|
var c = 0;
|
|
9836
9833
|
for (h = 0; h < e.length; h += 3) {
|
|
@@ -10659,7 +10656,7 @@
|
|
|
10659
10656
|
depth: !0,
|
|
10660
10657
|
antialias: this.layer.options.antialias
|
|
10661
10658
|
};
|
|
10662
|
-
i.preserveDrawingBuffer = !0, i.stencil = !0, this.glOptions = i, this.gl = this.gl || this.
|
|
10659
|
+
i.preserveDrawingBuffer = !0, i.stencil = !0, this.glOptions = i, this.gl = this.gl || this.Si(this.canvas, i),
|
|
10663
10660
|
this.regl = n.createREGL({
|
|
10664
10661
|
gl: this.gl,
|
|
10665
10662
|
attributes: i,
|
|
@@ -10692,12 +10689,12 @@
|
|
|
10692
10689
|
return er;
|
|
10693
10690
|
}
|
|
10694
10691
|
draw(t, i) {
|
|
10695
|
-
this.
|
|
10692
|
+
this.Pi !== t && (this.wi = !1, this.Oi());
|
|
10696
10693
|
const n = this.layer;
|
|
10697
10694
|
this.prepareCanvas(), this.ready && n.ready ? (this.plugins || this.Mi(), n.isDefaultRender() || this.plugins.length || this.featurePlugins.length ? (n.options.collision && (n.clearCollisionIndex(),
|
|
10698
10695
|
n.clearBackgroundCollisionIndex()), this.Ci = t, this.Ii = this.Ti(this.getMap().getGLRes()),
|
|
10699
|
-
this.Di = i || {}, this.Li(t), super.draw(t), this.
|
|
10700
|
-
this.completeRender(), this.
|
|
10696
|
+
this.Di = i || {}, this.Li(t), super.draw(t), this.Pi !== t && this.Ui(t), this.Ei(t),
|
|
10697
|
+
this.completeRender(), this.Pi = t) : this.completeRender()) : this.completeRender();
|
|
10701
10698
|
}
|
|
10702
10699
|
Oi() {
|
|
10703
10700
|
this.Fi().forEach((t, i) => {
|
|
@@ -10894,7 +10891,7 @@
|
|
|
10894
10891
|
pluginIndex: r,
|
|
10895
10892
|
timestamp: t
|
|
10896
10893
|
};
|
|
10897
|
-
n &&
|
|
10894
|
+
n && S(o, n), e.startFrame(o);
|
|
10898
10895
|
});
|
|
10899
10896
|
}
|
|
10900
10897
|
Ei(t) {
|
|
@@ -10910,7 +10907,7 @@
|
|
|
10910
10907
|
const e = this.Yi(i, 0, r, t);
|
|
10911
10908
|
i.prepareRender(e);
|
|
10912
10909
|
});
|
|
10913
|
-
const o = !i.timestamp || i.isFinalRender, h = this.
|
|
10910
|
+
const o = !i.timestamp || i.isFinalRender, h = this.Pi !== i.timestamp;
|
|
10914
10911
|
let a = !1;
|
|
10915
10912
|
if (h) {
|
|
10916
10913
|
const i = -this.layer.getPolygonOffset(), n = this.Yi(null, i, r, t);
|
|
@@ -10955,7 +10952,7 @@
|
|
|
10955
10952
|
cameraPosition: n,
|
|
10956
10953
|
timestamp: e
|
|
10957
10954
|
}, s = this.Di;
|
|
10958
|
-
return s &&
|
|
10955
|
+
return s && S(r, s), r;
|
|
10959
10956
|
}
|
|
10960
10957
|
in(t) {
|
|
10961
10958
|
if (!t) return !1;
|
|
@@ -11105,7 +11102,7 @@
|
|
|
11105
11102
|
const n = new i;
|
|
11106
11103
|
return n.config = t, n.config.sceneConfig || (n.config.sceneConfig = {}), n;
|
|
11107
11104
|
}
|
|
11108
|
-
|
|
11105
|
+
Si(t, i) {
|
|
11109
11106
|
const n = [ "webgl", "experimental-webgl" ];
|
|
11110
11107
|
let e = null;
|
|
11111
11108
|
for (let r = 0; r < n.length; ++r) {
|
|
@@ -11267,8 +11264,8 @@
|
|
|
11267
11264
|
}
|
|
11268
11265
|
function hr(t) {
|
|
11269
11266
|
let i;
|
|
11270
|
-
Array.isArray(t.data) ? (i = [], T(i, t.data)) : (i = {},
|
|
11271
|
-
const n =
|
|
11267
|
+
Array.isArray(t.data) ? (i = [], T(i, t.data)) : (i = {}, S(i, t.data));
|
|
11268
|
+
const n = S({}, t);
|
|
11272
11269
|
return n.data = i, n;
|
|
11273
11270
|
}
|
|
11274
11271
|
function ar(t, i) {
|
|
@@ -11321,7 +11318,7 @@
|
|
|
11321
11318
|
};
|
|
11322
11319
|
function yr(t, i, n) {
|
|
11323
11320
|
for (let e = 0; e < t.length; e++) {
|
|
11324
|
-
const r = t[e], s =
|
|
11321
|
+
const r = t[e], s = S({}, r), {renderPlugin: o} = r, h = S({}, o);
|
|
11325
11322
|
h.sceneConfig && !Object.keys(h.sceneConfig).length && delete h.sceneConfig;
|
|
11326
11323
|
let a = -1;
|
|
11327
11324
|
for (let t = n.length - 1; t >= 0; t--) if (dr(h, n[t])) {
|
|
@@ -11506,7 +11503,7 @@
|
|
|
11506
11503
|
};
|
|
11507
11504
|
}
|
|
11508
11505
|
setStyle(t) {
|
|
11509
|
-
if (t && (
|
|
11506
|
+
if (t && (P(t) || t.url)) {
|
|
11510
11507
|
const i = t, n = i.lastIndexOf("/"), e = n < 0 ? "." : i.substring(0, n);
|
|
11511
11508
|
return this.ready = !1, mr.getJSON(t.url ? t.url : t, t.url ? t : {}, (t, n) => {
|
|
11512
11509
|
if (t) throw this.setStyle([]), t;
|
|
@@ -11532,9 +11529,9 @@
|
|
|
11532
11529
|
let {style: e, featureStyle: r} = n;
|
|
11533
11530
|
e = e || [], r = r || [];
|
|
11534
11531
|
const s = new Array(e.length);
|
|
11535
|
-
for (let t = 0; t < e.length; t++) s[t] =
|
|
11532
|
+
for (let t = 0; t < e.length; t++) s[t] = S({}, e[t]), s[t].renderPlugin = i[e[t].renderPlugin];
|
|
11536
11533
|
const o = new Array(r.length);
|
|
11537
|
-
for (let t = 0; t < r.length; t++) o[t] =
|
|
11534
|
+
for (let t = 0; t < r.length; t++) o[t] = S({}, r[t]), o[t].renderPlugin = i[r[t].renderPlugin];
|
|
11538
11535
|
const h = {
|
|
11539
11536
|
style: s,
|
|
11540
11537
|
featureStyle: o
|
|
@@ -11547,9 +11544,9 @@
|
|
|
11547
11544
|
for (let n = 0; n < t.length; n++) {
|
|
11548
11545
|
const e = t[n].style;
|
|
11549
11546
|
if (e && Array.isArray(e) && e.length) for (let r = 0; r < e.length; r++) {
|
|
11550
|
-
const s =
|
|
11547
|
+
const s = S({}, t[n], e[r]);
|
|
11551
11548
|
e[r].un = i.length, delete s.style, i.push(s);
|
|
11552
|
-
} else i.push(
|
|
11549
|
+
} else i.push(S({}, t[n]));
|
|
11553
11550
|
}
|
|
11554
11551
|
return i;
|
|
11555
11552
|
}(t.featureStyle), this.cn = t.style || [];
|
|
@@ -11609,20 +11606,20 @@
|
|
|
11609
11606
|
const r = this.xi(t);
|
|
11610
11607
|
if (!r) return this;
|
|
11611
11608
|
let s, o = i;
|
|
11612
|
-
if (r[i].renderPlugin.sceneConfig || (r[i].renderPlugin.sceneConfig = {}),
|
|
11609
|
+
if (r[i].renderPlugin.sceneConfig || (r[i].renderPlugin.sceneConfig = {}), S(r[i].renderPlugin.sceneConfig, n),
|
|
11613
11610
|
void 0 !== e) {
|
|
11614
11611
|
xr(this.an, i, e), o = this.an[i].style[e].un;
|
|
11615
11612
|
const t = r[o].renderPlugin;
|
|
11616
11613
|
t.sceneConfig || (t.sceneConfig = {}), s = t.sceneConfig;
|
|
11617
11614
|
} else Fr(r, i), s = r[i].renderPlugin.sceneConfig;
|
|
11618
|
-
if (
|
|
11615
|
+
if (S(s, n), Array.isArray(this.options.style)) {
|
|
11619
11616
|
const t = this.options.style[i].renderPlugin;
|
|
11620
|
-
t.sceneConfig || (t.sceneConfig = {}),
|
|
11617
|
+
t.sceneConfig || (t.sceneConfig = {}), S(t.sceneConfig, n);
|
|
11621
11618
|
} else {
|
|
11622
11619
|
const r = this.xi(t, this.options.style);
|
|
11623
11620
|
let s;
|
|
11624
11621
|
void 0 !== e ? (xr(r, i, e), s = r[i].style[e].renderPlugin) : (Fr(r, i), s = r[i].renderPlugin),
|
|
11625
|
-
s.sceneConfig || (s.sceneConfig = {}),
|
|
11622
|
+
s.sceneConfig || (s.sceneConfig = {}), S(s.sceneConfig, n);
|
|
11626
11623
|
}
|
|
11627
11624
|
const h = this.getRenderer();
|
|
11628
11625
|
return h && h.updateSceneConfig(t, o, n), 0 === t ? this.fire("updatesceneconfig", {
|
|
@@ -11646,12 +11643,12 @@
|
|
|
11646
11643
|
let s, o = i;
|
|
11647
11644
|
void 0 !== e ? (xr(this.an, i, e), o = this.an[i].style[e].un, s = r[o].renderPlugin.dataConfig) : (Fr(r, i),
|
|
11648
11645
|
s = r[i].renderPlugin.dataConfig);
|
|
11649
|
-
const h =
|
|
11650
|
-
if (
|
|
11646
|
+
const h = S({}, s);
|
|
11647
|
+
if (S(s, n), Array.isArray(this.options.style)) S(this.options.style[i].renderPlugin.dataConfig, n); else {
|
|
11651
11648
|
const r = this.xi(t, this.options.style);
|
|
11652
11649
|
let s;
|
|
11653
11650
|
void 0 !== e ? (xr(r, i, e), s = r[i].style[e].renderPlugin) : (Fr(r, i), s = r[i].renderPlugin),
|
|
11654
|
-
s.dataConfig || (s.dataConfig = {}),
|
|
11651
|
+
s.dataConfig || (s.dataConfig = {}), S(s.dataConfig, n);
|
|
11655
11652
|
}
|
|
11656
11653
|
const a = this.getRenderer();
|
|
11657
11654
|
return a && a.updateDataConfig(t, o, n, h), 0 === t ? this.fire("updatedataconfig", {
|
|
@@ -11690,7 +11687,7 @@
|
|
|
11690
11687
|
}
|
|
11691
11688
|
}
|
|
11692
11689
|
for (const t in n) U(n, t) && (!r.Util.isObject(n[t]) || Array.isArray(n[t]) || n[t].stops ? s[t] = n[t] : (s[t] || (s[t] = {}),
|
|
11693
|
-
|
|
11690
|
+
S(s[t], n[t])));
|
|
11694
11691
|
let c = a.options.style;
|
|
11695
11692
|
Array.isArray(c) || (c = a.xi(t, a.options.style));
|
|
11696
11693
|
const f = JSON.parse(JSON.stringify(s));
|
|
@@ -11869,28 +11866,28 @@
|
|
|
11869
11866
|
getWorkerOptions() {
|
|
11870
11867
|
const t = super.getWorkerOptions();
|
|
11871
11868
|
let i = this.options.data;
|
|
11872
|
-
return i =
|
|
11869
|
+
return i = P(i) || i && i.url ? Pr(i) : this.features, t.data = i, t.tileBuffer = this.options.tileBuffer,
|
|
11873
11870
|
t.extent = this.options.extent, t;
|
|
11874
11871
|
}
|
|
11875
11872
|
setData(t) {
|
|
11876
|
-
if (this.options.data = t, t && (
|
|
11877
|
-
return !!this.getRenderer() && this.
|
|
11873
|
+
if (this.options.data = t, t && (P(t) || t.url)) {
|
|
11874
|
+
return !!this.getRenderer() && this.Sn(), this;
|
|
11878
11875
|
}
|
|
11879
|
-
return this.
|
|
11876
|
+
return this.Pn(t), this.Sn(), this;
|
|
11880
11877
|
}
|
|
11881
|
-
|
|
11878
|
+
Pn(t) {
|
|
11882
11879
|
if (this.options.convertFn) {
|
|
11883
11880
|
t = new Function("data", this.options.convertFn + "\nreturn convert(data)")(t);
|
|
11884
11881
|
}
|
|
11885
11882
|
return this.features = t, this.On(), this;
|
|
11886
11883
|
}
|
|
11887
|
-
|
|
11884
|
+
Sn() {
|
|
11888
11885
|
const t = this.getRenderer();
|
|
11889
11886
|
if (t) {
|
|
11890
11887
|
const i = t.getWorkerConnection();
|
|
11891
11888
|
if (i) {
|
|
11892
11889
|
let n = this.options.data;
|
|
11893
|
-
n =
|
|
11890
|
+
n = P(n) || n.url ? Pr(n) : this.features, i.setData(n, (i, n) => {
|
|
11894
11891
|
t.clear(), this.onWorkerReady(n), t.setToRedraw();
|
|
11895
11892
|
});
|
|
11896
11893
|
}
|
|
@@ -11906,7 +11903,7 @@
|
|
|
11906
11903
|
this.Cn = new r.Extent(...t);
|
|
11907
11904
|
}
|
|
11908
11905
|
Dn(t, i) {
|
|
11909
|
-
|
|
11906
|
+
P(t) ? mr.getJSON(t, i) : mr.getJSON(t.url, t, i);
|
|
11910
11907
|
}
|
|
11911
11908
|
getData() {
|
|
11912
11909
|
return this.features || null;
|
|
@@ -11933,12 +11930,12 @@
|
|
|
11933
11930
|
});
|
|
11934
11931
|
}
|
|
11935
11932
|
}
|
|
11936
|
-
function
|
|
11933
|
+
function Sr(t) {
|
|
11937
11934
|
let i = document.createElement("a");
|
|
11938
11935
|
return i.href = t, t = i.href, i = null, t;
|
|
11939
11936
|
}
|
|
11940
|
-
function
|
|
11941
|
-
return t.url ? t.url =
|
|
11937
|
+
function Pr(t) {
|
|
11938
|
+
return t.url ? t.url = Sr(t.url) : t = Sr(t), t;
|
|
11942
11939
|
}
|
|
11943
11940
|
_r.registerJSONType("GeoJSONVectorTileLayer"), _r.mergeOptions({
|
|
11944
11941
|
features: "id",
|
|
@@ -11960,7 +11957,7 @@
|
|
|
11960
11957
|
if (!this.options.style) throw new Error("can't call update symbol when style is not set");
|
|
11961
11958
|
const n = Array.isArray(this.options.style) ? this.options.style : this.options.style.style;
|
|
11962
11959
|
if (!n[t]) throw new Error("invalid style at " + t);
|
|
11963
|
-
return
|
|
11960
|
+
return S(n[t].symbol, i), this.setStyle(this.options.style), this;
|
|
11964
11961
|
}
|
|
11965
11962
|
getPolygonOffsetCount() {
|
|
11966
11963
|
return 1;
|
|
@@ -12061,7 +12058,7 @@
|
|
|
12061
12058
|
if (Array.isArray(c) && c.length) {
|
|
12062
12059
|
const r = [], s = c.length;
|
|
12063
12060
|
for (let o = 0; o < s; o++) {
|
|
12064
|
-
const h = o === s - 1 ? u :
|
|
12061
|
+
const h = o === s - 1 ? u : S({}, u);
|
|
12065
12062
|
for (const t in c[o]) U(c[o], t) && (h["_symbol_" + t] = c[o][t]);
|
|
12066
12063
|
const d = n && n[o] ? n[o].id : i.pickingId++, y = {
|
|
12067
12064
|
type: l,
|
|
@@ -12404,7 +12401,7 @@
|
|
|
12404
12401
|
this.jn = {}, this.Rn = {}, this.Nn = {}, this.zn = !0, this.Wn = {
|
|
12405
12402
|
id: 0,
|
|
12406
12403
|
pickingId: 0
|
|
12407
|
-
}, this.Hn =
|
|
12404
|
+
}, this.Hn = S({}, Dr, Lr), this.Vn = {};
|
|
12408
12405
|
}
|
|
12409
12406
|
hasNoAARendering() {
|
|
12410
12407
|
return !0;
|
|
@@ -12457,7 +12454,7 @@
|
|
|
12457
12454
|
cameraPosition: this.getMap().cameraPosition,
|
|
12458
12455
|
timestamp: this.getFrameTimestamp()
|
|
12459
12456
|
};
|
|
12460
|
-
return this.Di &&
|
|
12457
|
+
return this.Di && S(t, this.Di), t;
|
|
12461
12458
|
}
|
|
12462
12459
|
drawOnInteracting(t, i, n) {
|
|
12463
12460
|
this.draw(i, n);
|
|
@@ -12629,7 +12626,7 @@
|
|
|
12629
12626
|
positionType: Float32Array,
|
|
12630
12627
|
altitudeProperty: "altitude",
|
|
12631
12628
|
defaultAltitude: 0
|
|
12632
|
-
}, s =
|
|
12629
|
+
}, s = S({}, r);
|
|
12633
12630
|
r.allowEmptyPack = 1;
|
|
12634
12631
|
return Xn.splitPointSymbol(this.Hn).map((n, e) => new Xn(0 === e ? t : i, n, 0 === e ? r : s).load());
|
|
12635
12632
|
}
|
|
@@ -12696,7 +12693,7 @@
|
|
|
12696
12693
|
if (n[0].geometry.properties.aFeaIds.indexOf(d) < 0) return this.ge(), this.setToRedraw(),
|
|
12697
12694
|
!1;
|
|
12698
12695
|
}
|
|
12699
|
-
const p =
|
|
12696
|
+
const p = S({}, o), m = y.map(t => this.createVectorPacks(r, s, p, t, n[0], e));
|
|
12700
12697
|
return Promise.all(m).then(t => {
|
|
12701
12698
|
for (let n = 0; n < t.length; n++) {
|
|
12702
12699
|
let e;
|
|
@@ -12733,7 +12730,7 @@
|
|
|
12733
12730
|
if (!i.length) return;
|
|
12734
12731
|
const e = this.te;
|
|
12735
12732
|
this.Me = n;
|
|
12736
|
-
const r = this.xe(i), s =
|
|
12733
|
+
const r = this.xe(i), s = S({}, Ur), o = r.map((i, e) => this.createMesh(this.Gn, Kn, s, i, t && t[e], n));
|
|
12737
12734
|
this.Fe = !0, Promise.all(o).then(t => {
|
|
12738
12735
|
this.Qn && this.Gn.deleteMesh(this.Qn);
|
|
12739
12736
|
const i = [], n = [];
|
|
@@ -12782,9 +12779,9 @@
|
|
|
12782
12779
|
const i = t[Ir];
|
|
12783
12780
|
this.features[i] && this._e(i), this.features[i] = Tr(t, this.Wn, this.features[i]);
|
|
12784
12781
|
const n = this.features[i];
|
|
12785
|
-
return this.
|
|
12782
|
+
return this.Se(n), this.features[i][Ir] = i, this.Ln[i] = t, i;
|
|
12786
12783
|
}
|
|
12787
|
-
|
|
12784
|
+
Se(t) {
|
|
12788
12785
|
if (!t) return;
|
|
12789
12786
|
const i = Array.isArray(t) ? t[0].id : t.id;
|
|
12790
12787
|
if (this.En[i] = t, Array.isArray(t)) for (let i = 0; i < t.length; i++) {
|
|
@@ -12825,14 +12822,14 @@
|
|
|
12825
12822
|
}
|
|
12826
12823
|
}), e;
|
|
12827
12824
|
}
|
|
12828
|
-
|
|
12825
|
+
Pe(t) {
|
|
12829
12826
|
const i = t[Ir], n = this.features[i];
|
|
12830
12827
|
return Array.isArray(n) ? n[0][Rr] : n[Rr];
|
|
12831
12828
|
}
|
|
12832
12829
|
ne() {
|
|
12833
12830
|
let t = !1;
|
|
12834
12831
|
for (const i in this.Vn) {
|
|
12835
|
-
const n = this.Vn[i], e = this.
|
|
12832
|
+
const n = this.Vn[i], e = this.Pe(n);
|
|
12836
12833
|
if (!this.ye && (this.jn[e] || this.Rn[e])) {
|
|
12837
12834
|
const i = this.me(n);
|
|
12838
12835
|
t = t || i;
|
|
@@ -12926,7 +12923,7 @@
|
|
|
12926
12923
|
const t = this.features[n];
|
|
12927
12924
|
for (let i = 0; i < t.length; i++) t[i][Ir] = n;
|
|
12928
12925
|
} else this.features[n][Ir] = n;
|
|
12929
|
-
this.
|
|
12926
|
+
this.Se(this.features[n]), this.ge(), Wr(this);
|
|
12930
12927
|
}
|
|
12931
12928
|
createContext() {
|
|
12932
12929
|
const t = this.canvas.gl && this.canvas.gl.wrap;
|
|
@@ -12934,9 +12931,9 @@
|
|
|
12934
12931
|
t && (this.canvas.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height)),
|
|
12935
12932
|
this.prepareRequestors(), this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height),
|
|
12936
12933
|
this.painter = this.createPainter();
|
|
12937
|
-
const i = Or.get3DPainterClass("icon"), n =
|
|
12934
|
+
const i = Or.get3DPainterClass("icon"), n = S({}, Dr, Lr);
|
|
12938
12935
|
this.$n = new i(this.regl, this.layer, n, this.layer.options.sceneConfig, 0);
|
|
12939
|
-
const e = Or.get3DPainterClass("line"), r =
|
|
12936
|
+
const e = Or.get3DPainterClass("line"), r = S({}, Ur);
|
|
12940
12937
|
this.Gn = new e(this.regl, this.layer, r, this.layer.options.sceneConfig, 0), this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
|
|
12941
12938
|
}
|
|
12942
12939
|
createPainter() {}
|
|
@@ -12946,7 +12943,7 @@
|
|
|
12946
12943
|
depth: !0,
|
|
12947
12944
|
antialias: !1
|
|
12948
12945
|
};
|
|
12949
|
-
t.preserveDrawingBuffer = !0, t.stencil = !0, this.glOptions = t, this.gl = this.gl || this.
|
|
12946
|
+
t.preserveDrawingBuffer = !0, t.stencil = !0, this.glOptions = t, this.gl = this.gl || this.Si(this.canvas, t),
|
|
12950
12947
|
this.regl = n.createREGL({
|
|
12951
12948
|
gl: this.gl,
|
|
12952
12949
|
attributes: t,
|
|
@@ -12954,7 +12951,7 @@
|
|
|
12954
12951
|
optionalExtensions: n.reshader.Constants.WEBGL_OPTIONAL_EXTENSIONS
|
|
12955
12952
|
});
|
|
12956
12953
|
}
|
|
12957
|
-
|
|
12954
|
+
Si(t, i) {
|
|
12958
12955
|
const n = [ "webgl", "experimental-webgl" ];
|
|
12959
12956
|
let e = null;
|
|
12960
12957
|
for (let r = 0; r < n.length; ++r) {
|
|
@@ -13138,7 +13135,7 @@
|
|
|
13138
13135
|
if (!i.length) return;
|
|
13139
13136
|
const e = this.te;
|
|
13140
13137
|
this.Le = n;
|
|
13141
|
-
const r = this.Ue(i), s =
|
|
13138
|
+
const r = this.Ue(i), s = S({}, Kr), o = r.map((i, e) => this.createMesh(this.painter, Ue, s, i, t && t[e], n));
|
|
13142
13139
|
this.Oe = !0, Promise.all(o).then(t => {
|
|
13143
13140
|
this.meshes && this.painter.deleteMesh(this.meshes);
|
|
13144
13141
|
const i = [], n = [];
|
|
@@ -13164,13 +13161,13 @@
|
|
|
13164
13161
|
}
|
|
13165
13162
|
createPainter() {
|
|
13166
13163
|
const t = Or.get3DPainterClass("fill");
|
|
13167
|
-
this.painterSymbol =
|
|
13164
|
+
this.painterSymbol = S({}, Kr);
|
|
13168
13165
|
return new t(this.regl, this.layer, this.painterSymbol, this.layer.options.sceneConfig, 0);
|
|
13169
13166
|
}
|
|
13170
13167
|
updateMesh(t) {
|
|
13171
13168
|
return this.be(t, this.meshes, this.atlas, this.Le, this.painter, Ue, Kr, this.Ue);
|
|
13172
13169
|
}
|
|
13173
|
-
}), Yr.registerRenderer("canvas", null), gr.VERSION = "0.
|
|
13170
|
+
}), Yr.registerRenderer("canvas", null), gr.VERSION = "0.58.0", Or.VERSION = "0.58.0",
|
|
13174
13171
|
t.GeoJSONVectorTileLayer = _r, t.LineStringLayer = Zr, t.MapboxVectorTileLayer = Ar,
|
|
13175
13172
|
t.PackUtil = Je, t.PointLayer = Xr, t.PolygonLayer = Yr, t.SYMBOLS_NEED_REBUILD_IN_VECTOR = Xe,
|
|
13176
13173
|
t.SYMBOLS_NEED_REBUILD_IN_VT = Be, t.Vector3DLayer = Or, t.VectorTileLayer = gr,
|
|
@@ -13178,5 +13175,5 @@
|
|
|
13178
13175
|
value: !0
|
|
13179
13176
|
});
|
|
13180
13177
|
}));
|
|
13181
|
-
o.mat4.create(), "undefined" != typeof console && console.log("@maptalks/vt v0.
|
|
13178
|
+
o.mat4.create(), "undefined" != typeof console && console.log("@maptalks/vt v0.58.0");
|
|
13182
13179
|
}));
|