@maptalks/vt 0.115.0 → 0.115.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/maptalks.vt.d.ts +1 -1
- package/dist/maptalks.vt.es.js +6 -4
- package/dist/maptalks.vt.es.js.map +1 -1
- package/dist/maptalks.vt.js +203 -201
- package/dist/maptalks.vt.js.map +1 -1
- package/package.json +3 -3
package/dist/maptalks.vt.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* @maptalks/vt v0.115.
|
|
2
|
+
* @maptalks/vt v0.115.1
|
|
3
3
|
* LICENSE : undefined
|
|
4
4
|
* (c) 2016-2025 maptalks.org
|
|
5
5
|
*/
|
|
@@ -423,7 +423,7 @@
|
|
|
423
423
|
* Codes from mapbox-gl-js
|
|
424
424
|
* github.com/mapbox/mapbox-gl-js
|
|
425
425
|
* MIT License
|
|
426
|
-
*/ class
|
|
426
|
+
*/ class k {
|
|
427
427
|
constructor(e, t, {pixelRatio: n}) {
|
|
428
428
|
this.paddedRect = e, this.pixelRatio = n || 1, this.padding = t;
|
|
429
429
|
}
|
|
@@ -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 O {
|
|
441
441
|
constructor(e, t) {
|
|
442
442
|
this.iconMap = e, this.options = t || {}, this.build();
|
|
443
443
|
}
|
|
@@ -452,7 +452,7 @@
|
|
|
452
452
|
w: i.data.width + 2 * o,
|
|
453
453
|
h: i.data.height + 2 * o
|
|
454
454
|
};
|
|
455
|
-
r.push(s), n[t] = new
|
|
455
|
+
r.push(s), n[t] = new k(s, o, i);
|
|
456
456
|
}
|
|
457
457
|
if (i.pack(r, {
|
|
458
458
|
inPlace: !0
|
|
@@ -1282,11 +1282,11 @@
|
|
|
1282
1282
|
if (!("channels" in Ie[Ce])) throw new Error("missing channels property: " + Ce);
|
|
1283
1283
|
if (!("labels" in Ie[Ce])) throw new Error("missing channel labels property: " + Ce);
|
|
1284
1284
|
if (Ie[Ce].labels.length !== Ie[Ce].channels) throw new Error("channel and label counts mismatch: " + Ce);
|
|
1285
|
-
var
|
|
1285
|
+
var ke = Ie[Ce].channels, Oe = Ie[Ce].labels;
|
|
1286
1286
|
delete Ie[Ce].channels, delete Ie[Ce].labels, Object.defineProperty(Ie[Ce], "channels", {
|
|
1287
|
-
value: Oe
|
|
1288
|
-
}), Object.defineProperty(Ie[Ce], "labels", {
|
|
1289
1287
|
value: ke
|
|
1288
|
+
}), Object.defineProperty(Ie[Ce], "labels", {
|
|
1289
|
+
value: Oe
|
|
1290
1290
|
});
|
|
1291
1291
|
}
|
|
1292
1292
|
Ie.rgb.hsl = function(e) {
|
|
@@ -2042,7 +2042,7 @@
|
|
|
2042
2042
|
*/ var It = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {}, Ct = {
|
|
2043
2043
|
exports: {}
|
|
2044
2044
|
};
|
|
2045
|
-
function
|
|
2045
|
+
function kt(e, ...t) {
|
|
2046
2046
|
for (const n of t) for (const t in n) e[t] = n[t];
|
|
2047
2047
|
return e;
|
|
2048
2048
|
}
|
|
@@ -2135,12 +2135,12 @@
|
|
|
2135
2135
|
}, i && r) if (e.exports == i) r.exports = s; else for (a in s) s.hasOwnProperty(a) && (i[a] = s[a]); else n.punycode = s;
|
|
2136
2136
|
}(It);
|
|
2137
2137
|
}(Ct, Ct.exports);
|
|
2138
|
-
class
|
|
2138
|
+
class Ot extends Error {
|
|
2139
2139
|
constructor(e, t) {
|
|
2140
2140
|
super(t), this.message = t, this.key = e;
|
|
2141
2141
|
}
|
|
2142
2142
|
}
|
|
2143
|
-
var Rt =
|
|
2143
|
+
var Rt = Ot;
|
|
2144
2144
|
class Ft {
|
|
2145
2145
|
constructor(e, t = []) {
|
|
2146
2146
|
this.parent = e, this.bindings = {};
|
|
@@ -2903,7 +2903,7 @@
|
|
|
2903
2903
|
}
|
|
2904
2904
|
}
|
|
2905
2905
|
var Cn = In;
|
|
2906
|
-
class
|
|
2906
|
+
class kn {
|
|
2907
2907
|
constructor(e, t, n) {
|
|
2908
2908
|
this.type = Gt, this.locale = n, this.caseSensitive = e, this.diacriticSensitive = t;
|
|
2909
2909
|
}
|
|
@@ -2916,7 +2916,7 @@
|
|
|
2916
2916
|
const r = t.parse(void 0 !== n["diacritic-sensitive"] && n["diacritic-sensitive"], 1, Nt);
|
|
2917
2917
|
if (!r) return null;
|
|
2918
2918
|
let o = null;
|
|
2919
|
-
return n.locale && (o = t.parse(n.locale, 1, Lt), !o) ? null : new
|
|
2919
|
+
return n.locale && (o = t.parse(n.locale, 1, Lt), !o) ? null : new kn(i, r, o);
|
|
2920
2920
|
}
|
|
2921
2921
|
evaluate(e) {
|
|
2922
2922
|
return new an(this.caseSensitive.evaluate(e), this.diacriticSensitive.evaluate(e), this.locale ? this.locale.evaluate(e) : null);
|
|
@@ -2933,7 +2933,7 @@
|
|
|
2933
2933
|
this.locale && (e.locale = this.locale.serialize()), [ "collator", e ];
|
|
2934
2934
|
}
|
|
2935
2935
|
}
|
|
2936
|
-
const
|
|
2936
|
+
const On = 8192;
|
|
2937
2937
|
function Rn(e, t) {
|
|
2938
2938
|
e[0] = Math.min(e[0], t[0]), e[1] = Math.min(e[1], t[1]), e[2] = Math.max(e[2], t[0]),
|
|
2939
2939
|
e[3] = Math.max(e[3], t[1]);
|
|
@@ -2945,7 +2945,7 @@
|
|
|
2945
2945
|
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);
|
|
2946
2946
|
var r;
|
|
2947
2947
|
const o = Math.pow(2, t.z);
|
|
2948
|
-
return [ Math.round(n * o *
|
|
2948
|
+
return [ Math.round(n * o * On), Math.round(i * o * On) ];
|
|
2949
2949
|
}
|
|
2950
2950
|
function Dn(e, t, n) {
|
|
2951
2951
|
const i = e[0] - t[0], r = e[1] - t[1], o = e[0] - n[0], s = e[1] - n[1];
|
|
@@ -3018,7 +3018,7 @@
|
|
|
3018
3018
|
Rn(t, e);
|
|
3019
3019
|
}
|
|
3020
3020
|
function Xn(e, t, n, i) {
|
|
3021
|
-
const r = Math.pow(2, i.z) *
|
|
3021
|
+
const r = Math.pow(2, i.z) * On, o = [ i.x * On, i.y * On ], s = [];
|
|
3022
3022
|
if (!e) return s;
|
|
3023
3023
|
for (const i of e) for (const e of i) {
|
|
3024
3024
|
const i = [ e.x + o[0], e.y + o[1] ];
|
|
@@ -3027,7 +3027,7 @@
|
|
|
3027
3027
|
return s;
|
|
3028
3028
|
}
|
|
3029
3029
|
function $n(e, t, n, i) {
|
|
3030
|
-
const r = Math.pow(2, i.z) *
|
|
3030
|
+
const r = Math.pow(2, i.z) * On, o = [ i.x * On, i.y * On ], s = [];
|
|
3031
3031
|
if (!e) return s;
|
|
3032
3032
|
for (const n of e) {
|
|
3033
3033
|
const e = [];
|
|
@@ -3214,7 +3214,7 @@
|
|
|
3214
3214
|
function ii(e) {
|
|
3215
3215
|
if (e instanceof ei) return ii(e.boundExpression);
|
|
3216
3216
|
if (e instanceof Cn && "error" === e.name) return !1;
|
|
3217
|
-
if (e instanceof
|
|
3217
|
+
if (e instanceof kn) return !1;
|
|
3218
3218
|
if (e instanceof qn) return !1;
|
|
3219
3219
|
const t = e instanceof wn || e instanceof vn;
|
|
3220
3220
|
let n = !0;
|
|
@@ -3408,9 +3408,9 @@
|
|
|
3408
3408
|
}
|
|
3409
3409
|
static interpolationFactor(e, t, n, i) {
|
|
3410
3410
|
let r = 0;
|
|
3411
|
-
if ("exponential" === e.name) r =
|
|
3411
|
+
if ("exponential" === e.name) r = ki(t, e.base, n, i); else if ("linear" === e.name) r = ki(t, 1, n, i); else if ("cubic-bezier" === e.name) {
|
|
3412
3412
|
const o = e.controlPoints;
|
|
3413
|
-
r = new ai(o[0], o[1], o[2], o[3]).solve(
|
|
3413
|
+
r = new ai(o[0], o[1], o[2], o[3]).solve(ki(t, 1, n, i));
|
|
3414
3414
|
}
|
|
3415
3415
|
return r;
|
|
3416
3416
|
}
|
|
@@ -3478,11 +3478,11 @@
|
|
|
3478
3478
|
return t;
|
|
3479
3479
|
}
|
|
3480
3480
|
}
|
|
3481
|
-
function
|
|
3481
|
+
function ki(e, t, n, i) {
|
|
3482
3482
|
const r = i - n, o = e - n;
|
|
3483
3483
|
return 0 === r ? 0 : 1 === t ? o / r : (Math.pow(t, o) - 1) / (Math.pow(t, r) - 1);
|
|
3484
3484
|
}
|
|
3485
|
-
var
|
|
3485
|
+
var Oi = Ci;
|
|
3486
3486
|
class Ri {
|
|
3487
3487
|
constructor(e, t) {
|
|
3488
3488
|
this.type = e, this.args = t;
|
|
@@ -3960,14 +3960,14 @@
|
|
|
3960
3960
|
boolean: vn,
|
|
3961
3961
|
case: ji,
|
|
3962
3962
|
coalesce: Fi,
|
|
3963
|
-
collator:
|
|
3963
|
+
collator: kn,
|
|
3964
3964
|
format: An,
|
|
3965
3965
|
image: bn,
|
|
3966
3966
|
in: zi,
|
|
3967
3967
|
"index-of": Ui,
|
|
3968
|
-
interpolate:
|
|
3969
|
-
"interpolate-hcl":
|
|
3970
|
-
"interpolate-lab":
|
|
3968
|
+
interpolate: Oi,
|
|
3969
|
+
"interpolate-hcl": Oi,
|
|
3970
|
+
"interpolate-lab": Oi,
|
|
3971
3971
|
length: rr,
|
|
3972
3972
|
let: Di,
|
|
3973
3973
|
literal: mn,
|
|
@@ -4170,7 +4170,7 @@
|
|
|
4170
4170
|
}
|
|
4171
4171
|
function yr(e, t) {
|
|
4172
4172
|
const n = "color" === t.type, i = e.stops && "object" == typeof e.stops[0][0], r = i || void 0 !== e.property, o = i || !r, s = e.type || (dr(t) ? "exponential" : "interval");
|
|
4173
|
-
if (n && ((e =
|
|
4173
|
+
if (n && ((e = kt({}, e)).stops && (e.stops = e.stops.map((e => [ e[0], sn.parse(e[1]) ]))),
|
|
4174
4174
|
e.default ? e.default = sn.parse(e.default) : e.default = sn.parse(t.default)),
|
|
4175
4175
|
e.colorSpace && "rgb" !== e.colorSpace && !Ii[e.colorSpace]) throw new Error(`Unknown color space: ${e.colorSpace}`);
|
|
4176
4176
|
let a, l, h;
|
|
@@ -4202,7 +4202,7 @@
|
|
|
4202
4202
|
return {
|
|
4203
4203
|
kind: "composite",
|
|
4204
4204
|
interpolationType: o,
|
|
4205
|
-
interpolationFactor:
|
|
4205
|
+
interpolationFactor: Oi.interpolationFactor.bind(void 0, o),
|
|
4206
4206
|
zoomStops: r.map((e => e[0])),
|
|
4207
4207
|
evaluate: ({zoom: n}, i) => Ar({
|
|
4208
4208
|
stops: r,
|
|
@@ -4218,7 +4218,7 @@
|
|
|
4218
4218
|
return {
|
|
4219
4219
|
kind: "camera",
|
|
4220
4220
|
interpolationType: n,
|
|
4221
|
-
interpolationFactor:
|
|
4221
|
+
interpolationFactor: Oi.interpolationFactor.bind(void 0, n),
|
|
4222
4222
|
zoomStops: e.stops.map((e => e[0])),
|
|
4223
4223
|
evaluate: ({zoom: n}) => a(e, t, n, l, h)
|
|
4224
4224
|
};
|
|
@@ -4344,7 +4344,7 @@
|
|
|
4344
4344
|
return this._styleExpression.evaluate(e, t, n, i, r, o);
|
|
4345
4345
|
}
|
|
4346
4346
|
interpolationFactor(e, t, n) {
|
|
4347
|
-
return this.interpolationType ?
|
|
4347
|
+
return this.interpolationType ? Oi.interpolationFactor(this.interpolationType, e, t, n) : 0;
|
|
4348
4348
|
}
|
|
4349
4349
|
}
|
|
4350
4350
|
function Ir(e, t) {
|
|
@@ -4357,17 +4357,17 @@
|
|
|
4357
4357
|
if (!r && !function(e) {
|
|
4358
4358
|
return !!e.expression && e.expression.parameters.indexOf("zoom") > -1;
|
|
4359
4359
|
}(t)) return fr([ new Rt("", "zoom expressions not supported") ]);
|
|
4360
|
-
const o =
|
|
4360
|
+
const o = kr(n);
|
|
4361
4361
|
if (!o && !r) return fr([ new Rt("", '"zoom" expression may only be used as input to a top-level "step" or "interpolate" expression.') ]);
|
|
4362
4362
|
if (o instanceof Rt) return fr([ o ]);
|
|
4363
|
-
if (o instanceof
|
|
4363
|
+
if (o instanceof Oi && !dr(t)) return fr([ new Rt("", '"interpolate" expressions cannot be used with this property') ]);
|
|
4364
4364
|
if (!o) return ur(new Mr(i ? "constant" : "source", e.value));
|
|
4365
|
-
const s = o instanceof
|
|
4365
|
+
const s = o instanceof Oi ? o.interpolation : void 0;
|
|
4366
4366
|
return ur(new Pr(i ? "camera" : "composite", e.value, o.labels, s));
|
|
4367
4367
|
}
|
|
4368
4368
|
class Cr {
|
|
4369
4369
|
constructor(e, t) {
|
|
4370
|
-
this._parameters = e, this._specification = t,
|
|
4370
|
+
this._parameters = e, this._specification = t, kt(this, yr(this._parameters, this._specification));
|
|
4371
4371
|
}
|
|
4372
4372
|
static deserialize(e) {
|
|
4373
4373
|
return new Cr(e._parameters, e._specification);
|
|
@@ -4379,21 +4379,21 @@
|
|
|
4379
4379
|
};
|
|
4380
4380
|
}
|
|
4381
4381
|
}
|
|
4382
|
-
function
|
|
4382
|
+
function kr(e) {
|
|
4383
4383
|
let t = null;
|
|
4384
|
-
if (e instanceof Di) t =
|
|
4385
|
-
for (const n of e.args) if (t =
|
|
4386
|
-
} else (e instanceof si || e instanceof
|
|
4384
|
+
if (e instanceof Di) t = kr(e.result); else if (e instanceof Fi) {
|
|
4385
|
+
for (const n of e.args) if (t = kr(n), t) break;
|
|
4386
|
+
} else (e instanceof si || e instanceof Oi) && e.input instanceof Cn && "zoom" === e.input.name && (t = e);
|
|
4387
4387
|
return t instanceof Rt || e.eachChild((e => {
|
|
4388
|
-
const n =
|
|
4388
|
+
const n = kr(e);
|
|
4389
4389
|
n instanceof Rt ? t = n : !t && n ? t = new Rt("", '"zoom" expression may only be used as input to a top-level "step" or "interpolate" expression.') : t && n && t !== n && (t = new Rt("", 'Only one zoom-based "step" or "interpolate" subexpression may be used in an expression.'));
|
|
4390
4390
|
})), t;
|
|
4391
4391
|
}
|
|
4392
|
-
function
|
|
4393
|
-
if (Array.isArray(e)) return e.map(
|
|
4392
|
+
function Or(e) {
|
|
4393
|
+
if (Array.isArray(e)) return e.map(Or);
|
|
4394
4394
|
if (e instanceof Object && !(e instanceof Number || e instanceof String || e instanceof Boolean)) {
|
|
4395
4395
|
const t = {};
|
|
4396
|
-
for (const n in e) t[n] =
|
|
4396
|
+
for (const n in e) t[n] = Or(e[n]);
|
|
4397
4397
|
return t;
|
|
4398
4398
|
}
|
|
4399
4399
|
return function(e) {
|
|
@@ -4411,7 +4411,7 @@
|
|
|
4411
4411
|
try {
|
|
4412
4412
|
i = function(e) {
|
|
4413
4413
|
if (!Dr(e)) return e;
|
|
4414
|
-
let t =
|
|
4414
|
+
let t = Or(e);
|
|
4415
4415
|
return Er(t), t = Fr(t), t;
|
|
4416
4416
|
}(n);
|
|
4417
4417
|
} catch (e) {
|
|
@@ -4943,7 +4943,7 @@
|
|
|
4943
4943
|
height: r
|
|
4944
4944
|
}, o);
|
|
4945
4945
|
}
|
|
4946
|
-
this.iconAtlas = new
|
|
4946
|
+
this.iconAtlas = new O(e, {
|
|
4947
4947
|
nonPowerOfTwo: !this.options.isWebGL1
|
|
4948
4948
|
});
|
|
4949
4949
|
}
|
|
@@ -5104,7 +5104,7 @@
|
|
|
5104
5104
|
}
|
|
5105
5105
|
function yo(e) {
|
|
5106
5106
|
let t = e.positions, n = e.image && e.image.format || "alpha";
|
|
5107
|
-
if (e instanceof
|
|
5107
|
+
if (e instanceof O) {
|
|
5108
5108
|
t = {};
|
|
5109
5109
|
for (const n in e.positions) {
|
|
5110
5110
|
const i = e.positions[n];
|
|
@@ -5246,7 +5246,7 @@
|
|
|
5246
5246
|
},
|
|
5247
5247
|
templateKeys: Po
|
|
5248
5248
|
});
|
|
5249
|
-
const
|
|
5249
|
+
const ko = {
|
|
5250
5250
|
"Latin-1 Supplement": e => e >= 128 && e <= 255,
|
|
5251
5251
|
Arabic: e => e >= 1536 && e <= 1791,
|
|
5252
5252
|
"Arabic Supplement": e => e >= 1872 && e <= 1919,
|
|
@@ -5296,22 +5296,22 @@
|
|
|
5296
5296
|
"Arabic Presentation Forms-B": e => e >= 65136 && e <= 65279,
|
|
5297
5297
|
"Halfwidth and Fullwidth Forms": e => e >= 65280 && e <= 65519
|
|
5298
5298
|
};
|
|
5299
|
-
function
|
|
5300
|
-
return !(
|
|
5299
|
+
function Oo(e) {
|
|
5300
|
+
return !(ko.Arabic(e) || ko["Arabic Supplement"](e) || ko["Arabic Extended-A"](e) || ko["Arabic Presentation Forms-A"](e) || ko["Arabic Presentation Forms-B"](e));
|
|
5301
5301
|
}
|
|
5302
5302
|
function Ro(e) {
|
|
5303
|
-
return !!(!(e < 11904) && (
|
|
5303
|
+
return !!(!(e < 11904) && (ko["Bopomofo Extended"](e) || ko.Bopomofo(e) || ko["CJK Compatibility Forms"](e) || ko["CJK Compatibility Ideographs"](e) || ko["CJK Compatibility"](e) || ko["CJK Radicals Supplement"](e) || ko["CJK Strokes"](e) || ko["CJK Symbols and Punctuation"](e) || ko["CJK Unified Ideographs Extension A"](e) || ko["CJK Unified Ideographs"](e) || ko["Enclosed CJK Letters and Months"](e) || ko["Halfwidth and Fullwidth Forms"](e) || ko.Hiragana(e) || ko["Ideographic Description Characters"](e) || ko["Kangxi Radicals"](e) || ko["Katakana Phonetic Extensions"](e) || ko.Katakana(e) || ko["Vertical Forms"](e) || ko["Yi Radicals"](e) || ko["Yi Syllables"](e)));
|
|
5304
5304
|
}
|
|
5305
5305
|
function Fo(e) {
|
|
5306
|
-
return !!(746 === e || 747 === e || !(e < 4352) && (
|
|
5306
|
+
return !!(746 === e || 747 === e || !(e < 4352) && (ko["Bopomofo Extended"](e) || ko.Bopomofo(e) || ko["CJK Compatibility Forms"](e) && !(e >= 65097 && e <= 65103) || ko["CJK Compatibility Ideographs"](e) || ko["CJK Compatibility"](e) || ko["CJK Radicals Supplement"](e) || ko["CJK Strokes"](e) || !(!ko["CJK Symbols and Punctuation"](e) || e >= 12296 && e <= 12305 || e >= 12308 && e <= 12319 || 12336 === e) || ko["CJK Unified Ideographs Extension A"](e) || ko["CJK Unified Ideographs"](e) || ko["Enclosed CJK Letters and Months"](e) || ko["Hangul Compatibility Jamo"](e) || ko["Hangul Jamo Extended-A"](e) || ko["Hangul Jamo Extended-B"](e) || ko["Hangul Jamo"](e) || ko["Hangul Syllables"](e) || ko.Hiragana(e) || ko["Ideographic Description Characters"](e) || ko.Kanbun(e) || ko["Kangxi Radicals"](e) || ko["Katakana Phonetic Extensions"](e) || ko.Katakana(e) && 12540 !== e || !(!ko["Halfwidth and Fullwidth Forms"](e) || 65288 === e || 65289 === e || 65293 === e || e >= 65306 && e <= 65310 || 65339 === e || 65341 === e || 65343 === e || e >= 65371 && e <= 65503 || 65507 === e || e >= 65512 && e <= 65519) || !(!ko["Small Form Variants"](e) || e >= 65112 && e <= 65118 || e >= 65123 && e <= 65126) || ko["Unified Canadian Aboriginal Syllabics"](e) || ko["Unified Canadian Aboriginal Syllabics Extended"](e) || ko["Vertical Forms"](e) || ko["Yijing Hexagram Symbols"](e) || ko["Yi Syllables"](e) || ko["Yi Radicals"](e)));
|
|
5307
5307
|
}
|
|
5308
5308
|
function Eo(e) {
|
|
5309
5309
|
return !(Fo(e) || function(e) {
|
|
5310
|
-
return !!(
|
|
5310
|
+
return !!(ko["Latin-1 Supplement"](e) && (167 === e || 169 === e || 174 === e || 177 === e || 188 === e || 189 === e || 190 === e || 215 === e || 247 === e) || ko["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) || ko["Letterlike Symbols"](e) || ko["Number Forms"](e) || ko["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) || ko["Control Pictures"](e) && 9251 !== e || ko["Optical Character Recognition"](e) || ko["Enclosed Alphanumerics"](e) || ko["Geometric Shapes"](e) || ko["Miscellaneous Symbols"](e) && !(e >= 9754 && e <= 9759) || ko["Miscellaneous Symbols and Arrows"](e) && (e >= 11026 && e <= 11055 || e >= 11088 && e <= 11097 || e >= 11192 && e <= 11243) || ko["CJK Symbols and Punctuation"](e) || ko.Katakana(e) || ko["Private Use Area"](e) || ko["CJK Compatibility Forms"](e) || ko["Small Form Variants"](e) || ko["Halfwidth and Fullwidth Forms"](e) || 8734 === e || 8756 === e || 8757 === e || e >= 9984 && e <= 10087 || e >= 10102 && e <= 10131 || 65532 === e || 65533 === e);
|
|
5311
5311
|
}(e));
|
|
5312
5312
|
}
|
|
5313
5313
|
function Do(e) {
|
|
5314
|
-
return e >= 1424 && e <= 2303 ||
|
|
5314
|
+
return e >= 1424 && e <= 2303 || ko["Arabic Presentation Forms-A"](e) || ko["Arabic Presentation Forms-B"](e);
|
|
5315
5315
|
}
|
|
5316
5316
|
const Ho = [ [ 9, 9 ], [ 32, 32 ], [ 5760, 5760 ], [ 8192, 8198 ], [ 8200, 8202 ], [ 8287, 12288 ], [ 6158, 6158 ], [ 8203, 8205 ] ];
|
|
5317
5317
|
function Lo(e) {
|
|
@@ -5618,7 +5618,7 @@
|
|
|
5618
5618
|
const {font: e, text: n} = c.glyph;
|
|
5619
5619
|
if ("" === n) return null;
|
|
5620
5620
|
const o = 24, s = this.textSize[0] / o, f = 24, d = h.textKeepUpright, p = "map" === h.textRotationAlignment && "line" === h.textPlacement && !h.isIconText, g = t.glyphMap[e], m = es(i ? i(null, u) : h.textHorizontalAlignment, r ? r(null, u) : h.textVerticalAlignment), y = 1.2 * f, x = function(e) {
|
|
5621
|
-
for (let t = 0; t < e.length; t++) if (!
|
|
5621
|
+
for (let t = 0; t < e.length; t++) if (!Oo(e.charAt(t).charCodeAt(0))) return !1;
|
|
5622
5622
|
return !0;
|
|
5623
5623
|
}(n), _ = x && h.textLetterSpacing / s || 0, v = [ h.textDx / s || 0, h.textDy / s || 0 ], A = ((a ? a(null, u) : h.textWrapWidth) || 10 * f) / s, b = {};
|
|
5624
5624
|
b.horizontal = Uo(n, g, A, y, m, 0, _, v, f, zo, this.options.isVector3D), x && p && d && (b.vertical = Uo(n, g, A, y, m, 0, _, v, f, Vo)),
|
|
@@ -6349,7 +6349,7 @@
|
|
|
6349
6349
|
for (let n = 0; n < e.length; n++) if (Fo(e.charAt(n).charCodeAt(0))) t = 0; else if (t++,
|
|
6350
6350
|
t >= 1) return !1;
|
|
6351
6351
|
return !0;
|
|
6352
|
-
}(e.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: x, textSizeFn: _, textHaloFillFn: v, textHaloRadiusFn: A, textHaloOpacityFn: b, textDxFn: T, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn:
|
|
6352
|
+
}(e.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: x, textSizeFn: _, textHaloFillFn: v, textHaloRadiusFn: A, textHaloOpacityFn: b, textDxFn: T, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn: k, textRotationFn: O, textAllowOverlapFn: R, textIgnorePlacementFn: F, textOpacityFn: E, markerWidthFn: D, markerHeightFn: H, markerDxFn: L, markerDyFn: N, markerPitchAlignmentFn: z, markerRotationAlignmentFn: V, markerRotationFn: U, markerAllowOverlapFn: G, markerIgnorePlacementFn: B, markerOpacityFn: W} = this._fnTypes;
|
|
6353
6353
|
let j, X, $, Y, q, Z = [ 0, 0, 0, 0 ], K = 14, J = [ 0, 0, 0, 0 ], Q = 0, ee = 0, te = 0, ne = 0, re = 0, oe = 0, se = 0, ae = 0, le = 0, he = 0, ce = 0, ue = 0, fe = 0, de = 0;
|
|
6354
6354
|
if (g) {
|
|
6355
6355
|
const t = e.getIconAndGlyph().glyph.font;
|
|
@@ -6380,8 +6380,8 @@
|
|
|
6380
6380
|
}(r.horizontal, p, this.glyphAtlas.positions[t]), x && (Z = x(null, d), ie(Z) ? this.dynamicAttrs.aTextFill = 1 : Z = ht([], Z)),
|
|
6381
6381
|
_ && (K = _(this.options.zoom, d), M(K) && (K = 14)), v && (J = v(null, d), ie(J) ? this.dynamicAttrs.aTextHaloFill = 1 : J = ht([], J)),
|
|
6382
6382
|
A && (Q = A(null, d)), b && (ee = 255 * b(null, d)), T && (te = T(null, d) || 0),
|
|
6383
|
-
I && (ne = I(null, d) || 0), C && (he = +("map" === C(null, d))),
|
|
6384
|
-
|
|
6383
|
+
I && (ne = I(null, d) || 0), C && (he = +("map" === C(null, d))), k && (ue = +("map" === k(null, d))),
|
|
6384
|
+
O && (de = P(O(null, d), 0, 360) * Math.PI / 180);
|
|
6385
6385
|
}
|
|
6386
6386
|
m && (Y = i ? function(e) {
|
|
6387
6387
|
const t = e.image, n = e.top - 1 / t.pixelRatio, i = e.left - 1 / t.pixelRatio, r = e.bottom + 1 / t.pixelRatio, s = e.right + 1 / t.pixelRatio;
|
|
@@ -6478,7 +6478,7 @@
|
|
|
6478
6478
|
}
|
|
6479
6479
|
}
|
|
6480
6480
|
_fillFnTypeData(e, t, n, i, r, o, s, a, l, h, c, u, f, d, p, g, m, y, x, _, v, A) {
|
|
6481
|
-
const {textFillFn: b, textSizeFn: T, textHaloFillFn: S, textHaloRadiusFn: w, textDxFn: P, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn:
|
|
6481
|
+
const {textFillFn: b, textSizeFn: T, textHaloFillFn: S, textHaloRadiusFn: w, textDxFn: P, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn: k, textRotationFn: O, textAllowOverlapFn: R, textIgnorePlacementFn: F, textOpacityFn: E, textHaloOpacityFn: D, markerWidthFn: H, markerHeightFn: L, markerDxFn: N, markerDyFn: z, markerPitchAlignmentFn: V, markerRotationAlignmentFn: U, markerRotationFn: G, markerAllowOverlapFn: B, markerIgnorePlacementFn: W, markerOpacityFn: j} = this._fnTypes;
|
|
6482
6482
|
if (b) {
|
|
6483
6483
|
let n = e.aTextFill.currentIndex;
|
|
6484
6484
|
e.aTextFill[n++] = t[0], e.aTextFill[n++] = t[1], e.aTextFill[n++] = t[2], e.aTextFill[n++] = t[3],
|
|
@@ -6541,7 +6541,7 @@
|
|
|
6541
6541
|
e.aPitchAlign[t++] = p, e.aPitchAlign.currentIndex = t, t = e.aPitchAlign.currentIndex,
|
|
6542
6542
|
e.aPitchAlign[t++] = g, e.aPitchAlign.currentIndex = t;
|
|
6543
6543
|
}
|
|
6544
|
-
if (U ||
|
|
6544
|
+
if (U || k) if (X) {
|
|
6545
6545
|
let t = e.aRotationAlign.currentIndex;
|
|
6546
6546
|
e.aRotationAlign[t++] = y, e.aRotationAlign.currentIndex = t;
|
|
6547
6547
|
} else {
|
|
@@ -6549,7 +6549,7 @@
|
|
|
6549
6549
|
e.aRotationAlign[t++] = m, e.aRotationAlign.currentIndex = t, t = e.aRotationAlign.currentIndex,
|
|
6550
6550
|
e.aRotationAlign[t++] = y, e.aRotationAlign.currentIndex = t;
|
|
6551
6551
|
}
|
|
6552
|
-
if (G ||
|
|
6552
|
+
if (G || O) if (X) {
|
|
6553
6553
|
let t = e.aRotation.currentIndex;
|
|
6554
6554
|
e.aRotation[t++] = 9362 * _, e.aRotation.currentIndex = t;
|
|
6555
6555
|
} else {
|
|
@@ -6692,10 +6692,10 @@
|
|
|
6692
6692
|
var i = t[0], r = t[1], o = t[2], s = n[0], a = n[1], l = n[2];
|
|
6693
6693
|
return e[0] = r * l - o * a, e[1] = o * s - i * l, e[2] = i * a - r * s, e;
|
|
6694
6694
|
}
|
|
6695
|
-
function
|
|
6695
|
+
function ks(e, t, n, i, r) {
|
|
6696
6696
|
return e[0] = t, e[1] = n, e[2] = i, e[3] = r, e;
|
|
6697
6697
|
}
|
|
6698
|
-
function
|
|
6698
|
+
function Os(e, t, n) {
|
|
6699
6699
|
return e[0] = t[0] * n, e[1] = t[1] * n, e[2] = t[2] * n, e[3] = t[3] * n, e;
|
|
6700
6700
|
}
|
|
6701
6701
|
function Rs(e, t, n) {
|
|
@@ -7140,8 +7140,8 @@
|
|
|
7140
7140
|
* from @turf/bboxClip
|
|
7141
7141
|
* https://github.com/Turfjs/turf
|
|
7142
7142
|
* MIT LICENSE
|
|
7143
|
-
*/ (e, t, n, i) > 0) for (let r = t; r < n; r += i) o =
|
|
7144
|
-
return o && Sa(o, o.next) && (
|
|
7143
|
+
*/ (e, t, n, i) > 0) for (let r = t; r < n; r += i) o = ka(r / i | 0, e[r], e[r + 1], o); else for (let r = n - i; r >= t; r -= i) o = ka(r / i | 0, e[r], e[r + 1], o);
|
|
7144
|
+
return o && Sa(o, o.next) && (Oa(o), o = o.next), o;
|
|
7145
7145
|
}
|
|
7146
7146
|
function ha(e, t) {
|
|
7147
7147
|
if (!e) return e;
|
|
@@ -7149,7 +7149,7 @@
|
|
|
7149
7149
|
let n, i = e;
|
|
7150
7150
|
do {
|
|
7151
7151
|
if (n = !1, i.steiner || !Sa(i, i.next) && 0 !== Ta(i.prev, i, i.next)) i = i.next; else {
|
|
7152
|
-
if (
|
|
7152
|
+
if (Oa(i), i = t = i.prev, i === i.next) break;
|
|
7153
7153
|
n = !0;
|
|
7154
7154
|
}
|
|
7155
7155
|
} while (n || i !== t);
|
|
@@ -7186,7 +7186,7 @@
|
|
|
7186
7186
|
let a = e;
|
|
7187
7187
|
for (;e.prev !== e.next; ) {
|
|
7188
7188
|
const l = e.prev, h = e.next;
|
|
7189
|
-
if (o ? fa(e, i, r, o) : ua(e)) t.push(l.i, e.i, h.i),
|
|
7189
|
+
if (o ? fa(e, i, r, o) : ua(e)) t.push(l.i, e.i, h.i), Oa(e), e = h.next, a = h.next; else if ((e = h) === a) {
|
|
7190
7190
|
s ? 1 === s ? ca(e = da(ha(e), t), t, n, i, r, o, 2) : 2 === s && pa(e, t, n, i, r, o) : ca(ha(e), t, n, i, r, o, 1);
|
|
7191
7191
|
break;
|
|
7192
7192
|
}
|
|
@@ -7228,7 +7228,7 @@
|
|
|
7228
7228
|
do {
|
|
7229
7229
|
const i = n.prev, r = n.next.next;
|
|
7230
7230
|
!Sa(i, r) && wa(i, n, n.next, r) && Ia(i, r) && Ia(r, i) && (t.push(i.i, n.i, r.i),
|
|
7231
|
-
|
|
7231
|
+
Oa(n), Oa(n.next), n = e = r), n = n.next;
|
|
7232
7232
|
} while (n !== e);
|
|
7233
7233
|
return ha(n);
|
|
7234
7234
|
}
|
|
@@ -7344,12 +7344,12 @@
|
|
|
7344
7344
|
return e.next = t, t.prev = e, n.next = r, r.prev = n, i.next = n, n.prev = i, o.next = i,
|
|
7345
7345
|
i.prev = o, i;
|
|
7346
7346
|
}
|
|
7347
|
-
function
|
|
7347
|
+
function ka(e, t, n, i) {
|
|
7348
7348
|
const r = Ra(e, t, n);
|
|
7349
7349
|
return i ? (r.next = i.next, r.prev = i, i.next.prev = r, i.next = r) : (r.prev = r,
|
|
7350
7350
|
r.next = r), r;
|
|
7351
7351
|
}
|
|
7352
|
-
function
|
|
7352
|
+
function Oa(e) {
|
|
7353
7353
|
e.next.prev = e.prev, e.prev.next = e.next, e.prevZ && (e.prevZ.nextZ = e.nextZ),
|
|
7354
7354
|
e.nextZ && (e.nextZ.prevZ = e.prevZ);
|
|
7355
7355
|
}
|
|
@@ -7475,7 +7475,7 @@
|
|
|
7475
7475
|
fillData(e, t, n, i, r, o, s, a) {
|
|
7476
7476
|
const {lineWidthFn: l, lineColorFn: h, lineOpacityFn: c, linePatternAnimSpeedFn: u, linePatternGapFn: f} = this._fnTypes, d = r.length;
|
|
7477
7477
|
for (let o = 0; o < d; o++) {
|
|
7478
|
-
this.fillPosition(e, t, n, i),
|
|
7478
|
+
this.fillPosition(e, t, n, i), Os(r[o], r[o], Fs);
|
|
7479
7479
|
let d = e.aTubeNormal.currentIndex;
|
|
7480
7480
|
for (let t = 0; t < r[o].length; t++) e.aTubeNormal[d++] = r[o][t];
|
|
7481
7481
|
if (e.aTubeNormal.currentIndex = d, d = e.aLinesofar.currentIndex, e.aLinesofar[d++] = s,
|
|
@@ -7504,7 +7504,7 @@
|
|
|
7504
7504
|
}
|
|
7505
7505
|
const Ga = [], Ba = [], Wa = [], ja = {};
|
|
7506
7506
|
function Xa(e, t, n, i, r, o) {
|
|
7507
|
-
return
|
|
7507
|
+
return ks(n, i * (Math.cos(r) * e[0] + Math.sin(r) * t[0]), i * (Math.cos(r) * e[1] + Math.sin(r) * t[1]), i * (Math.cos(r) * e[2] + Math.sin(r) * t[2]), o),
|
|
7508
7508
|
n;
|
|
7509
7509
|
}
|
|
7510
7510
|
const $a = [], Ya = [], qa = [], Za = [], Ka = [];
|
|
@@ -7823,7 +7823,7 @@
|
|
|
7823
7823
|
}
|
|
7824
7824
|
};
|
|
7825
7825
|
}
|
|
7826
|
-
}, e.INVALID_TEX_COORD = za, e.IconAtlas =
|
|
7826
|
+
}, e.INVALID_TEX_COORD = za, e.IconAtlas = O, e.LRUCache = Qa, e.LineExtrusionPack = class extends zs {
|
|
7827
7827
|
constructor(e, t, n) {
|
|
7828
7828
|
super(e, t, n), this._hasALineHeight = n.altitudeProperty;
|
|
7829
7829
|
}
|
|
@@ -8170,7 +8170,7 @@
|
|
|
8170
8170
|
_addPolygon(e, t) {
|
|
8171
8171
|
let n, i, r, o;
|
|
8172
8172
|
const {polygonFillFn: s, polygonOpacityFn: a, uvScaleFn: l, uvOffsetFn: h, uvOffsetInMeterFn: c, polygonPatternUVFn: u} = this._fnTypes, f = t.properties;
|
|
8173
|
-
s && (n = s(this.options.zoom, f) ||
|
|
8173
|
+
s && (n = s(this.options.zoom, f) || ks([], 255, 255, 255, 255), ie(n) ? (this.dynamicAttrs.aColor = 1,
|
|
8174
8174
|
n = Na) : n = ht([], n)), a && (i = a(this.options.zoom, f), ie(i) ? (this.dynamicAttrs.aOpacity = 1,
|
|
8175
8175
|
i = 255) : (Ke(i) && (i = 1), i *= 255)), l && (r = l(this.options.zoom, f), ie(r) ? (r = [ 255, 255 ],
|
|
8176
8176
|
this.dynamicAttrs.aUVScale = 1) : (Ke(r) && (r = [ 1, 1 ]), r = [ 255 * r[0], 255 * r[1] ])),
|
|
@@ -8541,7 +8541,7 @@
|
|
|
8541
8541
|
};
|
|
8542
8542
|
var I = d.exports, C = {
|
|
8543
8543
|
exports: {}
|
|
8544
|
-
},
|
|
8544
|
+
}, k = {
|
|
8545
8545
|
aliceblue: [ 240, 248, 255 ],
|
|
8546
8546
|
antiquewhite: [ 250, 235, 215 ],
|
|
8547
8547
|
aqua: [ 0, 255, 255 ],
|
|
@@ -8690,8 +8690,8 @@
|
|
|
8690
8690
|
whitesmoke: [ 245, 245, 245 ],
|
|
8691
8691
|
yellow: [ 255, 255, 0 ],
|
|
8692
8692
|
yellowgreen: [ 154, 205, 50 ]
|
|
8693
|
-
},
|
|
8694
|
-
for (var R in
|
|
8693
|
+
}, O = {};
|
|
8694
|
+
for (var R in k) k.hasOwnProperty(R) && (O[k[R]] = R);
|
|
8695
8695
|
var F = C.exports = {
|
|
8696
8696
|
rgb: {
|
|
8697
8697
|
channels: 3,
|
|
@@ -8782,16 +8782,16 @@
|
|
|
8782
8782
|
var t, n = e[0] / 255, i = e[1] / 255, r = e[2] / 255;
|
|
8783
8783
|
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 ];
|
|
8784
8784
|
}, F.rgb.keyword = function(e) {
|
|
8785
|
-
var t =
|
|
8785
|
+
var t = O[e];
|
|
8786
8786
|
if (t) return t;
|
|
8787
8787
|
var n, i, r, o = 1 / 0;
|
|
8788
|
-
for (var s in
|
|
8789
|
-
var a =
|
|
8788
|
+
for (var s in k) if (k.hasOwnProperty(s)) {
|
|
8789
|
+
var a = k[s], l = (i = e, r = a, Math.pow(i[0] - r[0], 2) + Math.pow(i[1] - r[1], 2) + Math.pow(i[2] - r[2], 2));
|
|
8790
8790
|
l < o && (o = l, n = s);
|
|
8791
8791
|
}
|
|
8792
8792
|
return n;
|
|
8793
8793
|
}, F.keyword.rgb = function(e) {
|
|
8794
|
-
return
|
|
8794
|
+
return k[e];
|
|
8795
8795
|
}, F.rgb.xyz = function(e) {
|
|
8796
8796
|
var t = e[0] / 255, n = e[1] / 255, i = e[2] / 255;
|
|
8797
8797
|
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) ];
|
|
@@ -9497,10 +9497,10 @@
|
|
|
9497
9497
|
return e && "object" == typeof e && (e.stops || e.property && "identity" === e.type || e.expression && "calculate-expression" === e.type);
|
|
9498
9498
|
}
|
|
9499
9499
|
function Pe(e) {
|
|
9500
|
-
return
|
|
9500
|
+
return ke(e, "exponential");
|
|
9501
9501
|
}
|
|
9502
9502
|
function Ie(e) {
|
|
9503
|
-
return
|
|
9503
|
+
return ke(e, "interval");
|
|
9504
9504
|
}
|
|
9505
9505
|
function Ce(e, t) {
|
|
9506
9506
|
if (!e) return null;
|
|
@@ -9530,23 +9530,23 @@
|
|
|
9530
9530
|
l(o)) : s[o] = e[o];
|
|
9531
9531
|
return n ? s : e;
|
|
9532
9532
|
}
|
|
9533
|
-
function
|
|
9533
|
+
function ke(e, t) {
|
|
9534
9534
|
if (!Me(e)) return function() {
|
|
9535
9535
|
return e;
|
|
9536
9536
|
};
|
|
9537
9537
|
let n = !0, i = !0;
|
|
9538
9538
|
const r = (e = JSON.parse(JSON.stringify(e))).stops;
|
|
9539
9539
|
if (r) for (let e = 0; e < r.length; e++) if (Me(r[e][1])) {
|
|
9540
|
-
const o =
|
|
9540
|
+
const o = ke(r[e][1], t);
|
|
9541
9541
|
n = n && o.isZoomConstant, i = i && o.isFeatureConstant, r[e] = [ r[e][0], o ];
|
|
9542
9542
|
}
|
|
9543
9543
|
const o = me(e, t);
|
|
9544
9544
|
return o.isZoomConstant = n && o.isZoomConstant, o.isFeatureConstant = i && o.isFeatureConstant,
|
|
9545
9545
|
o;
|
|
9546
9546
|
}
|
|
9547
|
-
let
|
|
9547
|
+
let Oe = 0;
|
|
9548
9548
|
function Re() {
|
|
9549
|
-
return
|
|
9549
|
+
return Oe++;
|
|
9550
9550
|
}
|
|
9551
9551
|
const Fe = "function" == typeof Object.assign;
|
|
9552
9552
|
function Ee(e, ...t) {
|
|
@@ -10318,10 +10318,10 @@
|
|
|
10318
10318
|
function Ct(e) {
|
|
10319
10319
|
return "number" == typeof e && !isNaN(e);
|
|
10320
10320
|
}
|
|
10321
|
-
function
|
|
10321
|
+
function kt(e) {
|
|
10322
10322
|
return e && (e.markerFile || e.markerType) && void 0 !== e.textName;
|
|
10323
10323
|
}
|
|
10324
|
-
function
|
|
10324
|
+
function Ot(e, t) {
|
|
10325
10325
|
return Object.prototype.hasOwnProperty.call(e, t);
|
|
10326
10326
|
}
|
|
10327
10327
|
function Rt(e, t) {
|
|
@@ -11002,7 +11002,8 @@
|
|
|
11002
11002
|
renderTarget: {
|
|
11003
11003
|
fbo: r
|
|
11004
11004
|
}
|
|
11005
|
-
}, Ut.framebuffer = r, e.clear(Ut), this._parentContext.
|
|
11005
|
+
}, Ut.framebuffer = r, e.clear(Ut), this._parentContext.maskViewport = qt(a / 4),
|
|
11006
|
+
this._parentContext.viewport = qt(a), this._drawTerrainTile(i.tile);
|
|
11006
11007
|
}
|
|
11007
11008
|
this._endTerrainFrame(n), this._parentContext = s, this.isRenderingTerrainSkin = !1;
|
|
11008
11009
|
}
|
|
@@ -12496,7 +12497,7 @@
|
|
|
12496
12497
|
if (!e) return "true";
|
|
12497
12498
|
const t = e[0];
|
|
12498
12499
|
if (e.length <= 1) return "any" === t ? "false" : "true";
|
|
12499
|
-
return `(${"==" === t ? Cn(e[1], e[2], "===", !1) : "!=" === t ? Cn(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? Cn(e[1], e[2], t, !0) : "any" === t ?
|
|
12500
|
+
return `(${"==" === t ? Cn(e[1], e[2], "===", !1) : "!=" === t ? Cn(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? Cn(e[1], e[2], t, !0) : "any" === t ? On(e.slice(1), "||") : "all" === t ? On(e.slice(1), "&&") : "none" === t ? En(On(e.slice(1), "||")) : "in" === t ? Rn(e[1], e.slice(2)) : "!in" === t ? En(Rn(e[1], e.slice(2))) : "has" === t ? Fn(e[1]) : "!has" === t ? En(Fn(e[1])) : "contains" === t ? function(e, t, n) {
|
|
12500
12501
|
const i = In(e);
|
|
12501
12502
|
return void 0 !== n ? `(${i} + '').indexOf("${t}") === ${n}` : `(${i} + '').indexOf("${t}") >= 0`;
|
|
12502
12503
|
}(e[1], e[2], e[3]) : "true"})`;
|
|
@@ -12509,16 +12510,16 @@
|
|
|
12509
12510
|
const r = e.property, o = e.op;
|
|
12510
12511
|
let s = In(r);
|
|
12511
12512
|
return "length" !== o ? (console.error(`not support ${o} op`), "false") : (s = `((${s}+='').length)`,
|
|
12512
|
-
|
|
12513
|
+
kn(s, r, t, n, i));
|
|
12513
12514
|
}(e, t, n, i);
|
|
12514
12515
|
var r;
|
|
12515
|
-
return
|
|
12516
|
+
return kn(In(e), e, t, n, i);
|
|
12516
12517
|
}
|
|
12517
|
-
function
|
|
12518
|
+
function kn(e, t, n, i, r) {
|
|
12518
12519
|
const o = "$type" === t ? Mn.indexOf(n) : JSON.stringify(n);
|
|
12519
12520
|
return (r ? `typeof ${e}=== typeof ${o}&&` : "") + e + i + o;
|
|
12520
12521
|
}
|
|
12521
|
-
function
|
|
12522
|
+
function On(e, t) {
|
|
12522
12523
|
return e.map(Pn).join(t);
|
|
12523
12524
|
}
|
|
12524
12525
|
function Rn(e, t) {
|
|
@@ -13184,7 +13185,7 @@
|
|
|
13184
13185
|
const r = gi.set(t, n)._multi(i / e.res);
|
|
13185
13186
|
return e.extent2d.contains(r);
|
|
13186
13187
|
}
|
|
13187
|
-
const {SYMBOLS_NEED_REBUILD_IN_VT: _i, StyleUtil: vi, FuncTypeUtil: Ai} = h(), {loginIBLResOnCanvas: bi, logoutIBLResOnCanvas: Ti, getIBLResOnCanvas: Si} = n.reshader.pbr.PBRUtils, wi = "__gl_textures", Mi = [], Pi = new r.Point(0, 0), Ii = new r.Point(0, 0), Ci = new Float32Array(1),
|
|
13188
|
+
const {SYMBOLS_NEED_REBUILD_IN_VT: _i, StyleUtil: vi, FuncTypeUtil: Ai} = h(), {loginIBLResOnCanvas: bi, logoutIBLResOnCanvas: Ti, getIBLResOnCanvas: Si} = n.reshader.pbr.PBRUtils, wi = "__gl_textures", Mi = [], Pi = new r.Point(0, 0), Ii = new r.Point(0, 0), Ci = new Float32Array(1), ki = [], Oi = e => 0 === e.properties.level, Ri = e => e.properties.level > 0;
|
|
13188
13189
|
class Fi {
|
|
13189
13190
|
static getBloomSymbol() {
|
|
13190
13191
|
return [ "bloom" ];
|
|
@@ -13192,7 +13193,7 @@
|
|
|
13192
13193
|
constructor(e, t, i, r, o, s) {
|
|
13193
13194
|
this._is2D = !0, this.regl = e, this.layer = t, this.canvas = (e._gl || e.context).canvas,
|
|
13194
13195
|
this.sceneConfig = r || {}, this.dataConfig = s || {}, this.pluginIndex = o, this.scene = new n.reshader.Scene,
|
|
13195
|
-
this.pickingFBO = t.getRenderer().pickingFBO, this.level0Filter =
|
|
13196
|
+
this.pickingFBO = t.getRenderer().pickingFBO, this.level0Filter = Oi, this.levelNFilter = Ri,
|
|
13196
13197
|
this.loginTextureCache(), this.symbolDef = Array.isArray(i) ? i.map((e => bt(e))) : [ bt(i) ],
|
|
13197
13198
|
this._compileSymbols(), this.pickingViewport = {
|
|
13198
13199
|
x: 0,
|
|
@@ -13216,7 +13217,7 @@
|
|
|
13216
13217
|
return n.getTileLevelValue && n.getTileLevelValue(e, t) || 0;
|
|
13217
13218
|
}
|
|
13218
13219
|
getAnalysisMeshes() {
|
|
13219
|
-
return this.getShadowMeshes ? this.getShadowMeshes() :
|
|
13220
|
+
return this.getShadowMeshes ? this.getShadowMeshes() : ki;
|
|
13220
13221
|
}
|
|
13221
13222
|
isVisible() {
|
|
13222
13223
|
const {minZoom: e, maxZoom: t} = this.sceneConfig, n = this.getMap().getZoom();
|
|
@@ -13283,7 +13284,7 @@
|
|
|
13283
13284
|
if (n) for (const i in n) n[i] && t[i].renderUniforms && xt(e, t[i].renderUniforms);
|
|
13284
13285
|
}
|
|
13285
13286
|
createGeometries(e, t) {
|
|
13286
|
-
if (!e.length) return
|
|
13287
|
+
if (!e.length) return ki;
|
|
13287
13288
|
const n = [];
|
|
13288
13289
|
for (let i = 0; i < e.length; i++) if (e[i]) if (void 0 !== e[i].ref) n[e[i].ref] ? n.push({
|
|
13289
13290
|
geometry: n[e[i].ref].geometry,
|
|
@@ -13534,7 +13535,7 @@
|
|
|
13534
13535
|
return delete this._fnTypeConfigs, this.setToRedraw(!1), n;
|
|
13535
13536
|
}
|
|
13536
13537
|
_isNeedRefreshStyle(e, t) {
|
|
13537
|
-
for (const n in t) if (
|
|
13538
|
+
for (const n in t) if (Ot(t, n)) {
|
|
13538
13539
|
if (vi.isFnTypeSymbol(t[n]) && !this.layer.options.features && (!e[n] || e[n].property !== t[n].property)) return !0;
|
|
13539
13540
|
if (_i[n] && !se(t[n], e[n])) return !0;
|
|
13540
13541
|
}
|
|
@@ -13597,7 +13598,7 @@
|
|
|
13597
13598
|
}
|
|
13598
13599
|
logoutTextureCache() {
|
|
13599
13600
|
const e = (wi + "").trim(), t = this.getMap(), n = this._myTextures;
|
|
13600
|
-
if (n) for (const i in n)
|
|
13601
|
+
if (n) for (const i in n) Ot(n, i) && t[e][i] && (t[e][i].count--, t[e][i].count <= 0 && delete t[e][i]);
|
|
13601
13602
|
t[e].count--, t[e].count <= 0 && (t[e] = {});
|
|
13602
13603
|
}
|
|
13603
13604
|
getCachedTexture(e) {
|
|
@@ -14333,6 +14334,7 @@
|
|
|
14333
14334
|
projViewMatrix: n ? Qi : e.projViewMatrix,
|
|
14334
14335
|
glScale: t && t.isRenderingTerrainSkin ? 1 : 1 / e.getGLScale(),
|
|
14335
14336
|
viewport: n && t && t.viewport,
|
|
14337
|
+
maskViewport: n && t && t.maskViewport,
|
|
14336
14338
|
hasSSRGround: t && t.hasSSRGround
|
|
14337
14339
|
};
|
|
14338
14340
|
return this.setIncludeUniformValues(i, t), i;
|
|
@@ -15223,7 +15225,7 @@
|
|
|
15223
15225
|
return this._meshes;
|
|
15224
15226
|
}
|
|
15225
15227
|
}
|
|
15226
|
-
const Mr = 224, Pr = 600, Ir = 100, Cr = new Uint8Array(1),
|
|
15228
|
+
const Mr = 224, Pr = 600, Ir = 100, Cr = new Uint8Array(1), kr = [], Or = {
|
|
15227
15229
|
collides: 0,
|
|
15228
15230
|
boxes: []
|
|
15229
15231
|
}, Rr = [], Fr = [];
|
|
@@ -15316,10 +15318,10 @@
|
|
|
15316
15318
|
const t = this.getMap();
|
|
15317
15319
|
s = this._coordCache[r] = t.coordToContainerPoint(e), a = this._coordCache[o] = t.coordToContainerPoint(i);
|
|
15318
15320
|
}
|
|
15319
|
-
return s.z = e.z,
|
|
15320
|
-
|
|
15321
|
+
return s.z = e.z, kr[0] = s, kr[1] = a, s.width = e.width, s.height = e.height,
|
|
15322
|
+
kr;
|
|
15321
15323
|
}
|
|
15322
|
-
return
|
|
15324
|
+
return kr[0] = kr[1] = null, kr;
|
|
15323
15325
|
}
|
|
15324
15326
|
updateBoxCollisionFading(e, t, n, i, r) {
|
|
15325
15327
|
const {layer: o, renderer: s, zoom: a, collisionTags: l, isEnableUniquePlacement: h} = this._cachedInstances, {meshKey: c, isForeground: u} = t.properties;
|
|
@@ -15414,7 +15416,7 @@
|
|
|
15414
15416
|
}
|
|
15415
15417
|
_isBoxVisible(e, t, n, i, r, o, s) {
|
|
15416
15418
|
const a = this.getSymbol(e.properties.symbolIndex), l = this._isIgnorePlacement(a, e, t[i]), h = this._isAllowOverlap(a, e, t[i]);
|
|
15417
|
-
if (!this.isEnableCollision() || l && h) return
|
|
15419
|
+
if (!this.isEnableCollision() || l && h) return Or;
|
|
15418
15420
|
const c = this.isBoxCollides(e, t, n, i, r, o, s);
|
|
15419
15421
|
return h && (c.collides = 0, c.isAllowOverlap = 1), c;
|
|
15420
15422
|
}
|
|
@@ -15775,8 +15777,8 @@
|
|
|
15775
15777
|
m = _t(.5 + .5 * (1 - (1 - a / g) * s.markerPerspectiveRatio), 0, 4);
|
|
15776
15778
|
}
|
|
15777
15779
|
const {aShape: y, aMarkerDx: x, aMarkerDy: _, aMarkerWidth: v, aMarkerHeight: A, aPitchAlign: b, aRotationAlign: T, aRotation: S} = l, w = x ? x[i] : h.markerDx, M = _ ? _[i] : h.markerDy, P = b ? b[2 * i] : s.markerPitchWithMap, I = T ? T[2 * i] : s.markerRotateWithMap, C = n.vec2.set(lo, w || 0, -(M || 0));
|
|
15778
|
-
let
|
|
15779
|
-
0 === s.flipY && 1 === P && (n.vec2.multiply(
|
|
15780
|
+
let k = n.vec2.set(ro, y[2 * i] / 10, y[2 * i + 1] / 10), O = n.vec2.set(oo, y[2 * i + 2] / 10, y[2 * i + 3] / 10), R = n.vec2.set(so, y[2 * i + 4] / 10, y[2 * i + 5] / 10), F = n.vec2.set(ao, y[2 * i + 6] / 10, y[2 * i + 7] / 10);
|
|
15781
|
+
0 === s.flipY && 1 === P && (n.vec2.multiply(k, k, ho), n.vec2.multiply(O, O, ho),
|
|
15780
15782
|
n.vec2.multiply(R, R, ho), n.vec2.multiply(F, F, ho));
|
|
15781
15783
|
const [E, D] = Ui(t.geometry);
|
|
15782
15784
|
let H = v ? v[i] : h.markerWidth;
|
|
@@ -15785,22 +15787,22 @@
|
|
|
15785
15787
|
At(L) && (L = D || Kr);
|
|
15786
15788
|
const N = n.vec2.set(co, H / Jr, L / Jr);
|
|
15787
15789
|
let z;
|
|
15788
|
-
n.vec2.mul(
|
|
15790
|
+
n.vec2.mul(k, k, N), n.vec2.mul(O, O, N), n.vec2.mul(R, R, N), n.vec2.mul(F, F, N),
|
|
15789
15791
|
z = S ? S[2 * i] / 9362 : -(h.markerRotation || 0) * Math.PI / 180;
|
|
15790
15792
|
const V = -z, U = o.getBearing() * Math.PI / 180;
|
|
15791
15793
|
if (U * I || V) {
|
|
15792
15794
|
const e = qr(io, V, U, I, P);
|
|
15793
|
-
|
|
15795
|
+
k = n.vec2.transformMat2(k, k, e), O = n.vec2.transformMat2(O, O, e), R = n.vec2.transformMat2(R, R, e),
|
|
15794
15796
|
F = n.vec2.transformMat2(F, F, e);
|
|
15795
15797
|
}
|
|
15796
|
-
1 === P ? $r(e, f,
|
|
15797
|
-
n.vec2.multiply(R, R, ho), n.vec2.multiply(F, F, ho), Yr(e, p,
|
|
15798
|
+
1 === P ? $r(e, f, k, O, R, F, r, C, s, o, g, m) : (n.vec2.multiply(k, k, ho), n.vec2.multiply(O, O, ho),
|
|
15799
|
+
n.vec2.multiply(R, R, ho), n.vec2.multiply(F, F, ho), Yr(e, p, k, O, R, F, C, m));
|
|
15798
15800
|
const G = this.getMap().getDevicePixelRatio();
|
|
15799
15801
|
return 1 !== G && (e[0] *= G, e[1] *= G, e[2] *= G, e[3] *= G), e;
|
|
15800
15802
|
}
|
|
15801
15803
|
const {PackUtil: fo} = h(), po = 1, go = [], mo = [], yo = [], xo = [], _o = [], vo = [], Ao = [ 1, -1 ];
|
|
15802
15804
|
function bo(e, t, i, r, o, s, a, l, h) {
|
|
15803
|
-
const c = r.material.uniforms, u = h.cameraToCenterDistance, f = r.geometry.properties, d = this.getSymbol(f.symbolIndex), p = "line" === d.textPlacement && !
|
|
15805
|
+
const c = r.material.uniforms, u = h.cameraToCenterDistance, f = r.geometry.properties, d = this.getSymbol(f.symbolIndex), p = "line" === d.textPlacement && !kt(d), g = Qr, m = i[2];
|
|
15804
15806
|
let y = 1;
|
|
15805
15807
|
if (c.textPerspectiveRatio) {
|
|
15806
15808
|
y = _t(.5 + .5 * (1 - (1 - u / m) * c.textPerspectiveRatio), 0, 4);
|
|
@@ -15812,7 +15814,7 @@
|
|
|
15812
15814
|
const I = v ? P : c.textPitchWithMap;
|
|
15813
15815
|
let C;
|
|
15814
15816
|
A && (C = T ? A[2 * a + 1] : A[a]);
|
|
15815
|
-
const
|
|
15817
|
+
const k = A ? C : c.textRotateWithMap, O = n.vec2.set(vo, w || 0, -(M || 0));
|
|
15816
15818
|
if (p) {
|
|
15817
15819
|
const {aOffset: r, aShape: o} = f, s = r.length !== o.length;
|
|
15818
15820
|
let u, d, p, g;
|
|
@@ -15822,9 +15824,9 @@
|
|
|
15822
15824
|
d = n.vec2.set(yo, r[2 * a + 2] / 10, r[2 * a + 3] / 10), p = n.vec2.set(xo, r[2 * a + 4] / 10, r[2 * a + 5] / 10),
|
|
15823
15825
|
g = n.vec2.set(_o, r[2 * a + 6] / 10, r[2 * a + 7] / 10)), 1 === I) {
|
|
15824
15826
|
const n = Be(h.getResolution(), h);
|
|
15825
|
-
$r(e, t, u, d, p, g, l,
|
|
15827
|
+
$r(e, t, u, d, p, g, l, O, c, h, m, y, s, n);
|
|
15826
15828
|
} else n.vec2.multiply(u, u, Ao), n.vec2.multiply(d, d, Ao), n.vec2.multiply(p, p, Ao),
|
|
15827
|
-
n.vec2.multiply(g, g, Ao), Yr(e, i, u, d, p, g,
|
|
15829
|
+
n.vec2.multiply(g, g, Ao), Yr(e, i, u, d, p, g, O, y);
|
|
15828
15830
|
} else {
|
|
15829
15831
|
const {aShape: r} = f;
|
|
15830
15832
|
let s, u = n.vec2.set(mo, r[2 * a] / 10, -r[2 * a + 1] / 10), x = n.vec2.set(yo, r[2 * a + 2] / 10, -r[2 * a + 3] / 10), _ = n.vec2.set(xo, r[2 * a + 4] / 10, -r[2 * a + 5] / 10), v = n.vec2.set(_o, r[2 * a + 6] / 10, -r[2 * a + 7] / 10);
|
|
@@ -15832,13 +15834,13 @@
|
|
|
15832
15834
|
n.vec2.multiply(_, _, Ao), n.vec2.multiply(v, v, Ao)), s = b ? T && b.length > T.length ? b[2 * a + 1] / 9362 : b[a] / 9362 : (d.textRotation || 0) * Math.PI / 180;
|
|
15833
15835
|
const A = p ? 0 : h.getBearing() * Math.PI / 180;
|
|
15834
15836
|
if (s || A) {
|
|
15835
|
-
const e = qr(go, s, A,
|
|
15837
|
+
const e = qr(go, s, A, k, I);
|
|
15836
15838
|
u = n.vec2.transformMat2(u, u, e), x = n.vec2.transformMat2(x, x, e), _ = n.vec2.transformMat2(_, _, e),
|
|
15837
15839
|
v = n.vec2.transformMat2(v, v, e);
|
|
15838
15840
|
}
|
|
15839
15841
|
const S = o / g;
|
|
15840
15842
|
n.vec2.scale(u, u, S), n.vec2.scale(x, x, S), n.vec2.scale(_, _, S), n.vec2.scale(v, v, S),
|
|
15841
|
-
1 === I ? $r(e, t, u, x, _, v, l,
|
|
15843
|
+
1 === I ? $r(e, t, u, x, _, v, l, O, c, h, m, y) : Yr(e, i, u, x, _, v, O, y);
|
|
15842
15844
|
}
|
|
15843
15845
|
s = s || 0, e[0] -= s + po, e[1] -= s + po, e[2] += s + po, e[3] += s + po;
|
|
15844
15846
|
const R = this.getMap().getDevicePixelRatio();
|
|
@@ -15909,7 +15911,7 @@
|
|
|
15909
15911
|
glyphTexSize: [ r.width, r.height ],
|
|
15910
15912
|
isHalo: 0
|
|
15911
15913
|
};
|
|
15912
|
-
|
|
15914
|
+
Oo(e, l, t);
|
|
15913
15915
|
const h = new n.reshader.Material(l, So), c = new n.reshader.Mesh(e, h, {
|
|
15914
15916
|
disableVAO: !0,
|
|
15915
15917
|
transparent: a,
|
|
@@ -15929,7 +15931,7 @@
|
|
|
15929
15931
|
Yn(e, t, n, this.layer);
|
|
15930
15932
|
const s = e.properties;
|
|
15931
15933
|
if (!s.textInitialized) {
|
|
15932
|
-
|
|
15934
|
+
ko.call(this, e, i || o, r), s.textInitialized = !0;
|
|
15933
15935
|
const {aTextSize: t, aTextDx: n, aTextDy: a, aPitchAlign: l, aRotationAlign: h, aRotation: c, aOverlap: u, aAltitude: f} = e.data;
|
|
15934
15936
|
if (t) {
|
|
15935
15937
|
const e = (Xn + "aTextSize").trim();
|
|
@@ -15973,7 +15975,7 @@
|
|
|
15973
15975
|
tileRatio: n.properties.tileRatio,
|
|
15974
15976
|
glyphTex: o,
|
|
15975
15977
|
glyphTexSize: [ o && o.width || 0, o && o.height || 0 ]
|
|
15976
|
-
}),
|
|
15978
|
+
}), Oo(n, e, i), e;
|
|
15977
15979
|
}
|
|
15978
15980
|
function Co(e, t) {
|
|
15979
15981
|
const n = t.geometry;
|
|
@@ -15986,8 +15988,8 @@
|
|
|
15986
15988
|
oi(i.textRotationAlignment) && (e.HAS_TEXT_ROTATION_ALIGN = 1), n.data.aRotation && (e.HAS_TEXT_ROTATION = 1),
|
|
15987
15989
|
n.data.aAltitude && (e.HAS_ALTITUDE = 1), n.properties.aOffset && n.properties.aShape && n.properties.aOffset.length !== n.properties.aShape.length && (e.HAS_OFFSET_Z = 1);
|
|
15988
15990
|
}
|
|
15989
|
-
function
|
|
15990
|
-
const i = e.properties, r = this.getSymbol(i.symbolIndex), o = "line" === i.textPlacement && !
|
|
15991
|
+
function ko(e, t, n) {
|
|
15992
|
+
const i = e.properties, r = this.getSymbol(i.symbolIndex), o = "line" === i.textPlacement && !kt(r), {aPosition: s, aShape: a} = e.data, l = s.length / e.desc.positionSize;
|
|
15991
15993
|
if (i.vertexCount = l, i.aPickingId = e.data.aPickingId, i.aCount || (i.aCount = e.data.aCount,
|
|
15992
15994
|
delete e.data.aCount), t || o) {
|
|
15993
15995
|
let e = a;
|
|
@@ -16020,7 +16022,7 @@
|
|
|
16020
16022
|
}
|
|
16021
16023
|
}
|
|
16022
16024
|
}
|
|
16023
|
-
function
|
|
16025
|
+
function Oo(e, t, n) {
|
|
16024
16026
|
void 0 === t.isHalo && (t.isHalo = 1), Tt(t, "textOpacity", n, "textOpacity", So.textOpacity),
|
|
16025
16027
|
Tt(t, "textFill", n, "textFill", So.textFill, Mt()), Tt(t, "textHaloFill", n, "textHaloFill", So.textHaloFill, Mt()),
|
|
16026
16028
|
Tt(t, "textHaloBlur", n, "textHaloBlur", So.textHaloBlur), Tt(t, "textHaloRadius", n, "textHaloRadius", So.textHaloRadius),
|
|
@@ -16217,7 +16219,7 @@
|
|
|
16217
16219
|
const Eo = [], Do = [], Ho = [], Lo = [];
|
|
16218
16220
|
function No(e, t, n, i, r, o, s) {
|
|
16219
16221
|
e = 1 === e ? 1 : 0;
|
|
16220
|
-
const a = this.getMap(), l = t.geometry.properties, h = this.getSymbol(l.symbolIndex), c = "line" === l.textPlacement && !
|
|
16222
|
+
const a = this.getMap(), l = t.geometry.properties, h = this.getSymbol(l.symbolIndex), c = "line" === l.textPlacement && !kt(h), {aTextSize: u, aTextHalo: f, aShape: d} = l;
|
|
16221
16223
|
let p = u ? u[n[r]] : h.textSize;
|
|
16222
16224
|
null == p && (p = So.textSize);
|
|
16223
16225
|
const g = f ? f[2 * n[r]] : t.properties.textHaloRadius, m = To(Ho, t, n[r]), {aProjectedAnchor: y} = t.geometry.properties;
|
|
@@ -16883,7 +16885,7 @@
|
|
|
16883
16885
|
for (let t = 0; t < e.length; t++) {
|
|
16884
16886
|
if (!this.isMeshIterable(e[t])) continue;
|
|
16885
16887
|
const n = e[t].geometry, {symbolIndex: i} = n.properties;
|
|
16886
|
-
|
|
16888
|
+
kt(this.getSymbolDef(i)) && ts.call(this, this.getMap(), n);
|
|
16887
16889
|
}
|
|
16888
16890
|
const t = this.getMap().getZoom();
|
|
16889
16891
|
for (let n = 0; n < e.length; n++) {
|
|
@@ -17177,13 +17179,13 @@
|
|
|
17177
17179
|
let A = v > 0 ? 1 : -1, b = 0;
|
|
17178
17180
|
f && (A *= -1, b = Math.PI), A < 0 && (b += Math.PI);
|
|
17179
17181
|
const T = h + c, S = Math.abs(v);
|
|
17180
|
-
let w = A > 0 ? l : l + 1, M = li.convert(i), P = li.convert(i), I = li.convert(r), C = li.convert(r),
|
|
17181
|
-
for (;
|
|
17182
|
+
let w = A > 0 ? l : l + 1, M = li.convert(i), P = li.convert(i), I = li.convert(r), C = li.convert(r), k = 0, O = 0;
|
|
17183
|
+
for (;k + O <= S; ) {
|
|
17182
17184
|
if (w += A, w < h || w >= T) return null;
|
|
17183
17185
|
P.x = M.x, P.y = M.y, C.x = I.x, C.y = I.y, M.x = n[3 * w], M.y = n[3 * w + 1],
|
|
17184
|
-
I.x = x[3 * w], I.y = x[3 * w + 1],
|
|
17186
|
+
I.x = x[3 * w], I.y = x[3 * w + 1], k += O, O = P.dist(M) / d;
|
|
17185
17187
|
}
|
|
17186
|
-
const R = (S -
|
|
17188
|
+
const R = (S - k) / O, F = g && g.getRenderer(), E = F && F.getTerrainHelper(), D = t.properties.tile.terrainTileInfos;
|
|
17187
17189
|
if (!y && E) {
|
|
17188
17190
|
const {extent: n} = t.properties.tile, i = g.getTileSize().width / n, r = g.getMap();
|
|
17189
17191
|
let o = I.sub(C).mult(R)._add(C);
|
|
@@ -17225,7 +17227,7 @@
|
|
|
17225
17227
|
}, Ps = function(e) {
|
|
17226
17228
|
const t = this.layer.getRenderer(), n = e.properties.tile.z, i = t.getCurrentTileZoom();
|
|
17227
17229
|
return !this._isHalo0(e) && !t.isForeground(e) && "line" === e.geometry.properties.textPlacement && n < i;
|
|
17228
|
-
}, Is = [ 0, 0, 3 ], Cs = [],
|
|
17230
|
+
}, Is = [ 0, 0, 3 ], Cs = [], ks = [], Os = [], Rs = [], Fs = [], Es = [], Ds = [], Hs = [], Ls = [ 1, -1 ], Ns = new Int16Array(3), zs = [], Vs = [], Us = [], Gs = [], Bs = [], Ws = [], js = [], Xs = {}, $s = {}, Ys = {}, qs = [], Zs = [], Ks = n.mat4.identity([]), Js = [];
|
|
17229
17231
|
class Qs extends Er {
|
|
17230
17232
|
static getBloomSymbol() {
|
|
17231
17233
|
return [ "textBloom" ];
|
|
@@ -17343,7 +17345,7 @@
|
|
|
17343
17345
|
_updateLabels() {
|
|
17344
17346
|
let e = this.scene.getMeshes();
|
|
17345
17347
|
if (!e || !e.length) return;
|
|
17346
|
-
const t = -this.getMap().getBearing() * Math.PI / 180, i = n.mat2.fromRotation(
|
|
17348
|
+
const t = -this.getMap().getBearing() * Math.PI / 180, i = n.mat2.fromRotation(Os, t), r = (e, t, n, i) => {
|
|
17347
17349
|
const {start: r, end: o, mesh: s, allElements: a} = t[0];
|
|
17348
17350
|
if (this.updateBoxCollisionFading(!0, s, t, n, i)) {
|
|
17349
17351
|
let t = e.count;
|
|
@@ -17457,19 +17459,19 @@
|
|
|
17457
17459
|
if (e === ht) return A[3 * S] = lt, A[3 * S + 1] = lt, A[3 * S + 2] = lt, !1;
|
|
17458
17460
|
e ? (C = n.vec3.set(Zs, ...M), C[2] = 100 * e, C = ci(C, C, s, d.width, d.height)) : C = P;
|
|
17459
17461
|
} else C = P;
|
|
17460
|
-
const
|
|
17461
|
-
if (n.vec4.scale(Js, C, 1 /
|
|
17462
|
+
const k = d.getDevicePixelRatio();
|
|
17463
|
+
if (n.vec4.scale(Js, C, 1 / k), d.isOffscreen(Js)) return f || ea(y, t, i, r), A[3 * S] = lt,
|
|
17462
17464
|
A[3 * S + 1] = lt, A[3 * S + 2] = lt, !1;
|
|
17463
17465
|
T && (M = P), A[3 * S] = C[0], A[3 * S + 1] = C[1], A[3 * S + 2] = C[2];
|
|
17464
|
-
const
|
|
17466
|
+
const O = T ? 1 : p.properties.tileExtent / this.layer.getTileSize().width;
|
|
17465
17467
|
let R = !0;
|
|
17466
|
-
const F = t[i], E = t[r - 1], D = b ? b[F] : e.properties.textSize, H = this._updateNormal(e, D, o, F, E, M, Rs,
|
|
17468
|
+
const F = t[i], E = t[r - 1], D = b ? b[F] : e.properties.textSize, H = this._updateNormal(e, D, o, F, E, M, Rs, O, a);
|
|
17467
17469
|
if (null === H) return ea(y, t, i, r), !1;
|
|
17468
17470
|
const L = E - F <= 3, N = Math.floor(H / 2), z = H % 2;
|
|
17469
17471
|
for (let a = i; a < r; a += 6) {
|
|
17470
17472
|
const l = t[a];
|
|
17471
17473
|
let d;
|
|
17472
|
-
if (d = N || a !== i || L || u ? N || a !== r - 6 || L || u ? ds.call(this,
|
|
17474
|
+
if (d = N || a !== i || L || u ? N || a !== r - 6 || L || u ? ds.call(this, ks, e, D, o, l, M, Rs, O, N, C, this.layer, s, c) : js : Ws,
|
|
17473
17475
|
!d) {
|
|
17474
17476
|
R = !1, f || ea(y, t, i, r);
|
|
17475
17477
|
break;
|
|
@@ -18173,7 +18175,7 @@
|
|
|
18173
18175
|
_updateMaterial() {
|
|
18174
18176
|
this.material && this.material.dispose();
|
|
18175
18177
|
const e = this.layer instanceof r.TileLayer, t = this.getSymbols()[0].material, i = {};
|
|
18176
|
-
for (const n in t)
|
|
18178
|
+
for (const n in t) Ot(t, n) && (i[n] = t[n], "uvRotation" === n && (i[n] = i[n] * Math.PI / 180,
|
|
18177
18179
|
e || (i[n] *= -1)));
|
|
18178
18180
|
this.material = new n.reshader.PhongMaterial(i);
|
|
18179
18181
|
}
|
|
@@ -18288,7 +18290,7 @@
|
|
|
18288
18290
|
}
|
|
18289
18291
|
}
|
|
18290
18292
|
const Pa = n.reshader.ShaderLib.get("mesh_picking_vert"), Ia = n.reshader.WgslShaderLib.get("mesh_picking").vert, {getPBRUniforms: Ca} = n.reshader.pbr.PBRUtils;
|
|
18291
|
-
class
|
|
18293
|
+
class ka extends _a {
|
|
18292
18294
|
constructor(...e) {
|
|
18293
18295
|
super(...e), this._loader = new n.reshader.ResourceLoader(null, this.layer.getURLModifier());
|
|
18294
18296
|
}
|
|
@@ -18425,7 +18427,7 @@
|
|
|
18425
18427
|
}
|
|
18426
18428
|
const t = this.layer instanceof r.TileLayer, i = this.dataConfig, o = e || this.getSymbols()[0].material, s = {};
|
|
18427
18429
|
let a = !1;
|
|
18428
|
-
for (const e in o) if (
|
|
18430
|
+
for (const e in o) if (Ot(o, e)) if (e.indexOf("Texture") > 0) {
|
|
18429
18431
|
let t = o[e];
|
|
18430
18432
|
if (!t) {
|
|
18431
18433
|
s[e] = void 0;
|
|
@@ -18468,7 +18470,7 @@
|
|
|
18468
18470
|
this._getDefines(e), this.shader.shaderDefines = e;
|
|
18469
18471
|
}
|
|
18470
18472
|
}
|
|
18471
|
-
var
|
|
18473
|
+
var Oa = "#include <gl2_vert>\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\nuniform mat4 projViewModelMatrix;\nuniform mat4 positionMatrix;\nuniform vec2 centiMeterToLocal;\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec4 aTubeNormal;\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#include <vt_position_vert>\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#else\nuniform mat4 modelViewMatrix;\nuniform mat3 modelNormalMatrix;\nuniform mat4 modelMatrix;\n#if defined(HAS_PATTERN)\nuniform float resolution;\nuniform float tileResolution;\nuniform float tileRatio;\nattribute float aLinesofar;\nvarying highp float vLinesofar;\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\nvarying float vNormalY;\nvarying float vPatternHeight;\nattribute float aNormalDistance;\n#if defined(HAS_PATTERN_ANIM)\nattribute float aLinePatternAnimSpeed;\nvarying float vLinePatternAnimSpeed;\n#endif\n#if defined(HAS_PATTERN_GAP)\nattribute float aLinePatternGap;\nvarying float vLinePatternGap;\n#endif\n#endif\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\n#endif\nvarying float vOpacity;\nvarying vec3 vModelNormal;\nvarying vec4 vViewVertex;\nvarying vec3 vModelVertex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#include <highlight_vert>\nvoid main() {\n \n#ifdef HAS_LINE_WIDTH\nfloat c = aLineWidth;\n#else\nfloat c = lineWidth;\n#endif\nfloat d = c / 2.;\n vec3 e = aTubeNormal.xyz / EXTRUDE_SCALE;\n vec3 f = unpackVTPosition();\n vec4 h = vec4(f, 1.);\n h.xy += e.xy * d * centiMeterToLocal;\n h.z += e.z * d;\n gl_Position = projViewModelMatrix * h;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#else\nvViewVertex = modelViewMatrix * h;\n vec3 i = normalize(e);\n vModelNormal = modelNormalMatrix * i;\n vModelVertex = (modelMatrix * h).xyz;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(h);\n#endif\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_PATTERN\nfloat j = tileResolution / resolution;\n float k = aLinesofar - d * centiMeterToLocal.y * aNormalDistance / EXTRUDE_SCALE;\n vLinesofar = k / tileRatio * j;\n vTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n vPatternHeight = c * centiMeterToLocal.x / tileRatio * j;\n vNormalY = aTubeNormal.w / EXTRUDE_SCALE;\n#if defined(HAS_PATTERN_ANIM)\nvLinePatternAnimSpeed = aLinePatternAnimSpeed / 127.;\n#endif\n#if defined(HAS_PATTERN_GAP)\nvLinePatternGap = aLinePatternGap / 10.0;\n#endif\n#endif\nhighlight_setVarying();\n#endif\n}";
|
|
18472
18474
|
const {StyleUtil: Ra} = h(), {getPBRUniforms: Fa} = n.reshader.pbr.PBRUtils;
|
|
18473
18475
|
class Ea extends Hi {
|
|
18474
18476
|
needToRedraw() {
|
|
@@ -18544,7 +18546,7 @@
|
|
|
18544
18546
|
if (this.renderer = new n.reshader.Renderer(t), this.createShader(e), this.pickingFBO) {
|
|
18545
18547
|
const e = [];
|
|
18546
18548
|
this.picking = [ new n.reshader.FBORayPicking(this.renderer, {
|
|
18547
|
-
vert: "#define PICKING_MODE 1\n" +
|
|
18549
|
+
vert: "#define PICKING_MODE 1\n" + Oa,
|
|
18548
18550
|
uniforms: [ {
|
|
18549
18551
|
name: "projViewModelMatrix",
|
|
18550
18552
|
type: "function",
|
|
@@ -18572,7 +18574,7 @@
|
|
|
18572
18574
|
return n.mat4.multiply(i, t.projViewMatrix, t.modelMatrix), i;
|
|
18573
18575
|
}
|
|
18574
18576
|
}), this.shader = new n.reshader.pbr.StandardShader({
|
|
18575
|
-
vert:
|
|
18577
|
+
vert: Oa,
|
|
18576
18578
|
uniforms: t,
|
|
18577
18579
|
defines: this._getDefines(i),
|
|
18578
18580
|
extraCommandProps: this.getExtraCommandProps()
|
|
@@ -18815,10 +18817,10 @@
|
|
|
18815
18817
|
}
|
|
18816
18818
|
return I;
|
|
18817
18819
|
}));
|
|
18818
|
-
const C = this.layer.getRenderer().getZScale(),
|
|
18820
|
+
const C = this.layer.getRenderer().getZScale(), k = [], O = [];
|
|
18819
18821
|
return P.setLocalTransform((() => {
|
|
18820
18822
|
const e = this.layer.options.altitude || 0;
|
|
18821
|
-
return n.vec3.copy(
|
|
18823
|
+
return n.vec3.copy(O, p), O[2] += 100 * e * C, n.mat4.translate(k, i, O), k;
|
|
18822
18824
|
})), v.generateBuffers(this.regl, {
|
|
18823
18825
|
excludeElementsInVAO: !0
|
|
18824
18826
|
}), d.instance_color && (M.HAS_INSTANCE_COLOR = 1), d.aTerrainAltitude && (M.HAS_INSTANCE_TERRAIN_ALTITUDE = 1,
|
|
@@ -18860,12 +18862,12 @@
|
|
|
18860
18862
|
const [i, r, o] = T;
|
|
18861
18863
|
let s = e + a;
|
|
18862
18864
|
d ? n.vec3.set(S, f[s], f[s + 1], d[s / a]) : La.unpackPosition(S, f[s], f[s + 1], f[s + 2]);
|
|
18863
|
-
const [h, I, C] = S,
|
|
18865
|
+
const [h, I, C] = S, k = p[e / a], O = g.set(i * w, r * w, o * M), R = m.set(h * w, I * w, C * M), F = O.distanceTo(R), E = u.arrangeAlongLine(O, R, F, l, 1, c);
|
|
18864
18866
|
for (let e = 0; e < E.length; e++) {
|
|
18865
18867
|
const t = E[e];
|
|
18866
18868
|
g.set(i, r, o), m.set(h, I, C);
|
|
18867
18869
|
const n = Qa(g, m, t.t);
|
|
18868
|
-
y.push(n.x, n.y), x.push(n.z), _.push(
|
|
18870
|
+
y.push(n.x, n.y), x.push(n.z), _.push(k), v.push(-t.rotationZ * Math.PI / 180),
|
|
18869
18871
|
A.push(t.rotationXY * Math.PI / 180), b.push(...t.scale);
|
|
18870
18872
|
}
|
|
18871
18873
|
}
|
|
@@ -18951,25 +18953,25 @@
|
|
|
18951
18953
|
t[0] < _ && (_ = t[0]), t[0] > b && (b = t[0]), t[1] < v && (v = t[1]), t[1] > T && (T = t[1]),
|
|
18952
18954
|
t[2] < A && (A = t[2]), t[2] > S && (S = t[2]);
|
|
18953
18955
|
}
|
|
18954
|
-
const P = (_ + b) / 2, I = (v + T) / 2, C = (A + S) / 2,
|
|
18956
|
+
const P = (_ + b) / 2, I = (v + T) / 2, C = (A + S) / 2, k = [], O = this._hasFuncType(), R = [ 0, 0, 1 ], F = [ 0, 0, 0 ];
|
|
18955
18957
|
for (let t = 0; t < g; t++) {
|
|
18956
18958
|
d ? n.vec3.set(M, h[t * s], h[t * s + 1], d[t]) : La.unpackPosition(M, h[t * s], h[t * s + 1], h[t * s + 2]);
|
|
18957
18959
|
const i = M[0], r = M[1], o = n.vec3.set(w, i * m - P, -r * m - I, (M[2] + x) * y - C), g = n.vec3.set(Ga, 1, 1, 1);
|
|
18958
18960
|
p && (n.vec3.set(g, p[3 * t], p[3 * t + 1], p[3 * t + 2]), n.mat4.fromScaling(Ba, g));
|
|
18959
18961
|
const _ = u && u[t] || 0, v = f && f[t] || 0;
|
|
18960
18962
|
if (_ || v) {
|
|
18961
|
-
n.mat4.fromRotation(
|
|
18963
|
+
n.mat4.fromRotation(k, v, R);
|
|
18962
18964
|
const e = n.vec3.set(Na, Math.cos(v), Math.sin(v), 0), t = n.vec3.rotateZ(e, e, F, 90 * Math.PI / 180);
|
|
18963
|
-
n.mat4.rotate(
|
|
18965
|
+
n.mat4.rotate(k, k, _, t), p && n.mat4.multiply(k, k, Ba);
|
|
18964
18966
|
const i = n.mat4.fromTranslation(Za, o);
|
|
18965
|
-
n.mat4.multiply(
|
|
18966
|
-
} else n.mat4.fromTranslation(
|
|
18967
|
-
if (
|
|
18967
|
+
n.mat4.multiply(k, i, k);
|
|
18968
|
+
} else n.mat4.fromTranslation(k, o), p && n.mat4.multiply(k, k, Ba);
|
|
18969
|
+
if (O) {
|
|
18968
18970
|
let e = this._getSymbolTRSMatrix(Za, a, c, t);
|
|
18969
18971
|
const i = this._getMeterScale(), r = n.mat4.identity([]);
|
|
18970
|
-
n.mat4.scale(r, r, [ i, i, i ]), e = n.mat4.multiply([], r, e), n.mat4.multiply(
|
|
18972
|
+
n.mat4.scale(r, r, [ i, i, i ]), e = n.mat4.multiply([], r, e), n.mat4.multiply(k, k, e);
|
|
18971
18973
|
}
|
|
18972
|
-
l("instance_vectorA", t,
|
|
18974
|
+
l("instance_vectorA", t, k, 0), l("instance_vectorB", t, k, 1), l("instance_vectorC", t, k, 2),
|
|
18973
18975
|
e.aPickingId[t] = c[t];
|
|
18974
18976
|
}
|
|
18975
18977
|
return n.vec3.set(w, P, I, C), w;
|
|
@@ -19097,7 +19099,7 @@
|
|
|
19097
19099
|
return e.diffuseFactor ? n.reshader.PhongSpecularGlossinessMaterial : n.reshader.PhongMaterial;
|
|
19098
19100
|
}
|
|
19099
19101
|
}
|
|
19100
|
-
class nl extends(Ja(
|
|
19102
|
+
class nl extends(Ja(ka)){
|
|
19101
19103
|
getMaterialClazz(e) {
|
|
19102
19104
|
return e.specularGlossinessTexture || e.diffuseTexture ? n.reshader.pbr.StandardSpecularGlossinessMaterial : n.reshader.pbr.StandardMaterial;
|
|
19103
19105
|
}
|
|
@@ -19881,7 +19883,7 @@
|
|
|
19881
19883
|
getUniformValues(e, t) {
|
|
19882
19884
|
return {
|
|
19883
19885
|
projViewMatrix: Tl,
|
|
19884
|
-
viewport: t && t.
|
|
19886
|
+
viewport: t && t.maskViewport
|
|
19885
19887
|
};
|
|
19886
19888
|
}
|
|
19887
19889
|
}
|
|
@@ -19893,16 +19895,16 @@
|
|
|
19893
19895
|
Il.registerAt(rn);
|
|
19894
19896
|
const Cl = Bn("icon", ls);
|
|
19895
19897
|
Cl.registerAt(rn);
|
|
19896
|
-
const
|
|
19897
|
-
Ol.registerAt(rn);
|
|
19898
|
-
const kl = Bn("native-line", la);
|
|
19898
|
+
const kl = Bn("text", Qs);
|
|
19899
19899
|
kl.registerAt(rn);
|
|
19900
|
+
const Ol = Bn("native-line", la);
|
|
19901
|
+
Ol.registerAt(rn);
|
|
19900
19902
|
Bn("native-point", ra).registerAt(rn);
|
|
19901
19903
|
const Rl = Bn("phong", Sa);
|
|
19902
19904
|
Rl.registerAt(rn);
|
|
19903
19905
|
const Fl = Bn("wireframe", Ma);
|
|
19904
19906
|
Fl.registerAt(rn);
|
|
19905
|
-
const El = Bn("lit",
|
|
19907
|
+
const El = Bn("lit", ka);
|
|
19906
19908
|
El.registerAt(rn);
|
|
19907
19909
|
const Dl = Bn("tube", Ea);
|
|
19908
19910
|
Dl.registerAt(rn);
|
|
@@ -19979,7 +19981,7 @@
|
|
|
19979
19981
|
const Vl = Bn("billboard", bl);
|
|
19980
19982
|
Vl.registerAt(rn);
|
|
19981
19983
|
const Ul = Bn("terrain-flat-mask", wl);
|
|
19982
|
-
Ul.registerAt(rn), fn.registerPainter("lit",
|
|
19984
|
+
Ul.registerAt(rn), fn.registerPainter("lit", ka), fn.registerPainter("icon", ls),
|
|
19983
19985
|
fn.registerPainter("fill", sr), fn.registerPainter("line", ur), fn.registerPainter("line-gradient", Tr),
|
|
19984
19986
|
fn.registerPainter("water", hl), fn.registerPainter("tube", Ea), fn.registerPainter("billboard", bl);
|
|
19985
19987
|
class Gl extends rn {
|
|
@@ -21127,8 +21129,8 @@
|
|
|
21127
21129
|
return r === s && (r < 0 || r > i) || o === a && (o < 0 || o > i);
|
|
21128
21130
|
}
|
|
21129
21131
|
wh.registerRenderer("gl", Ph), wh.registerRenderer("gpu", Ph), wh.registerRenderer("canvas", null);
|
|
21130
|
-
var
|
|
21131
|
-
function
|
|
21132
|
+
var kh = "undefined" != typeof Float32Array ? Float32Array : Array;
|
|
21133
|
+
function Oh(e, t, n, i) {
|
|
21132
21134
|
return e[0] = t, e[1] = n, e[2] = i, e;
|
|
21133
21135
|
}
|
|
21134
21136
|
function Rh(e, t) {
|
|
@@ -21152,13 +21154,13 @@
|
|
|
21152
21154
|
for (var e = 0, t = arguments.length; t--; ) e += arguments[t] * arguments[t];
|
|
21153
21155
|
return Math.sqrt(e);
|
|
21154
21156
|
}), function() {
|
|
21155
|
-
var e, t = (e = new
|
|
21157
|
+
var e, t = (e = new kh(3), kh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0),
|
|
21156
21158
|
e);
|
|
21157
21159
|
}(), function() {
|
|
21158
|
-
var e, t = (e = new
|
|
21160
|
+
var e, t = (e = new kh(4), kh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0,
|
|
21159
21161
|
e[3] = 0), e);
|
|
21160
21162
|
}(), function() {
|
|
21161
|
-
var e, t = (e = new
|
|
21163
|
+
var e, t = (e = new kh(2), kh != Float32Array && (e[0] = 0, e[1] = 0), e);
|
|
21162
21164
|
}();
|
|
21163
21165
|
const Lh = Math.PI / 180, Nh = 6378137 * Math.PI / 180, zh = 85.0511287798;
|
|
21164
21166
|
function Vh(e, t, n) {
|
|
@@ -21545,10 +21547,10 @@
|
|
|
21545
21547
|
var i = t[0], r = t[1], o = t[2], s = n[0], a = n[1], l = n[2];
|
|
21546
21548
|
return e[0] = r * l - o * a, e[1] = o * s - i * l, e[2] = i * a - r * s, e;
|
|
21547
21549
|
}
|
|
21548
|
-
var
|
|
21550
|
+
var kc = function(e, t, n) {
|
|
21549
21551
|
return e[0] = t[0] - n[0], e[1] = t[1] - n[1], e[2] = t[2] - n[2], e;
|
|
21550
21552
|
};
|
|
21551
|
-
function
|
|
21553
|
+
function Oc() {
|
|
21552
21554
|
var e = new Ac(4);
|
|
21553
21555
|
return Ac != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), e[3] = 1, e;
|
|
21554
21556
|
}
|
|
@@ -21578,7 +21580,7 @@
|
|
|
21578
21580
|
return s > 0 && (s = 1 / Math.sqrt(s), e[0] = n * s, e[1] = i * s, e[2] = r * s,
|
|
21579
21581
|
e[3] = o * s), e;
|
|
21580
21582
|
};
|
|
21581
|
-
bc(), Tc(1, 0, 0), Tc(0, 1, 0),
|
|
21583
|
+
bc(), Tc(1, 0, 0), Tc(0, 1, 0), Oc(), Oc(), Fc = new Ac(9), Ac != Float32Array && (Fc[1] = 0,
|
|
21582
21584
|
Fc[2] = 0, Fc[3] = 0, Fc[5] = 0, Fc[6] = 0, Fc[7] = 0), Fc[0] = 1, Fc[4] = 1, Fc[8] = 1;
|
|
21583
21585
|
/*!
|
|
21584
21586
|
* Contains code from google filament
|
|
@@ -21608,7 +21610,7 @@
|
|
|
21608
21610
|
function Zc(e, t, n, i, r, o) {
|
|
21609
21611
|
wc(Xc, e[3 * t], e[3 * t + 1], e[3 * t + 2]), wc($c, e[3 * n], e[3 * n + 1], e[3 * n + 2]),
|
|
21610
21612
|
wc(Yc, e[3 * i], e[3 * i + 1], e[3 * i + 2]);
|
|
21611
|
-
const s =
|
|
21613
|
+
const s = kc(Bc, Yc, $c), a = kc(Wc, Xc, $c), l = Cc(jc, s, a);
|
|
21612
21614
|
Pc(qc, l), r[3 * t] = r[3 * t] || 0, r[3 * n] = r[3 * n] || 0, r[3 * i] = r[3 * i] || 0,
|
|
21613
21615
|
r[3 * t + 1] = r[3 * t + 1] || 0, r[3 * n + 1] = r[3 * n + 1] || 0, r[3 * i + 1] = r[3 * i + 1] || 0,
|
|
21614
21616
|
r[3 * t + 2] = r[3 * t + 2] || 0, r[3 * n + 2] = r[3 * n + 2] || 0, r[3 * i + 2] = r[3 * i + 2] || 0,
|
|
@@ -21631,10 +21633,10 @@
|
|
|
21631
21633
|
const {StyleUtil: Qc, PackUtil: eu, ArrayPool: tu} = h(), nu = tu.getInstance();
|
|
21632
21634
|
function iu(e, t, n, i, r, o, s, a, l, h, c, u, f, d, p, g) {
|
|
21633
21635
|
void 0 === t.top && (t.top = !0), void 0 === t.side && (t.side = !0), nu.reset();
|
|
21634
|
-
const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: A, tangent: b, uv: T, topUVMode: S, sideUVMode: w, sideVerticalUVMode: M, top: P, side: I, textureYOrigin: C, topThickness:
|
|
21636
|
+
const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: A, tangent: b, uv: T, topUVMode: S, sideUVMode: w, sideVerticalUVMode: M, top: P, side: I, textureYOrigin: C, topThickness: k} = t, O = !!g, R = function(e, t, {altitudeScale: n, altitudeProperty: i, defaultAltitude: r, heightProperty: o, minHeightProperty: s, 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: A, positionType: b, res: T, glScale: S, projectionCode: w}, M, P) {
|
|
21635
21637
|
let I = t / e[0].extent;
|
|
21636
21638
|
t === 1 / 0 && (I = 1);
|
|
21637
|
-
const C = t === 1 / 0,
|
|
21639
|
+
const C = t === 1 / 0, k = P.get(), O = P.get(), R = P.get(), F = P.getProxy(), E = P.get(), D = P.get(), H = P.get(), L = !!d, N = !!c, z = !!h, V = L ? P.get() : null;
|
|
21638
21640
|
function U(e, n, i, r, o, s) {
|
|
21639
21641
|
let a = n;
|
|
21640
21642
|
if (N) {
|
|
@@ -21701,20 +21703,20 @@
|
|
|
21701
21703
|
}
|
|
21702
21704
|
const _ = E.getLength() - g, v = (at + "").trim();
|
|
21703
21705
|
for (let e = 0; e < _ / 3; e++) {
|
|
21704
|
-
let e =
|
|
21705
|
-
|
|
21706
|
-
|
|
21706
|
+
let e = O.currentIndex;
|
|
21707
|
+
O[e++] = void 0 === l[v] ? X : l[v], O.currentIndex = e, e = k.currentIndex, k[e++] = X,
|
|
21708
|
+
k.currentIndex = e, He(h) && (e = R.currentIndex, R[e++] = h, R.currentIndex = e);
|
|
21707
21709
|
}
|
|
21708
21710
|
}
|
|
21709
|
-
const J = mc.getUnsignedArrayType(
|
|
21711
|
+
const J = mc.getUnsignedArrayType(O.getLength() ? O[O.getLength() - 1] : 0), Q = {
|
|
21710
21712
|
hasNegativeHeight: K,
|
|
21711
21713
|
maxAltitude: G === -1 / 0 ? 0 : G,
|
|
21712
21714
|
minAltitude: B === 1 / 0 ? 0 : B,
|
|
21713
21715
|
vertices: E,
|
|
21714
21716
|
verticeTypes: H,
|
|
21715
21717
|
indices: D,
|
|
21716
|
-
pickingIds: yc.createTypedArray(
|
|
21717
|
-
featureIndexes:
|
|
21718
|
+
pickingIds: yc.createTypedArray(O, J),
|
|
21719
|
+
featureIndexes: k
|
|
21718
21720
|
};
|
|
21719
21721
|
if (R.getLength()) {
|
|
21720
21722
|
const e = q ? mc.getPosArrayType(Y) : mc.getUnsignedArrayType(Y);
|
|
@@ -21732,7 +21734,7 @@
|
|
|
21732
21734
|
center: g,
|
|
21733
21735
|
top: P,
|
|
21734
21736
|
side: I,
|
|
21735
|
-
topThickness: 10 *
|
|
21737
|
+
topThickness: 10 * k || 0,
|
|
21736
21738
|
uv: T || b,
|
|
21737
21739
|
uvSize: [ r, r ],
|
|
21738
21740
|
uvOrigin: i,
|
|
@@ -21769,7 +21771,7 @@
|
|
|
21769
21771
|
let U = !0;
|
|
21770
21772
|
const G = V.getLength ? V.getLength() : V.length;
|
|
21771
21773
|
for (let e = 0; e < G; e++) {
|
|
21772
|
-
|
|
21774
|
+
O || (V[e] = -V[e]);
|
|
21773
21775
|
const t = V[e] % 1;
|
|
21774
21776
|
1 - Math.abs(t) > 1e-6 ? U = !1 : 0 !== t && (V[e] = Math.round(V[e]));
|
|
21775
21777
|
}
|
|
@@ -21791,7 +21793,7 @@
|
|
|
21791
21793
|
const x = [], _ = [], v = [], A = [];
|
|
21792
21794
|
let b, T, S;
|
|
21793
21795
|
function w(e) {
|
|
21794
|
-
Kc(v, t, 3 * e), Sc(A, v), T = a[e], Sc(x, T),
|
|
21796
|
+
Kc(v, t, 3 * e), Sc(A, v), T = a[e], Sc(x, T), kc(x, x, function(e, t, n) {
|
|
21795
21797
|
return e[0] = t[0] * n, e[1] = t[1] * n, e[2] = t[2] * n, e;
|
|
21796
21798
|
}(v, v, Ic(v, T))), Pc(x, x), Cc(_, A, T), S = Ic(_, l[e]), b = S < 0 ? -1 : 1,
|
|
21797
21799
|
s[4 * e] = x[0], s[4 * e + 1] = x[1], s[4 * e + 2] = x[2], s[4 * e + 3] = b;
|
|
@@ -21802,7 +21804,7 @@
|
|
|
21802
21804
|
const n = t.getLength(), i = new Float32Array(n), r = [], o = [], s = [];
|
|
21803
21805
|
for (let a = 0; a < n; a += 4) {
|
|
21804
21806
|
const n = a / 4 * 3;
|
|
21805
|
-
|
|
21807
|
+
Oh(o, e[n] || 0, e[n + 1] || 0, e[n + 2] || 0), Fh(r, t[a] || 0, t[a + 1] || 0, t[a + 2] || 0, t[a + 3] || 0),
|
|
21806
21808
|
Uc(s, o, r), Rh(i.subarray(a, a + 4), s);
|
|
21807
21809
|
}
|
|
21808
21810
|
return i;
|
|
@@ -22229,7 +22231,7 @@
|
|
|
22229
22231
|
};
|
|
22230
22232
|
var Cu = Mu.exports.nested = Iu;
|
|
22231
22233
|
Mu.exports.flat = Pu;
|
|
22232
|
-
const
|
|
22234
|
+
const ku = 11102230246251565e-32, Ou = 134217729, Ru = (3 + 8 * ku) * ku;
|
|
22233
22235
|
function Fu(e, t, n, i, r) {
|
|
22234
22236
|
let o, s, a, l, h = t[0], c = i[0], u = 0, f = 0;
|
|
22235
22237
|
c > h == c > -h ? (o = h, h = t[++u]) : (o = c, c = i[++f]);
|
|
@@ -22255,9 +22257,9 @@
|
|
|
22255
22257
|
return Math.abs(l) >= Du * h ? l : -function(e, t, n, i, r, o, s) {
|
|
22256
22258
|
let a, l, h, c, u, f, d, p, g, m, y, x, _, v, A, b, T, S;
|
|
22257
22259
|
const w = e - r, M = n - r, P = t - o, I = i - o;
|
|
22258
|
-
v = w * I, f =
|
|
22259
|
-
m = I - g, A = p * m - (v - d * g - p * g - d * m), b = P * M, f =
|
|
22260
|
-
p = P - d, f =
|
|
22260
|
+
v = w * I, f = Ou * w, d = f - (f - w), p = w - d, f = Ou * I, g = f - (f - I),
|
|
22261
|
+
m = I - g, A = p * m - (v - d * g - p * g - d * m), b = P * M, f = Ou * P, d = f - (f - P),
|
|
22262
|
+
p = P - d, f = Ou * M, g = f - (f - M), m = M - g, T = p * m - (b - d * g - p * g - d * m),
|
|
22261
22263
|
y = A - T, u = A - y, Nu[0] = A - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
22262
22264
|
y = _ - b, u = _ - y, Nu[1] = _ - (y + u) + (u - b), S = x + y, u = S - x, Nu[2] = x - (S - u) + (y - u),
|
|
22263
22265
|
Nu[3] = S;
|
|
@@ -22265,28 +22267,28 @@
|
|
|
22265
22267
|
let n = t[0];
|
|
22266
22268
|
for (let i = 1; i < e; i++) n += t[i];
|
|
22267
22269
|
return n;
|
|
22268
|
-
}(4, Nu),
|
|
22269
|
-
if (C >=
|
|
22270
|
+
}(4, Nu), k = Hu * s;
|
|
22271
|
+
if (C >= k || -C >= k) return C;
|
|
22270
22272
|
if (u = e - w, a = e - (w + u) + (u - r), u = n - M, h = n - (M + u) + (u - r),
|
|
22271
22273
|
u = t - P, l = t - (P + u) + (u - o), u = i - I, c = i - (I + u) + (u - o), 0 === a && 0 === l && 0 === h && 0 === c) return C;
|
|
22272
|
-
if (
|
|
22273
|
-
v = a * I, f =
|
|
22274
|
-
m = I - g, A = p * m - (v - d * g - p * g - d * m), b = l * M, f =
|
|
22275
|
-
p = l - d, f =
|
|
22274
|
+
if (k = Lu * s + Ru * Math.abs(C), C += w * c + I * a - (P * h + M * l), C >= k || -C >= k) return C;
|
|
22275
|
+
v = a * I, f = Ou * a, d = f - (f - a), p = a - d, f = Ou * I, g = f - (f - I),
|
|
22276
|
+
m = I - g, A = p * m - (v - d * g - p * g - d * m), b = l * M, f = Ou * l, d = f - (f - l),
|
|
22277
|
+
p = l - d, f = Ou * M, g = f - (f - M), m = M - g, T = p * m - (b - d * g - p * g - d * m),
|
|
22276
22278
|
y = A - T, u = A - y, Gu[0] = A - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
22277
22279
|
y = _ - b, u = _ - y, Gu[1] = _ - (y + u) + (u - b), S = x + y, u = S - x, Gu[2] = x - (S - u) + (y - u),
|
|
22278
22280
|
Gu[3] = S;
|
|
22279
|
-
const
|
|
22280
|
-
v = w * c, f =
|
|
22281
|
-
m = c - g, A = p * m - (v - d * g - p * g - d * m), b = P * h, f =
|
|
22282
|
-
p = P - d, f =
|
|
22281
|
+
const O = Fu(4, Nu, 4, Gu, zu);
|
|
22282
|
+
v = w * c, f = Ou * w, d = f - (f - w), p = w - d, f = Ou * c, g = f - (f - c),
|
|
22283
|
+
m = c - g, A = p * m - (v - d * g - p * g - d * m), b = P * h, f = Ou * P, d = f - (f - P),
|
|
22284
|
+
p = P - d, f = Ou * h, g = f - (f - h), m = h - g, T = p * m - (b - d * g - p * g - d * m),
|
|
22283
22285
|
y = A - T, u = A - y, Gu[0] = A - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
22284
22286
|
y = _ - b, u = _ - y, Gu[1] = _ - (y + u) + (u - b), S = x + y, u = S - x, Gu[2] = x - (S - u) + (y - u),
|
|
22285
22287
|
Gu[3] = S;
|
|
22286
|
-
const R = Fu(
|
|
22287
|
-
v = a * c, f =
|
|
22288
|
-
m = c - g, A = p * m - (v - d * g - p * g - d * m), b = l * h, f =
|
|
22289
|
-
p = l - d, f =
|
|
22288
|
+
const R = Fu(O, zu, 4, Gu, Vu);
|
|
22289
|
+
v = a * c, f = Ou * a, d = f - (f - a), p = a - d, f = Ou * c, g = f - (f - c),
|
|
22290
|
+
m = c - g, A = p * m - (v - d * g - p * g - d * m), b = l * h, f = Ou * l, d = f - (f - l),
|
|
22291
|
+
p = l - d, f = Ou * h, g = f - (f - h), m = h - g, T = p * m - (b - d * g - p * g - d * m),
|
|
22290
22292
|
y = A - T, u = A - y, Gu[0] = A - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u),
|
|
22291
22293
|
y = _ - b, u = _ - y, Gu[1] = _ - (y + u) + (u - b), S = x + y, u = S - x, Gu[2] = x - (S - u) + (y - u),
|
|
22292
22294
|
Gu[3] = S;
|
|
@@ -22770,12 +22772,12 @@
|
|
|
22770
22772
|
e.FillPlugin = Ml, e.FilterUtil = yf, e.GLTFPhongPlugin = Hl, e.GLTFStandardPlugin = Ll,
|
|
22771
22773
|
e.GeoJSONVectorTileLayer = Wl, e.HeatmapPlugin = Nl, e.IconPainter = ls, e.IconPlugin = Cl,
|
|
22772
22774
|
e.LineGradientPlugin = Il, e.LinePainter = ur, e.LinePlugin = Pl, e.LineStringLayer = Ah,
|
|
22773
|
-
e.LitPlugin = El, e.MapboxVectorTileLayer = Gl, e.NativeLinePainter = la, e.NativeLinePlugin =
|
|
22775
|
+
e.LitPlugin = El, e.MapboxVectorTileLayer = Gl, e.NativeLinePainter = la, e.NativeLinePlugin = Ol,
|
|
22774
22776
|
e.NativePointPainter = ra, e.PackUtil = mf, e.PhongPainter = Sa, e.PhongPlugin = Rl,
|
|
22775
22777
|
e.PointLayer = xh, e.PointLayerRenderer = _h, e.PolygonLayer = wh, e.SYMBOLS_NEED_REBUILD_IN_VECTOR = _f,
|
|
22776
22778
|
e.SYMBOLS_NEED_REBUILD_IN_VT = xf, e.TerrainFlatMaskPainter = wl, e.TerrainFlatMaskPlugin = Ul,
|
|
22777
|
-
e.TextPainter = Qs, e.TextPlugin =
|
|
22779
|
+
e.TextPainter = Qs, e.TextPlugin = kl, e.TubePlugin = Dl, e.Vector3DLayer = fn,
|
|
22778
22780
|
e.VectorTileLayer = rn, e.VectorTileLayerRenderer = Wt, e.WaterPlugin = zl, e.WireframePainter = Ma,
|
|
22779
|
-
e.WireframePlugin = Fl, e.getVectorPacker = h, "undefined" != typeof console && console.log("@maptalks/vt v0.115.
|
|
22781
|
+
e.WireframePlugin = Fl, e.getVectorPacker = h, "undefined" != typeof console && console.log("@maptalks/vt v0.115.1");
|
|
22780
22782
|
}));
|
|
22781
22783
|
//# sourceMappingURL=maptalks.vt.js.map
|