@maptalks/vt 0.103.5 → 0.104.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.d.ts +1 -1
- package/dist/maptalks.vt.es.js +7 -6
- package/dist/maptalks.vt.es.js.map +1 -1
- package/dist/maptalks.vt.js +241 -240
- package/dist/maptalks.vt.js.map +1 -1
- package/package.json +2 -2
package/dist/maptalks.vt.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* @maptalks/vt v0.
|
|
2
|
+
* @maptalks/vt v0.104.0
|
|
3
3
|
* LICENSE : undefined
|
|
4
4
|
* (c) 2016-2025 maptalks.org
|
|
5
5
|
*/
|
|
@@ -437,7 +437,7 @@
|
|
|
437
437
|
return [ (this.paddedRect.w - 2 * this.padding) / this.pixelRatio, (this.paddedRect.h - 2 * this.padding) / this.pixelRatio ];
|
|
438
438
|
}
|
|
439
439
|
}
|
|
440
|
-
class
|
|
440
|
+
class F {
|
|
441
441
|
constructor(e) {
|
|
442
442
|
this.glyphMap = e, this.build();
|
|
443
443
|
}
|
|
@@ -457,7 +457,7 @@
|
|
|
457
457
|
if (i.pack(r, {
|
|
458
458
|
inPlace: !0
|
|
459
459
|
}), !C(i.w) || !C(i.h)) {
|
|
460
|
-
const e =
|
|
460
|
+
const e = O(i.w), t = O(i.h);
|
|
461
461
|
i.resize(e, t);
|
|
462
462
|
}
|
|
463
463
|
const o = new v({
|
|
@@ -477,7 +477,7 @@
|
|
|
477
477
|
this.image = o, this.positions = n;
|
|
478
478
|
}
|
|
479
479
|
}
|
|
480
|
-
function
|
|
480
|
+
function O(e) {
|
|
481
481
|
return Math.pow(2, Math.ceil(Math.log(e) / Math.LN2));
|
|
482
482
|
}
|
|
483
483
|
/*!
|
|
@@ -1512,14 +1512,14 @@
|
|
|
1512
1512
|
return [ (e[0] + e[1] + e[2]) / 3 / 255 * 100 ];
|
|
1513
1513
|
};
|
|
1514
1514
|
var Ce = be.exports, Ie = Ce;
|
|
1515
|
-
function
|
|
1515
|
+
function Fe(e, t) {
|
|
1516
1516
|
return function(n) {
|
|
1517
1517
|
return t(e(n));
|
|
1518
1518
|
};
|
|
1519
1519
|
}
|
|
1520
|
-
function
|
|
1520
|
+
function Oe(e, t) {
|
|
1521
1521
|
for (var n = [ t[e].parent, e ], i = Ie[t[e].parent][e], r = t[e].parent; t[r].parent; ) n.unshift(t[r].parent),
|
|
1522
|
-
i =
|
|
1522
|
+
i = Fe(Ie[t[r].parent][r], i), r = t[r].parent;
|
|
1523
1523
|
return i.conversion = n, i;
|
|
1524
1524
|
}
|
|
1525
1525
|
var Re = Ce, Ee = function(e) {
|
|
@@ -1538,7 +1538,7 @@
|
|
|
1538
1538
|
return t;
|
|
1539
1539
|
}(e), n = {}, i = Object.keys(t), r = i.length, s = 0; s < r; s++) {
|
|
1540
1540
|
var o = i[s];
|
|
1541
|
-
null !== t[o].parent && (n[o] =
|
|
1541
|
+
null !== t[o].parent && (n[o] = Oe(o, t));
|
|
1542
1542
|
}
|
|
1543
1543
|
return n;
|
|
1544
1544
|
}, De = {};
|
|
@@ -2149,8 +2149,8 @@
|
|
|
2149
2149
|
return !!this.bindings[e] || !!this.parent && this.parent.has(e);
|
|
2150
2150
|
}
|
|
2151
2151
|
}
|
|
2152
|
-
var
|
|
2153
|
-
const
|
|
2152
|
+
var Ft = It;
|
|
2153
|
+
const Ot = {
|
|
2154
2154
|
kind: "null"
|
|
2155
2155
|
}, Rt = {
|
|
2156
2156
|
kind: "number"
|
|
@@ -2185,7 +2185,7 @@
|
|
|
2185
2185
|
}
|
|
2186
2186
|
return e.kind;
|
|
2187
2187
|
}
|
|
2188
|
-
const jt = [
|
|
2188
|
+
const jt = [ Ot, Rt, Et, Dt, Lt, Vt, Ht, Ut(Nt), Bt ];
|
|
2189
2189
|
function Wt(e, t) {
|
|
2190
2190
|
if ("error" === t.kind) return null;
|
|
2191
2191
|
if ("array" === e.kind) {
|
|
@@ -2523,7 +2523,7 @@
|
|
|
2523
2523
|
return !1;
|
|
2524
2524
|
}
|
|
2525
2525
|
function cn(e) {
|
|
2526
|
-
if (null === e) return
|
|
2526
|
+
if (null === e) return Ot;
|
|
2527
2527
|
if ("string" == typeof e) return Et;
|
|
2528
2528
|
if ("boolean" == typeof e) return Dt;
|
|
2529
2529
|
if ("number" == typeof e) return Rt;
|
|
@@ -2932,13 +2932,13 @@
|
|
|
2932
2932
|
function In(e, t) {
|
|
2933
2933
|
return !(e[0] <= t[0] || e[2] >= t[2] || e[1] <= t[1] || e[3] >= t[3]);
|
|
2934
2934
|
}
|
|
2935
|
-
function
|
|
2935
|
+
function Fn(e, t) {
|
|
2936
2936
|
const n = (180 + e[0]) / 360, i = (r = e[1], (180 - 180 / Math.PI * Math.log(Math.tan(Math.PI / 4 + r * Math.PI / 360))) / 360);
|
|
2937
2937
|
var r;
|
|
2938
2938
|
const s = Math.pow(2, t.z);
|
|
2939
2939
|
return [ Math.round(n * s * kn), Math.round(i * s * kn) ];
|
|
2940
2940
|
}
|
|
2941
|
-
function
|
|
2941
|
+
function On(e, t, n) {
|
|
2942
2942
|
const i = e[0] - t[0], r = e[1] - t[1], s = e[0] - n[0], o = e[1] - n[1];
|
|
2943
2943
|
return i * o - s * r == 0 && i * s <= 0 && r * o <= 0;
|
|
2944
2944
|
}
|
|
@@ -2947,7 +2947,7 @@
|
|
|
2947
2947
|
for (let o = 0, a = t.length; o < a; o++) {
|
|
2948
2948
|
const a = t[o];
|
|
2949
2949
|
for (let t = 0, o = a.length; t < o - 1; t++) {
|
|
2950
|
-
if (
|
|
2950
|
+
if (On(e, a[t], a[t + 1])) return !1;
|
|
2951
2951
|
i = e, r = a[t], s = a[t + 1], r[1] > i[1] != s[1] > i[1] && i[0] < (s[0] - r[0]) * (i[1] - r[1]) / (s[1] - r[1]) + r[0] && (n = !n);
|
|
2952
2952
|
}
|
|
2953
2953
|
}
|
|
@@ -2985,7 +2985,7 @@
|
|
|
2985
2985
|
for (let r = 0; r < e.length; r++) {
|
|
2986
2986
|
const s = [];
|
|
2987
2987
|
for (let i = 0; i < e[r].length; i++) {
|
|
2988
|
-
const o =
|
|
2988
|
+
const o = Fn(e[r][i], n);
|
|
2989
2989
|
Cn(t, o), s.push(o);
|
|
2990
2990
|
}
|
|
2991
2991
|
i.push(s);
|
|
@@ -3147,7 +3147,7 @@
|
|
|
3147
3147
|
}
|
|
3148
3148
|
var Jn = Zn;
|
|
3149
3149
|
class Kn {
|
|
3150
|
-
constructor(e, t = [], n, i = new
|
|
3150
|
+
constructor(e, t = [], n, i = new Ft, r = []) {
|
|
3151
3151
|
this.registry = e, this.path = t, this.key = t.map((e => `[${e}]`)).join(""), this.scope = i,
|
|
3152
3152
|
this.errors = r, this.expectedType = n;
|
|
3153
3153
|
}
|
|
@@ -3517,7 +3517,7 @@
|
|
|
3517
3517
|
}
|
|
3518
3518
|
}
|
|
3519
3519
|
var Ii = Ci;
|
|
3520
|
-
class
|
|
3520
|
+
class Fi {
|
|
3521
3521
|
constructor(e, t) {
|
|
3522
3522
|
this.type = t.type, this.bindings = [].concat(e), this.result = t;
|
|
3523
3523
|
}
|
|
@@ -3540,7 +3540,7 @@
|
|
|
3540
3540
|
n.push([ r, s ]);
|
|
3541
3541
|
}
|
|
3542
3542
|
const i = t.parse(e[e.length - 1], e.length - 1, t.expectedType, n);
|
|
3543
|
-
return i ? new
|
|
3543
|
+
return i ? new Fi(n, i) : null;
|
|
3544
3544
|
}
|
|
3545
3545
|
outputDefined() {
|
|
3546
3546
|
return this.result.outputDefined();
|
|
@@ -3551,7 +3551,7 @@
|
|
|
3551
3551
|
return e.push(this.result.serialize()), e;
|
|
3552
3552
|
}
|
|
3553
3553
|
}
|
|
3554
|
-
var
|
|
3554
|
+
var Oi = Fi;
|
|
3555
3555
|
class Ri {
|
|
3556
3556
|
constructor(e, t, n) {
|
|
3557
3557
|
this.type = e, this.index = t, this.input = n;
|
|
@@ -3588,7 +3588,7 @@
|
|
|
3588
3588
|
static parse(e, t) {
|
|
3589
3589
|
if (3 !== e.length) return t.error(`Expected 2 arguments, but found ${e.length - 1} instead.`);
|
|
3590
3590
|
const n = t.parse(e[1], 1, Nt), i = t.parse(e[2], 2, Nt);
|
|
3591
|
-
return n && i ? Xt(n.type, [ Dt, Et, Rt,
|
|
3591
|
+
return n && i ? Xt(n.type, [ Dt, Et, Rt, Ot, Nt ]) ? new Di(n, i) : t.error(`Expected first argument to be of type boolean, string, number or null, but found ${Gt(n.type)} instead`) : null;
|
|
3592
3592
|
}
|
|
3593
3593
|
evaluate(e) {
|
|
3594
3594
|
const t = this.needle.evaluate(e), n = this.haystack.evaluate(e);
|
|
@@ -3616,7 +3616,7 @@
|
|
|
3616
3616
|
if (e.length <= 2 || e.length >= 5) return t.error(`Expected 3 or 4 arguments, but found ${e.length - 1} instead.`);
|
|
3617
3617
|
const n = t.parse(e[1], 1, Nt), i = t.parse(e[2], 2, Nt);
|
|
3618
3618
|
if (!n || !i) return null;
|
|
3619
|
-
if (!Xt(n.type, [ Dt, Et, Rt,
|
|
3619
|
+
if (!Xt(n.type, [ Dt, Et, Rt, Ot, Nt ])) return t.error(`Expected first argument to be of type boolean, string, number or null, but found ${Gt(n.type)} instead`);
|
|
3620
3620
|
if (4 === e.length) {
|
|
3621
3621
|
const r = t.parse(e[3], 3, Rt);
|
|
3622
3622
|
return r ? new Hi(n, i, r) : null;
|
|
@@ -3960,7 +3960,7 @@
|
|
|
3960
3960
|
"interpolate-hcl": ki,
|
|
3961
3961
|
"interpolate-lab": ki,
|
|
3962
3962
|
length: tr,
|
|
3963
|
-
let:
|
|
3963
|
+
let: Oi,
|
|
3964
3964
|
literal: dn,
|
|
3965
3965
|
match: Vi,
|
|
3966
3966
|
number: yn,
|
|
@@ -4372,7 +4372,7 @@
|
|
|
4372
4372
|
}
|
|
4373
4373
|
function Pr(e) {
|
|
4374
4374
|
let t = null;
|
|
4375
|
-
if (e instanceof
|
|
4375
|
+
if (e instanceof Oi) t = Pr(e.result); else if (e instanceof Ii) {
|
|
4376
4376
|
for (const n of e.args) if (t = Pr(n), t) break;
|
|
4377
4377
|
} else (e instanceof ii || e instanceof ki) && e.input instanceof Sn && "zoom" === e.input.name && (t = e);
|
|
4378
4378
|
return t instanceof Ct || e.eachChild((e => {
|
|
@@ -4401,9 +4401,9 @@
|
|
|
4401
4401
|
let i = !0;
|
|
4402
4402
|
try {
|
|
4403
4403
|
i = function(e) {
|
|
4404
|
-
if (!
|
|
4404
|
+
if (!Or(e)) return e;
|
|
4405
4405
|
let t = kr(e);
|
|
4406
|
-
return
|
|
4406
|
+
return Fr(t), t = Ir(t), t;
|
|
4407
4407
|
}(n);
|
|
4408
4408
|
} catch (e) {
|
|
4409
4409
|
console.warn(`Failed to extract static filter. Filter will continue working, but at higher memory usage and slower framerate.\nThis is most likely a bug, please report this via https://github.com/mapbox/mapbox-gl-js/issues/new?assignees=&labels=&template=Bug_report.md\nand paste the contents of this message in the report.\nThank you!\nFilter Expression:\n${JSON.stringify(n, null, 2)}\n `);
|
|
@@ -4428,34 +4428,34 @@
|
|
|
4428
4428
|
function Ir(e) {
|
|
4429
4429
|
if (!Array.isArray(e)) return e;
|
|
4430
4430
|
const t = function(e) {
|
|
4431
|
-
if (Rr.has(e[0])) for (let t = 1; t < e.length; t++) if (
|
|
4431
|
+
if (Rr.has(e[0])) for (let t = 1; t < e.length; t++) if (Or(e[t])) return !0;
|
|
4432
4432
|
return e;
|
|
4433
4433
|
}(e);
|
|
4434
4434
|
return !0 === t ? t : t.map((e => Ir(e)));
|
|
4435
4435
|
}
|
|
4436
|
-
function
|
|
4436
|
+
function Fr(e) {
|
|
4437
4437
|
let t = !1;
|
|
4438
4438
|
const n = [];
|
|
4439
4439
|
if ("case" === e[0]) {
|
|
4440
|
-
for (let i = 1; i < e.length - 1; i += 2) t = t ||
|
|
4440
|
+
for (let i = 1; i < e.length - 1; i += 2) t = t || Or(e[i]), n.push(e[i + 1]);
|
|
4441
4441
|
n.push(e[e.length - 1]);
|
|
4442
4442
|
} else if ("match" === e[0]) {
|
|
4443
|
-
t = t ||
|
|
4443
|
+
t = t || Or(e[1]);
|
|
4444
4444
|
for (let t = 2; t < e.length - 1; t += 2) n.push(e[t + 1]);
|
|
4445
4445
|
n.push(e[e.length - 1]);
|
|
4446
4446
|
} else if ("step" === e[0]) {
|
|
4447
|
-
t = t ||
|
|
4447
|
+
t = t || Or(e[1]);
|
|
4448
4448
|
for (let t = 1; t < e.length - 1; t += 2) n.push(e[t + 1]);
|
|
4449
4449
|
}
|
|
4450
4450
|
t && (e.length = 0, e.push("any", ...n));
|
|
4451
|
-
for (let t = 1; t < e.length; t++)
|
|
4451
|
+
for (let t = 1; t < e.length; t++) Fr(e[t]);
|
|
4452
4452
|
}
|
|
4453
|
-
function
|
|
4453
|
+
function Or(e) {
|
|
4454
4454
|
if (!Array.isArray(e)) return !1;
|
|
4455
4455
|
if (function(e) {
|
|
4456
4456
|
return "pitch" === e || "distance-from-center" === e;
|
|
4457
4457
|
}(e[0])) return !0;
|
|
4458
|
-
for (let t = 1; t < e.length; t++) if (
|
|
4458
|
+
for (let t = 1; t < e.length; t++) if (Or(e[t])) return !0;
|
|
4459
4459
|
return !1;
|
|
4460
4460
|
}
|
|
4461
4461
|
const Rr = new Set([ "in", "==", "!=", ">", ">=", "<", "<=", "to-boolean" ]);
|
|
@@ -4924,7 +4924,7 @@
|
|
|
4924
4924
|
height: r
|
|
4925
4925
|
}, s);
|
|
4926
4926
|
}
|
|
4927
|
-
this.iconAtlas = new
|
|
4927
|
+
this.iconAtlas = new F(e);
|
|
4928
4928
|
}
|
|
4929
4929
|
if (n && Object.keys(n).length) {
|
|
4930
4930
|
for (const e in n) {
|
|
@@ -5083,7 +5083,7 @@
|
|
|
5083
5083
|
}
|
|
5084
5084
|
function ds(e) {
|
|
5085
5085
|
let t = e.positions, n = e.image && e.image.format || "alpha";
|
|
5086
|
-
if (e instanceof
|
|
5086
|
+
if (e instanceof F) {
|
|
5087
5087
|
t = {};
|
|
5088
5088
|
for (const n in e.positions) {
|
|
5089
5089
|
const i = e.positions[n];
|
|
@@ -5289,12 +5289,12 @@
|
|
|
5289
5289
|
return !!(Ss["Latin-1 Supplement"](e) && (167 === e || 169 === e || 174 === e || 177 === e || 188 === e || 189 === e || 190 === e || 215 === e || 247 === e) || Ss["General Punctuation"](e) && (8214 === e || 8224 === e || 8225 === e || 8240 === e || 8241 === e || 8251 === e || 8252 === e || 8258 === e || 8263 === e || 8264 === e || 8265 === e || 8273 === e) || Ss["Letterlike Symbols"](e) || Ss["Number Forms"](e) || Ss["Miscellaneous Technical"](e) && (e >= 8960 && e <= 8967 || e >= 8972 && e <= 8991 || e >= 8996 && e <= 9e3 || 9003 === e || e >= 9085 && e <= 9114 || e >= 9150 && e <= 9165 || 9167 === e || e >= 9169 && e <= 9179 || e >= 9186 && e <= 9215) || Ss["Control Pictures"](e) && 9251 !== e || Ss["Optical Character Recognition"](e) || Ss["Enclosed Alphanumerics"](e) || Ss["Geometric Shapes"](e) || Ss["Miscellaneous Symbols"](e) && !(e >= 9754 && e <= 9759) || Ss["Miscellaneous Symbols and Arrows"](e) && (e >= 11026 && e <= 11055 || e >= 11088 && e <= 11097 || e >= 11192 && e <= 11243) || Ss["CJK Symbols and Punctuation"](e) || Ss.Katakana(e) || Ss["Private Use Area"](e) || Ss["CJK Compatibility Forms"](e) || Ss["Small Form Variants"](e) || Ss["Halfwidth and Fullwidth Forms"](e) || 8734 === e || 8756 === e || 8757 === e || e >= 9984 && e <= 10087 || e >= 10102 && e <= 10131 || 65532 === e || 65533 === e);
|
|
5290
5290
|
}(e));
|
|
5291
5291
|
}
|
|
5292
|
-
function
|
|
5292
|
+
function Fs(e) {
|
|
5293
5293
|
return e >= 1424 && e <= 2303 || Ss["Arabic Presentation Forms-A"](e) || Ss["Arabic Presentation Forms-B"](e);
|
|
5294
5294
|
}
|
|
5295
|
-
const
|
|
5295
|
+
const Os = [ [ 9, 9 ], [ 32, 32 ], [ 5760, 5760 ], [ 8192, 8198 ], [ 8200, 8202 ], [ 8287, 12288 ], [ 6158, 6158 ], [ 8203, 8205 ] ];
|
|
5296
5296
|
function Rs(e) {
|
|
5297
|
-
for (const t of
|
|
5297
|
+
for (const t of Os) if (e >= t[0] && e <= t[1]) return !0;
|
|
5298
5298
|
return !1;
|
|
5299
5299
|
}
|
|
5300
5300
|
const Es = {
|
|
@@ -5556,14 +5556,14 @@
|
|
|
5556
5556
|
}
|
|
5557
5557
|
function Xs(e) {
|
|
5558
5558
|
if (!function(e) {
|
|
5559
|
-
for (const t of e) if (
|
|
5559
|
+
for (const t of e) if (Fs(t.charCodeAt(0))) return !0;
|
|
5560
5560
|
return !1;
|
|
5561
5561
|
}(e)) return e;
|
|
5562
5562
|
const t = [], n = [], i = [];
|
|
5563
5563
|
let r = 0, s = 0, o = 1, a = 1;
|
|
5564
5564
|
for (const l of e) {
|
|
5565
5565
|
const e = l.codePointAt(0);
|
|
5566
|
-
Rs(e) ? (i.push(l), r++) : (o =
|
|
5566
|
+
Rs(e) ? (i.push(l), r++) : (o = Fs(e) ? -1 : 1, a !== o ? (s = r, n.length && (a > 0 && n.reverse(),
|
|
5567
5567
|
t.push(...n)), i.length && (t.splice(s, 0, ...i), i.length = 0), a = o, n.length = 0) : i.length && (n.push(...i),
|
|
5568
5568
|
i.length = 0), n.push(l), r++);
|
|
5569
5569
|
}
|
|
@@ -6307,7 +6307,7 @@
|
|
|
6307
6307
|
for (let n = 0; n < e.length; n++) if (Cs(e.charAt(n).charCodeAt(0))) t = 0; else if (t++,
|
|
6308
6308
|
t >= 1) return !1;
|
|
6309
6309
|
return !0;
|
|
6310
|
-
}(e.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: g, textSizeFn: m, textHaloFillFn: y, textHaloRadiusFn: x, textHaloOpacityFn: _, textDxFn: v, textDyFn: b, textPitchAlignmentFn: A, textRotationAlignmentFn: w, textRotationFn: k, textAllowOverlapFn: C, textIgnorePlacementFn: I, textOpacityFn:
|
|
6310
|
+
}(e.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: g, textSizeFn: m, textHaloFillFn: y, textHaloRadiusFn: x, textHaloOpacityFn: _, textDxFn: v, textDyFn: b, textPitchAlignmentFn: A, textRotationAlignmentFn: w, textRotationFn: k, textAllowOverlapFn: C, textIgnorePlacementFn: I, textOpacityFn: F, markerWidthFn: O, markerHeightFn: R, markerDxFn: E, markerDyFn: D, markerPitchAlignmentFn: L, markerRotationAlignmentFn: H, markerRotationFn: N, markerAllowOverlapFn: z, markerIgnorePlacementFn: V, markerOpacityFn: B} = this._fnTypes;
|
|
6311
6311
|
let U, G, j, W, X, Y, q, $, Z, J, K, Q, te, ne, ie, re, se;
|
|
6312
6312
|
if (d) {
|
|
6313
6313
|
const t = e.getIconAndGlyph().glyph.font;
|
|
@@ -6374,7 +6374,7 @@
|
|
|
6374
6374
|
writingMode: void 0,
|
|
6375
6375
|
glyphOffset: [ 0, 0 ]
|
|
6376
6376
|
} ];
|
|
6377
|
-
}(),
|
|
6377
|
+
}(), O && (Z = O(null, u)), S(Z) && (Z = U[0].tex.w), R && (J = R(null, u)), S(J) && (J = U[0].tex.h),
|
|
6378
6378
|
E && (K = E(null, u)), D && (Q = D(null, u)), L && (te = +("map" === L(null, u))),
|
|
6379
6379
|
H && (ne = +("map" === H(null, u))), N && (ie = P(N(null, u), 0, 360) * Math.PI / 180);
|
|
6380
6380
|
ee(j) && (this.dynamicAttrs.aTextSize = 1), ee(X) && (this.dynamicAttrs.aTextHaloRadius = 1),
|
|
@@ -6388,7 +6388,7 @@
|
|
|
6388
6388
|
const ae = V || I;
|
|
6389
6389
|
let le;
|
|
6390
6390
|
ae && (se = ae(null, u) || 0);
|
|
6391
|
-
const he =
|
|
6391
|
+
const he = F || B;
|
|
6392
6392
|
he && (le = 255 * he(this.options.zoom, u));
|
|
6393
6393
|
const ce = U.length;
|
|
6394
6394
|
this.ensureDataCapacity(4 * ce, o.length);
|
|
@@ -6433,7 +6433,7 @@
|
|
|
6433
6433
|
}
|
|
6434
6434
|
}
|
|
6435
6435
|
_fillFnTypeData(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m, y) {
|
|
6436
|
-
const {textFillFn: x, textSizeFn: _, textHaloFillFn: v, textHaloRadiusFn: b, textHaloOpacityFn: A, textDxFn: w, textDyFn: T, textPitchAlignmentFn: M, textRotationAlignmentFn: S, textRotationFn: P, textAllowOverlapFn: k, textIgnorePlacementFn: C, textOpacityFn: I, markerWidthFn:
|
|
6436
|
+
const {textFillFn: x, textSizeFn: _, textHaloFillFn: v, textHaloRadiusFn: b, textHaloOpacityFn: A, textDxFn: w, textDyFn: T, textPitchAlignmentFn: M, textRotationAlignmentFn: S, textRotationFn: P, textAllowOverlapFn: k, textIgnorePlacementFn: C, textOpacityFn: I, markerWidthFn: F, markerHeightFn: O, markerDxFn: R, markerDyFn: E, markerPitchAlignmentFn: D, markerRotationAlignmentFn: L, markerRotationFn: H, markerAllowOverlapFn: N, markerIgnorePlacementFn: z, markerOpacityFn: V} = this._fnTypes;
|
|
6437
6437
|
if (x) {
|
|
6438
6438
|
let n = e.aTextFill.currentIndex;
|
|
6439
6439
|
e.aTextFill[n++] = t[0], e.aTextFill[n++] = t[1], e.aTextFill[n++] = t[2], e.aTextFill[n++] = t[3],
|
|
@@ -6464,11 +6464,11 @@
|
|
|
6464
6464
|
let t = e.aTextDy.currentIndex;
|
|
6465
6465
|
e.aTextDy[t++] = a, e.aTextDy.currentIndex = t;
|
|
6466
6466
|
}
|
|
6467
|
-
if (
|
|
6467
|
+
if (F) {
|
|
6468
6468
|
let t = e.aMarkerWidth.currentIndex;
|
|
6469
6469
|
e.aMarkerWidth[t++] = l, e.aMarkerWidth.currentIndex = t;
|
|
6470
6470
|
}
|
|
6471
|
-
if (
|
|
6471
|
+
if (O) {
|
|
6472
6472
|
let t = e.aMarkerHeight.currentIndex;
|
|
6473
6473
|
e.aMarkerHeight[t++] = h, e.aMarkerHeight.currentIndex = t;
|
|
6474
6474
|
}
|
|
@@ -6666,7 +6666,7 @@
|
|
|
6666
6666
|
var e = new Ao(2);
|
|
6667
6667
|
Ao != Float32Array && (e[0] = 0, e[1] = 0);
|
|
6668
6668
|
}();
|
|
6669
|
-
const Co = 63, Io = Math.cos(Math.PI / 180 * 37.5),
|
|
6669
|
+
const Co = 63, Io = Math.cos(Math.PI / 180 * 37.5), Fo = Math.pow(2, 16) / 1, Oo = new s, Ro = new s, Eo = new s;
|
|
6670
6670
|
class Do extends fs {
|
|
6671
6671
|
static mergeLineFeatures(e, t, n, i) {
|
|
6672
6672
|
return xo(e, t, n, i);
|
|
@@ -6922,15 +6922,15 @@
|
|
|
6922
6922
|
const o = t.x + t.y * n, a = t.y - t.x * n, l = -t.x + t.y * i, h = -t.y - t.x * i;
|
|
6923
6923
|
let c = 0, u = 0;
|
|
6924
6924
|
if (r.middleVertex) {
|
|
6925
|
-
|
|
6925
|
+
Oo.x = o, Oo.y = a;
|
|
6926
6926
|
const e = r.currentNormal;
|
|
6927
|
-
if (c = Bo(e,
|
|
6927
|
+
if (c = Bo(e, Oo, r.dir), 0 === n && 0 === i) u = -c; else {
|
|
6928
6928
|
const t = Ro;
|
|
6929
6929
|
t.x = e.x, t.y = e.y, t._mult(-1), Eo.x = l, Eo.y = h, u = Bo(t, Eo, r.dir);
|
|
6930
6930
|
}
|
|
6931
6931
|
}
|
|
6932
6932
|
this.addHalfVertex(e, o, a, s, !1, n, r, c), this.addHalfVertex(e, l, h, s, !0, -i, r, u),
|
|
6933
|
-
this.prevVertex && Uo(e, this.prevVertex) || (this.prevVertex = e), this.distance >
|
|
6933
|
+
this.prevVertex && Uo(e, this.prevVertex) || (this.prevVertex = e), this.distance > Fo / 2 && 0 === this.totalDistance && (this.distance = 0,
|
|
6934
6934
|
this.updateScaledDistance(), this.addCurrentVertex(e, t, n, i, r, s));
|
|
6935
6935
|
}
|
|
6936
6936
|
addHalfVertex({x: e, y: t, z: n}, i, r, s, o, a, l, h) {
|
|
@@ -6999,7 +6999,7 @@
|
|
|
6999
6999
|
this.updateScaledDistance();
|
|
7000
7000
|
}
|
|
7001
7001
|
updateScaledDistance() {
|
|
7002
|
-
this.scaledDistance = this.totalDistance > 0 ? (this.clipStart + (this.clipEnd - this.clipStart) * this.distance / this.totalDistance) * (
|
|
7002
|
+
this.scaledDistance = this.totalDistance > 0 ? (this.clipStart + (this.clipEnd - this.clipStart) * this.distance / this.totalDistance) * (Fo - 1) : this.distance;
|
|
7003
7003
|
}
|
|
7004
7004
|
}
|
|
7005
7005
|
function Lo(e, t, n) {
|
|
@@ -7321,12 +7321,12 @@
|
|
|
7321
7321
|
};
|
|
7322
7322
|
}
|
|
7323
7323
|
const Ca = [], Ia = [];
|
|
7324
|
-
function
|
|
7324
|
+
function Fa(e, t) {
|
|
7325
7325
|
var n, i, r, o, a, l, h;
|
|
7326
7326
|
for (i = 1; i <= 8; i *= 2) {
|
|
7327
7327
|
for (n = [], o = !(Ra(r = e[e.length - 1], t) & i), a = 0; a < e.length; a++) {
|
|
7328
7328
|
if ((h = !(Ra(l = e[a], t) & i)) !== o) {
|
|
7329
|
-
const e =
|
|
7329
|
+
const e = Oa(r, l, i, t);
|
|
7330
7330
|
void 0 !== l.x ? n.push(new s(e[0], e[1])) : n.push(e);
|
|
7331
7331
|
}
|
|
7332
7332
|
h && n.push(l), r = l, o = h;
|
|
@@ -7335,7 +7335,7 @@
|
|
|
7335
7335
|
}
|
|
7336
7336
|
return n;
|
|
7337
7337
|
}
|
|
7338
|
-
function
|
|
7338
|
+
function Oa(e, t, n, i) {
|
|
7339
7339
|
return Ca[0] = void 0 === e.x ? e[0] : e.x, Ca[1] = void 0 === e.y ? e[1] : e.y,
|
|
7340
7340
|
e = Ca, Ia[0] = void 0 === t.x ? t[0] : t.x, Ia[1] = void 0 === t.y ? t[1] : t.y,
|
|
7341
7341
|
t = Ia, 8 & n ? [ e[0] + (t[0] - e[0]) * (i[3] - e[1]) / (t[1] - e[1]), i[3] ] : 4 & n ? [ e[0] + (t[0] - e[0]) * (i[1] - e[1]) / (t[1] - e[1]), i[1] ] : 2 & n ? [ i[2], e[1] + (t[1] - e[1]) * (i[2] - e[0]) / (t[0] - e[0]) ] : 1 & n ? [ i[0], e[1] + (t[1] - e[1]) * (i[0] - e[0]) / (t[0] - e[0]) ] : null;
|
|
@@ -7576,7 +7576,7 @@
|
|
|
7576
7576
|
var nl = Object.freeze({
|
|
7577
7577
|
__proto__: null,
|
|
7578
7578
|
calculateSignedArea: b,
|
|
7579
|
-
clipPolygon:
|
|
7579
|
+
clipPolygon: Fa,
|
|
7580
7580
|
convertGeometry: N,
|
|
7581
7581
|
convertRTLText: Xs,
|
|
7582
7582
|
generatePickingIndiceIndex: k,
|
|
@@ -8145,7 +8145,7 @@
|
|
|
8145
8145
|
b.setLength(0), A.setLength(0);
|
|
8146
8146
|
for (let e = 0; e < t.length; e++) {
|
|
8147
8147
|
let o = t[e];
|
|
8148
|
-
if (this.options.EXTENT !== 1 / 0 && 0 === this.maxPosZ && 0 === this.minPosZ && (o =
|
|
8148
|
+
if (this.options.EXTENT !== 1 / 0 && 0 === this.maxPosZ && 0 === this.minPosZ && (o = Fa(o, v)),
|
|
8149
8149
|
0 === o.length) continue;
|
|
8150
8150
|
0 !== e && A.push(b.length / 3), this.ensureDataCapacity(o.length);
|
|
8151
8151
|
const a = this.data;
|
|
@@ -8633,7 +8633,7 @@
|
|
|
8633
8633
|
yellowgreen: [ 154, 205, 50 ]
|
|
8634
8634
|
}, C = {};
|
|
8635
8635
|
for (var I in k) k.hasOwnProperty(I) && (C[k[I]] = I);
|
|
8636
|
-
var
|
|
8636
|
+
var F = P.exports = {
|
|
8637
8637
|
rgb: {
|
|
8638
8638
|
channels: 3,
|
|
8639
8639
|
labels: "rgb"
|
|
@@ -8695,34 +8695,34 @@
|
|
|
8695
8695
|
labels: [ "gray" ]
|
|
8696
8696
|
}
|
|
8697
8697
|
};
|
|
8698
|
-
for (var
|
|
8699
|
-
if (!("channels" in O
|
|
8700
|
-
if (!("labels" in O
|
|
8701
|
-
if (O
|
|
8702
|
-
var R = O
|
|
8703
|
-
delete O
|
|
8698
|
+
for (var O in F) if (F.hasOwnProperty(O)) {
|
|
8699
|
+
if (!("channels" in F[O])) throw new Error("missing channels property: " + O);
|
|
8700
|
+
if (!("labels" in F[O])) throw new Error("missing channel labels property: " + O);
|
|
8701
|
+
if (F[O].labels.length !== F[O].channels) throw new Error("channel and label counts mismatch: " + O);
|
|
8702
|
+
var R = F[O].channels, E = F[O].labels;
|
|
8703
|
+
delete F[O].channels, delete F[O].labels, Object.defineProperty(F[O], "channels", {
|
|
8704
8704
|
value: R
|
|
8705
|
-
}), Object.defineProperty(O
|
|
8705
|
+
}), Object.defineProperty(F[O], "labels", {
|
|
8706
8706
|
value: E
|
|
8707
8707
|
});
|
|
8708
8708
|
}
|
|
8709
|
-
|
|
8709
|
+
F.rgb.hsl = function(e) {
|
|
8710
8710
|
var t, n, i = e[0] / 255, r = e[1] / 255, s = e[2] / 255, o = Math.min(i, r, s), a = Math.max(i, r, s), l = a - o;
|
|
8711
8711
|
return a === o ? t = 0 : i === a ? t = (r - s) / l : r === a ? t = 2 + (s - i) / l : s === a && (t = 4 + (i - r) / l),
|
|
8712
8712
|
(t = Math.min(60 * t, 360)) < 0 && (t += 360), n = (o + a) / 2, [ t, 100 * (a === o ? 0 : n <= .5 ? l / (a + o) : l / (2 - a - o)), 100 * n ];
|
|
8713
|
-
},
|
|
8713
|
+
}, F.rgb.hsv = function(e) {
|
|
8714
8714
|
var t, n, i, r, s, o = e[0] / 255, a = e[1] / 255, l = e[2] / 255, h = Math.max(o, a, l), c = h - Math.min(o, a, l), u = function(e) {
|
|
8715
8715
|
return (h - e) / 6 / c + .5;
|
|
8716
8716
|
};
|
|
8717
8717
|
return 0 === c ? r = s = 0 : (s = c / h, t = u(o), n = u(a), i = u(l), o === h ? r = i - n : a === h ? r = 1 / 3 + t - i : l === h && (r = 2 / 3 + n - t),
|
|
8718
8718
|
r < 0 ? r += 1 : r > 1 && (r -= 1)), [ 360 * r, 100 * s, 100 * h ];
|
|
8719
|
-
},
|
|
8719
|
+
}, F.rgb.hwb = function(e) {
|
|
8720
8720
|
var t = e[0], n = e[1], i = e[2];
|
|
8721
|
-
return [
|
|
8722
|
-
},
|
|
8721
|
+
return [ F.rgb.hsl(e)[0], 100 * (1 / 255 * Math.min(t, Math.min(n, i))), 100 * (i = 1 - 1 / 255 * Math.max(t, Math.max(n, i))) ];
|
|
8722
|
+
}, F.rgb.cmyk = function(e) {
|
|
8723
8723
|
var t, n = e[0] / 255, i = e[1] / 255, r = e[2] / 255;
|
|
8724
8724
|
return [ 100 * ((1 - n - (t = Math.min(1 - n, 1 - i, 1 - r))) / (1 - t) || 0), 100 * ((1 - i - t) / (1 - t) || 0), 100 * ((1 - r - t) / (1 - t) || 0), 100 * t ];
|
|
8725
|
-
},
|
|
8725
|
+
}, F.rgb.keyword = function(e) {
|
|
8726
8726
|
var t = C[e];
|
|
8727
8727
|
if (t) return t;
|
|
8728
8728
|
var n, i, r, s = 1 / 0;
|
|
@@ -8731,16 +8731,16 @@
|
|
|
8731
8731
|
l < s && (s = l, n = o);
|
|
8732
8732
|
}
|
|
8733
8733
|
return n;
|
|
8734
|
-
},
|
|
8734
|
+
}, F.keyword.rgb = function(e) {
|
|
8735
8735
|
return k[e];
|
|
8736
|
-
},
|
|
8736
|
+
}, F.rgb.xyz = function(e) {
|
|
8737
8737
|
var t = e[0] / 255, n = e[1] / 255, i = e[2] / 255;
|
|
8738
8738
|
return [ 100 * (.4124 * (t = t > .04045 ? Math.pow((t + .055) / 1.055, 2.4) : t / 12.92) + .3576 * (n = n > .04045 ? Math.pow((n + .055) / 1.055, 2.4) : n / 12.92) + .1805 * (i = i > .04045 ? Math.pow((i + .055) / 1.055, 2.4) : i / 12.92)), 100 * (.2126 * t + .7152 * n + .0722 * i), 100 * (.0193 * t + .1192 * n + .9505 * i) ];
|
|
8739
|
-
},
|
|
8740
|
-
var t =
|
|
8739
|
+
}, F.rgb.lab = function(e) {
|
|
8740
|
+
var t = F.rgb.xyz(e), n = t[0], i = t[1], r = t[2];
|
|
8741
8741
|
return i /= 100, r /= 108.883, n = (n /= 95.047) > .008856 ? Math.pow(n, 1 / 3) : 7.787 * n + 16 / 116,
|
|
8742
8742
|
[ 116 * (i = i > .008856 ? Math.pow(i, 1 / 3) : 7.787 * i + 16 / 116) - 16, 500 * (n - i), 200 * (i - (r = r > .008856 ? Math.pow(r, 1 / 3) : 7.787 * r + 16 / 116)) ];
|
|
8743
|
-
},
|
|
8743
|
+
}, F.hsl.rgb = function(e) {
|
|
8744
8744
|
var t, n, i, r, s, o = e[0] / 360, a = e[1] / 100, l = e[2] / 100;
|
|
8745
8745
|
if (0 === a) return [ s = 255 * l, s, s ];
|
|
8746
8746
|
t = 2 * l - (n = l < .5 ? l * (1 + a) : l + a - l * a), r = [ 0, 0, 0 ];
|
|
@@ -8748,10 +8748,10 @@
|
|
|
8748
8748
|
s = 6 * i < 1 ? t + 6 * (n - t) * i : 2 * i < 1 ? n : 3 * i < 2 ? t + (n - t) * (2 / 3 - i) * 6 : t,
|
|
8749
8749
|
r[h] = 255 * s;
|
|
8750
8750
|
return r;
|
|
8751
|
-
},
|
|
8751
|
+
}, F.hsl.hsv = function(e) {
|
|
8752
8752
|
var t = e[0], n = e[1] / 100, i = e[2] / 100, r = n, s = Math.max(i, .01);
|
|
8753
8753
|
return n *= (i *= 2) <= 1 ? i : 2 - i, r *= s <= 1 ? s : 2 - s, [ t, 100 * (0 === i ? 2 * r / (s + r) : 2 * n / (i + n)), 100 * ((i + n) / 2) ];
|
|
8754
|
-
},
|
|
8754
|
+
}, F.hsv.rgb = function(e) {
|
|
8755
8755
|
var t = e[0] / 60, n = e[1] / 100, i = e[2] / 100, r = Math.floor(t) % 6, s = t - Math.floor(t), o = 255 * i * (1 - n), a = 255 * i * (1 - n * s), l = 255 * i * (1 - n * (1 - s));
|
|
8756
8756
|
switch (i *= 255, r) {
|
|
8757
8757
|
case 0:
|
|
@@ -8772,10 +8772,10 @@
|
|
|
8772
8772
|
case 5:
|
|
8773
8773
|
return [ i, o, a ];
|
|
8774
8774
|
}
|
|
8775
|
-
},
|
|
8775
|
+
}, F.hsv.hsl = function(e) {
|
|
8776
8776
|
var t, n, i, r = e[0], s = e[1] / 100, o = e[2] / 100, a = Math.max(o, .01);
|
|
8777
8777
|
return i = (2 - s) * o, n = s * a, [ r, 100 * (n = (n /= (t = (2 - s) * a) <= 1 ? t : 2 - t) || 0), 100 * (i /= 2) ];
|
|
8778
|
-
},
|
|
8778
|
+
}, F.hwb.rgb = function(e) {
|
|
8779
8779
|
var t, n, i, r, s, o, a, l = e[0] / 360, h = e[1] / 100, c = e[2] / 100, u = h + c;
|
|
8780
8780
|
switch (u > 1 && (h /= u, c /= u), i = 6 * l - (t = Math.floor(6 * l)), 1 & t && (i = 1 - i),
|
|
8781
8781
|
r = h + i * ((n = 1 - c) - h), t) {
|
|
@@ -8805,57 +8805,57 @@
|
|
|
8805
8805
|
s = n, o = h, a = r;
|
|
8806
8806
|
}
|
|
8807
8807
|
return [ 255 * s, 255 * o, 255 * a ];
|
|
8808
|
-
},
|
|
8808
|
+
}, F.cmyk.rgb = function(e) {
|
|
8809
8809
|
var t = e[0] / 100, n = e[1] / 100, i = e[2] / 100, r = e[3] / 100;
|
|
8810
8810
|
return [ 255 * (1 - Math.min(1, t * (1 - r) + r)), 255 * (1 - Math.min(1, n * (1 - r) + r)), 255 * (1 - Math.min(1, i * (1 - r) + r)) ];
|
|
8811
|
-
},
|
|
8811
|
+
}, F.xyz.rgb = function(e) {
|
|
8812
8812
|
var t, n, i, r = e[0] / 100, s = e[1] / 100, o = e[2] / 100;
|
|
8813
8813
|
return n = -.9689 * r + 1.8758 * s + .0415 * o, i = .0557 * r + -.204 * s + 1.057 * o,
|
|
8814
8814
|
t = (t = 3.2406 * r + -1.5372 * s + -.4986 * o) > .0031308 ? 1.055 * Math.pow(t, 1 / 2.4) - .055 : 12.92 * t,
|
|
8815
8815
|
n = n > .0031308 ? 1.055 * Math.pow(n, 1 / 2.4) - .055 : 12.92 * n, i = i > .0031308 ? 1.055 * Math.pow(i, 1 / 2.4) - .055 : 12.92 * i,
|
|
8816
8816
|
[ 255 * (t = Math.min(Math.max(0, t), 1)), 255 * (n = Math.min(Math.max(0, n), 1)), 255 * (i = Math.min(Math.max(0, i), 1)) ];
|
|
8817
|
-
},
|
|
8817
|
+
}, F.xyz.lab = function(e) {
|
|
8818
8818
|
var t = e[0], n = e[1], i = e[2];
|
|
8819
8819
|
return n /= 100, i /= 108.883, t = (t /= 95.047) > .008856 ? Math.pow(t, 1 / 3) : 7.787 * t + 16 / 116,
|
|
8820
8820
|
[ 116 * (n = n > .008856 ? Math.pow(n, 1 / 3) : 7.787 * n + 16 / 116) - 16, 500 * (t - n), 200 * (n - (i = i > .008856 ? Math.pow(i, 1 / 3) : 7.787 * i + 16 / 116)) ];
|
|
8821
|
-
},
|
|
8821
|
+
}, F.lab.xyz = function(e) {
|
|
8822
8822
|
var t, n, i, r = e[0];
|
|
8823
8823
|
t = e[1] / 500 + (n = (r + 16) / 116), i = n - e[2] / 200;
|
|
8824
8824
|
var s = Math.pow(n, 3), o = Math.pow(t, 3), a = Math.pow(i, 3);
|
|
8825
8825
|
return n = s > .008856 ? s : (n - 16 / 116) / 7.787, t = o > .008856 ? o : (t - 16 / 116) / 7.787,
|
|
8826
8826
|
i = a > .008856 ? a : (i - 16 / 116) / 7.787, [ t *= 95.047, n *= 100, i *= 108.883 ];
|
|
8827
|
-
},
|
|
8827
|
+
}, F.lab.lch = function(e) {
|
|
8828
8828
|
var t, n = e[0], i = e[1], r = e[2];
|
|
8829
8829
|
return (t = 360 * Math.atan2(r, i) / 2 / Math.PI) < 0 && (t += 360), [ n, Math.sqrt(i * i + r * r), t ];
|
|
8830
|
-
},
|
|
8830
|
+
}, F.lch.lab = function(e) {
|
|
8831
8831
|
var t, n = e[0], i = e[1];
|
|
8832
8832
|
return t = e[2] / 360 * 2 * Math.PI, [ n, i * Math.cos(t), i * Math.sin(t) ];
|
|
8833
|
-
},
|
|
8834
|
-
var t = e[0], n = e[1], i = e[2], r = 1 in arguments ? arguments[1] :
|
|
8833
|
+
}, F.rgb.ansi16 = function(e) {
|
|
8834
|
+
var t = e[0], n = e[1], i = e[2], r = 1 in arguments ? arguments[1] : F.rgb.hsv(e)[2];
|
|
8835
8835
|
if (0 === (r = Math.round(r / 50))) return 30;
|
|
8836
8836
|
var s = 30 + (Math.round(i / 255) << 2 | Math.round(n / 255) << 1 | Math.round(t / 255));
|
|
8837
8837
|
return 2 === r && (s += 60), s;
|
|
8838
|
-
},
|
|
8839
|
-
return
|
|
8840
|
-
},
|
|
8838
|
+
}, F.hsv.ansi16 = function(e) {
|
|
8839
|
+
return F.rgb.ansi16(F.hsv.rgb(e), e[2]);
|
|
8840
|
+
}, F.rgb.ansi256 = function(e) {
|
|
8841
8841
|
var t = e[0], n = e[1], i = e[2];
|
|
8842
8842
|
return t === n && n === i ? t < 8 ? 16 : t > 248 ? 231 : Math.round((t - 8) / 247 * 24) + 232 : 16 + 36 * Math.round(t / 255 * 5) + 6 * Math.round(n / 255 * 5) + Math.round(i / 255 * 5);
|
|
8843
|
-
},
|
|
8843
|
+
}, F.ansi16.rgb = function(e) {
|
|
8844
8844
|
var t = e % 10;
|
|
8845
8845
|
if (0 === t || 7 === t) return e > 50 && (t += 3.5), [ t = t / 10.5 * 255, t, t ];
|
|
8846
8846
|
var n = .5 * (1 + ~~(e > 50));
|
|
8847
8847
|
return [ (1 & t) * n * 255, (t >> 1 & 1) * n * 255, (t >> 2 & 1) * n * 255 ];
|
|
8848
|
-
},
|
|
8848
|
+
}, F.ansi256.rgb = function(e) {
|
|
8849
8849
|
if (e >= 232) {
|
|
8850
8850
|
var t = 10 * (e - 232) + 8;
|
|
8851
8851
|
return [ t, t, t ];
|
|
8852
8852
|
}
|
|
8853
8853
|
var n;
|
|
8854
8854
|
return e -= 16, [ Math.floor(e / 36) / 5 * 255, Math.floor((n = e % 36) / 6) / 5 * 255, n % 6 / 5 * 255 ];
|
|
8855
|
-
},
|
|
8855
|
+
}, F.rgb.hex = function(e) {
|
|
8856
8856
|
var t = (((255 & Math.round(e[0])) << 16) + ((255 & Math.round(e[1])) << 8) + (255 & Math.round(e[2]))).toString(16).toUpperCase();
|
|
8857
8857
|
return "000000".substring(t.length) + t;
|
|
8858
|
-
},
|
|
8858
|
+
}, F.hex.rgb = function(e) {
|
|
8859
8859
|
var t = e.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
|
|
8860
8860
|
if (!t) return [ 0, 0, 0 ];
|
|
8861
8861
|
var n = t[0];
|
|
@@ -8864,18 +8864,18 @@
|
|
|
8864
8864
|
})).join(""));
|
|
8865
8865
|
var i = parseInt(n, 16);
|
|
8866
8866
|
return [ i >> 16 & 255, i >> 8 & 255, 255 & i ];
|
|
8867
|
-
},
|
|
8867
|
+
}, F.rgb.hcg = function(e) {
|
|
8868
8868
|
var t, n = e[0] / 255, i = e[1] / 255, r = e[2] / 255, s = Math.max(Math.max(n, i), r), o = Math.min(Math.min(n, i), r), a = s - o;
|
|
8869
8869
|
return t = a <= 0 ? 0 : s === n ? (i - r) / a % 6 : s === i ? 2 + (r - n) / a : 4 + (n - i) / a + 4,
|
|
8870
8870
|
t /= 6, [ 360 * (t %= 1), 100 * a, 100 * (a < 1 ? o / (1 - a) : 0) ];
|
|
8871
|
-
},
|
|
8871
|
+
}, F.hsl.hcg = function(e) {
|
|
8872
8872
|
var t = e[1] / 100, n = e[2] / 100, i = 1, r = 0;
|
|
8873
8873
|
return (i = n < .5 ? 2 * t * n : 2 * t * (1 - n)) < 1 && (r = (n - .5 * i) / (1 - i)),
|
|
8874
8874
|
[ e[0], 100 * i, 100 * r ];
|
|
8875
|
-
},
|
|
8875
|
+
}, F.hsv.hcg = function(e) {
|
|
8876
8876
|
var t = e[1] / 100, n = e[2] / 100, i = t * n, r = 0;
|
|
8877
8877
|
return i < 1 && (r = (n - i) / (1 - i)), [ e[0], 100 * i, 100 * r ];
|
|
8878
|
-
},
|
|
8878
|
+
}, F.hcg.rgb = function(e) {
|
|
8879
8879
|
var t = e[0] / 360, n = e[1] / 100, i = e[2] / 100;
|
|
8880
8880
|
if (0 === n) return [ 255 * i, 255 * i, 255 * i ];
|
|
8881
8881
|
var r, s = [ 0, 0, 0 ], o = t % 1 * 6, a = o % 1, l = 1 - a;
|
|
@@ -8904,37 +8904,37 @@
|
|
|
8904
8904
|
s[0] = 1, s[1] = 0, s[2] = l;
|
|
8905
8905
|
}
|
|
8906
8906
|
return r = (1 - n) * i, [ 255 * (n * s[0] + r), 255 * (n * s[1] + r), 255 * (n * s[2] + r) ];
|
|
8907
|
-
},
|
|
8907
|
+
}, F.hcg.hsv = function(e) {
|
|
8908
8908
|
var t = e[1] / 100, n = t + e[2] / 100 * (1 - t), i = 0;
|
|
8909
8909
|
return n > 0 && (i = t / n), [ e[0], 100 * i, 100 * n ];
|
|
8910
|
-
},
|
|
8910
|
+
}, F.hcg.hsl = function(e) {
|
|
8911
8911
|
var t = e[1] / 100, n = e[2] / 100 * (1 - t) + .5 * t, i = 0;
|
|
8912
8912
|
return n > 0 && n < .5 ? i = t / (2 * n) : n >= .5 && n < 1 && (i = t / (2 * (1 - n))),
|
|
8913
8913
|
[ e[0], 100 * i, 100 * n ];
|
|
8914
|
-
},
|
|
8914
|
+
}, F.hcg.hwb = function(e) {
|
|
8915
8915
|
var t = e[1] / 100, n = t + e[2] / 100 * (1 - t);
|
|
8916
8916
|
return [ e[0], 100 * (n - t), 100 * (1 - n) ];
|
|
8917
|
-
},
|
|
8917
|
+
}, F.hwb.hcg = function(e) {
|
|
8918
8918
|
var t = e[1] / 100, n = 1 - e[2] / 100, i = n - t, r = 0;
|
|
8919
8919
|
return i < 1 && (r = (n - i) / (1 - i)), [ e[0], 100 * i, 100 * r ];
|
|
8920
|
-
},
|
|
8920
|
+
}, F.apple.rgb = function(e) {
|
|
8921
8921
|
return [ e[0] / 65535 * 255, e[1] / 65535 * 255, e[2] / 65535 * 255 ];
|
|
8922
|
-
},
|
|
8922
|
+
}, F.rgb.apple = function(e) {
|
|
8923
8923
|
return [ e[0] / 255 * 65535, e[1] / 255 * 65535, e[2] / 255 * 65535 ];
|
|
8924
|
-
},
|
|
8924
|
+
}, F.gray.rgb = function(e) {
|
|
8925
8925
|
return [ e[0] / 100 * 255, e[0] / 100 * 255, e[0] / 100 * 255 ];
|
|
8926
|
-
},
|
|
8926
|
+
}, F.gray.hsl = F.gray.hsv = function(e) {
|
|
8927
8927
|
return [ 0, 0, e[0] ];
|
|
8928
|
-
},
|
|
8928
|
+
}, F.gray.hwb = function(e) {
|
|
8929
8929
|
return [ 0, 100, e[0] ];
|
|
8930
|
-
},
|
|
8930
|
+
}, F.gray.cmyk = function(e) {
|
|
8931
8931
|
return [ 0, 0, 0, e[0] ];
|
|
8932
|
-
},
|
|
8932
|
+
}, F.gray.lab = function(e) {
|
|
8933
8933
|
return [ e[0], 0, 0 ];
|
|
8934
|
-
},
|
|
8934
|
+
}, F.gray.hex = function(e) {
|
|
8935
8935
|
var t = 255 & Math.round(e[0] / 100 * 255), n = ((t << 16) + (t << 8) + t).toString(16).toUpperCase();
|
|
8936
8936
|
return "000000".substring(n.length) + n;
|
|
8937
|
-
},
|
|
8937
|
+
}, F.rgb.gray = function(e) {
|
|
8938
8938
|
return [ (e[0] + e[1] + e[2]) / 3 / 255 * 100 ];
|
|
8939
8939
|
};
|
|
8940
8940
|
var D = P.exports, L = D;
|
|
@@ -9492,10 +9492,10 @@
|
|
|
9492
9492
|
function Ie(e) {
|
|
9493
9493
|
return !Ee(e) && ("string" == typeof e || null !== e.constructor && e.constructor === String);
|
|
9494
9494
|
}
|
|
9495
|
-
function
|
|
9495
|
+
function Fe(e) {
|
|
9496
9496
|
return "number" == typeof e && !isNaN(e);
|
|
9497
9497
|
}
|
|
9498
|
-
function
|
|
9498
|
+
function Oe(e) {
|
|
9499
9499
|
return !Ee(e) && ("function" == typeof e || null !== e.constructor && e.constructor === Function);
|
|
9500
9500
|
}
|
|
9501
9501
|
function Re(e) {
|
|
@@ -9544,7 +9544,7 @@
|
|
|
9544
9544
|
}, document.getElementsByTagName("head")[0].appendChild(i), this;
|
|
9545
9545
|
},
|
|
9546
9546
|
get: function(e, t, n) {
|
|
9547
|
-
if (
|
|
9547
|
+
if (Oe(t)) {
|
|
9548
9548
|
const e = n;
|
|
9549
9549
|
n = t, t = e;
|
|
9550
9550
|
}
|
|
@@ -9622,14 +9622,14 @@
|
|
|
9622
9622
|
return t.onreadystatechange = Be._wrapCallback(t, e), t;
|
|
9623
9623
|
},
|
|
9624
9624
|
getArrayBuffer(e, t, n) {
|
|
9625
|
-
if (
|
|
9625
|
+
if (Oe(t)) {
|
|
9626
9626
|
const e = n;
|
|
9627
9627
|
n = t, t = e;
|
|
9628
9628
|
}
|
|
9629
9629
|
return t || (t = {}), t.responseType = "arraybuffer", Be.get(e, t, n);
|
|
9630
9630
|
},
|
|
9631
9631
|
getJSON: function(e, t, n) {
|
|
9632
|
-
if (
|
|
9632
|
+
if (Oe(t)) {
|
|
9633
9633
|
const e = n;
|
|
9634
9634
|
n = t, t = e;
|
|
9635
9635
|
}
|
|
@@ -10250,8 +10250,8 @@
|
|
|
10250
10250
|
const s = e.distanceToPointAtRes(t, t, i, n, kt);
|
|
10251
10251
|
return r ? s.y : s.x;
|
|
10252
10252
|
}
|
|
10253
|
-
const {FilterUtil: It} = h(),
|
|
10254
|
-
color:
|
|
10253
|
+
const {FilterUtil: It} = h(), Ft = [], Ot = [ 0, 0, 0, 0 ], Rt = new r.Point(0, 0), Et = [], Dt = {
|
|
10254
|
+
color: Ot,
|
|
10255
10255
|
depth: 1,
|
|
10256
10256
|
stencil: 0
|
|
10257
10257
|
}, Lt = e => e.isTerrainSkin(), Ht = e => e.isTerrainVector();
|
|
@@ -10403,7 +10403,7 @@
|
|
|
10403
10403
|
}
|
|
10404
10404
|
clearCanvas() {
|
|
10405
10405
|
super.clearCanvas(), this.regl && this.regl.clear({
|
|
10406
|
-
color:
|
|
10406
|
+
color: Ot,
|
|
10407
10407
|
depth: 1,
|
|
10408
10408
|
stencil: 0
|
|
10409
10409
|
});
|
|
@@ -10412,7 +10412,7 @@
|
|
|
10412
10412
|
return !0;
|
|
10413
10413
|
}
|
|
10414
10414
|
checkResources() {
|
|
10415
|
-
return
|
|
10415
|
+
return Ft;
|
|
10416
10416
|
}
|
|
10417
10417
|
_drawTiles(e, t, n, i, r) {
|
|
10418
10418
|
if (super._drawTiles(e, t, n, i, r), this._prevTilesInView) if (Object.keys(this._prevTilesInView).length) for (const e in this._prevTilesInView) {
|
|
@@ -10536,7 +10536,7 @@
|
|
|
10536
10536
|
workerCacheIndex: this._workerCacheIndex,
|
|
10537
10537
|
command: "loadTile"
|
|
10538
10538
|
};
|
|
10539
|
-
this.loadTileArrayBuffer &&
|
|
10539
|
+
this.loadTileArrayBuffer && Oe(this.loadTileArrayBuffer) ? this.loadTileArrayBuffer(d.tileInfo.url, e, ((e, n) => {
|
|
10540
10540
|
e ? this._onReceiveMVTData(t, e) : n && n instanceof ArrayBuffer ? (d.tileArrayBuffer = n,
|
|
10541
10541
|
this._workerConn.loadTile(d, this._onReceiveMVTData.bind(this, t))) : console.error("loadTileArrayBuffer return data is not ArrayBuffer:", n);
|
|
10542
10542
|
}), d) : this._workerConn.loadTile(d, this._onReceiveMVTData.bind(this, t));
|
|
@@ -10712,10 +10712,10 @@
|
|
|
10712
10712
|
return e;
|
|
10713
10713
|
}
|
|
10714
10714
|
_getStylePlugins(e) {
|
|
10715
|
-
return Ee(e) && (e = this._styleCounter), this._plugins[e] ||
|
|
10715
|
+
return Ee(e) && (e = this._styleCounter), this._plugins[e] || Ft;
|
|
10716
10716
|
}
|
|
10717
10717
|
_getFeaturePlugins(e) {
|
|
10718
|
-
return Ee(e) && (e = this._styleCounter), this._featurePlugins[e] ||
|
|
10718
|
+
return Ee(e) && (e = this._styleCounter), this._featurePlugins[e] || Ft;
|
|
10719
10719
|
}
|
|
10720
10720
|
_startFrame(e, t) {
|
|
10721
10721
|
const n = this._isRenderingTerrain(), i = this.layer.isDefaultRender() && this._layerPlugins, r = this._parentContext;
|
|
@@ -11035,7 +11035,7 @@
|
|
|
11035
11035
|
abortTileLoading(e, t) {
|
|
11036
11036
|
const n = t ? Wt(t) : "";
|
|
11037
11037
|
t && t.url && (this._workerConn && this._workerConn.abortTile(n), delete this._requestingMVT[t.url]),
|
|
11038
|
-
this.loadTileArrayBuffer &&
|
|
11038
|
+
this.loadTileArrayBuffer && Oe(this.loadTileArrayBuffer) ? this.loadTileArrayBuffer(n, t, (() => {}), {
|
|
11039
11039
|
command: "abortTile"
|
|
11040
11040
|
}) : super.abortTileLoading(e, t);
|
|
11041
11041
|
}
|
|
@@ -12417,8 +12417,8 @@
|
|
|
12417
12417
|
}, In.needPolygonOffset = function() {
|
|
12418
12418
|
throw new Error("to be implemented.");
|
|
12419
12419
|
}, In.constructor = Cn;
|
|
12420
|
-
const
|
|
12421
|
-
function
|
|
12420
|
+
const Fn = Object.prototype.hasOwnProperty;
|
|
12421
|
+
function On(e) {
|
|
12422
12422
|
e.registerPlugin(this);
|
|
12423
12423
|
}
|
|
12424
12424
|
Cn.extend = function(e, t) {
|
|
@@ -12426,8 +12426,8 @@
|
|
|
12426
12426
|
this.init && this.init();
|
|
12427
12427
|
}, i = Object.create(In);
|
|
12428
12428
|
i.constructor = n, n.prototype = i, n.type = e;
|
|
12429
|
-
for (const e in t)
|
|
12430
|
-
return n.registerAt =
|
|
12429
|
+
for (const e in t) Fn.call(t, e) && (n.prototype[e] = t[e]);
|
|
12430
|
+
return n.registerAt = On.bind(n), n;
|
|
12431
12431
|
};
|
|
12432
12432
|
const Rn = {
|
|
12433
12433
|
redraw: !1,
|
|
@@ -13743,7 +13743,7 @@
|
|
|
13743
13743
|
}
|
|
13744
13744
|
}
|
|
13745
13745
|
var Ii = "#include <gl2_vert>\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nuniform mat4 projViewModelMatrix;\nuniform mat4 positionMatrix;\n#include <fbo_picking_vert>\n#include <vt_position_vert>\nvoid main() {\n vec3 c = unpackVTPosition();\n gl_Position = projViewModelMatrix * positionMatrix * vec4(c, 1.);\n fbo_picking_setData(gl_Position.w, true);\n}";
|
|
13746
|
-
function
|
|
13746
|
+
function Fi(e, t, i, r) {
|
|
13747
13747
|
if (r) {
|
|
13748
13748
|
const e = n.reshader.Util.resizeToPowerOfTwo(t.data, t.width, t.height);
|
|
13749
13749
|
t.data = e;
|
|
@@ -13764,12 +13764,12 @@
|
|
|
13764
13764
|
}
|
|
13765
13765
|
return e.texture(o);
|
|
13766
13766
|
}
|
|
13767
|
-
const
|
|
13767
|
+
const Oi = [ 0, 0 ], Ri = [];
|
|
13768
13768
|
function Ei(e) {
|
|
13769
|
-
if (!e.properties.iconPositions) return
|
|
13769
|
+
if (!e.properties.iconPositions) return Oi;
|
|
13770
13770
|
let t, n = 0;
|
|
13771
|
-
for (const i in e.properties.iconPositions) if (t = i, n++, n > 1) return
|
|
13772
|
-
if (!t) return
|
|
13771
|
+
for (const i in e.properties.iconPositions) if (t = i, n++, n > 1) return Oi;
|
|
13772
|
+
if (!t) return Oi;
|
|
13773
13773
|
const i = e.properties.iconPositions[t], r = i.displaySize[0], s = i.displaySize[1];
|
|
13774
13774
|
return Ri[0] = r, Ri[1] = s, Ri;
|
|
13775
13775
|
}
|
|
@@ -13862,7 +13862,7 @@
|
|
|
13862
13862
|
const e = y.polygonPatternFileWidth, t = y.polygonPatternFileHeight;
|
|
13863
13863
|
return e || t ? 1 : a.properties.tileResolution / s.getResolution();
|
|
13864
13864
|
}
|
|
13865
|
-
}), g.polygonPatternFile =
|
|
13865
|
+
}), g.polygonPatternFile = Fi(this.regl, x, !1, !1), g.atlasSize = [ x.width, x.height ],
|
|
13866
13866
|
this.drawDebugAtlas(x);
|
|
13867
13867
|
}
|
|
13868
13868
|
const v = new n.reshader.Material(g, Hi), b = new n.reshader.Mesh(a, v, {
|
|
@@ -14146,7 +14146,8 @@
|
|
|
14146
14146
|
const l = this.getSymbol(s), h = {
|
|
14147
14147
|
tileResolution: i.properties.tileResolution,
|
|
14148
14148
|
tileRatio: i.properties.tileRatio,
|
|
14149
|
-
tileExtent: i.properties.tileExtent
|
|
14149
|
+
tileExtent: i.properties.tileExtent,
|
|
14150
|
+
fogFactor: this.layer.options.fogFactor || 0
|
|
14150
14151
|
};
|
|
14151
14152
|
this.setLineUniforms(l, h), xt(h, "lineColor", l, "lineColor", "#fff", bt(this.colorCache)),
|
|
14152
14153
|
xt(h, "linePatterGapColor", l, "linePatterGapColor", [ 0, 0, 0, 0 ], bt(this.colorCache)),
|
|
@@ -14160,7 +14161,7 @@
|
|
|
14160
14161
|
return t || [ 0, 0, 0, 0 ];
|
|
14161
14162
|
})), xt(h, "lineDashColor", l, "lineDashColor", [ 0, 0, 0, 0 ], bt(this.colorCache));
|
|
14162
14163
|
const c = i.properties.iconAtlas, u = this.layer instanceof r.TileLayer;
|
|
14163
|
-
c && (h.linePatternFile =
|
|
14164
|
+
c && (h.linePatternFile = Fi(this.regl, c, !1, !1), h.atlasSize = c ? [ c.width, c.height ] : [ 0, 0 ],
|
|
14164
14165
|
h.flipY = u ? -1 : 1, this.drawDebugAtlas(c)), void 0 === o && i.generateBuffers(this.regl);
|
|
14165
14166
|
const f = new n.reshader.Material(h), d = new n.reshader.Mesh(i, f, {
|
|
14166
14167
|
castShadow: !1,
|
|
@@ -14330,7 +14331,7 @@
|
|
|
14330
14331
|
}
|
|
14331
14332
|
}), this.shader = new n.reshader.MeshShader({
|
|
14332
14333
|
vert: ji,
|
|
14333
|
-
frag: "#define SHADER_NAME LINE\n#define DEVICE_PIXEL_RATIO 1.0\nprecision highp float;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_frag>\n#endif\nuniform lowp float blendSrcIsOne;\nuniform lowp float lineBlur;\nuniform float isRenderingTerrain;\n#ifdef HAS_COLOR\nvarying vec4 vColor;\n#else\nuniform lowp vec4 lineColor;\n#endif\n#include <highlight_frag>\n#ifdef HAS_STROKE_COLOR\nvarying vec4 vStrokeColor;\n#else\nuniform lowp vec4 lineStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nvarying float vOpacity;\n#else\nuniform lowp float lineOpacity;\n#endif\nuniform float layerOpacity;\n#ifdef HAS_PATTERN\nuniform sampler2D linePatternFile;\nuniform vec2 atlasSize;\nuniform float flipY;\n#ifdef HAS_PATTERN_ANIM\nvarying float vLinePatternAnimSpeed;\n#else\nuniform float linePatternAnimSpeed;\n#endif\n#ifdef HAS_PATTERN_GAP\nvarying float vLinePatternGap;\n#else\nuniform float linePatternGap;\n#endif\nuniform vec4 linePatterGapColor;\nvarying vec4 vTexInfo;\nvec2 c(vec2 d) {\n vec2 e = mod(d, 1.);\n vec2 f = vTexInfo.xy;\n vec2 h = vTexInfo.zw;\n return (f + e * h) / atlasSize;\n}\n#endif\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\nuniform float tileExtent;\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvarying vec4 vDasharray;\n#else\nuniform vec4 lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvarying vec4 vDashColor;\n#else\nuniform vec4 lineDashColor;\n#endif\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nvarying highp float vLinesofar;\n#endif\n#ifdef HAS_TRAIL\nuniform float trailSpeed;\nuniform float trailLength;\nuniform float trailCircle;\n#endif\n#if defined(HAS_TRAIL) || defined(HAS_PATTERN)\nuniform float currentTime;\n#endif\nfloat i(float j, float k) {\n float l = k / 2.;\n float m = abs(j - l);\n float n = (.1 + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n return clamp(min(m + n, l - m) / n, .0, 1.);\n}\nvarying vec3 vVertex;\nuniform vec3 cameraPosition;\nuniform float cameraToCenterDistance;\nvoid main() {\n \n#ifndef ENABLE_TILE_STENCIL\nfloat o = sign(tileExtent - min(tileExtent, abs(vPosition.x))) * sign(1. + sign(vPosition.x)) * sign(tileExtent - min(tileExtent, abs(vPosition.y))) * sign(1. + sign(vPosition.y));\n if(o == .0) {\n discard;\n }\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nfloat u = vLinesofar;\n#endif\nfloat v = length(vNormal) * vWidth.s;\n#ifdef HAS_PATTERN\nvec2 h = vTexInfo.zw;\n float A = sign(h.x * h.y);\n float B = mix(lineBlur, .0, A);\n#else\nfloat B = lineBlur;\n#endif\nfloat n = (B + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n float C = clamp(min(v - (vWidth.t - n), vWidth.s - v) / n, .0, 1.);\n#ifdef HAS_COLOR\nvec4 D = vColor / 255.;\n#else\nvec4 D = lineColor;\n#endif\n#ifdef HAS_PATTERN\nif(A == 1.) {\n \n#ifdef HAS_PATTERN_GAP\nfloat E = vLinePatternGap;\n#else\nfloat E = linePatternGap;\n#endif\n#ifdef HAS_PATTERN_ANIM\nfloat F = vLinePatternAnimSpeed;\n#else\nfloat F = linePatternAnimSpeed;\n#endif\nfloat G = h.x * vWidth.s * 2. / h.y;\n float H = G * (1. + E);\n u += mod(currentTime * -F * .2, H);\n float I = mod(u / H, 1.);\n float J = mod((flipY * vNormal.y + 1.) / 2., 1.);\n vec4 K = texture2D(linePatternFile, c(vec2(I * (1. + E), J)));\n float L = clamp(sign(1. / (1. + E) - I) + .000001, .0, 1.);\n K = mix(linePatterGapColor, K, L);\n D *= K;\n }\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvec4 M = vDasharray;\n#else\nvec4 M = lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvec4 N = vDashColor;\n#else\nvec4 N = lineDashColor;\n#endif\nfloat k = M[0] + M[1] + M[2] + M[3];\n float j = mod(u, k);\n float O = max(sign(M[0] - j), .0);\n float P = j - M[0] - M[1];\n float Q = max(sign(P), .0) * max(sign(M[2] - P), .0);\n float R = O + Q;\n float S = i(j, M[0]);\n float T = i(P, M[2]);\n float U = S * O + T * Q;\n D = D * (1. - U) + N * U;\n#endif\n#ifdef HAS_STROKE_COLOR\nvec4 V = vStrokeColor / 255.;\n#else\nvec4 V = lineStrokeColor;\n#endif\nV = mix(D, V, sign(vWidth.t));\n D = V * C + max(sign(vWidth.t - v), .0) * D * (1. - C);\n#ifdef HAS_TRAIL\nfloat W = mod(u - currentTime * trailSpeed * .1, trailCircle);\n float X = W < trailLength ? mix(.0, 1., W / trailLength) : .0;\n D *= X;\n#endif\n#ifdef HAS_OPACITY\nfloat Y = vOpacity;\n#else\nfloat Y = lineOpacity;\n#endif\ngl_FragColor = D * Y * layerOpacity;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nfloat Z = shadow_computeShadow();\n gl_FragColor.rgb = shadow_blend(gl_FragColor.rgb, Z);\n#endif\nfloat ba;\n if(isRenderingTerrain == 1.) {\n ba = 1.;\n } else {\n ba = clamp(cameraToCenterDistance * 1.5 / distance(vVertex, cameraPosition), .0, 1.);\n }\n gl_FragColor *= ba;\n gl_FragColor = highlight_blendColor(gl_FragColor);\n}",
|
|
14334
|
+
frag: "#define SHADER_NAME LINE\n#define DEVICE_PIXEL_RATIO 1.0\nprecision highp float;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_frag>\n#endif\nuniform lowp float blendSrcIsOne;\nuniform lowp float lineBlur;\nuniform float isRenderingTerrain;\n#ifdef HAS_COLOR\nvarying vec4 vColor;\n#else\nuniform lowp vec4 lineColor;\n#endif\n#include <highlight_frag>\n#ifdef HAS_STROKE_COLOR\nvarying vec4 vStrokeColor;\n#else\nuniform lowp vec4 lineStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nvarying float vOpacity;\n#else\nuniform lowp float lineOpacity;\n#endif\nuniform float layerOpacity;\n#ifdef HAS_PATTERN\nuniform sampler2D linePatternFile;\nuniform vec2 atlasSize;\nuniform float flipY;\n#ifdef HAS_PATTERN_ANIM\nvarying float vLinePatternAnimSpeed;\n#else\nuniform float linePatternAnimSpeed;\n#endif\n#ifdef HAS_PATTERN_GAP\nvarying float vLinePatternGap;\n#else\nuniform float linePatternGap;\n#endif\nuniform vec4 linePatterGapColor;\nvarying vec4 vTexInfo;\nvec2 c(vec2 d) {\n vec2 e = mod(d, 1.);\n vec2 f = vTexInfo.xy;\n vec2 h = vTexInfo.zw;\n return (f + e * h) / atlasSize;\n}\n#endif\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\nuniform float tileExtent;\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvarying vec4 vDasharray;\n#else\nuniform vec4 lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvarying vec4 vDashColor;\n#else\nuniform vec4 lineDashColor;\n#endif\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nvarying highp float vLinesofar;\n#endif\n#ifdef HAS_TRAIL\nuniform float trailSpeed;\nuniform float trailLength;\nuniform float trailCircle;\n#endif\n#if defined(HAS_TRAIL) || defined(HAS_PATTERN)\nuniform float currentTime;\n#endif\nfloat i(float j, float k) {\n float l = k / 2.;\n float m = abs(j - l);\n float n = (.1 + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n return clamp(min(m + n, l - m) / n, .0, 1.);\n}\nvarying vec3 vVertex;\nuniform vec3 cameraPosition;\nuniform float cameraToCenterDistance;\nuniform float fogFactor;\nvoid main() {\n \n#ifndef ENABLE_TILE_STENCIL\nfloat o = sign(tileExtent - min(tileExtent, abs(vPosition.x))) * sign(1. + sign(vPosition.x)) * sign(tileExtent - min(tileExtent, abs(vPosition.y))) * sign(1. + sign(vPosition.y));\n if(o == .0) {\n discard;\n }\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nfloat u = vLinesofar;\n#endif\nfloat v = length(vNormal) * vWidth.s;\n#ifdef HAS_PATTERN\nvec2 h = vTexInfo.zw;\n float A = sign(h.x * h.y);\n float B = mix(lineBlur, .0, A);\n#else\nfloat B = lineBlur;\n#endif\nfloat n = (B + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n float C = clamp(min(v - (vWidth.t - n), vWidth.s - v) / n, .0, 1.);\n#ifdef HAS_COLOR\nvec4 D = vColor / 255.;\n#else\nvec4 D = lineColor;\n#endif\n#ifdef HAS_PATTERN\nif(A == 1.) {\n \n#ifdef HAS_PATTERN_GAP\nfloat E = vLinePatternGap;\n#else\nfloat E = linePatternGap;\n#endif\n#ifdef HAS_PATTERN_ANIM\nfloat F = vLinePatternAnimSpeed;\n#else\nfloat F = linePatternAnimSpeed;\n#endif\nfloat G = h.x * vWidth.s * 2. / h.y;\n float H = G * (1. + E);\n u += mod(currentTime * -F * .2, H);\n float I = mod(u / H, 1.);\n float J = mod((flipY * vNormal.y + 1.) / 2., 1.);\n vec4 K = texture2D(linePatternFile, c(vec2(I * (1. + E), J)));\n float L = clamp(sign(1. / (1. + E) - I) + .000001, .0, 1.);\n K = mix(linePatterGapColor, K, L);\n D *= K;\n }\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvec4 M = vDasharray;\n#else\nvec4 M = lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvec4 N = vDashColor;\n#else\nvec4 N = lineDashColor;\n#endif\nfloat k = M[0] + M[1] + M[2] + M[3];\n float j = mod(u, k);\n float O = max(sign(M[0] - j), .0);\n float P = j - M[0] - M[1];\n float Q = max(sign(P), .0) * max(sign(M[2] - P), .0);\n float R = O + Q;\n float S = i(j, M[0]);\n float T = i(P, M[2]);\n float U = S * O + T * Q;\n D = D * (1. - U) + N * U;\n#endif\n#ifdef HAS_STROKE_COLOR\nvec4 V = vStrokeColor / 255.;\n#else\nvec4 V = lineStrokeColor;\n#endif\nV = mix(D, V, sign(vWidth.t));\n D = V * C + max(sign(vWidth.t - v), .0) * D * (1. - C);\n#ifdef HAS_TRAIL\nfloat W = mod(u - currentTime * trailSpeed * .1, trailCircle);\n float X = W < trailLength ? mix(.0, 1., W / trailLength) : .0;\n D *= X;\n#endif\n#ifdef HAS_OPACITY\nfloat Y = vOpacity;\n#else\nfloat Y = lineOpacity;\n#endif\ngl_FragColor = D * Y * layerOpacity;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nfloat Z = shadow_computeShadow();\n gl_FragColor.rgb = shadow_blend(gl_FragColor.rgb, Z);\n#endif\nfloat ba;\n if(isRenderingTerrain == 1.) {\n ba = 1.;\n } else {\n ba = clamp(cameraToCenterDistance * 1.5 / distance(vVertex, cameraPosition), .0, 1.);\n }\n gl_FragColor *= ba;\n gl_FragColor = highlight_blendColor(gl_FragColor);\n if(fogFactor > .0) {\n vec3 bb = vec3(vVertex[0] - cameraPosition[0], vVertex[1] - cameraPosition[1], vVertex[2] - cameraPosition[2]);\n float bc = length(bb);\n float bd = clamp(1. - (bc * 1.2) / fogFactor, .0, 1.);\n gl_FragColor *= bd;\n }\n}",
|
|
14334
14335
|
uniforms: t,
|
|
14335
14336
|
defines: i,
|
|
14336
14337
|
extraCommandProps: this.getExtraCommandProps(e)
|
|
@@ -15484,7 +15485,7 @@
|
|
|
15484
15485
|
const o = Math.sin(t), a = Math.cos(t);
|
|
15485
15486
|
return n.mat2.set(e, a, -o, o, a);
|
|
15486
15487
|
}
|
|
15487
|
-
const Ir = 2048,
|
|
15488
|
+
const Ir = 2048, Fr = 24, Or = .01, Rr = [], Er = [], Dr = [], Lr = [], Hr = [], Nr = [], zr = [], Vr = [], Br = [ 1, -1 ], Ur = [ 1, 1 ];
|
|
15488
15489
|
function Gr(e, t, i, r, s) {
|
|
15489
15490
|
const o = t.material.uniforms, a = s.cameraToCenterDistance, l = t.geometry.properties, h = this.getSymbol(l.symbolIndex), c = t.geometry.desc.positionSize, u = l.aAnchor, f = n.vec3.set(Rr, u[i * c], u[i * c + 1], 2 === c ? 0 : u[i * c + 2]), {aTerrainAltitude: d} = l;
|
|
15490
15491
|
if (d) {
|
|
@@ -15498,30 +15499,30 @@
|
|
|
15498
15499
|
m = pt(.5 + .5 * (1 - (1 - a / g) * o.markerPerspectiveRatio), 0, 4);
|
|
15499
15500
|
}
|
|
15500
15501
|
const {aShape: y, aMarkerDx: x, aMarkerDy: _, aMarkerWidth: v, aMarkerHeight: b, aPitchAlign: A, aRotationAlign: w, aRotation: T} = l, M = x ? x[i] : h.markerDx, S = _ ? _[i] : h.markerDy, P = A ? A[i] : o.pitchWithMap, k = w ? w[i] : o.rotateWithMap, C = n.vec2.set(Vr, M || 0, -(S || 0));
|
|
15501
|
-
let I = n.vec2.set(Lr, y[2 * i] / 10, y[2 * i + 1] / 10),
|
|
15502
|
-
0 === o.flipY && 1 === P && (n.vec2.multiply(I, I, Br), n.vec2.multiply(
|
|
15503
|
-
n.vec2.multiply(
|
|
15502
|
+
let I = n.vec2.set(Lr, y[2 * i] / 10, y[2 * i + 1] / 10), F = n.vec2.set(Hr, y[2 * i + 2] / 10, y[2 * i + 3] / 10), O = n.vec2.set(Nr, y[2 * i + 4] / 10, y[2 * i + 5] / 10), R = n.vec2.set(zr, y[2 * i + 6] / 10, y[2 * i + 7] / 10);
|
|
15503
|
+
0 === o.flipY && 1 === P && (n.vec2.multiply(I, I, Br), n.vec2.multiply(F, F, Br),
|
|
15504
|
+
n.vec2.multiply(O, O, Br), n.vec2.multiply(R, R, Br));
|
|
15504
15505
|
const [E, D] = Ei(t.geometry);
|
|
15505
15506
|
let L = v ? v[i] : h.markerWidth;
|
|
15506
15507
|
mt(L) && (L = E || 15);
|
|
15507
15508
|
let H = b ? b[i] : h.markerHeight;
|
|
15508
15509
|
mt(H) && (H = D || 15);
|
|
15509
15510
|
const N = n.vec2.set(Ur, L / Ir, H / Ir);
|
|
15510
|
-
n.vec2.mul(I, I, N), n.vec2.mul(
|
|
15511
|
+
n.vec2.mul(I, I, N), n.vec2.mul(F, F, N), n.vec2.mul(O, O, N), n.vec2.mul(R, R, N);
|
|
15511
15512
|
const z = -(T ? T[i] / 9362 : -(h.markerRotation || 0) * Math.PI / 180), V = s.getBearing() * Math.PI / 180;
|
|
15512
15513
|
if (V * k || z) {
|
|
15513
15514
|
const e = Cr(Dr, z, V, k, P);
|
|
15514
|
-
I = n.vec2.transformMat2(I, I, e),
|
|
15515
|
+
I = n.vec2.transformMat2(I, I, e), F = n.vec2.transformMat2(F, F, e), O = n.vec2.transformMat2(O, O, e),
|
|
15515
15516
|
R = n.vec2.transformMat2(R, R, e);
|
|
15516
15517
|
}
|
|
15517
|
-
1 === P ? Pr(e, f, I,
|
|
15518
|
-
n.vec2.multiply(
|
|
15518
|
+
1 === P ? Pr(e, f, I, F, O, R, r, C, o, s, g, m) : (n.vec2.multiply(I, I, Br), n.vec2.multiply(F, F, Br),
|
|
15519
|
+
n.vec2.multiply(O, O, Br), n.vec2.multiply(R, R, Br), kr(e, p, I, F, O, R, C, m));
|
|
15519
15520
|
const B = this.getMap().getDevicePixelRatio();
|
|
15520
15521
|
return 1 !== B && (e[0] *= B, e[1] *= B, e[2] *= B, e[3] *= B), e;
|
|
15521
15522
|
}
|
|
15522
15523
|
const {PackUtil: jr} = h(), Wr = 1, Xr = [], Yr = [], qr = [], $r = [], Zr = [], Jr = [], Kr = [ 1, -1 ];
|
|
15523
15524
|
function Qr(e, t, i, r, s, o, a, l, h) {
|
|
15524
|
-
const c = r.material.uniforms, u = h.cameraToCenterDistance, f = r.geometry.properties, d = this.getSymbol(f.symbolIndex), p = "line" === d.textPlacement && !Mt(d), g =
|
|
15525
|
+
const c = r.material.uniforms, u = h.cameraToCenterDistance, f = r.geometry.properties, d = this.getSymbol(f.symbolIndex), p = "line" === d.textPlacement && !Mt(d), g = Fr, m = i[2];
|
|
15525
15526
|
let y = 1;
|
|
15526
15527
|
if (c.textPerspectiveRatio) {
|
|
15527
15528
|
y = pt(.5 + .5 * (1 - (1 - u / m) * c.textPerspectiveRatio), 0, 4);
|
|
@@ -15624,7 +15625,7 @@
|
|
|
15624
15625
|
t.properties.aAltitude = t.properties[e] || new u.constructor(u);
|
|
15625
15626
|
}
|
|
15626
15627
|
}
|
|
15627
|
-
const f =
|
|
15628
|
+
const f = Fi(e, u, !1), d = {
|
|
15628
15629
|
flipY: 0,
|
|
15629
15630
|
tileResolution: t.properties.tileResolution,
|
|
15630
15631
|
tileRatio: t.properties.tileRatio,
|
|
@@ -15642,7 +15643,7 @@
|
|
|
15642
15643
|
castShadow: !1,
|
|
15643
15644
|
picking: !0
|
|
15644
15645
|
});
|
|
15645
|
-
if (m.setLocalTransform(i), m.setUniform("alphaTest",
|
|
15646
|
+
if (m.setLocalTransform(i), m.setUniform("alphaTest", Or), d.isHalo && (m.properties.isHalo = !0),
|
|
15646
15647
|
a && m.setDefines({
|
|
15647
15648
|
ENABLE_COLLISION: 1
|
|
15648
15649
|
}), c.push(m), d.isHalo) {
|
|
@@ -15661,7 +15662,7 @@
|
|
|
15661
15662
|
castShadow: !1,
|
|
15662
15663
|
picking: !0
|
|
15663
15664
|
});
|
|
15664
|
-
o.setUniform("alphaTest",
|
|
15665
|
+
o.setUniform("alphaTest", Or), o.properties.haloMesh = m, Object.defineProperty(o.properties, "textSize", {
|
|
15665
15666
|
enumerable: !0,
|
|
15666
15667
|
get: function() {
|
|
15667
15668
|
return e.textSize;
|
|
@@ -16235,7 +16236,7 @@
|
|
|
16235
16236
|
if (be(A)) {
|
|
16236
16237
|
A = (b.textSizeFn = b.textSizeFn || Ae(A))(c, b);
|
|
16237
16238
|
}
|
|
16238
|
-
A /=
|
|
16239
|
+
A /= Fr;
|
|
16239
16240
|
let w, T, M = h && h(c, b) || l;
|
|
16240
16241
|
if (be(M)) {
|
|
16241
16242
|
M = (b.fitPaddingFn = b.fitPaddingFn || we(M))(c, b);
|
|
@@ -16287,10 +16288,10 @@
|
|
|
16287
16288
|
}, Is = function(e) {
|
|
16288
16289
|
const t = this.layer.getRenderer();
|
|
16289
16290
|
return !this._isHalo0(e) && t.isForeground(e) && !!e.geometry.properties.glyphAtlas;
|
|
16290
|
-
},
|
|
16291
|
+
}, Fs = function(e) {
|
|
16291
16292
|
const t = this.layer.getRenderer();
|
|
16292
16293
|
return !this._isHalo0(e) && !t.isForeground(e) && !!e.geometry.properties.glyphAtlas;
|
|
16293
|
-
},
|
|
16294
|
+
}, Os = [], Rs = {
|
|
16294
16295
|
collides: -1
|
|
16295
16296
|
}, Es = [ Ir, Ir ], Ds = n.mat4.identity([]), Ls = [];
|
|
16296
16297
|
class Hs extends gr {
|
|
@@ -16300,7 +16301,7 @@
|
|
|
16300
16301
|
constructor(e, t, n, i, r, s) {
|
|
16301
16302
|
super(e, t, n, i, r, s), this.propAllowOverlap = "markerAllowOverlap", this.propIgnorePlacement = "markerIgnorePlacement",
|
|
16302
16303
|
this._fnTypeConfigs = {}, this.isLabelCollides = us.bind(this), this._iconFilter0 = ks.bind(this),
|
|
16303
|
-
this._iconFilter1 = Cs.bind(this), this._textFilter0 = Is.bind(this), this._textFilter1 =
|
|
16304
|
+
this._iconFilter1 = Cs.bind(this), this._textFilter0 = Is.bind(this), this._textFilter1 = Fs.bind(this),
|
|
16304
16305
|
this._meshesToCheck = [];
|
|
16305
16306
|
}
|
|
16306
16307
|
needToRefreshTerrainTileOnZooming() {
|
|
@@ -16389,7 +16390,7 @@
|
|
|
16389
16390
|
xt(c, "markerDx", s, "markerDx", 0), xt(c, "markerDy", s, "markerDy", 0), xt(c, "markerRotation", s, "markerRotation", 0, (e => e * Math.PI / 180)),
|
|
16390
16391
|
xt(c, "pitchWithMap", s, "markerPitchAlignment", 0, (e => "map" === e ? 1 : 0)),
|
|
16391
16392
|
xt(c, "rotateWithMap", s, "markerRotationAlignment", 0, (e => "map" === e ? 1 : 0)),
|
|
16392
|
-
c.iconTex = h ?
|
|
16393
|
+
c.iconTex = h ? Fi(e, h, !1) : null, c.texSize = h ? [ h.width, h.height ] : [ 0, 0 ],
|
|
16393
16394
|
t.generateBuffers(e, {
|
|
16394
16395
|
excludeElementsInVAO: !0
|
|
16395
16396
|
});
|
|
@@ -16404,7 +16405,7 @@
|
|
|
16404
16405
|
t.data.aMarkerDx && (g.HAS_MARKER_DX = 1), t.data.aMarkerDy && (g.HAS_MARKER_DY = 1),
|
|
16405
16406
|
t.data.aPitchAlign && (g.HAS_PITCH_ALIGN = 1), t.data.aRotationAlign && (g.HAS_ROTATION_ALIGN = 1),
|
|
16406
16407
|
t.data.aRotation && (g.HAS_ROTATION = 1), t.data.aPadOffsetX && (g.HAS_PAD_OFFSET = 1),
|
|
16407
|
-
t.data.aAltitude && (g.HAS_ALTITUDE = 1), p.setDefines(g), p.setUniform("alphaTest",
|
|
16408
|
+
t.data.aAltitude && (g.HAS_ALTITUDE = 1), p.setDefines(g), p.setUniform("alphaTest", Or),
|
|
16408
16409
|
p.setLocalTransform(i), p.properties.symbolIndex = t.properties.symbolIndex, p;
|
|
16409
16410
|
}(this.regl, a, t, 0, c, u.icon, o.options.collision, !s, this.isEnableUniquePlacement());
|
|
16410
16411
|
e && (e.positionMatrix = this.getAltitudeOffsetMatrix(), delete e.geometry.properties.glyphAtlas,
|
|
@@ -16540,7 +16541,7 @@
|
|
|
16540
16541
|
_iterateMeshBox(e, t, i, r) {
|
|
16541
16542
|
const s = this.getMap(), {collideBoxIndex: o} = e.meshes[0].geometry.properties;
|
|
16542
16543
|
if (!(o && o[t])) return !1;
|
|
16543
|
-
const a = n.mat4.multiply(
|
|
16544
|
+
const a = n.mat4.multiply(Os, s.projViewMatrix, e.meshes[0].localTransform);
|
|
16544
16545
|
let l, h = !1;
|
|
16545
16546
|
const c = e.meshes;
|
|
16546
16547
|
let u = 0;
|
|
@@ -16734,7 +16735,7 @@
|
|
|
16734
16735
|
canvasSize: l,
|
|
16735
16736
|
iconSize: Es,
|
|
16736
16737
|
resolution: e.getResolution(),
|
|
16737
|
-
glyphSize:
|
|
16738
|
+
glyphSize: Fr,
|
|
16738
16739
|
gammaScale: 1,
|
|
16739
16740
|
blendSrcIsOne: +!("one" !== c && 1 !== c),
|
|
16740
16741
|
viewport: i && t && t.viewport,
|
|
@@ -16766,21 +16767,21 @@
|
|
|
16766
16767
|
let b = v > 0 ? 1 : -1, A = 0;
|
|
16767
16768
|
f && (b *= -1, A = Math.PI), b < 0 && (A += Math.PI);
|
|
16768
16769
|
const w = h + c, T = Math.abs(v);
|
|
16769
|
-
let M = b > 0 ? l : l + 1, S = ti.convert(i), P = ti.convert(i), k = ti.convert(r), C = ti.convert(r), I = 0,
|
|
16770
|
-
for (;I +
|
|
16770
|
+
let M = b > 0 ? l : l + 1, S = ti.convert(i), P = ti.convert(i), k = ti.convert(r), C = ti.convert(r), I = 0, F = 0;
|
|
16771
|
+
for (;I + F <= T; ) {
|
|
16771
16772
|
if (M += b, M < h || M >= w) return null;
|
|
16772
16773
|
P.x = S.x, P.y = S.y, C.x = k.x, C.y = k.y, S.x = n[3 * M], S.y = n[3 * M + 1],
|
|
16773
|
-
k.x = x[3 * M], k.y = x[3 * M + 1], I +=
|
|
16774
|
+
k.x = x[3 * M], k.y = x[3 * M + 1], I += F, F = P.dist(S) / d;
|
|
16774
16775
|
}
|
|
16775
|
-
const
|
|
16776
|
+
const O = (T - I) / F, R = g && g.getRenderer(), E = R && R.getTerrainHelper(), D = t.properties.tile.terrainTileInfos;
|
|
16776
16777
|
if (!y && E) {
|
|
16777
16778
|
const {extent: n} = t.properties.tile, i = g.getTileSize().width / n, r = g.getMap();
|
|
16778
|
-
let s = k.sub(C).mult(
|
|
16779
|
+
let s = k.sub(C).mult(O)._add(C);
|
|
16779
16780
|
S = ci(ri, r, t, k, i, g, m, D), P = ci(si, r, t, C, i, g, m, D), s = ci(oi, r, t, s, i, g, m, D);
|
|
16780
16781
|
const o = A + Math.atan2(S[1] - P[1], S[0] - P[0]);
|
|
16781
16782
|
return e[0] = (s[0] - p[0]) / d, e[1] = (s[1] - p[1]) / d, e[2] = o, e;
|
|
16782
16783
|
}
|
|
16783
|
-
const L = S.sub(P), H = L.mult(
|
|
16784
|
+
const L = S.sub(P), H = L.mult(O)._add(P);
|
|
16784
16785
|
H._add(L._unit()._perp()._mult(a * b));
|
|
16785
16786
|
const N = A + Math.atan2(S.y - P.y, S.x - P.x);
|
|
16786
16787
|
return e[0] = (H.x - i[0]) / d, e[1] = (H.y - i[1]) / d, e[2] = N, e;
|
|
@@ -17050,17 +17051,17 @@
|
|
|
17050
17051
|
if (n.vec4.scale(So, C, 1 / I), d.isOffscreen(So)) return f || ko(y, t, i, r), b[3 * T] = it,
|
|
17051
17052
|
b[3 * T + 1] = it, b[3 * T + 2] = it, !1;
|
|
17052
17053
|
w && (S = P), b[3 * T] = C[0], b[3 * T + 1] = C[1], b[3 * T + 2] = C[2];
|
|
17053
|
-
const
|
|
17054
|
-
let
|
|
17055
|
-
const R = t[i], E = t[r - 1], D = A ? A[R] : e.properties.textSize, L = this._updateNormal(e, D, s, R, E, S, so,
|
|
17054
|
+
const F = w ? 1 : p.properties.tileExtent / this.layer.getTileSize().width;
|
|
17055
|
+
let O = !0;
|
|
17056
|
+
const R = t[i], E = t[r - 1], D = A ? A[R] : e.properties.textSize, L = this._updateNormal(e, D, s, R, E, S, so, F, a);
|
|
17056
17057
|
if (null === L) return ko(y, t, i, r), !1;
|
|
17057
17058
|
const H = E - R <= 3, N = Math.floor(L / 2), z = L % 2;
|
|
17058
17059
|
for (let a = i; a < r; a += 6) {
|
|
17059
17060
|
const l = t[a];
|
|
17060
17061
|
let d;
|
|
17061
|
-
if (d = N || a !== i || H || u ? N || a !== r - 6 || H || u ? Us.call(this, io, e, D, s, l, S, so,
|
|
17062
|
+
if (d = N || a !== i || H || u ? N || a !== r - 6 || H || u ? Us.call(this, io, e, D, s, l, S, so, F, N, C, this.layer, o, c) : _o : xo,
|
|
17062
17063
|
!d) {
|
|
17063
|
-
|
|
17064
|
+
O = !1, f || ko(y, t, i, r);
|
|
17064
17065
|
break;
|
|
17065
17066
|
}
|
|
17066
17067
|
let p = d[2];
|
|
@@ -17085,7 +17086,7 @@
|
|
|
17085
17086
|
y[i] = uo[0], y[i + 1] = uo[1], x && (y[i + 2] = uo[2]));
|
|
17086
17087
|
}
|
|
17087
17088
|
}
|
|
17088
|
-
return
|
|
17089
|
+
return O;
|
|
17089
17090
|
}
|
|
17090
17091
|
_updateNormal(e, t, n, i, r, s, o, a, l) {
|
|
17091
17092
|
const h = r - i <= 3, c = this.getMap(), u = this.getSymbol(e.geometry.properties.symbolIndex);
|
|
@@ -17166,7 +17167,7 @@
|
|
|
17166
17167
|
viewMatrix: e.viewMatrix,
|
|
17167
17168
|
cameraToCenterDistance: o,
|
|
17168
17169
|
canvasSize: a,
|
|
17169
|
-
glyphSize:
|
|
17170
|
+
glyphSize: Fr,
|
|
17170
17171
|
gammaScale: 1 * (this.layer.options.textGamma || 1),
|
|
17171
17172
|
resolution: e.getResolution(),
|
|
17172
17173
|
altitudeScale: l,
|
|
@@ -17190,12 +17191,12 @@
|
|
|
17190
17191
|
return 0 === n ? e.properties.meshKey - t.properties.meshKey : n;
|
|
17191
17192
|
}
|
|
17192
17193
|
var Io = "#define SHADER_NAME NATIVE_POINT\n#include <gl2_vert>\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\nuniform mat4 positionMatrix;\nuniform mat4 projViewModelMatrix;\nuniform float markerSize;\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n vec3 c = unpackVTPosition();\n gl_Position = projViewModelMatrix * positionMatrix * vec4(c, 1.);\n gl_PointSize = markerSize;\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
|
|
17193
|
-
const
|
|
17194
|
+
const Fo = {
|
|
17194
17195
|
markerFill: [ 0, 0, 0 ],
|
|
17195
17196
|
markerOpacity: 1,
|
|
17196
17197
|
markerSize: 10
|
|
17197
17198
|
};
|
|
17198
|
-
class
|
|
17199
|
+
class Oo extends Ci {
|
|
17199
17200
|
getPrimitive() {
|
|
17200
17201
|
return "points";
|
|
17201
17202
|
}
|
|
@@ -17216,7 +17217,7 @@
|
|
|
17216
17217
|
const a = {};
|
|
17217
17218
|
xt(a, "markerOpacity", o, "markerOpacity", 1), xt(a, "markerSize", o, "markerSize", 10),
|
|
17218
17219
|
xt(a, "markerFill", o, "markerFill", "#000", bt(this.colorCache, 3));
|
|
17219
|
-
const l = new n.reshader.Material(a,
|
|
17220
|
+
const l = new n.reshader.Material(a, Fo);
|
|
17220
17221
|
l.createDefines = () => "square" !== o.markerType ? {
|
|
17221
17222
|
USE_CIRCLE: 1
|
|
17222
17223
|
} : null, l.appendDefines = e => ("square" !== o.markerType && (e.USE_CIRCLE = 1),
|
|
@@ -18076,7 +18077,7 @@
|
|
|
18076
18077
|
xt(f, "roughnessFactor", h, "roughnessFactor", .4), xt(f, "emissiveFactor", h, "emissiveFactor", [ 0, 0, 0 ]),
|
|
18077
18078
|
xt(f, "uvScale", h, "uvScale", [ 1, 1 ]);
|
|
18078
18079
|
const d = s.properties.iconAtlas, p = this.layer instanceof r.TileLayer;
|
|
18079
|
-
d && (f.linePatternFile =
|
|
18080
|
+
d && (f.linePatternFile = Fi(this.regl, d, !1), f.atlasSize = d ? [ d.width, d.height ] : [ 0, 0 ],
|
|
18080
18081
|
f.flipY = p ? -1 : 1, this.drawDebugAtlas(d)), void 0 === a && s.generateBuffers(this.regl),
|
|
18081
18082
|
f.alphaTest = -1;
|
|
18082
18083
|
const g = new n.reshader.pbr.StandardMaterial(f), m = new n.reshader.Mesh(s, g, {
|
|
@@ -18270,7 +18271,7 @@
|
|
|
18270
18271
|
constructor(e, t, i, r, s, o) {
|
|
18271
18272
|
super(e, t, i, r, s, o), this._ready = !1, this.scene.sortFunction = this.sortByCommandKey;
|
|
18272
18273
|
const a = r.fetchOptions || {};
|
|
18273
|
-
a.referrer = window && window.location.href, this._gltfManager = new n.reshader.GLTFManager(e, {
|
|
18274
|
+
a.referrer = window && window.location.href, this._gltfManager = e.gltfManager = e.gltfManager || new n.reshader.GLTFManager(e, {
|
|
18274
18275
|
fetchOptions: a,
|
|
18275
18276
|
urlModifier: e => {
|
|
18276
18277
|
const n = t.getURLModifier();
|
|
@@ -18471,7 +18472,7 @@
|
|
|
18471
18472
|
n.mat4.multiply(k, k, e);
|
|
18472
18473
|
}
|
|
18473
18474
|
f("instance_vectorA", t, k, 0), f("instance_vectorB", t, k, 1), f("instance_vectorC", t, k, 2),
|
|
18474
|
-
e.aPickingId[t] = t;
|
|
18475
|
+
e.aPickingId[t] = c[t];
|
|
18475
18476
|
}
|
|
18476
18477
|
return n.vec3.set(w, M, S, P), w;
|
|
18477
18478
|
}
|
|
@@ -18871,13 +18872,13 @@
|
|
|
18871
18872
|
Ca.registerAt(Jt);
|
|
18872
18873
|
const Ia = Ln("line-gradient", rr);
|
|
18873
18874
|
Ia.registerAt(Jt);
|
|
18874
|
-
const
|
|
18875
|
-
Oa.registerAt(Jt);
|
|
18876
|
-
const Fa = Ln("text", Po);
|
|
18875
|
+
const Fa = Ln("icon", Hs);
|
|
18877
18876
|
Fa.registerAt(Jt);
|
|
18877
|
+
const Oa = Ln("text", Po);
|
|
18878
|
+
Oa.registerAt(Jt);
|
|
18878
18879
|
const Ra = Ln("native-line", Do);
|
|
18879
18880
|
Ra.registerAt(Jt);
|
|
18880
|
-
Ln("native-point",
|
|
18881
|
+
Ln("native-point", Oo).registerAt(Jt);
|
|
18881
18882
|
const Ea = Ln("phong", $o);
|
|
18882
18883
|
Ea.registerAt(Jt);
|
|
18883
18884
|
const Da = Ln("wireframe", Jo);
|
|
@@ -19087,7 +19088,7 @@
|
|
|
19087
19088
|
const t = this.options.featureIdProperty, n = this.features;
|
|
19088
19089
|
Array.isArray(n) ? n.forEach((n => {
|
|
19089
19090
|
if (n) {
|
|
19090
|
-
if (
|
|
19091
|
+
if (Fe(n.id) || (n.id = e++), t) {
|
|
19091
19092
|
let e = t;
|
|
19092
19093
|
Re(t) && (e = t[n.layer || "0"]), n.id = n.properties[e];
|
|
19093
19094
|
}
|
|
@@ -19095,7 +19096,7 @@
|
|
|
19095
19096
|
}
|
|
19096
19097
|
})) : n.features && n.features.forEach((n => {
|
|
19097
19098
|
if (n) {
|
|
19098
|
-
if (
|
|
19099
|
+
if (Fe(n.id) || (n.id = e++), t) {
|
|
19099
19100
|
let e = t;
|
|
19100
19101
|
Re(t) && (e = t[n.layer || "0"]), n.id = n.properties[e];
|
|
19101
19102
|
}
|
|
@@ -20117,11 +20118,11 @@
|
|
|
20117
20118
|
function Il(e, t, n, i, r) {
|
|
20118
20119
|
return e[0] = t, e[1] = n, e[2] = i, e[3] = r, e;
|
|
20119
20120
|
}
|
|
20120
|
-
function
|
|
20121
|
+
function Fl(e, t, n) {
|
|
20121
20122
|
return e[0] = t[0] / n[0], e[1] = t[1] / n[1], e[2] = t[2] / n[2], e[3] = t[3] / n[3],
|
|
20122
20123
|
e;
|
|
20123
20124
|
}
|
|
20124
|
-
function
|
|
20125
|
+
function Ol(e, t, n) {
|
|
20125
20126
|
return e[0] = t, e[1] = n, e;
|
|
20126
20127
|
}
|
|
20127
20128
|
function Rl(e, t) {
|
|
@@ -20164,7 +20165,7 @@
|
|
|
20164
20165
|
const g = Rl(u, f), m = Rl(f, d), y = [], x = [], _ = [];
|
|
20165
20166
|
for (let e = t; e < n; e += 3) {
|
|
20166
20167
|
const t = e / 3 * 2;
|
|
20167
|
-
|
|
20168
|
+
Ol(y, (s.x / l + r[e] / o) * a, s.y / l * a + (c ? r[e + 1] : -r[e + 1]) / o * a),
|
|
20168
20169
|
"EPSG:4326" !== h && "EPSG:4490" !== h || Hl(y, y), zl(x, y, u, f), zl(_, y, p, u),
|
|
20169
20170
|
i[t] = Rl(u, x) / g, i[t + 1] = Rl(u, _) / m;
|
|
20170
20171
|
}
|
|
@@ -20551,9 +20552,9 @@
|
|
|
20551
20552
|
var e, t = (e = new xh(4), xh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0,
|
|
20552
20553
|
e[3] = 0), e);
|
|
20553
20554
|
}();
|
|
20554
|
-
var Ih,
|
|
20555
|
+
var Ih, Fh = function(e, t, n) {
|
|
20555
20556
|
return e[0] = t[0] * n, e[1] = t[1] * n, e[2] = t[2] * n, e[3] = t[3] * n, e;
|
|
20556
|
-
},
|
|
20557
|
+
}, Oh = function(e, t) {
|
|
20557
20558
|
var n = t[0], i = t[1], r = t[2], s = t[3], o = n * n + i * i + r * r + s * s;
|
|
20558
20559
|
return o > 0 && (o = 1 / Math.sqrt(o), e[0] = n * o, e[1] = i * o, e[2] = r * o,
|
|
20559
20560
|
e[3] = s * o), e;
|
|
@@ -20572,8 +20573,8 @@
|
|
|
20572
20573
|
e[8] = h, e;
|
|
20573
20574
|
}(Eh, n[0], n[1], n[2], ...i, ...t);
|
|
20574
20575
|
e = Ch(e, r), e = function(e) {
|
|
20575
|
-
return e[3] < 0 ?
|
|
20576
|
-
}(e =
|
|
20576
|
+
return e[3] < 0 ? Fh(e, e, -1) : e;
|
|
20577
|
+
}(e = Oh(e, e));
|
|
20577
20578
|
const s = 1 / ((1 << 2 * Rh - 1) - 1);
|
|
20578
20579
|
if (e[3] < s) {
|
|
20579
20580
|
e[3] = s;
|
|
@@ -20581,7 +20582,7 @@
|
|
|
20581
20582
|
e[0] *= t, e[1] *= t, e[2] *= t;
|
|
20582
20583
|
}
|
|
20583
20584
|
const o = n[3] > 0 ? Sh(Lh, n, t) : Sh(Lh, t, n);
|
|
20584
|
-
return Mh(Sh(Hh, n, t), o) < 0 &&
|
|
20585
|
+
return Mh(Sh(Hh, n, t), o) < 0 && Fh(e, e, -1), e;
|
|
20585
20586
|
}
|
|
20586
20587
|
const zh = [];
|
|
20587
20588
|
const Vh = [], Bh = [], Uh = [], Gh = [], jh = [], Wh = [], Xh = [];
|
|
@@ -20611,10 +20612,10 @@
|
|
|
20611
20612
|
const {StyleUtil: Zh, PackUtil: Jh, ArrayPool: Kh} = h(), Qh = Kh.getInstance();
|
|
20612
20613
|
function ec(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g) {
|
|
20613
20614
|
void 0 === t.top && (t.top = !0), void 0 === t.side && (t.side = !0), Qh.reset();
|
|
20614
|
-
const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: b, tangent: A, uv: w, topUVMode: T, sideUVMode: M, sideVerticalUVMode: S, top: P, side: k, textureYOrigin: C, topThickness: I} = t,
|
|
20615
|
+
const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: b, tangent: A, uv: w, topUVMode: T, sideUVMode: M, sideVerticalUVMode: S, top: P, side: k, textureYOrigin: C, topThickness: I} = t, F = !!g, O = function(e, t, {altitudeScale: n, altitudeProperty: i, defaultAltitude: r, heightProperty: s, minHeightProperty: o, defaultHeight: a}, {center: l, side: h, top: c, topThickness: u, uvOrigin: f, uv: d, uvSize: p, topUVMode: g, sideUVMode: m, sideVerticalUVMode: y, textureYOrigin: x, tileRatio: _, centimeterToPoint: v, verticalCentimeterToPoint: b, positionType: A, res: w, glScale: T, projectionCode: M}, S, P) {
|
|
20615
20616
|
let k = t / e[0].extent;
|
|
20616
20617
|
t === 1 / 0 && (k = 1);
|
|
20617
|
-
const C = t === 1 / 0, I = P.get(),
|
|
20618
|
+
const C = t === 1 / 0, I = P.get(), F = P.get(), O = P.get(), R = P.getProxy(), E = P.get(), D = P.get(), L = P.get(), H = !!d, N = !!c, z = !!h, V = H ? P.get() : null;
|
|
20618
20619
|
function B(e, n, i, r, s, o) {
|
|
20619
20620
|
let a = n;
|
|
20620
20621
|
if (N) {
|
|
@@ -20646,13 +20647,13 @@
|
|
|
20646
20647
|
let U = -1 / 0, G = 1 / 0, j = 0;
|
|
20647
20648
|
const W = [ -1, -1, t + 1, t + 1 ];
|
|
20648
20649
|
let X = 0, Y = e.length;
|
|
20649
|
-
|
|
20650
|
+
Fe(S) && (X = S, Y = S + 1);
|
|
20650
20651
|
let q = 0, $ = !1;
|
|
20651
20652
|
const Z = P.getProxy();
|
|
20652
20653
|
let J = !1;
|
|
20653
20654
|
for (;X < Y; X++) {
|
|
20654
20655
|
const l = e[X], h = l.id;
|
|
20655
|
-
|
|
20656
|
+
Fe(h) && (Math.abs(h) > q && (q = Math.abs(h)), h < 0 && ($ = !0));
|
|
20656
20657
|
const c = l.geometry, u = l.properties[st];
|
|
20657
20658
|
let f = Array.isArray(u && u[0] && u[0][0]) ? u[0] : u;
|
|
20658
20659
|
const {altitude: d, height: p} = dh.getFeaAltitudeAndHeight(l, n, i, r, s, a, o);
|
|
@@ -20681,24 +20682,24 @@
|
|
|
20681
20682
|
}
|
|
20682
20683
|
const _ = E.getLength() - g, v = (nt + "").trim();
|
|
20683
20684
|
for (let e = 0; e < _ / 3; e++) {
|
|
20684
|
-
let e =
|
|
20685
|
-
|
|
20686
|
-
I.currentIndex = e,
|
|
20685
|
+
let e = F.currentIndex;
|
|
20686
|
+
F[e++] = void 0 === l[v] ? X : l[v], F.currentIndex = e, e = I.currentIndex, I[e++] = X,
|
|
20687
|
+
I.currentIndex = e, Fe(h) && (e = O.currentIndex, O[e++] = h, O.currentIndex = e);
|
|
20687
20688
|
}
|
|
20688
20689
|
}
|
|
20689
|
-
const K = dh.getUnsignedArrayType(
|
|
20690
|
+
const K = dh.getUnsignedArrayType(F.getLength() ? F[F.getLength() - 1] : 0), Q = {
|
|
20690
20691
|
hasNegativeHeight: J,
|
|
20691
20692
|
maxAltitude: U === -1 / 0 ? 0 : U,
|
|
20692
20693
|
minAltitude: G === 1 / 0 ? 0 : G,
|
|
20693
20694
|
vertices: E,
|
|
20694
20695
|
verticeTypes: L,
|
|
20695
20696
|
indices: D,
|
|
20696
|
-
pickingIds: ph.createTypedArray(
|
|
20697
|
+
pickingIds: ph.createTypedArray(F, K),
|
|
20697
20698
|
featureIndexes: I
|
|
20698
20699
|
};
|
|
20699
|
-
if (
|
|
20700
|
+
if (O.getLength()) {
|
|
20700
20701
|
const e = $ ? dh.getPosArrayType(q) : dh.getUnsignedArrayType(q);
|
|
20701
|
-
Q.featureIds = ph.createTypedArray(
|
|
20702
|
+
Q.featureIds = ph.createTypedArray(O, e);
|
|
20702
20703
|
} else Q.featureIds = [];
|
|
20703
20704
|
return V && (V.setLength(E.getLength() / 3 * 2), Q.uvs = V), Q;
|
|
20704
20705
|
}(e, n, {
|
|
@@ -20727,10 +20728,10 @@
|
|
|
20727
20728
|
res: s,
|
|
20728
20729
|
glScale: o,
|
|
20729
20730
|
projectionCode: f
|
|
20730
|
-
}, d, Qh), R = [], E =
|
|
20731
|
-
delete
|
|
20732
|
-
const H = Math.max(Math.abs(
|
|
20733
|
-
|
|
20731
|
+
}, d, Qh), R = [], E = O.vertices.getLength() / 3, D = Jh.getIndexArrayType(E), L = Kh.createTypedArray(O.indices, D);
|
|
20732
|
+
delete O.indices, R.push(L.buffer, O.pickingIds.buffer);
|
|
20733
|
+
const H = Math.max(Math.abs(O.maxAltitude), Math.abs(O.minAltitude)), N = p || Jh.getPosArrayType(Math.max(512, H));
|
|
20734
|
+
O.vertices = Kh.createTypedArray(O.vertices, N);
|
|
20734
20735
|
const z = A ? Qh.getProxy() : new Float32Array(3 * E);
|
|
20735
20736
|
z.setLength && z.setLength(3 * E);
|
|
20736
20737
|
const V = function(e, t, n) {
|
|
@@ -20745,15 +20746,15 @@
|
|
|
20745
20746
|
0 !== t ? (i[e] /= t, i[e + 1] /= t, i[e + 2] /= t) : (i[e] = 0, i[e + 1] = 0, i[e + 2] = 0);
|
|
20746
20747
|
}
|
|
20747
20748
|
return i;
|
|
20748
|
-
}(
|
|
20749
|
+
}(O.vertices, L, z);
|
|
20749
20750
|
let B = !0;
|
|
20750
20751
|
const U = V.getLength ? V.getLength() : V.length;
|
|
20751
20752
|
for (let e = 0; e < U; e++) {
|
|
20752
|
-
|
|
20753
|
+
F || (V[e] = -V[e]);
|
|
20753
20754
|
const t = V[e] % 1;
|
|
20754
20755
|
1 - Math.abs(t) > 1e-6 ? B = !1 : 0 !== t && (V[e] = Math.round(V[e]));
|
|
20755
20756
|
}
|
|
20756
|
-
if (
|
|
20757
|
+
if (O.normals = V, A) {
|
|
20757
20758
|
let e = Qh.get();
|
|
20758
20759
|
e.setLength(4 * E), e = function(e, t, n, i, r) {
|
|
20759
20760
|
const s = e.length / 3, o = r || new Array(4 * s), a = [], l = [];
|
|
@@ -20778,7 +20779,7 @@
|
|
|
20778
20779
|
}
|
|
20779
20780
|
for (let e = 0, t = i.length; e < t; e += 3) M(i[e + 0]), M(i[e + 1]), M(i[e + 2]);
|
|
20780
20781
|
return o;
|
|
20781
|
-
}(
|
|
20782
|
+
}(O.vertices, O.normals, O.uvs, L, e), e = function(e, t) {
|
|
20782
20783
|
const n = t.getLength(), i = new Float32Array(n), r = [], s = [], o = [];
|
|
20783
20784
|
for (let a = 0; a < n; a += 4) {
|
|
20784
20785
|
const n = a / 4 * 3;
|
|
@@ -20786,15 +20787,15 @@
|
|
|
20786
20787
|
Nh(o, s, r), Cl(i.subarray(a, a + 4), o);
|
|
20787
20788
|
}
|
|
20788
20789
|
return i;
|
|
20789
|
-
}(
|
|
20790
|
+
}(O.normals, e), O.tangents = e, R.push(e.buffer), delete O.normals;
|
|
20790
20791
|
}
|
|
20791
|
-
if (
|
|
20792
|
-
R.push(
|
|
20793
|
-
const e =
|
|
20794
|
-
|
|
20792
|
+
if (O.normals && (B && (O.normals = Kh.createTypedArray(O.normals, Int8Array)),
|
|
20793
|
+
R.push(O.normals.buffer)), O.uvs) {
|
|
20794
|
+
const e = O.uvs;
|
|
20795
|
+
O.uvs = Kh.createTypedArray(e, Float32Array), R.push(O.uvs.buffer);
|
|
20795
20796
|
}
|
|
20796
20797
|
if (g) {
|
|
20797
|
-
const e =
|
|
20798
|
+
const e = O.vertices, t = e.length;
|
|
20798
20799
|
for (let n = 0; n < t; n += 3) e[n] -= g[0], e[n + 1] -= g[1];
|
|
20799
20800
|
}
|
|
20800
20801
|
const G = function(e, t, n, i) {
|
|
@@ -20827,7 +20828,7 @@
|
|
|
20827
20828
|
s.aOpacity = l;
|
|
20828
20829
|
}
|
|
20829
20830
|
return s.dynamicAttributes = r, s;
|
|
20830
|
-
}(e, c, u,
|
|
20831
|
+
}(e, c, u, O.featureIndexes), j = function(e, t, n, i, r) {
|
|
20831
20832
|
const s = [ [], [] ], o = Le(i.topPolygonFill), a = Le(i.bottomPolygonFill), l = [ 255, 255, 255, 255 ], h = t.getLength();
|
|
20832
20833
|
if (o || a) {
|
|
20833
20834
|
let c = o && we(i.topPolygonFill), u = a && we(i.bottomPolygonFill), f = null, d = null, p = null, g = null;
|
|
@@ -20846,35 +20847,35 @@
|
|
|
20846
20847
|
y.$layer = m.layer, y.$type = m.type;
|
|
20847
20848
|
let x = h ? c : u, _ = x(r, y);
|
|
20848
20849
|
be(_) && (x = we(_), _ = x(r, y)), delete y.$layer, delete y.$type, Zh.normalizeColor(tc, _),
|
|
20849
|
-
|
|
20850
|
+
Fl(tc, tc, l);
|
|
20850
20851
|
let v = nc(s, tc);
|
|
20851
20852
|
v < 0 && (v = s.length, s.push(Cl([], tc))), e[i] = v, h ? (f = t[i], p = v) : (d = t[i],
|
|
20852
20853
|
g = v);
|
|
20853
20854
|
}
|
|
20854
20855
|
}
|
|
20855
20856
|
return s.slice(2);
|
|
20856
|
-
}(
|
|
20857
|
+
}(O.verticeTypes, O.featureIndexes, e, c, u), W = {
|
|
20857
20858
|
data: {
|
|
20858
20859
|
data: {
|
|
20859
|
-
aVertexColorType: j.length <= 252 ? Kh.createTypedArray(
|
|
20860
|
-
aPosition:
|
|
20861
|
-
aNormal:
|
|
20862
|
-
aTexCoord0:
|
|
20863
|
-
aTangent:
|
|
20864
|
-
aPickingId:
|
|
20860
|
+
aVertexColorType: j.length <= 252 ? Kh.createTypedArray(O.verticeTypes, Uint8Array) : Kh.createTypedArray(O.verticeTypes, Uint16Array),
|
|
20861
|
+
aPosition: O.vertices,
|
|
20862
|
+
aNormal: O.normals,
|
|
20863
|
+
aTexCoord0: O.uvs,
|
|
20864
|
+
aTangent: O.tangents,
|
|
20865
|
+
aPickingId: O.pickingIds
|
|
20865
20866
|
},
|
|
20866
20867
|
indices: L,
|
|
20867
20868
|
properties: {
|
|
20868
|
-
maxAltitude:
|
|
20869
|
-
minAltitude:
|
|
20870
|
-
hasNegativeHeight:
|
|
20869
|
+
maxAltitude: O.maxAltitude / 100,
|
|
20870
|
+
minAltitude: O.minAltitude / 100,
|
|
20871
|
+
hasNegativeHeight: O.hasNegativeHeight
|
|
20871
20872
|
},
|
|
20872
20873
|
dynamicAttributes: G.dynamicAttributes,
|
|
20873
20874
|
vertexColors: j
|
|
20874
20875
|
},
|
|
20875
20876
|
buffers: R
|
|
20876
20877
|
};
|
|
20877
|
-
return
|
|
20878
|
+
return O.featureIds.length ? (W.data.featureIds = O.featureIds, R.push(W.data.featureIds.buffer)) : W.data.featureIds = [],
|
|
20878
20879
|
G.aColor && (W.data.data.aColor = G.aColor, W.buffers.push(G.aColor.buffer)), G.aOpacity && (W.data.data.aOpacity = G.aOpacity,
|
|
20879
20880
|
W.buffers.push(G.aOpacity.buffer)), W.buffers.push(W.data.data.aPosition.buffer),
|
|
20880
20881
|
W.data.pickingIdIndiceMap = Jh.generatePickingIndiceIndex(W.data.data.aPickingId, W.data.indices),
|
|
@@ -21224,15 +21225,15 @@
|
|
|
21224
21225
|
0 !== a && (r[d++] = a);
|
|
21225
21226
|
return 0 === s && 0 !== d || (r[d++] = s), d;
|
|
21226
21227
|
}
|
|
21227
|
-
function
|
|
21228
|
+
function Fc(e) {
|
|
21228
21229
|
return new Float64Array(e);
|
|
21229
21230
|
}
|
|
21230
|
-
const
|
|
21231
|
+
const Oc = 33306690738754716e-32, Rc = 22204460492503146e-32, Ec = 11093356479670487e-47, Dc = Fc(4), Lc = Fc(8), Hc = Fc(12), Nc = Fc(16), zc = Fc(4);
|
|
21231
21232
|
function Vc(e, t, n, i, r, s) {
|
|
21232
21233
|
const o = (t - s) * (n - r), a = (e - r) * (i - s), l = o - a;
|
|
21233
21234
|
if (0 === o || 0 === a || o > 0 != a > 0) return l;
|
|
21234
21235
|
const h = Math.abs(o + a);
|
|
21235
|
-
return Math.abs(l) >=
|
|
21236
|
+
return Math.abs(l) >= Oc * h ? l : -function(e, t, n, i, r, s, o) {
|
|
21236
21237
|
let a, l, h, c, u, f, d, p, g, m, y, x, _, v, b, A, w, T;
|
|
21237
21238
|
const M = e - r, S = n - r, P = t - s, k = i - s;
|
|
21238
21239
|
v = M * k, f = kc * M, d = f - (f - M), p = M - d, f = kc * k, g = f - (f - k),
|
|
@@ -21256,21 +21257,21 @@
|
|
|
21256
21257
|
y = b - w, u = b - y, zc[0] = b - (y + u) + (u - w), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
21257
21258
|
y = _ - A, u = _ - y, zc[1] = _ - (y + u) + (u - A), T = x + y, u = T - x, zc[2] = x - (T - u) + (y - u),
|
|
21258
21259
|
zc[3] = T;
|
|
21259
|
-
const
|
|
21260
|
+
const F = Ic(4, Dc, 4, zc, Lc);
|
|
21260
21261
|
v = M * c, f = kc * M, d = f - (f - M), p = M - d, f = kc * c, g = f - (f - c),
|
|
21261
21262
|
m = c - g, b = p * m - (v - d * g - p * g - d * m), A = P * h, f = kc * P, d = f - (f - P),
|
|
21262
21263
|
p = P - d, f = kc * h, g = f - (f - h), m = h - g, w = p * m - (A - d * g - p * g - d * m),
|
|
21263
21264
|
y = b - w, u = b - y, zc[0] = b - (y + u) + (u - w), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
21264
21265
|
y = _ - A, u = _ - y, zc[1] = _ - (y + u) + (u - A), T = x + y, u = T - x, zc[2] = x - (T - u) + (y - u),
|
|
21265
21266
|
zc[3] = T;
|
|
21266
|
-
const
|
|
21267
|
+
const O = Ic(F, Lc, 4, zc, Hc);
|
|
21267
21268
|
v = a * c, f = kc * a, d = f - (f - a), p = a - d, f = kc * c, g = f - (f - c),
|
|
21268
21269
|
m = c - g, b = p * m - (v - d * g - p * g - d * m), A = l * h, f = kc * l, d = f - (f - l),
|
|
21269
21270
|
p = l - d, f = kc * h, g = f - (f - h), m = h - g, w = p * m - (A - d * g - p * g - d * m),
|
|
21270
21271
|
y = b - w, u = b - y, zc[0] = b - (y + u) + (u - w), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
21271
21272
|
y = _ - A, u = _ - y, zc[1] = _ - (y + u) + (u - A), T = x + y, u = T - x, zc[2] = x - (T - u) + (y - u),
|
|
21272
21273
|
zc[3] = T;
|
|
21273
|
-
const R = Ic(
|
|
21274
|
+
const R = Ic(O, Hc, 4, zc, Nc);
|
|
21274
21275
|
return Nc[R - 1];
|
|
21275
21276
|
}(e, t, n, i, r, s, h);
|
|
21276
21277
|
}
|
|
@@ -21458,7 +21459,7 @@
|
|
|
21458
21459
|
}
|
|
21459
21460
|
const iu = [], ru = [];
|
|
21460
21461
|
function su(e) {
|
|
21461
|
-
if (
|
|
21462
|
+
if (Fe(e[0] && e[0].x)) {
|
|
21462
21463
|
const t = [];
|
|
21463
21464
|
let n = 0;
|
|
21464
21465
|
for (let i = 0; i < e.length; i++) ru[n] ? (ru[n][0] = e[i].x, ru[n][1] = e[i].y) : ru[n] = [ e[i].x, e[i].y ],
|
|
@@ -21744,13 +21745,13 @@
|
|
|
21744
21745
|
} else r.registerWorkerAdapter("@maptalks/vt", gu);
|
|
21745
21746
|
e.ExtrudePolygonLayer = au, e.FillPainter = Gi, e.FillPlugin = ka, e.FilterUtil = fu,
|
|
21746
21747
|
e.GLTFPhongPlugin = Na, e.GLTFStandardPlugin = za, e.GeoJSONVectorTileLayer = ja,
|
|
21747
|
-
e.HeatmapPlugin = Va, e.IconPainter = Hs, e.IconPlugin =
|
|
21748
|
+
e.HeatmapPlugin = Va, e.IconPainter = Hs, e.IconPlugin = Fa, e.LineGradientPlugin = Ia,
|
|
21748
21749
|
e.LinePainter = Yi, e.LinePlugin = Ca, e.LineStringLayer = _l, e.LitPlugin = La,
|
|
21749
21750
|
e.MapboxVectorTileLayer = Ua, e.NativeLinePainter = Do, e.NativeLinePlugin = Ra,
|
|
21750
|
-
e.NativePointPainter =
|
|
21751
|
+
e.NativePointPainter = Oo, e.PackUtil = uu, e.PhongPainter = $o, e.PhongPlugin = Ea,
|
|
21751
21752
|
e.PointLayer = yl, e.PolygonLayer = Al, e.SYMBOLS_NEED_REBUILD_IN_VECTOR = pu, e.SYMBOLS_NEED_REBUILD_IN_VT = du,
|
|
21752
|
-
e.TextPainter = Po, e.TextPlugin =
|
|
21753
|
+
e.TextPainter = Po, e.TextPlugin = Oa, e.TubePlugin = Ha, e.Vector3DLayer = sn,
|
|
21753
21754
|
e.VectorTileLayer = Jt, e.VectorTileLayerRenderer = Nt, e.WaterPlugin = Ba, e.WireframePainter = Jo,
|
|
21754
|
-
e.WireframePlugin = Da, "undefined" != typeof console && console.log("@maptalks/vt v0.
|
|
21755
|
+
e.WireframePlugin = Da, "undefined" != typeof console && console.log("@maptalks/vt v0.104.0");
|
|
21755
21756
|
}));
|
|
21756
21757
|
//# sourceMappingURL=maptalks.vt.js.map
|