@nika-js/onlymap 0.6.19 → 0.6.20
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/CHANGELOG.md +6 -0
- package/dist/{LercDecode.es-Butn4LVX.js → LercDecode.es-DiDn51b8.js} +1 -1
- package/dist/{basemap-qZH_aNYE.js → basemap-Bvtudw-w.js} +341 -313
- package/dist/basemap.d.ts +17 -1
- package/dist/elements/om-map.d.ts +2 -0
- package/dist/{geoparquet-DWQCUg6N.js → geoparquet-DFfq6-JJ.js} +1 -1
- package/dist/{index-CeeQ7CH4.js → index-AlG5NjjQ.js} +1 -1
- package/dist/{index-CagRqDDL.js → index-CPthQWzC.js} +8578 -8566
- package/dist/{index-4St6BumW.js → index-Cq0qmoDj.js} +2 -2
- package/dist/{index-CNlULiHm.js → index-DIHnIeho.js} +1 -1
- package/dist/{index-BTM6Mblt.js → index-ZDGLuUoq.js} +1 -1
- package/dist/{lerc-cWjnr__g.js → lerc-C3kqqJ1B.js} +2 -2
- package/dist/onlymap.standalone.js +14931 -14891
- package/dist/onlymapjs.js +1 -1
- package/dist/{raster-BxxtJxxs.js → raster-6tndfpHv.js} +2 -2
- package/dist/{raster-pipeline-DlppdBYw.js → raster-pipeline-DVLch-nI.js} +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/{zarr-BtxMPczZ.js → zarr-D5UCDgG7.js} +2 -2
- package/package.json +1 -1
- package/skills/onlymapjs/SKILL.md +1 -1
- package/skills/onlymapjs/references/syntax.md +2 -2
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
import { C as ny, L as sy, M as oy, m as ay, c as ka, a as Sd, z as oc, G as sm, V as ly, W as cy, b as uy, g as hy, d as Vu, f as Ed, e as dy, l as py, u as fy, D as Qf, h as my } from "./index-
|
|
1
|
+
import { C as ny, L as sy, M as oy, m as ay, c as ka, a as Sd, z as oc, G as sm, V as ly, W as cy, b as uy, g as hy, d as Vu, f as Ed, e as dy, l as py, u as fy, D as Qf, h as my } from "./index-CPthQWzC.js";
|
|
2
2
|
const Cd = Math.PI / 180, gy = 180 / Math.PI;
|
|
3
|
-
function em(Pe,
|
|
3
|
+
function em(Pe, J = 0) {
|
|
4
4
|
const me = Math.min(180, Pe) * Cd;
|
|
5
|
-
return sm * 2 * Math.sin(me / 2) * Math.pow(2,
|
|
5
|
+
return sm * 2 * Math.sin(me / 2) * Math.pow(2, J);
|
|
6
6
|
}
|
|
7
|
-
function tm(Pe,
|
|
8
|
-
const me = Pe / Math.pow(2,
|
|
7
|
+
function tm(Pe, J = 0) {
|
|
8
|
+
const me = Pe / Math.pow(2, J);
|
|
9
9
|
return Math.asin(Math.min(1, me / sm / 2)) * 2 * gy;
|
|
10
10
|
}
|
|
11
11
|
class _y extends oy {
|
|
12
|
-
constructor(
|
|
13
|
-
const { startPanPos: me, ...Me } =
|
|
12
|
+
constructor(J) {
|
|
13
|
+
const { startPanPos: me, ...Me } = J;
|
|
14
14
|
Me.normalize = !1, super(Me), me !== void 0 && (this._state.startPanPos = me);
|
|
15
15
|
}
|
|
16
|
-
panStart({ pos:
|
|
16
|
+
panStart({ pos: J }) {
|
|
17
17
|
const { latitude: me, longitude: Me, zoom: Te } = this.getViewportProps();
|
|
18
18
|
return this._getUpdatedState({
|
|
19
19
|
startPanLngLat: [Me, me],
|
|
20
|
-
startPanPos:
|
|
20
|
+
startPanPos: J,
|
|
21
21
|
startZoom: Te
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
-
pan({ pos:
|
|
24
|
+
pan({ pos: J, startPos: me }) {
|
|
25
25
|
const Me = this.getState(), Te = Me.startPanLngLat || this._unproject(me);
|
|
26
26
|
if (!Te)
|
|
27
27
|
return this;
|
|
28
|
-
const Le = Me.startZoom ?? this.getViewportProps().zoom, R = Me.startPanPos || me, h = [Te[0], Te[1], Le], ct = this.makeViewport(this.getViewportProps()).panByPosition(h,
|
|
28
|
+
const Le = Me.startZoom ?? this.getViewportProps().zoom, R = Me.startPanPos || me, h = [Te[0], Te[1], Le], ct = this.makeViewport(this.getViewportProps()).panByPosition(h, J, R);
|
|
29
29
|
return this._getUpdatedState(ct);
|
|
30
30
|
}
|
|
31
31
|
panEnd() {
|
|
@@ -35,26 +35,26 @@ class _y extends oy {
|
|
|
35
35
|
startZoom: null
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
zoom({ scale:
|
|
39
|
-
const Me = (this.getState().startZoom || this.getViewportProps().zoom) + Math.log2(
|
|
38
|
+
zoom({ scale: J }) {
|
|
39
|
+
const Me = (this.getState().startZoom || this.getViewportProps().zoom) + Math.log2(J);
|
|
40
40
|
return this._getUpdatedState({ zoom: Me });
|
|
41
41
|
}
|
|
42
|
-
applyConstraints(
|
|
43
|
-
const { longitude: me, latitude: Me, maxBounds: Te } =
|
|
44
|
-
if (
|
|
45
|
-
const Le =
|
|
42
|
+
applyConstraints(J) {
|
|
43
|
+
const { longitude: me, latitude: Me, maxBounds: Te } = J;
|
|
44
|
+
if (J.zoom = this._constrainZoom(J.zoom, J), (me < -180 || me > 180) && (J.longitude = ay(me + 180, 360) - 180), J.latitude = ka(Me, -Sd, Sd), Te && (J.longitude = ka(J.longitude, Te[0][0], Te[1][0]), J.latitude = ka(J.latitude, Te[0][1], Te[1][1])), Te) {
|
|
45
|
+
const Le = J.zoom - oc(Me), R = Te[1][0] - Te[0][0], h = Te[1][1] - Te[0][1];
|
|
46
46
|
if (h > 0 && h < Sd * 2) {
|
|
47
|
-
const de = Math.min(tm(
|
|
48
|
-
|
|
47
|
+
const de = Math.min(tm(J.height, Le), h) / 2;
|
|
48
|
+
J.latitude = ka(J.latitude, Te[0][1] + de, Te[1][1] - de);
|
|
49
49
|
}
|
|
50
50
|
if (R > 0 && R < 360) {
|
|
51
|
-
const de = Math.min(tm(
|
|
52
|
-
|
|
51
|
+
const de = Math.min(tm(J.width / Math.cos(J.latitude * Cd), Le), R) / 2;
|
|
52
|
+
J.longitude = ka(J.longitude, Te[0][0] + de, Te[1][0] - de);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
return
|
|
55
|
+
return J.latitude !== Me && (J.zoom += oc(J.latitude) - oc(Me)), J;
|
|
56
56
|
}
|
|
57
|
-
_constrainZoom(
|
|
57
|
+
_constrainZoom(J, me) {
|
|
58
58
|
me || (me = this.getViewportProps());
|
|
59
59
|
const { latitude: Me, maxZoom: Te, maxBounds: Le } = me;
|
|
60
60
|
let { minZoom: R } = me;
|
|
@@ -63,7 +63,7 @@ class _y extends oy {
|
|
|
63
63
|
const Bt = Le[0][1], fi = Le[1][1], Qi = Math.sign(Bt) === Math.sign(fi) ? Math.min(Math.abs(Bt), Math.abs(fi)) : 0, At = em(Le[1][0] - Le[0][0]) * Math.cos(Qi * Cd), si = em(Le[1][1] - Le[0][1]);
|
|
64
64
|
At > 0 && (R = Math.max(R, Math.log2(me.width / At) + h)), si > 0 && (R = Math.max(R, Math.log2(me.height / si) + h)), R > Te && (R = Te);
|
|
65
65
|
}
|
|
66
|
-
return ka(
|
|
66
|
+
return ka(J, R + de, Te + de);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
class yy extends ny {
|
|
@@ -73,25 +73,25 @@ class yy extends ny {
|
|
|
73
73
|
transitionInterpolator: new sy(["longitude", "latitude", "zoom"])
|
|
74
74
|
}, this.dragMode = "pan";
|
|
75
75
|
}
|
|
76
|
-
setProps(
|
|
77
|
-
super.setProps(
|
|
76
|
+
setProps(J) {
|
|
77
|
+
super.setProps(J), this.dragRotate = !1, this.touchRotate = !1;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
const vy = {
|
|
81
81
|
cullMode: "back"
|
|
82
82
|
};
|
|
83
83
|
class om extends ly {
|
|
84
|
-
constructor(
|
|
84
|
+
constructor(J = {}) {
|
|
85
85
|
super({
|
|
86
|
-
...
|
|
86
|
+
...J,
|
|
87
87
|
parameters: {
|
|
88
88
|
...vy,
|
|
89
|
-
...
|
|
89
|
+
...J.parameters
|
|
90
90
|
}
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
|
-
getViewportType(
|
|
94
|
-
return
|
|
93
|
+
getViewportType(J) {
|
|
94
|
+
return J.zoom > 12 ? cy : uy;
|
|
95
95
|
}
|
|
96
96
|
get ControllerType() {
|
|
97
97
|
return yy;
|
|
@@ -105,7 +105,7 @@ var ju = { exports: {} };
|
|
|
105
105
|
*/
|
|
106
106
|
var xy = ju.exports, im;
|
|
107
107
|
function by() {
|
|
108
|
-
return im || (im = 1, (function(Pe,
|
|
108
|
+
return im || (im = 1, (function(Pe, J) {
|
|
109
109
|
(function(me, Me) {
|
|
110
110
|
Pe.exports = Me();
|
|
111
111
|
})(xy, (function() {
|
|
@@ -804,8 +804,8 @@ function by() {
|
|
|
804
804
|
const A = [+p, Un(+m, 0, 100), Un(+_, 0, 100), b ? vc(+b, I) : 1];
|
|
805
805
|
if (Ha(A)) return (function([D, L, k, F]) {
|
|
806
806
|
function O(j) {
|
|
807
|
-
const Y = (j + D / 30) % 12,
|
|
808
|
-
return k -
|
|
807
|
+
const Y = (j + D / 30) % 12, Q = L * Math.min(k, 1 - k);
|
|
808
|
+
return k - Q * Math.max(-1, Math.min(Y - 3, 9 - Y, 1));
|
|
809
809
|
}
|
|
810
810
|
return D = _c(D), L /= 100, k /= 100, [O(0), O(8), O(4), F];
|
|
811
811
|
})(A);
|
|
@@ -4426,13 +4426,13 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
4426
4426
|
_refreshViews() {
|
|
4427
4427
|
this.uint8 = new Uint8Array(this.arrayBuffer), this.int16 = new Int16Array(this.arrayBuffer), this.uint16 = new Uint16Array(this.arrayBuffer), this.uint32 = new Uint32Array(this.arrayBuffer), this.float32 = new Float32Array(this.arrayBuffer);
|
|
4428
4428
|
}
|
|
4429
|
-
emplaceBack(e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y,
|
|
4429
|
+
emplaceBack(e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y, Q, ne, ie, le, ce) {
|
|
4430
4430
|
const se = this.length;
|
|
4431
|
-
return this.resize(se + 1), this.emplace(se, e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y,
|
|
4431
|
+
return this.resize(se + 1), this.emplace(se, e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y, Q, ne, ie, le, ce);
|
|
4432
4432
|
}
|
|
4433
|
-
emplace(e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y,
|
|
4433
|
+
emplace(e, i, s, o, l, u, p, g, m, v, _, T, b, I, M, A, D, L, k, F, O, j, Y, Q, ne, ie, le, ce, se) {
|
|
4434
4434
|
const re = 32 * e, _e = 16 * e;
|
|
4435
|
-
return this.int16[re + 0] = i, this.int16[re + 1] = s, this.int16[re + 2] = o, this.int16[re + 3] = l, this.int16[re + 4] = u, this.int16[re + 5] = p, this.int16[re + 6] = g, this.int16[re + 7] = m, this.uint16[re + 8] = v, this.uint16[re + 9] = _, this.uint16[re + 10] = T, this.uint16[re + 11] = b, this.uint16[re + 12] = I, this.uint16[re + 13] = M, this.uint16[re + 14] = A, this.uint16[re + 15] = D, this.uint16[re + 16] = L, this.uint16[re + 17] = k, this.uint16[re + 18] = F, this.uint16[re + 19] = O, this.uint16[re + 20] = j, this.uint16[re + 21] = Y, this.uint16[re + 22] =
|
|
4435
|
+
return this.int16[re + 0] = i, this.int16[re + 1] = s, this.int16[re + 2] = o, this.int16[re + 3] = l, this.int16[re + 4] = u, this.int16[re + 5] = p, this.int16[re + 6] = g, this.int16[re + 7] = m, this.uint16[re + 8] = v, this.uint16[re + 9] = _, this.uint16[re + 10] = T, this.uint16[re + 11] = b, this.uint16[re + 12] = I, this.uint16[re + 13] = M, this.uint16[re + 14] = A, this.uint16[re + 15] = D, this.uint16[re + 16] = L, this.uint16[re + 17] = k, this.uint16[re + 18] = F, this.uint16[re + 19] = O, this.uint16[re + 20] = j, this.uint16[re + 21] = Y, this.uint16[re + 22] = Q, this.uint32[_e + 12] = ne, this.float32[_e + 13] = ie, this.float32[_e + 14] = le, this.uint16[re + 30] = ce, this.uint16[re + 31] = se, e;
|
|
4436
4436
|
}
|
|
4437
4437
|
}
|
|
4438
4438
|
Fl.prototype.bytesPerElement = 64, Ce("StructArrayLayout8i15ui1ul2f2ui64", Fl);
|
|
@@ -6113,12 +6113,12 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6113
6113
|
const j = b === 0;
|
|
6114
6114
|
if (j && (p === m || p === v)) return;
|
|
6115
6115
|
if (j || A >= 1 || D <= 0) {
|
|
6116
|
-
const
|
|
6116
|
+
const Q = s - p, ne = u + (i - u) * Math.min((m - p) / Q, (v - p) / Q);
|
|
6117
6117
|
k = Math.floor(Math.min(ne, g) / this._granularityCellSize) + 1, F = Math.ceil(Math.max(ne, g) / this._granularityCellSize) - 1, O = g < ne;
|
|
6118
6118
|
}
|
|
6119
6119
|
const Y = _ > 0 ? v : m;
|
|
6120
|
-
if (O) for (let
|
|
6121
|
-
else for (let
|
|
6120
|
+
if (O) for (let Q = k; Q <= F; Q++) e.push(this._vertexToIndex(Q * this._granularityCellSize, Y));
|
|
6121
|
+
else for (let Q = F; Q >= k; Q--) e.push(this._vertexToIndex(Q * this._granularityCellSize, Y));
|
|
6122
6122
|
}
|
|
6123
6123
|
_generateOutline(e) {
|
|
6124
6124
|
const i = [];
|
|
@@ -6175,12 +6175,12 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6175
6175
|
let A, D, L;
|
|
6176
6176
|
if (T && (I = (function(k, F, O, j) {
|
|
6177
6177
|
const Y = [];
|
|
6178
|
-
for (let
|
|
6179
|
-
const ie = qd(k, F[
|
|
6178
|
+
for (let Q = 0, ne = F.length; Q < ne; Q++) {
|
|
6179
|
+
const ie = qd(k, F[Q] * j, Q < ne - 1 ? F[Q + 1] * j : k.length, j, !1);
|
|
6180
6180
|
ie === ie.next && (ie.steiner = !0), Y.push(Lm(ie));
|
|
6181
6181
|
}
|
|
6182
6182
|
Y.sort(zm);
|
|
6183
|
-
for (let
|
|
6183
|
+
for (let Q = 0; Q < Y.length; Q++) O = km(Y[Q], O);
|
|
6184
6184
|
return O;
|
|
6185
6185
|
})(m, v, I, _)), m.length > 80 * _) {
|
|
6186
6186
|
A = m[0], D = m[1];
|
|
@@ -6226,17 +6226,17 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6226
6226
|
const _ = r[v], T = v < g - 1 ? r[v + 1] : r[0], b = _.x, I = _.y, M = T.x, A = T.y, D = b !== M, L = I !== A;
|
|
6227
6227
|
if (!D && !L) continue;
|
|
6228
6228
|
const k = M - b, F = A - I, O = Math.abs(k), j = Math.abs(F);
|
|
6229
|
-
let Y = b,
|
|
6229
|
+
let Y = b, Q = I;
|
|
6230
6230
|
for (; ; ) {
|
|
6231
|
-
const ie = k > 0 ? (Math.floor(Y / u) + 1) * u : (Math.ceil(Y / u) - 1) * u, le = F > 0 ? (Math.floor(
|
|
6231
|
+
const ie = k > 0 ? (Math.floor(Y / u) + 1) * u : (Math.ceil(Y / u) - 1) * u, le = F > 0 ? (Math.floor(Q / u) + 1) * u : (Math.ceil(Q / u) - 1) * u, ce = Math.abs(Y - ie), se = Math.abs(Q - le), re = Math.abs(Y - M), _e = Math.abs(Q - A), Se = D ? ce / O : Number.POSITIVE_INFINITY, be = L ? se / j : Number.POSITIVE_INFINITY;
|
|
6232
6232
|
if ((re <= ce || !D) && (_e <= se || !L)) break;
|
|
6233
6233
|
if (Se < be && D || !L) {
|
|
6234
|
-
Y = ie,
|
|
6235
|
-
const ye = new de(Y, Math.round(
|
|
6234
|
+
Y = ie, Q += F * Se;
|
|
6235
|
+
const ye = new de(Y, Math.round(Q));
|
|
6236
6236
|
p[p.length - 1].x === ye.x && p[p.length - 1].y === ye.y || p.push(ye);
|
|
6237
6237
|
} else {
|
|
6238
|
-
Y += k * be,
|
|
6239
|
-
const ye = new de(Math.round(Y),
|
|
6238
|
+
Y += k * be, Q = le;
|
|
6239
|
+
const ye = new de(Math.round(Y), Q);
|
|
6240
6240
|
p[p.length - 1].x === ye.x && p[p.length - 1].y === ye.y || p.push(ye);
|
|
6241
6241
|
}
|
|
6242
6242
|
}
|
|
@@ -6291,10 +6291,10 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6291
6291
|
const L = { count: 0 };
|
|
6292
6292
|
let k = 0, F = _.getOrCreateLatestSegment(T, b), O = F.vertexLength;
|
|
6293
6293
|
for (let j = 2; j < M.length; j += 3) {
|
|
6294
|
-
const Y = M[j - 2],
|
|
6295
|
-
let ie = D[Y] < k, le = D[
|
|
6294
|
+
const Y = M[j - 2], Q = M[j - 1], ne = M[j];
|
|
6295
|
+
let ie = D[Y] < k, le = D[Q] < k, ce = D[ne] < k;
|
|
6296
6296
|
F.vertexLength + ((ie ? 1 : 0) + (le ? 1 : 0) + (ce ? 1 : 0)) > Ee.MAX_VERTEX_ARRAY_LENGTH && (F = _.createNewSegment(T, b), k = L.count, ie = !0, le = !0, ce = !0, O = 0);
|
|
6297
|
-
const se = Hl(D, I, A, L, Y, ie, F), re = Hl(D, I, A, L,
|
|
6297
|
+
const se = Hl(D, I, A, L, Y, ie, F), re = Hl(D, I, A, L, Q, le, F), _e = Hl(D, I, A, L, ne, ce, F);
|
|
6298
6298
|
b.emplaceBack(O + se - k, O + re - k, O + _e - k), F.primitiveLength++;
|
|
6299
6299
|
}
|
|
6300
6300
|
})(e, i, s, o, l, r), v && (function(_, T, b, I, M, A) {
|
|
@@ -6303,10 +6303,10 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6303
6303
|
const L = { count: 0 };
|
|
6304
6304
|
let k = 0, F = _.getOrCreateLatestSegment(T, b), O = F.vertexLength;
|
|
6305
6305
|
for (const j of M) for (let Y = 1; Y < j.length; Y += 2) {
|
|
6306
|
-
const
|
|
6307
|
-
let ie = D[
|
|
6306
|
+
const Q = j[Y - 1], ne = j[Y];
|
|
6307
|
+
let ie = D[Q] < k, le = D[ne] < k;
|
|
6308
6308
|
F.vertexLength + ((ie ? 1 : 0) + (le ? 1 : 0)) > Ee.MAX_VERTEX_ARRAY_LENGTH && (F = _.createNewSegment(T, b), k = L.count, ie = !0, le = !0, O = 0);
|
|
6309
|
-
const ce = Hl(D, I, A, L,
|
|
6309
|
+
const ce = Hl(D, I, A, L, Q, ie, F), se = Hl(D, I, A, L, ne, le, F);
|
|
6310
6310
|
b.emplaceBack(O + ce - k, O + se - k), F.primitiveLength++;
|
|
6311
6311
|
}
|
|
6312
6312
|
})(u, i, p, o, g, r), e.forceNewSegmentOnNextPrepare(), u?.forceNewSegmentOnNextPrepare();
|
|
@@ -6639,11 +6639,11 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
6639
6639
|
}
|
|
6640
6640
|
return M;
|
|
6641
6641
|
})(g, p), T = (function(b, I, M, A) {
|
|
6642
|
-
const D = [], L = [], k = A[8] * I, F = A[9] * I, O = A[10] * I, j = A[11] * I, Y = A[8] * M,
|
|
6642
|
+
const D = [], L = [], k = A[8] * I, F = A[9] * I, O = A[10] * I, j = A[11] * I, Y = A[8] * M, Q = A[9] * M, ne = A[10] * M, ie = A[11] * M;
|
|
6643
6643
|
for (const le of b) {
|
|
6644
6644
|
const ce = [], se = [];
|
|
6645
6645
|
for (const re of le) {
|
|
6646
|
-
const _e = re.x, Se = re.y, be = A[0] * _e + A[4] * Se + A[12], ye = A[1] * _e + A[5] * Se + A[13], Fe = A[2] * _e + A[6] * Se + A[14], tt = A[3] * _e + A[7] * Se + A[15], rt = Fe + O, lt = tt + j, di = be + Y, Et = ye +
|
|
6646
|
+
const _e = re.x, Se = re.y, be = A[0] * _e + A[4] * Se + A[12], ye = A[1] * _e + A[5] * Se + A[13], Fe = A[2] * _e + A[6] * Se + A[14], tt = A[3] * _e + A[7] * Se + A[15], rt = Fe + O, lt = tt + j, di = be + Y, Et = ye + Q, Gt = Fe + ne, Xt = tt + ie, yt = new de((be + k) / lt, (ye + F) / lt);
|
|
6647
6647
|
yt.z = rt / lt, ce.push(yt);
|
|
6648
6648
|
const ni = new de(di / Xt, Et / Xt);
|
|
6649
6649
|
ni.z = Gt / Xt, se.push(ni);
|
|
@@ -7020,8 +7020,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
7020
7020
|
let m, v, _ = r.start;
|
|
7021
7021
|
for (let A = 0; A < r.points.length - 3; A += 3) {
|
|
7022
7022
|
const D = r.points[A], L = r.points[A + 1], k = r.points[A + 2], F = r.points[A + 3], O = r.points[A + 4], j = o === bi.X ? D : L, Y = o === bi.X ? F : O;
|
|
7023
|
-
let
|
|
7024
|
-
u && (m = Math.sqrt(Math.pow(D - F, 2) + Math.pow(L - O, 2))), j < i ? Y > i && (v = g(p, D, L, F, O, i), u && (p.start = _ + m * v)) : j > s ? Y < s && (v = g(p, D, L, F, O, s), u && (p.start = _ + m * v)) : ga(p.points, D, L, k), Y < i && j >= i && (v = g(p, D, L, F, O, i),
|
|
7023
|
+
let Q = !1;
|
|
7024
|
+
u && (m = Math.sqrt(Math.pow(D - F, 2) + Math.pow(L - O, 2))), j < i ? Y > i && (v = g(p, D, L, F, O, i), u && (p.start = _ + m * v)) : j > s ? Y < s && (v = g(p, D, L, F, O, s), u && (p.start = _ + m * v)) : ga(p.points, D, L, k), Y < i && j >= i && (v = g(p, D, L, F, O, i), Q = !0), Y > s && j <= s && (v = g(p, D, L, F, O, s), Q = !0), !l && Q && (u && (p.end = _ + m * v), e.push(p), p = pp(r)), u && (_ += m);
|
|
7025
7025
|
}
|
|
7026
7026
|
let T = r.points.length - 3;
|
|
7027
7027
|
const b = r.points[T], I = r.points[T + 1], M = o === bi.X ? b : I;
|
|
@@ -7258,8 +7258,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
7258
7258
|
const Y = j * v;
|
|
7259
7259
|
if (g[Y + 2] <= i) continue;
|
|
7260
7260
|
g[Y + 2] = i;
|
|
7261
|
-
const
|
|
7262
|
-
L += g[Y] *
|
|
7261
|
+
const Q = g[Y + 5];
|
|
7262
|
+
L += g[Y] * Q, k += g[Y + 1] * Q, g[Y + 4] = O, l && (D || (D = this.map(g, _, !0), F = this.clusterProps.length, this.clusterProps.push(D)), l(D, this.map(g, Y)));
|
|
7263
7263
|
}
|
|
7264
7264
|
g[_ + 4] = O, m.push(L / A, k / A, 1 / 0, O, -1, A), l && m.push(F);
|
|
7265
7265
|
} else {
|
|
@@ -7431,16 +7431,16 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
7431
7431
|
let b = this.tiles[T];
|
|
7432
7432
|
if (!b && (v > 1 && console.time("creation"), b = this.tiles[T] = gp(e, i, s, o, m), this.tileCoords.push({ z: i, x: s, y: o, id: T }), v)) {
|
|
7433
7433
|
v > 1 && (console.log("tile z%d-%d-%d (features: %d, points: %d, simplified: %d)", i, s, o, b.numFeatures, b.numPoints, b.numSimplified), console.timeEnd("creation"));
|
|
7434
|
-
const
|
|
7435
|
-
this.stats[
|
|
7434
|
+
const Q = `z${i}`;
|
|
7435
|
+
this.stats[Q] = (this.stats[Q] || 0) + 1, this.total++;
|
|
7436
7436
|
}
|
|
7437
7437
|
if (b.source = e, l == null) {
|
|
7438
7438
|
if (i === m.indexMaxZoom || b.numPoints <= m.indexMaxPoints) continue;
|
|
7439
7439
|
} else {
|
|
7440
7440
|
if (i === m.maxZoom || i === l) continue;
|
|
7441
7441
|
if (l != null) {
|
|
7442
|
-
const
|
|
7443
|
-
if (s !== u >>
|
|
7442
|
+
const Q = l - i;
|
|
7443
|
+
if (s !== u >> Q || o !== p >> Q) continue;
|
|
7444
7444
|
}
|
|
7445
7445
|
}
|
|
7446
7446
|
if (b.source = null, !e.length) continue;
|
|
@@ -7550,7 +7550,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
7550
7550
|
L && (D = L), I && (M = I), I = e[k], L = A ? A.sub(I)._unit()._perp() : D, D || (D = L);
|
|
7551
7551
|
let F = D.add(L);
|
|
7552
7552
|
F.x === 0 && F.y === 0 || F._unit();
|
|
7553
|
-
const O = D.x * L.x + D.y * L.y, j = F.x * L.x + F.y * L.y, Y = j !== 0 ? 1 / j : 1 / 0,
|
|
7553
|
+
const O = D.x * L.x + D.y * L.y, j = F.x * L.x + F.y * L.y, Y = j !== 0 ? 1 / j : 1 / 0, Q = 2 * Math.sqrt(2 - 2 * j), ne = j < wg && M && A, ie = D.x * L.y - D.y * L.x > 0;
|
|
7554
7554
|
if (ne && k > _) {
|
|
7555
7555
|
const se = I.dist(M);
|
|
7556
7556
|
if (se > 2 * T) {
|
|
@@ -7571,7 +7571,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
7571
7571
|
} else if (ce === "bevel" || ce === "fakeround") {
|
|
7572
7572
|
const se = -Math.sqrt(Y * Y - 1), re = ie ? se : 0, _e = ie ? 0 : se;
|
|
7573
7573
|
if (M && this.addCurrentVertex(I, D, re, _e, b), ce === "fakeround") {
|
|
7574
|
-
const Se = Math.round(180 *
|
|
7574
|
+
const Se = Math.round(180 * Q / Math.PI / 20);
|
|
7575
7575
|
for (let be = 1; be < Se; be++) {
|
|
7576
7576
|
let ye = be / Se;
|
|
7577
7577
|
if (ye !== 0.5) {
|
|
@@ -8262,29 +8262,29 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8262
8262
|
A = [], D = D.map(((Y) => M.toCodeUnitIndex(Y)));
|
|
8263
8263
|
const j = L(M.toString(), D);
|
|
8264
8264
|
for (const Y of j) {
|
|
8265
|
-
const
|
|
8266
|
-
A.push(new _a(Y, M.sections,
|
|
8265
|
+
const Q = [...Y].map((() => 0));
|
|
8266
|
+
A.push(new _a(Y, M.sections, Q));
|
|
8267
8267
|
}
|
|
8268
8268
|
} else if (k) {
|
|
8269
8269
|
A = [], D = D.map(((ne) => M.toCodeUnitIndex(ne)));
|
|
8270
8270
|
let j = 0;
|
|
8271
8271
|
const Y = [];
|
|
8272
8272
|
for (const ne of M.text) Y.push(...Array(ne.length).fill(M.sectionIndex[j])), j++;
|
|
8273
|
-
const
|
|
8274
|
-
for (const ne of
|
|
8273
|
+
const Q = k(M.text, Y, D);
|
|
8274
|
+
for (const ne of Q) {
|
|
8275
8275
|
const ie = [];
|
|
8276
8276
|
let le = "";
|
|
8277
8277
|
for (const ce of ne[0]) ie.push(ne[1][le.length]), le += ce;
|
|
8278
8278
|
A.push(new _a(ne[0], M.sections, ie));
|
|
8279
8279
|
}
|
|
8280
8280
|
} else A = (function(j, Y) {
|
|
8281
|
-
const
|
|
8281
|
+
const Q = [];
|
|
8282
8282
|
let ne = 0;
|
|
8283
|
-
for (const ie of Y)
|
|
8284
|
-
return ne < j.length() &&
|
|
8283
|
+
for (const ie of Y) Q.push(j.substring(ne, ie)), ne = ie;
|
|
8284
|
+
return ne < j.length() && Q.push(j.substring(ne, j.length())), Q;
|
|
8285
8285
|
})(M, D);
|
|
8286
8286
|
const F = [], O = { positionedLines: F, text: M.toString(), top: v[1], bottom: v[1], left: v[0], right: v[0], writingMode: _, iconsInText: !1, verticalizable: !1 };
|
|
8287
|
-
return (function(j, Y,
|
|
8287
|
+
return (function(j, Y, Q, ne, ie, le, ce, se, re, _e, Se, be) {
|
|
8288
8288
|
let ye = 0, Fe = 0, tt = 0, rt = 0;
|
|
8289
8289
|
const lt = se === "right" ? 1 : se === "left" ? 0 : 0.5, di = Wt / be;
|
|
8290
8290
|
let Et = 0;
|
|
@@ -8304,7 +8304,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8304
8304
|
const Tt = yt.getSection(Ui), jt = Yt.codePointAt(0), Ct = Wg(re, Se, jt), Kt = { glyph: jt, imageName: null, x: ye, y: Fe + -17, vertical: Ct, scale: 1, fontStack: "", sectionIndex: yt.getSectionIndex(Ui), metrics: null, rect: null };
|
|
8305
8305
|
let Dn;
|
|
8306
8306
|
if ("fontStack" in Tt) {
|
|
8307
|
-
if (Dn = Hg(Tt, jt, Ct, pi, Y,
|
|
8307
|
+
if (Dn = Hg(Tt, jt, Ct, pi, Y, Q), !Dn) continue;
|
|
8308
8308
|
Kt.fontStack = Tt.fontStack;
|
|
8309
8309
|
} else {
|
|
8310
8310
|
if (j.iconsInText = !0, Tt.scale *= di, Dn = Xg(Tt, Ct, ni, pi, ne), !Dn) continue;
|
|
@@ -8524,18 +8524,18 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8524
8524
|
for (const { feature: D, id: L, index: k, sourceLayerIndex: F } of e) {
|
|
8525
8525
|
const O = l._featureFilter.needGeometry, j = Yr(D, O);
|
|
8526
8526
|
if (!l._featureFilter.filter(A, j, s)) continue;
|
|
8527
|
-
let Y,
|
|
8527
|
+
let Y, Q;
|
|
8528
8528
|
if (O || (j.geometry = Xr(D)), v) {
|
|
8529
8529
|
const ie = l.getValueAndResolveTokens("text-field", j, s, M), le = Ei.factory(ie);
|
|
8530
8530
|
this.hasRTLText || (this.hasRTLText = Qg(le)), (!this.hasRTLText || Tr.getRTLTextPluginStatus() === "unavailable" || this.hasRTLText && Tr.isParsed()) && (Y = Ag(le, l, j));
|
|
8531
8531
|
}
|
|
8532
8532
|
if (_) {
|
|
8533
8533
|
const ie = l.getValueAndResolveTokens("icon-image", j, s, M);
|
|
8534
|
-
|
|
8534
|
+
Q = ie instanceof Li ? ie : Li.fromString(ie);
|
|
8535
8535
|
}
|
|
8536
|
-
if (!Y && !
|
|
8536
|
+
if (!Y && !Q) continue;
|
|
8537
8537
|
const ne = this.sortFeaturesByKey ? T.evaluate(j, {}, s) : void 0;
|
|
8538
|
-
if (this.features.push({ id: L, text: Y, icon:
|
|
8538
|
+
if (this.features.push({ id: L, text: Y, icon: Q, index: k, sourceLayerIndex: F, geometry: j.geometry, properties: D.properties, type: Xl.types[D.type], sortKey: ne }), Q && (b[Q.name] = !0), Y) {
|
|
8539
8539
|
const ie = p.evaluate(j, {}, s).join(","), le = u.get("text-rotation-alignment") !== "viewport" && u.get("symbol-placement") !== "point";
|
|
8540
8540
|
this.allowVerticalPlacement = (o = this.writingModes) === null || o === void 0 ? void 0 : o.includes(R.ax.vertical);
|
|
8541
8541
|
for (const ce of Y.sections) if (ce.image) b[ce.image.name] = !0;
|
|
@@ -8555,7 +8555,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8555
8555
|
const se = k[ie];
|
|
8556
8556
|
return delete k[ie], k[le] = se, F[se].geometry[0].pop(), F[se].geometry[0] = F[se].geometry[0].concat(ce[0]), se;
|
|
8557
8557
|
}
|
|
8558
|
-
function
|
|
8558
|
+
function Q(ie, le, ce) {
|
|
8559
8559
|
const se = L[le];
|
|
8560
8560
|
return delete L[le], L[ie] = se, F[se].geometry[0].shift(), F[se].geometry[0] = ce[0].concat(F[se].geometry[0]), se;
|
|
8561
8561
|
}
|
|
@@ -8571,9 +8571,9 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8571
8571
|
}
|
|
8572
8572
|
const re = ne(se, ce), _e = ne(se, ce, !0);
|
|
8573
8573
|
if (re in k && _e in L && k[re] !== L[_e]) {
|
|
8574
|
-
const Se =
|
|
8574
|
+
const Se = Q(re, _e, ce), be = Y(re, _e, F[Se].geometry);
|
|
8575
8575
|
delete L[re], delete k[_e], k[ne(se, F[be].geometry, !0)] = be, F[Se].geometry = null;
|
|
8576
|
-
} else re in k ? Y(re, _e, ce) : _e in L ?
|
|
8576
|
+
} else re in k ? Y(re, _e, ce) : _e in L ? Q(re, _e, ce) : (j(ie), L[re] = O - 1, k[_e] = O - 1);
|
|
8577
8577
|
}
|
|
8578
8578
|
return F.filter(((ie) => ie.geometry));
|
|
8579
8579
|
})(this.features)), this.sortFeaturesByKey && this.features.sort(((D, L) => D.sortKey - L.sortKey));
|
|
@@ -8613,8 +8613,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
8613
8613
|
addSymbols(e, i, s, o, l, u, p, g, m, v, _, T) {
|
|
8614
8614
|
const b = e.indexArray, I = e.layoutVertexArray, M = e.segments.prepareSegment(4 * i.length, I, b, this.canOverlap ? u.sortKey : void 0), A = this.glyphOffsetArray.length, D = M.vertexLength, L = this.allowVerticalPlacement && p === R.ax.vertical ? Math.PI / 2 : 0, k = u.text && u.text.sections;
|
|
8615
8615
|
for (let F = 0; F < i.length; F++) {
|
|
8616
|
-
const { tl: O, tr: j, bl: Y, br:
|
|
8617
|
-
Cu(I, g.x, g.y, O.x, ye + O.y, ne.x, ne.y, s, _e, ie.x, ie.y, ce, se), Cu(I, g.x, g.y, j.x, ye + j.y, ne.x + ne.w, ne.y, s, _e, le.x, ie.y, ce, se), Cu(I, g.x, g.y, Y.x, ye + Y.y, ne.x, ne.y + ne.h, s, _e, ie.x, le.y, ce, se), Cu(I, g.x, g.y,
|
|
8616
|
+
const { tl: O, tr: j, bl: Y, br: Q, tex: ne, pixelOffsetTL: ie, pixelOffsetBR: le, minFontScaleX: ce, minFontScaleY: se, glyphOffset: re, isSDF: _e, sectionIndex: Se } = i[F], be = M.vertexLength, ye = re[1];
|
|
8617
|
+
Cu(I, g.x, g.y, O.x, ye + O.y, ne.x, ne.y, s, _e, ie.x, ie.y, ce, se), Cu(I, g.x, g.y, j.x, ye + j.y, ne.x + ne.w, ne.y, s, _e, le.x, ie.y, ce, se), Cu(I, g.x, g.y, Y.x, ye + Y.y, ne.x, ne.y + ne.h, s, _e, ie.x, le.y, ce, se), Cu(I, g.x, g.y, Q.x, ye + Q.y, ne.x + ne.w, ne.y + ne.h, s, _e, le.x, le.y, ce, se), Xh(e.dynamicLayoutVertexArray, g, L), b.emplaceBack(be, be + 2, be + 1), b.emplaceBack(be + 1, be + 2, be + 3), M.vertexLength += 4, M.primitiveLength += 2, this.glyphOffsetArray.emplaceBack(re[0]), F !== i.length - 1 && Se === i[F + 1].sectionIndex || e.programConfigurations.populatePaintArrays(I.length, u, u.index, { imagePositions: {}, canonical: T, formattedSection: k?.[Se] });
|
|
8618
8618
|
}
|
|
8619
8619
|
e.placedSymbolArray.emplaceBack(g.x, g.y, A, this.glyphOffsetArray.length - A, D, m, v, g.segment, s ? s[0] : 0, s ? s[1] : 0, o[0], o[1], p, 0, !1, 0, _);
|
|
8620
8620
|
}
|
|
@@ -9424,18 +9424,18 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9424
9424
|
const I = (function(D, L, k, F) {
|
|
9425
9425
|
F.byteContainer.length < k && (F.byteContainer = new Uint8Array(2 * k), F.byteContainerI32 = void 0);
|
|
9426
9426
|
const O = F.byteContainer, j = k >>> 2;
|
|
9427
|
-
if (3 & O.byteOffset) for (let
|
|
9428
|
-
const ne = 0 | D[L +
|
|
9427
|
+
if (3 & O.byteOffset) for (let Q = 0; Q < j; Q = Q + 1 | 0) {
|
|
9428
|
+
const ne = 0 | D[L + Q | 0], ie = Q << 2;
|
|
9429
9429
|
O[ie] = 255 & ne, O[ie + 1 | 0] = ne >>> 8 & 255, O[ie + 2 | 0] = ne >>> 16 & 255, O[ie + 3 | 0] = ne >>> 24 & 255;
|
|
9430
9430
|
}
|
|
9431
9431
|
else {
|
|
9432
|
-
let
|
|
9433
|
-
(!
|
|
9432
|
+
let Q = F.byteContainerI32;
|
|
9433
|
+
(!Q || Q.buffer !== O.buffer || Q.byteOffset !== O.byteOffset || Q.length < j) && (Q = F.byteContainerI32 = new Int32Array(O.buffer, O.byteOffset, O.byteLength >>> 2)), Q.set(D.subarray(L, L + j));
|
|
9434
9434
|
}
|
|
9435
9435
|
const Y = 3 & k;
|
|
9436
9436
|
if (Y > 0) {
|
|
9437
|
-
const
|
|
9438
|
-
for (let ie = 0; ie < Y; ie = ie + 1 | 0) O[ne + ie | 0] =
|
|
9437
|
+
const Q = 0 | D[L + j | 0], ne = j << 2;
|
|
9438
|
+
for (let ie = 0; ie < Y; ie = ie + 1 | 0) O[ne + ie | 0] = Q >>> (ie << 3) & 255;
|
|
9439
9439
|
}
|
|
9440
9440
|
return O;
|
|
9441
9441
|
})(r, T, v, l), M = v, A = (function(D, L, k) {
|
|
@@ -9443,20 +9443,20 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9443
9443
|
for (let j = 2; j <= 32; j = j + 1 | 0) {
|
|
9444
9444
|
if (!(F >>> j - 1 & 1)) continue;
|
|
9445
9445
|
if (L >= D.length) throw new Error(`FastPFOR decode: truncated exception stream header (bitWidth=${j}, streamWordIndex=${L}, needWords=1, availableWords=${D.length - L}, encodedWords=${D.length})`);
|
|
9446
|
-
const Y = D[L++] >>> 0,
|
|
9446
|
+
const Y = D[L++] >>> 0, Q = ad(Y + 31, 32), ne = Y * j + 31 >>> 5;
|
|
9447
9447
|
if (L + ne > D.length) throw new Error(`FastPFOR decode: truncated exception stream (bitWidth=${j}, size=${Y}, streamWordIndex=${L}, needWords=${ne}, availableWords=${D.length - L}, encodedWords=${D.length})`);
|
|
9448
9448
|
let ie = O[j];
|
|
9449
|
-
(!ie || ie.length <
|
|
9449
|
+
(!ie || ie.length < Q) && (ie = O[j] = new Uint32Array(Q));
|
|
9450
9450
|
let le = 0;
|
|
9451
9451
|
for (; le < Y; le = le + 32 | 0) d_(D, L, ie, le, j), L = L + j | 0;
|
|
9452
9452
|
L = L - ((le - Y | 0) * j >>> 5) | 0, k.exceptionSizes[j] = Y;
|
|
9453
9453
|
}
|
|
9454
9454
|
return L;
|
|
9455
9455
|
})(r, b, l);
|
|
9456
|
-
return l.dataPointers.fill(0), (function(D, L, k, F, O, j, Y,
|
|
9456
|
+
return l.dataPointers.fill(0), (function(D, L, k, F, O, j, Y, Q, ne, ie) {
|
|
9457
9457
|
let le = 0 | k, ce = 0;
|
|
9458
9458
|
for (let se = 0; se < Y; se = se + 1 | 0) {
|
|
9459
|
-
const re = c_(
|
|
9459
|
+
const re = c_(Q, ne, ce, se);
|
|
9460
9460
|
ce = re.bytePosIn;
|
|
9461
9461
|
const _e = re.bitWidth, Se = re.exceptionCount, be = j + se * An | 0;
|
|
9462
9462
|
switch (_e) {
|
|
@@ -9470,7 +9470,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9470
9470
|
default:
|
|
9471
9471
|
le = l_(D, le, O, be, _e);
|
|
9472
9472
|
}
|
|
9473
|
-
Se > 0 && (ce = u_(O, be, _e, Se,
|
|
9473
|
+
Se > 0 && (ce = u_(O, be, _e, Se, Q, ne, ce, ie, se));
|
|
9474
9474
|
}
|
|
9475
9475
|
if (le !== F) throw new Error(`FastPFOR decode: packed region mismatch (pageStart=${L}, packedStart=${k}, consumedPackedEnd=${le}, expectedPackedEnd=${F}, packedWords=${F - k}, encoded.length=${D.length})`);
|
|
9476
9476
|
})(r, u, g, m, e, 0 | s, o / An | 0, I, M, l), A;
|
|
@@ -9534,20 +9534,20 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9534
9534
|
case 11:
|
|
9535
9535
|
return void (function(m, v, _, T) {
|
|
9536
9536
|
let b = T;
|
|
9537
|
-
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0,
|
|
9538
|
-
_[b++] = I >>> 0 & 2047, _[b++] = I >>> 11 & 2047, _[b++] = 2047 & (I >>> 22 | (1 & M) << 10), _[b++] = M >>> 1 & 2047, _[b++] = M >>> 12 & 2047, _[b++] = 2047 & (M >>> 23 | (3 & A) << 9), _[b++] = A >>> 2 & 2047, _[b++] = A >>> 13 & 2047, _[b++] = 2047 & (A >>> 24 | (7 & D) << 8), _[b++] = D >>> 3 & 2047, _[b++] = D >>> 14 & 2047, _[b++] = 2047 & (D >>> 25 | (15 & L) << 7), _[b++] = L >>> 4 & 2047, _[b++] = L >>> 15 & 2047, _[b++] = 2047 & (L >>> 26 | (31 & k) << 6), _[b++] = k >>> 5 & 2047, _[b++] = k >>> 16 & 2047, _[b++] = 2047 & (k >>> 27 | (63 & F) << 5), _[b++] = F >>> 6 & 2047, _[b++] = F >>> 17 & 2047, _[b++] = 2047 & (F >>> 28 | (127 & O) << 4), _[b++] = O >>> 7 & 2047, _[b++] = O >>> 18 & 2047, _[b++] = 2047 & (O >>> 29 | (255 & j) << 3), _[b++] = j >>> 8 & 2047, _[b++] = j >>> 19 & 2047, _[b++] = 2047 & (j >>> 30 | (511 & Y) << 2), _[b++] = Y >>> 9 & 2047, _[b++] = Y >>> 20 & 2047, _[b++] = 2047 & (Y >>> 31 | (1023 &
|
|
9537
|
+
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0, Q = m[v + 10] >>> 0;
|
|
9538
|
+
_[b++] = I >>> 0 & 2047, _[b++] = I >>> 11 & 2047, _[b++] = 2047 & (I >>> 22 | (1 & M) << 10), _[b++] = M >>> 1 & 2047, _[b++] = M >>> 12 & 2047, _[b++] = 2047 & (M >>> 23 | (3 & A) << 9), _[b++] = A >>> 2 & 2047, _[b++] = A >>> 13 & 2047, _[b++] = 2047 & (A >>> 24 | (7 & D) << 8), _[b++] = D >>> 3 & 2047, _[b++] = D >>> 14 & 2047, _[b++] = 2047 & (D >>> 25 | (15 & L) << 7), _[b++] = L >>> 4 & 2047, _[b++] = L >>> 15 & 2047, _[b++] = 2047 & (L >>> 26 | (31 & k) << 6), _[b++] = k >>> 5 & 2047, _[b++] = k >>> 16 & 2047, _[b++] = 2047 & (k >>> 27 | (63 & F) << 5), _[b++] = F >>> 6 & 2047, _[b++] = F >>> 17 & 2047, _[b++] = 2047 & (F >>> 28 | (127 & O) << 4), _[b++] = O >>> 7 & 2047, _[b++] = O >>> 18 & 2047, _[b++] = 2047 & (O >>> 29 | (255 & j) << 3), _[b++] = j >>> 8 & 2047, _[b++] = j >>> 19 & 2047, _[b++] = 2047 & (j >>> 30 | (511 & Y) << 2), _[b++] = Y >>> 9 & 2047, _[b++] = Y >>> 20 & 2047, _[b++] = 2047 & (Y >>> 31 | (1023 & Q) << 1), _[b++] = Q >>> 10 & 2047, _[b] = Q >>> 21 & 2047;
|
|
9539
9539
|
})(r, e, i, s);
|
|
9540
9540
|
case 12:
|
|
9541
9541
|
return void (function(m, v, _, T) {
|
|
9542
9542
|
let b = T;
|
|
9543
|
-
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0,
|
|
9544
|
-
_[b++] = I >>> 0 & 4095, _[b++] = I >>> 12 & 4095, _[b++] = 4095 & (I >>> 24 | (15 & M) << 8), _[b++] = M >>> 4 & 4095, _[b++] = M >>> 16 & 4095, _[b++] = 4095 & (M >>> 28 | (255 & A) << 4), _[b++] = A >>> 8 & 4095, _[b++] = A >>> 20 & 4095, _[b++] = D >>> 0 & 4095, _[b++] = D >>> 12 & 4095, _[b++] = 4095 & (D >>> 24 | (15 & L) << 8), _[b++] = L >>> 4 & 4095, _[b++] = L >>> 16 & 4095, _[b++] = 4095 & (L >>> 28 | (255 & k) << 4), _[b++] = k >>> 8 & 4095, _[b++] = k >>> 20 & 4095, _[b++] = F >>> 0 & 4095, _[b++] = F >>> 12 & 4095, _[b++] = 4095 & (F >>> 24 | (15 & O) << 8), _[b++] = O >>> 4 & 4095, _[b++] = O >>> 16 & 4095, _[b++] = 4095 & (O >>> 28 | (255 & j) << 4), _[b++] = j >>> 8 & 4095, _[b++] = j >>> 20 & 4095, _[b++] = Y >>> 0 & 4095, _[b++] = Y >>> 12 & 4095, _[b++] = 4095 & (Y >>> 24 | (15 &
|
|
9543
|
+
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0, Q = m[v + 10] >>> 0, ne = m[v + 11] >>> 0;
|
|
9544
|
+
_[b++] = I >>> 0 & 4095, _[b++] = I >>> 12 & 4095, _[b++] = 4095 & (I >>> 24 | (15 & M) << 8), _[b++] = M >>> 4 & 4095, _[b++] = M >>> 16 & 4095, _[b++] = 4095 & (M >>> 28 | (255 & A) << 4), _[b++] = A >>> 8 & 4095, _[b++] = A >>> 20 & 4095, _[b++] = D >>> 0 & 4095, _[b++] = D >>> 12 & 4095, _[b++] = 4095 & (D >>> 24 | (15 & L) << 8), _[b++] = L >>> 4 & 4095, _[b++] = L >>> 16 & 4095, _[b++] = 4095 & (L >>> 28 | (255 & k) << 4), _[b++] = k >>> 8 & 4095, _[b++] = k >>> 20 & 4095, _[b++] = F >>> 0 & 4095, _[b++] = F >>> 12 & 4095, _[b++] = 4095 & (F >>> 24 | (15 & O) << 8), _[b++] = O >>> 4 & 4095, _[b++] = O >>> 16 & 4095, _[b++] = 4095 & (O >>> 28 | (255 & j) << 4), _[b++] = j >>> 8 & 4095, _[b++] = j >>> 20 & 4095, _[b++] = Y >>> 0 & 4095, _[b++] = Y >>> 12 & 4095, _[b++] = 4095 & (Y >>> 24 | (15 & Q) << 8), _[b++] = Q >>> 4 & 4095, _[b++] = Q >>> 16 & 4095, _[b++] = 4095 & (Q >>> 28 | (255 & ne) << 4), _[b++] = ne >>> 8 & 4095, _[b] = ne >>> 20 & 4095;
|
|
9545
9545
|
})(r, e, i, s);
|
|
9546
9546
|
case 16:
|
|
9547
9547
|
return void (function(m, v, _, T) {
|
|
9548
9548
|
let b = T;
|
|
9549
|
-
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0,
|
|
9550
|
-
_[b++] = I >>> 0 & 65535, _[b++] = I >>> 16 & 65535, _[b++] = M >>> 0 & 65535, _[b++] = M >>> 16 & 65535, _[b++] = A >>> 0 & 65535, _[b++] = A >>> 16 & 65535, _[b++] = D >>> 0 & 65535, _[b++] = D >>> 16 & 65535, _[b++] = L >>> 0 & 65535, _[b++] = L >>> 16 & 65535, _[b++] = k >>> 0 & 65535, _[b++] = k >>> 16 & 65535, _[b++] = F >>> 0 & 65535, _[b++] = F >>> 16 & 65535, _[b++] = O >>> 0 & 65535, _[b++] = O >>> 16 & 65535, _[b++] = j >>> 0 & 65535, _[b++] = j >>> 16 & 65535, _[b++] = Y >>> 0 & 65535, _[b++] = Y >>> 16 & 65535, _[b++] =
|
|
9549
|
+
const I = m[v] >>> 0, M = m[v + 1] >>> 0, A = m[v + 2] >>> 0, D = m[v + 3] >>> 0, L = m[v + 4] >>> 0, k = m[v + 5] >>> 0, F = m[v + 6] >>> 0, O = m[v + 7] >>> 0, j = m[v + 8] >>> 0, Y = m[v + 9] >>> 0, Q = m[v + 10] >>> 0, ne = m[v + 11] >>> 0, ie = m[v + 12] >>> 0, le = m[v + 13] >>> 0, ce = m[v + 14] >>> 0, se = m[v + 15] >>> 0;
|
|
9550
|
+
_[b++] = I >>> 0 & 65535, _[b++] = I >>> 16 & 65535, _[b++] = M >>> 0 & 65535, _[b++] = M >>> 16 & 65535, _[b++] = A >>> 0 & 65535, _[b++] = A >>> 16 & 65535, _[b++] = D >>> 0 & 65535, _[b++] = D >>> 16 & 65535, _[b++] = L >>> 0 & 65535, _[b++] = L >>> 16 & 65535, _[b++] = k >>> 0 & 65535, _[b++] = k >>> 16 & 65535, _[b++] = F >>> 0 & 65535, _[b++] = F >>> 16 & 65535, _[b++] = O >>> 0 & 65535, _[b++] = O >>> 16 & 65535, _[b++] = j >>> 0 & 65535, _[b++] = j >>> 16 & 65535, _[b++] = Y >>> 0 & 65535, _[b++] = Y >>> 16 & 65535, _[b++] = Q >>> 0 & 65535, _[b++] = Q >>> 16 & 65535, _[b++] = ne >>> 0 & 65535, _[b++] = ne >>> 16 & 65535, _[b++] = ie >>> 0 & 65535, _[b++] = ie >>> 16 & 65535, _[b++] = le >>> 0 & 65535, _[b++] = le >>> 16 & 65535, _[b++] = ce >>> 0 & 65535, _[b++] = ce >>> 16 & 65535, _[b++] = se >>> 0 & 65535, _[b] = se >>> 16 & 65535;
|
|
9551
9551
|
})(r, e, i, s);
|
|
9552
9552
|
case 32:
|
|
9553
9553
|
for (let m = 0; m < 32; m = m + 1 | 0) i[s + m | 0] = 0 | r[e + m | 0];
|
|
@@ -9903,20 +9903,20 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9903
9903
|
const O = Math.floor(k / 4), j = k % 4 != 0, Y = j ? O + 1 : O;
|
|
9904
9904
|
if (F.length < Y) throw new RangeError(`decodeBigEndianInt32sInto: out.length=${F.length} < ${Y}`);
|
|
9905
9905
|
if (O > 0) {
|
|
9906
|
-
const
|
|
9907
|
-
if (3 &
|
|
9906
|
+
const Q = D.byteOffset + L;
|
|
9907
|
+
if (3 & Q) for (let ne = 0; ne < O; ne++) {
|
|
9908
9908
|
const ie = L + 4 * ne;
|
|
9909
9909
|
F[ne] = D[ie] << 24 | D[ie + 1] << 16 | D[ie + 2] << 8 | D[ie + 3];
|
|
9910
9910
|
}
|
|
9911
9911
|
else {
|
|
9912
|
-
const ne = new Uint32Array(D.buffer,
|
|
9912
|
+
const ne = new Uint32Array(D.buffer, Q, O);
|
|
9913
9913
|
for (let ie = 0; ie < O; ie++) F[ie] = 0 | o_(ne[ie]);
|
|
9914
9914
|
}
|
|
9915
9915
|
}
|
|
9916
9916
|
if (j) {
|
|
9917
|
-
const
|
|
9917
|
+
const Q = L + 4 * O, ne = k - 4 * O;
|
|
9918
9918
|
let ie = 0;
|
|
9919
|
-
for (let le = 0; le < ne; le++) ie |= D[
|
|
9919
|
+
for (let le = 0; le < ne; le++) ie |= D[Q + le] << 24 - 8 * le;
|
|
9920
9920
|
F[O] = 0 | ie;
|
|
9921
9921
|
}
|
|
9922
9922
|
})(g, b, v, M);
|
|
@@ -9924,9 +9924,9 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9924
9924
|
let F = 0, O = 0;
|
|
9925
9925
|
const j = new Uint32Array(L), Y = k ?? tf();
|
|
9926
9926
|
if (D.length > 0) {
|
|
9927
|
-
const
|
|
9928
|
-
if (F = F + 1 | 0, 255 &
|
|
9929
|
-
if (O +
|
|
9927
|
+
const Q = 0 | D[F];
|
|
9928
|
+
if (F = F + 1 | 0, 255 & Q) throw new Error(`FastPFOR decode: invalid alignedLength=${Q} (expected multiple of 256)`);
|
|
9929
|
+
if (O + Q > j.length) throw new Error(`FastPFOR decode: output buffer too small (outPos=${O}, alignedLength=${Q}, out.length=${j.length})`);
|
|
9930
9930
|
F = (function(ne, ie, le, ce, se, re) {
|
|
9931
9931
|
const _e = ce + ad(se, An);
|
|
9932
9932
|
let Se = ce, be = le;
|
|
@@ -9935,9 +9935,9 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9935
9935
|
be = h_(ne, ie, be, Se, ye, re), Se = Se + ye | 0;
|
|
9936
9936
|
}
|
|
9937
9937
|
return be;
|
|
9938
|
-
})(D, j, F, O,
|
|
9938
|
+
})(D, j, F, O, Q, Y), O = O + Q | 0;
|
|
9939
9939
|
}
|
|
9940
|
-
return (function(
|
|
9940
|
+
return (function(Q, ne, ie, le, ce, se) {
|
|
9941
9941
|
if (se === 0) return ne;
|
|
9942
9942
|
let re = 0, _e = ne;
|
|
9943
9943
|
const Se = ne + ie, be = ce;
|
|
@@ -9945,7 +9945,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
9945
9945
|
const Fe = ce + se;
|
|
9946
9946
|
let tt = 0, rt = 0;
|
|
9947
9947
|
for (; _e < Se && ye < Fe; ) {
|
|
9948
|
-
const lt =
|
|
9948
|
+
const lt = Q[_e] >>> re & 255;
|
|
9949
9949
|
if (re += 8, _e += re >>> 5, re &= 31, tt |= (127 & lt) << rt, 128 & lt) le[ye++] = 0 | tt, tt = 0, rt = 0;
|
|
9950
9950
|
else if (rt += 7, rt > 28) throw new Error(`FastPFOR VByte: unterminated value (expected MSB=1 terminator within 5 bytes; shift=${rt}, partial=${tt}, decoded=${ye - be}/${se}, inPos=${_e}, inEnd=${Se})`);
|
|
9951
9951
|
}
|
|
@@ -10207,13 +10207,13 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10207
10207
|
const j = T[s] - T[s - 1];
|
|
10208
10208
|
let Y;
|
|
10209
10209
|
s++;
|
|
10210
|
-
const
|
|
10210
|
+
const Q = new Array(j - 1), ne = b[o] - b[o - 1];
|
|
10211
10211
|
o++, M ? (Y = Ma(D, p, ne, !0), p += 2 * ne) : (Y = Ia(e.vertexBufferType, D, I, g, ne, !0, m), g += ne);
|
|
10212
|
-
for (let ie = 0; ie <
|
|
10212
|
+
for (let ie = 0; ie < Q.length; ie++) {
|
|
10213
10213
|
const le = b[o] - b[o - 1];
|
|
10214
|
-
o++, M ? (
|
|
10214
|
+
o++, M ? (Q[ie] = Ma(D, p, le, !0), p += 2 * le) : (Q[ie] = Ia(e.vertexBufferType, D, I, g, le, !0, m), g += le);
|
|
10215
10215
|
}
|
|
10216
|
-
F[O] = [Y].concat(
|
|
10216
|
+
F[O] = [Y].concat(Q);
|
|
10217
10217
|
}
|
|
10218
10218
|
i[u++] = F.flat();
|
|
10219
10219
|
}
|
|
@@ -10370,40 +10370,40 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10370
10370
|
const L = pd(r, i, l);
|
|
10371
10371
|
let k, F, O, j;
|
|
10372
10372
|
for (let Y = 0; Y < e - 1; Y++) {
|
|
10373
|
-
const
|
|
10374
|
-
switch (
|
|
10373
|
+
const Q = zi(r, i);
|
|
10374
|
+
switch (Q.physicalStreamType) {
|
|
10375
10375
|
case ui.LENGTH:
|
|
10376
|
-
switch (
|
|
10376
|
+
switch (Q.logicalStreamType.lengthType) {
|
|
10377
10377
|
case Ki.GEOMETRIES:
|
|
10378
|
-
k = fs(r, i,
|
|
10378
|
+
k = fs(r, i, Q);
|
|
10379
10379
|
break;
|
|
10380
10380
|
case Ki.PARTS:
|
|
10381
|
-
F = fs(r, i,
|
|
10381
|
+
F = fs(r, i, Q);
|
|
10382
10382
|
break;
|
|
10383
10383
|
case Ki.RINGS:
|
|
10384
|
-
O = fs(r, i,
|
|
10384
|
+
O = fs(r, i, Q);
|
|
10385
10385
|
break;
|
|
10386
10386
|
case Ki.TRIANGLES:
|
|
10387
|
-
j = fs(r, i,
|
|
10387
|
+
j = fs(r, i, Q);
|
|
10388
10388
|
}
|
|
10389
10389
|
break;
|
|
10390
10390
|
case ui.OFFSET:
|
|
10391
|
-
switch (
|
|
10391
|
+
switch (Q.logicalStreamType.offsetType) {
|
|
10392
10392
|
case lo.VERTEX:
|
|
10393
|
-
u = Ji(r, i,
|
|
10393
|
+
u = Ji(r, i, Q);
|
|
10394
10394
|
break;
|
|
10395
10395
|
case lo.INDEX:
|
|
10396
|
-
m = Ji(r, i,
|
|
10396
|
+
m = Ji(r, i, Q);
|
|
10397
10397
|
}
|
|
10398
10398
|
break;
|
|
10399
10399
|
case ui.DATA:
|
|
10400
|
-
Mr.VERTEX ===
|
|
10400
|
+
Mr.VERTEX === Q.logicalStreamType.dictionaryType ? p = dd(r, i, Q) : (g = { numBits: Q.numBits, coordinateShift: Q.coordinateShift }, p = Ji(r, i, Q));
|
|
10401
10401
|
}
|
|
10402
10402
|
}
|
|
10403
|
-
return m ? k !== void 0 || F !== void 0 ? yf(s, L, j, m, p, { geometryOffsets: k, partOffsets: F, ringOffsets: O }) : yf(s, L, j, m, p) : g === void 0 ? (function(Y,
|
|
10404
|
-
return new mf(Y,
|
|
10405
|
-
})(s, L, { geometryOffsets: k, partOffsets: F, ringOffsets: O }, u, p) : (function(Y,
|
|
10406
|
-
return new mf(Y,
|
|
10403
|
+
return m ? k !== void 0 || F !== void 0 ? yf(s, L, j, m, p, { geometryOffsets: k, partOffsets: F, ringOffsets: O }) : yf(s, L, j, m, p) : g === void 0 ? (function(Y, Q, ne, ie, le) {
|
|
10404
|
+
return new mf(Y, Q, ps.VEC_2, ne, ie, le);
|
|
10405
|
+
})(s, L, { geometryOffsets: k, partOffsets: F, ringOffsets: O }, u, p) : (function(Y, Q, ne, ie, le, ce) {
|
|
10406
|
+
return new mf(Y, Q, ps.MORTON, ne, ie, le, ce);
|
|
10407
10407
|
})(s, L, { geometryOffsets: k, partOffsets: F, ringOffsets: O }, u, p, g);
|
|
10408
10408
|
}
|
|
10409
10409
|
const v = Ji(r, i, l);
|
|
@@ -10443,25 +10443,25 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10443
10443
|
const j = new Uint32Array(F[F.length - 1] + 1);
|
|
10444
10444
|
let Y = 0;
|
|
10445
10445
|
j[0] = Y;
|
|
10446
|
-
let
|
|
10446
|
+
let Q = 1, ne = 1, ie = 0;
|
|
10447
10447
|
for (let le = 0; le < L.length; le++) {
|
|
10448
10448
|
const ce = L[le], se = k[le + 1] - k[le];
|
|
10449
10449
|
if (ce !== 0 && ce !== 3) for (let re = 0; re < se; re++) {
|
|
10450
|
-
const _e = F[
|
|
10451
|
-
|
|
10450
|
+
const _e = F[Q] - F[Q - 1];
|
|
10451
|
+
Q++;
|
|
10452
10452
|
for (let Se = 0; Se < _e; Se++) Y = j[ne++] = Y + O[ie++];
|
|
10453
10453
|
}
|
|
10454
|
-
else for (let re = 0; re < se; re++) j[ne++] = ++Y,
|
|
10454
|
+
else for (let re = 0; re < se; re++) j[ne++] = ++Y, Q++;
|
|
10455
10455
|
}
|
|
10456
10456
|
return j;
|
|
10457
10457
|
})(v, M, A, b)) : T && (A = (function(L, k, F) {
|
|
10458
10458
|
const O = new Uint32Array(k[k.length - 1] + 1);
|
|
10459
10459
|
let j = 0;
|
|
10460
10460
|
O[0] = j;
|
|
10461
|
-
let Y = 1,
|
|
10461
|
+
let Y = 1, Q = 0;
|
|
10462
10462
|
for (let ne = 0; ne < L.length; ne++) {
|
|
10463
10463
|
const ie = L[ne], le = k[ne + 1] - k[ne];
|
|
10464
|
-
if (ie === 4 || ie === 1) for (let ce = 0; ce < le; ce++) j = O[Y++] = j + F[
|
|
10464
|
+
if (ie === 4 || ie === 1) for (let ce = 0; ce < le; ce++) j = O[Y++] = j + F[Q++];
|
|
10465
10465
|
else for (let ce = 0; ce < le; ce++) O[Y++] = ++j;
|
|
10466
10466
|
}
|
|
10467
10467
|
return O;
|
|
@@ -10618,15 +10618,15 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10618
10618
|
return (function(I, M, A, D, L) {
|
|
10619
10619
|
const k = zi(I, M), F = ku(k, L, I, M), O = D.physicalType === 3;
|
|
10620
10620
|
if (F === _t.FLAT) {
|
|
10621
|
-
const Y = rc(L) ? L : void 0,
|
|
10622
|
-
return new td(A.name,
|
|
10621
|
+
const Y = rc(L) ? L : void 0, Q = O ? dd(I, M, k, 0, Y) : Ji(I, M, k, 0, Y);
|
|
10622
|
+
return new td(A.name, Q, L);
|
|
10623
10623
|
}
|
|
10624
10624
|
if (F === _t.SEQUENCE) {
|
|
10625
10625
|
const Y = af(I, M, k);
|
|
10626
10626
|
return new rd(A.name, Y[0], Y[1], k.numRleValues);
|
|
10627
10627
|
}
|
|
10628
|
-
const j = O ? (function(Y,
|
|
10629
|
-
const ie = Pa(Y,
|
|
10628
|
+
const j = O ? (function(Y, Q, ne) {
|
|
10629
|
+
const ie = Pa(Y, Q, ne);
|
|
10630
10630
|
return ie.length === 1 ? ht(ie[0]) : (function(le) {
|
|
10631
10631
|
return ht(le[1]);
|
|
10632
10632
|
})(ie);
|
|
@@ -10635,17 +10635,17 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10635
10635
|
})(p, g, _, v, b);
|
|
10636
10636
|
case 9:
|
|
10637
10637
|
return (function(I, M, A, D, L) {
|
|
10638
|
-
let k = null, F = null, O = null, j = null, Y = null,
|
|
10638
|
+
let k = null, F = null, O = null, j = null, Y = null, Q = L ?? null, ne = null, ie = null;
|
|
10639
10639
|
for (let le = 0; le < D; le++) {
|
|
10640
10640
|
const ce = zi(M, A);
|
|
10641
10641
|
switch (ce.physicalStreamType) {
|
|
10642
10642
|
case ui.PRESENT: {
|
|
10643
10643
|
const se = ic(M, ce.numValues, ce.byteLength, A), re = new Er(se, ce.numValues);
|
|
10644
|
-
|
|
10644
|
+
Q = L ?? re;
|
|
10645
10645
|
break;
|
|
10646
10646
|
}
|
|
10647
10647
|
case ui.OFFSET:
|
|
10648
|
-
F = Ji(M, A, ce, 0,
|
|
10648
|
+
F = Ji(M, A, ce, 0, Q);
|
|
10649
10649
|
break;
|
|
10650
10650
|
case ui.LENGTH: {
|
|
10651
10651
|
const se = fs(M, A, ce);
|
|
@@ -10663,9 +10663,9 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10663
10663
|
}
|
|
10664
10664
|
return (function(le, ce, se, re, _e, Se, be) {
|
|
10665
10665
|
return ce ? new Tf(le, se, re, _e, Se, ce, be) : null;
|
|
10666
|
-
})(I, Y, F, k, O, j,
|
|
10666
|
+
})(I, Y, F, k, O, j, Q) ?? (function(le, ce, se, re, _e) {
|
|
10667
10667
|
return ce ? _e ? new Ea(le, se, re, ce, _e) : new Ea(le, se, re, ce) : null;
|
|
10668
|
-
})(I, O, F, k,
|
|
10668
|
+
})(I, O, F, k, Q) ?? (function(le, ce, se, re, _e) {
|
|
10669
10669
|
if (!ce || !se) return null;
|
|
10670
10670
|
if (re) return _e ? new Ea(le, re, ce, se, _e) : new Ea(le, re, ce, se);
|
|
10671
10671
|
if (_e && _e.size() !== ce.length - 1) {
|
|
@@ -10675,21 +10675,21 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10675
10675
|
return new Ea(le, Se, ce, se, _e);
|
|
10676
10676
|
}
|
|
10677
10677
|
return _e ? new wf(le, ce, se, _e) : new wf(le, ce, se);
|
|
10678
|
-
})(I, ne, ie, F,
|
|
10678
|
+
})(I, ne, ie, F, Q);
|
|
10679
10679
|
})(_.name, p, g, _.nullable ? u - 1 : u, T);
|
|
10680
10680
|
case 0:
|
|
10681
10681
|
return (function(I, M, A, D, L) {
|
|
10682
10682
|
const k = zi(I, M), F = k.numValues, O = M.get(), j = rc(L) ? L : void 0, Y = ic(I, F, k.byteLength, M, j);
|
|
10683
10683
|
M.set(O + k.byteLength);
|
|
10684
|
-
const
|
|
10685
|
-
return new y_(A.name,
|
|
10684
|
+
const Q = new Er(Y, F);
|
|
10685
|
+
return new y_(A.name, Q, L);
|
|
10686
10686
|
})(p, g, _, 0, b);
|
|
10687
10687
|
case 6:
|
|
10688
10688
|
case 5:
|
|
10689
10689
|
return (function(I, M, A, D, L) {
|
|
10690
10690
|
const k = zi(I, M), F = ku(k, D, I, M, "int64"), O = L.physicalType === 5;
|
|
10691
10691
|
if (F === _t.FLAT) {
|
|
10692
|
-
const Y = rc(D) ? D : void 0,
|
|
10692
|
+
const Y = rc(D) ? D : void 0, Q = O ? (function(ne, ie, le, ce) {
|
|
10693
10693
|
return (function(se, re, _e) {
|
|
10694
10694
|
let Se;
|
|
10695
10695
|
switch (re.logicalLevelTechnique1) {
|
|
@@ -10737,14 +10737,14 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10737
10737
|
return _e ? Sa(Se, _e, 0n) : Se;
|
|
10738
10738
|
})(wa(ne, ie, le.numValues), le, ce);
|
|
10739
10739
|
})(I, M, k, Y) : cf(I, M, k, Y);
|
|
10740
|
-
return new hf(A.name,
|
|
10740
|
+
return new hf(A.name, Q, D);
|
|
10741
10741
|
}
|
|
10742
10742
|
if (F === _t.SEQUENCE) {
|
|
10743
10743
|
const Y = lf(I, M, k);
|
|
10744
10744
|
return new df(A.name, Y[0], Y[1], k.numRleValues);
|
|
10745
10745
|
}
|
|
10746
|
-
const j = O ? (function(Y,
|
|
10747
|
-
const ie = wa(Y,
|
|
10746
|
+
const j = O ? (function(Y, Q, ne) {
|
|
10747
|
+
const ie = wa(Y, Q, ne.numValues);
|
|
10748
10748
|
return ie.length === 1 ? Di(ie[0]) : (function(le) {
|
|
10749
10749
|
return Di(le[1]);
|
|
10750
10750
|
})(ie);
|
|
@@ -10753,17 +10753,17 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10753
10753
|
})(p, g, _, b, v);
|
|
10754
10754
|
case 7:
|
|
10755
10755
|
return (function(I, M, A, D) {
|
|
10756
|
-
const L = zi(I, M), k = rc(D) ? D : void 0, F = (function(O, j, Y,
|
|
10756
|
+
const L = zi(I, M), k = rc(D) ? D : void 0, F = (function(O, j, Y, Q) {
|
|
10757
10757
|
const ne = j.get(), ie = ne + Y * Float32Array.BYTES_PER_ELEMENT, le = new Uint8Array(O.subarray(ne, ie)).buffer, ce = new Float32Array(le);
|
|
10758
|
-
return j.set(ie),
|
|
10758
|
+
return j.set(ie), Q ? Sa(ce, Q, 0) : ce;
|
|
10759
10759
|
})(I, M, L.numValues, k);
|
|
10760
10760
|
return new v_(A.name, F, D);
|
|
10761
10761
|
})(p, g, _, b);
|
|
10762
10762
|
case 8:
|
|
10763
10763
|
return (function(I, M, A, D) {
|
|
10764
|
-
const L = zi(I, M), k = rc(D) ? D : void 0, F = (function(O, j, Y,
|
|
10764
|
+
const L = zi(I, M), k = rc(D) ? D : void 0, F = (function(O, j, Y, Q) {
|
|
10765
10765
|
const ne = j.get(), ie = ne + Y * Float64Array.BYTES_PER_ELEMENT, le = new Uint8Array(O.subarray(ne, ie)).buffer, ce = new Float64Array(le);
|
|
10766
|
-
return j.set(ie),
|
|
10766
|
+
return j.set(ie), Q ? Sa(ce, Q, 0) : ce;
|
|
10767
10767
|
})(I, M, L.numValues, k);
|
|
10768
10768
|
return new id(A.name, F, D);
|
|
10769
10769
|
})(p, g, _, b);
|
|
@@ -10789,8 +10789,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10789
10789
|
if (k === 0) continue;
|
|
10790
10790
|
const F = L.name ? `${g.name}${L.name}` : g.name;
|
|
10791
10791
|
if (k !== 2 || L.type !== "scalarField" || L.scalarField.physicalType !== 9) throw new Error("Currently only optional string fields are implemented for a struct.");
|
|
10792
|
-
const O = zi(u, p), j = ic(u, O.numValues, O.byteLength, p), Y = zi(u, p),
|
|
10793
|
-
A[D++] = b ? new Tf(F,
|
|
10792
|
+
const O = zi(u, p), j = ic(u, O.numValues, O.byteLength, p), Y = zi(u, p), Q = Ji(u, p, Y, 0, Y.decompressedCount !== m ? new Er(j, O.numValues) : void 0);
|
|
10793
|
+
A[D++] = b ? new Tf(F, Q, v, _, T, b, new Er(j, O.numValues)) : new Ea(F, Q, v, _, new Er(j, O.numValues));
|
|
10794
10794
|
}
|
|
10795
10795
|
return A;
|
|
10796
10796
|
})(r, e, i, o);
|
|
@@ -10984,8 +10984,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
10984
10984
|
const F = k.length / 4 * 4;
|
|
10985
10985
|
let O = 1;
|
|
10986
10986
|
if (F >= 4) for (; O < F - 4; O += 4) {
|
|
10987
|
-
const j = k[O + 1], Y = k[O + 2],
|
|
10988
|
-
k[O] = Ta(k[O]) + k[O - 1], k[O + 1] = Ta(j) + k[O], k[O + 2] = Ta(Y) + k[O + 1], k[O + 3] = Ta(
|
|
10987
|
+
const j = k[O + 1], Y = k[O + 2], Q = k[O + 3];
|
|
10988
|
+
k[O] = Ta(k[O]) + k[O - 1], k[O + 1] = Ta(j) + k[O], k[O + 2] = Ta(Y) + k[O + 1], k[O + 3] = Ta(Q) + k[O + 2];
|
|
10989
10989
|
}
|
|
10990
10990
|
for (; O !== k.length; ++O) k[O] = Ta(k[O]) + k[O - 1];
|
|
10991
10991
|
})(D), D;
|
|
@@ -11076,8 +11076,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11076
11076
|
if ((g = k).type === "scalarType" && g.scalarType?.type === "logicalType" && g.scalarType.logicalType === 0) {
|
|
11077
11077
|
let O = null;
|
|
11078
11078
|
if (k.nullable) {
|
|
11079
|
-
const Y = zi(s, u),
|
|
11080
|
-
u.set(
|
|
11079
|
+
const Y = zi(s, u), Q = u.get(), ne = ic(s, Y.numValues, Y.byteLength, u);
|
|
11080
|
+
u.set(Q + Y.byteLength), O = new Er(ne, Y.numValues);
|
|
11081
11081
|
}
|
|
11082
11082
|
const j = zi(s, u);
|
|
11083
11083
|
D = O ? O.size() : j.decompressedCount, I = M_(s, k, u, F, j, O ?? D, l);
|
|
@@ -11188,9 +11188,9 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11188
11188
|
}
|
|
11189
11189
|
query(e, i, s, o) {
|
|
11190
11190
|
this.loadVTLayers();
|
|
11191
|
-
const l = e.params, u = Be / e.tileSize / e.scale, p = js(l.filter, l.globalState), g = e.queryGeometry, m = e.queryPadding * u, v = ao.fromPoints(g), _ = this.grid.query(v.minX - m, v.minY - m, v.maxX + m, v.maxY + m), T = ao.fromPoints(e.cameraQueryGeometry).expandBy(m), b = this.grid3D.query(T.minX, T.minY, T.maxX, T.maxY, ((A, D, L, k) => (function(F, O, j, Y,
|
|
11192
|
-
for (const ie of F) if (O <= ie.x && j <= ie.y && Y >= ie.x &&
|
|
11193
|
-
const ne = [new de(O, j), new de(O,
|
|
11191
|
+
const l = e.params, u = Be / e.tileSize / e.scale, p = js(l.filter, l.globalState), g = e.queryGeometry, m = e.queryPadding * u, v = ao.fromPoints(g), _ = this.grid.query(v.minX - m, v.minY - m, v.maxX + m, v.maxY + m), T = ao.fromPoints(e.cameraQueryGeometry).expandBy(m), b = this.grid3D.query(T.minX, T.minY, T.maxX, T.maxY, ((A, D, L, k) => (function(F, O, j, Y, Q) {
|
|
11192
|
+
for (const ie of F) if (O <= ie.x && j <= ie.y && Y >= ie.x && Q >= ie.y) return !0;
|
|
11193
|
+
const ne = [new de(O, j), new de(O, Q), new de(Y, Q), new de(Y, j)];
|
|
11194
11194
|
if (F.length > 2) {
|
|
11195
11195
|
for (const ie of ne) if (ca(F, ie)) return !0;
|
|
11196
11196
|
}
|
|
@@ -11394,19 +11394,19 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11394
11394
|
const o = [], l = r.image, u = l.pixelRatio, p = l.paddedRect.w - 2, g = l.paddedRect.h - 2;
|
|
11395
11395
|
let m = { x1: r.left, y1: r.top, x2: r.right, y2: r.bottom };
|
|
11396
11396
|
const v = l.stretchX || [[0, p]], _ = l.stretchY || [[0, g]], T = (re, _e) => re + _e[1] - _e[0], b = v.reduce(T, 0), I = _.reduce(T, 0), M = p - b, A = g - I;
|
|
11397
|
-
let D = 0, L = b, k = 0, F = I, O = 0, j = M, Y = 0,
|
|
11397
|
+
let D = 0, L = b, k = 0, F = I, O = 0, j = M, Y = 0, Q = A;
|
|
11398
11398
|
if (l.content && s) {
|
|
11399
11399
|
const re = l.content, _e = re[2] - re[0], Se = re[3] - re[1];
|
|
11400
|
-
(l.textFitWidth || l.textFitHeight) && (m = Lp(r)), D = Ru(v, 0, re[0]), k = Ru(_, 0, re[1]), L = Ru(v, re[0], re[2]), F = Ru(_, re[1], re[3]), O = re[0] - D, Y = re[1] - k, j = _e - L,
|
|
11400
|
+
(l.textFitWidth || l.textFitHeight) && (m = Lp(r)), D = Ru(v, 0, re[0]), k = Ru(_, 0, re[1]), L = Ru(v, re[0], re[2]), F = Ru(_, re[1], re[3]), O = re[0] - D, Y = re[1] - k, j = _e - L, Q = Se - F;
|
|
11401
11401
|
}
|
|
11402
11402
|
const ne = m.x1, ie = m.y1, le = m.x2 - ne, ce = m.y2 - ie, se = (re, _e, Se, be) => {
|
|
11403
|
-
const ye = Lu(re.stretch - D, L, le, ne), Fe = Fu(re.fixed - O, j, re.stretch, b), tt = Lu(_e.stretch - k, F, ce, ie), rt = Fu(_e.fixed - Y,
|
|
11403
|
+
const ye = Lu(re.stretch - D, L, le, ne), Fe = Fu(re.fixed - O, j, re.stretch, b), tt = Lu(_e.stretch - k, F, ce, ie), rt = Fu(_e.fixed - Y, Q, _e.stretch, I), lt = Lu(Se.stretch - D, L, le, ne), di = Fu(Se.fixed - O, j, Se.stretch, b), Et = Lu(be.stretch - k, F, ce, ie), Gt = Fu(be.fixed - Y, Q, be.stretch, I), Xt = new de(ye, tt), yt = new de(lt, tt), ni = new de(lt, Et), Ti = new de(ye, Et), Si = new de(Fe / u, rt / u), Ni = new de(di / u, Gt / u), pi = e * Math.PI / 180;
|
|
11404
11404
|
if (pi) {
|
|
11405
11405
|
const Yt = Math.sin(pi), Tt = Math.cos(pi), jt = [Tt, -Yt, Yt, Tt];
|
|
11406
11406
|
Xt._matMult(jt), yt._matMult(jt), Ti._matMult(jt), ni._matMult(jt);
|
|
11407
11407
|
}
|
|
11408
11408
|
const Ui = re.stretch + re.fixed, gr = _e.stretch + _e.fixed;
|
|
11409
|
-
return { tl: Xt, tr: yt, bl: Ti, br: ni, tex: { x: l.paddedRect.x + 1 + Ui, y: l.paddedRect.y + 1 + gr, w: Se.stretch + Se.fixed - Ui, h: be.stretch + be.fixed - gr }, writingMode: void 0, glyphOffset: [0, 0], sectionIndex: 0, pixelOffsetTL: Si, pixelOffsetBR: Ni, minFontScaleX: j / u / le, minFontScaleY:
|
|
11409
|
+
return { tl: Xt, tr: yt, bl: Ti, br: ni, tex: { x: l.paddedRect.x + 1 + Ui, y: l.paddedRect.y + 1 + gr, w: Se.stretch + Se.fixed - Ui, h: be.stretch + be.fixed - gr }, writingMode: void 0, glyphOffset: [0, 0], sectionIndex: 0, pixelOffsetTL: Si, pixelOffsetBR: Ni, minFontScaleX: j / u / le, minFontScaleY: Q / u / ce, isSDF: i };
|
|
11410
11410
|
};
|
|
11411
11411
|
if (s && (l.stretchX || l.stretchY)) {
|
|
11412
11412
|
const re = Nf(v, M, b), _e = Nf(_, A, I);
|
|
@@ -11637,7 +11637,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11637
11637
|
const b = r.layers[0].layout, I = b.get("icon-offset").evaluate(e, {}, v), M = $f(i.horizontal), A = u / 24, D = r.tilePixelRatio * A, L = r.tilePixelRatio * T / 24, k = r.tilePixelRatio * p, F = r.tilePixelRatio * b.get("symbol-spacing"), O = b.get("text-padding") * r.tilePixelRatio, j = (function(Se, be, ye, Fe = 1) {
|
|
11638
11638
|
const tt = Se.get("icon-padding").evaluate(be, {}, ye), rt = tt?.values;
|
|
11639
11639
|
return [rt[0] * Fe, rt[1] * Fe, rt[2] * Fe, rt[3] * Fe];
|
|
11640
|
-
})(b, e, v, r.tilePixelRatio), Y = b.get("text-max-angle") / 180 * Math.PI,
|
|
11640
|
+
})(b, e, v, r.tilePixelRatio), Y = b.get("text-max-angle") / 180 * Math.PI, Q = b.get("text-rotation-alignment") !== "viewport" && b.get("symbol-placement") !== "point", ne = b.get("icon-rotation-alignment") === "map" && b.get("symbol-placement") !== "point", ie = b.get("symbol-placement"), le = F / 2, ce = b.get("icon-text-fit");
|
|
11641
11641
|
let se;
|
|
11642
11642
|
s && ce !== "none" && (r.allowVerticalPlacement && i.vertical && (se = Fp(s, i.vertical, ce, b.get("icon-text-fit-padding"), I, A)), M && (s = Fp(s, M, ce, b.get("icon-text-fit-padding"), I, A)));
|
|
11643
11643
|
const re = v ? _.line.getGranularityForZoomLevel(v.z) : 1, _e = (Se, be) => {
|
|
@@ -11684,7 +11684,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11684
11684
|
return [uo, Pi.length];
|
|
11685
11685
|
})(ye.textAnchorOffsets, ty);
|
|
11686
11686
|
ye.symbolInstances.emplaceBack(Fe.x, Fe.y, zn.right >= 0 ? zn.right : -1, zn.center >= 0 ? zn.center : -1, zn.left >= 0 ? zn.left : -1, zn.vertical || -1, wd, Td, Yf, W_, H_, X_, Y_, K_, J_, Q_, ey, yt, Hf, Xf, qf, Wf, Jf, 0, Si, Ar, iy, ry);
|
|
11687
|
-
})(r, be, Se, i, s, o, se, r.layers[0], r.collisionBoxArray, e.index, e.sourceLayerIndex, r.index, D, [O, O, O, O],
|
|
11687
|
+
})(r, be, Se, i, s, o, se, r.layers[0], r.collisionBoxArray, e.index, e.sourceLayerIndex, r.index, D, [O, O, O, O], Q, g, k, j, ne, I, e, l, m, v, u);
|
|
11688
11688
|
};
|
|
11689
11689
|
if (ie === "line") for (const Se of zf(e.geometry, 0, 0, Be, Be)) {
|
|
11690
11690
|
const be = oo(Se, re), ye = N_(be, F, Y, i.vertical || M, s, 24, L, r.overscaling, Be);
|
|
@@ -11706,7 +11706,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11706
11706
|
else if (e.type === "Point") for (const Se of e.geometry) for (const be of Se) _e([be], new ms(be.x, be.y, 0));
|
|
11707
11707
|
}
|
|
11708
11708
|
function Zf(r, e, i, s, o, l, u, p, g, m, v, _, T, b, I) {
|
|
11709
|
-
const M = (function(L, k, F, O, j, Y,
|
|
11709
|
+
const M = (function(L, k, F, O, j, Y, Q, ne) {
|
|
11710
11710
|
const ie = O.layout.get("text-rotate").evaluate(Y, {}) * Math.PI / 180, le = [];
|
|
11711
11711
|
for (const ce of k.positionedLines) for (const se of ce.positionedGlyphs) {
|
|
11712
11712
|
if (!se.rect) continue;
|
|
@@ -11714,7 +11714,7 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
11714
11714
|
let _e = 4, Se = !0, be = 1, ye = 0;
|
|
11715
11715
|
const Fe = (j || ne) && se.vertical, tt = se.metrics.advance * se.scale / 2;
|
|
11716
11716
|
if (ne && k.verticalizable && (ye = ce.lineOffset / 2 - (se.imageName ? -(Wt - se.metrics.width * se.scale) / 2 : (se.scale - 1) * Wt)), se.imageName) {
|
|
11717
|
-
const Yt =
|
|
11717
|
+
const Yt = Q[se.imageName];
|
|
11718
11718
|
Se = Yt.sdf, be = Yt.pixelRatio, _e = 1 / be;
|
|
11719
11719
|
}
|
|
11720
11720
|
const rt = j ? [se.x + tt, se.y] : [0, 0];
|
|
@@ -12141,8 +12141,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
12141
12141
|
var s = Math.sin(i), o = Math.cos(i), l = e[4], u = e[5], p = e[6], g = e[7], m = e[8], v = e[9], _ = e[10], T = e[11];
|
|
12142
12142
|
return e !== r && (r[0] = e[0], r[1] = e[1], r[2] = e[2], r[3] = e[3], r[12] = e[12], r[13] = e[13], r[14] = e[14], r[15] = e[15]), r[4] = l * o + m * s, r[5] = u * o + v * s, r[6] = p * o + _ * s, r[7] = g * o + T * s, r[8] = m * o - l * s, r[9] = v * o - u * s, r[10] = _ * o - p * s, r[11] = T * o - g * s, r;
|
|
12143
12143
|
}, R.bg = function(r, e) {
|
|
12144
|
-
var i = e[0], s = e[1], o = e[2], l = e[3], u = e[4], p = e[5], g = e[6], m = e[7], v = e[8], _ = e[9], T = e[10], b = e[11], I = e[12], M = e[13], A = e[14], D = e[15], L = i * p - s * u, k = i * g - o * u, F = i * m - l * u, O = s * g - o * p, j = s * m - l * p, Y = o * m - l * g,
|
|
12145
|
-
return re ? (r[0] = (p * se - g * ce + m * le) * (re = 1 / re), r[1] = (o * ce - s * se - l * le) * re, r[2] = (M * Y - A * j + D * O) * re, r[3] = (T * j - _ * Y - b * O) * re, r[4] = (g * ie - u * se - m * ne) * re, r[5] = (i * se - o * ie + l * ne) * re, r[6] = (A * F - I * Y - D * k) * re, r[7] = (v * Y - T * F + b * k) * re, r[8] = (u * ce - p * ie + m *
|
|
12144
|
+
var i = e[0], s = e[1], o = e[2], l = e[3], u = e[4], p = e[5], g = e[6], m = e[7], v = e[8], _ = e[9], T = e[10], b = e[11], I = e[12], M = e[13], A = e[14], D = e[15], L = i * p - s * u, k = i * g - o * u, F = i * m - l * u, O = s * g - o * p, j = s * m - l * p, Y = o * m - l * g, Q = v * M - _ * I, ne = v * A - T * I, ie = v * D - b * I, le = _ * A - T * M, ce = _ * D - b * M, se = T * D - b * A, re = L * se - k * ce + F * le + O * ie - j * ne + Y * Q;
|
|
12145
|
+
return re ? (r[0] = (p * se - g * ce + m * le) * (re = 1 / re), r[1] = (o * ce - s * se - l * le) * re, r[2] = (M * Y - A * j + D * O) * re, r[3] = (T * j - _ * Y - b * O) * re, r[4] = (g * ie - u * se - m * ne) * re, r[5] = (i * se - o * ie + l * ne) * re, r[6] = (A * F - I * Y - D * k) * re, r[7] = (v * Y - T * F + b * k) * re, r[8] = (u * ce - p * ie + m * Q) * re, r[9] = (s * ie - i * ce - l * Q) * re, r[10] = (I * j - M * F + D * L) * re, r[11] = (_ * F - v * j - b * L) * re, r[12] = (p * ne - u * le - g * Q) * re, r[13] = (i * le - s * ne + o * Q) * re, r[14] = (M * k - I * O - A * L) * re, r[15] = (v * O - _ * k + T * L) * re, r) : null;
|
|
12146
12146
|
}, R.bh = function() {
|
|
12147
12147
|
const r = new Float32Array(16);
|
|
12148
12148
|
return kn(r), r;
|
|
@@ -12274,14 +12274,14 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
12274
12274
|
const T = o.get("text-font").evaluate(_, {}, r.canonical).join(","), b = v.evaluate(_, {}, r.canonical), I = u.layoutTextSize.evaluate(_, {}, r.canonical), M = u.layoutIconSize.evaluate(_, {}, r.canonical), A = { horizontal: {}, vertical: void 0 }, D = _.text;
|
|
12275
12275
|
let L, k = [0, 0];
|
|
12276
12276
|
if (D) {
|
|
12277
|
-
const j = D.toString(), Y = o.get("text-letter-spacing").evaluate(_, {}, r.canonical) * Wt,
|
|
12277
|
+
const j = D.toString(), Y = o.get("text-letter-spacing").evaluate(_, {}, r.canonical) * Wt, Q = Ho(j) ? Y : 0, ne = o.get("text-anchor").evaluate(_, {}, r.canonical), ie = Gf(s, _, r.canonical);
|
|
12278
12278
|
if (!ie) {
|
|
12279
12279
|
const re = o.get("text-radial-offset").evaluate(_, {}, r.canonical);
|
|
12280
12280
|
k = re ? Uf(ne, [re * Wt, xd]) : o.get("text-offset").evaluate(_, {}, r.canonical).map(((_e) => _e * Wt));
|
|
12281
12281
|
}
|
|
12282
12282
|
let le = g ? "center" : o.get("text-justify").evaluate(_, {}, r.canonical);
|
|
12283
12283
|
const ce = o.get("symbol-placement") === "point" ? o.get("text-max-width").evaluate(_, {}, r.canonical) * Wt : 1 / 0, se = () => {
|
|
12284
|
-
r.bucket.allowVerticalPlacement && Sl(j) && (A.vertical = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, "left",
|
|
12284
|
+
r.bucket.allowVerticalPlacement && Sl(j) && (A.vertical = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, "left", Q, k, R.ax.vertical, !0, I, b));
|
|
12285
12285
|
};
|
|
12286
12286
|
if (!g && ie) {
|
|
12287
12287
|
const re = /* @__PURE__ */ new Set();
|
|
@@ -12290,14 +12290,14 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
12290
12290
|
let _e = !1;
|
|
12291
12291
|
for (const Se of re) if (!A.horizontal[Se]) if (_e) A.horizontal[Se] = A.horizontal[0];
|
|
12292
12292
|
else {
|
|
12293
|
-
const be = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, "center", Se,
|
|
12293
|
+
const be = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, "center", Se, Q, k, R.ax.horizontal, !1, I, b);
|
|
12294
12294
|
be && (A.horizontal[Se] = be, _e = be.positionedLines.length === 1);
|
|
12295
12295
|
}
|
|
12296
12296
|
se();
|
|
12297
12297
|
} else {
|
|
12298
12298
|
le === "auto" && (le = bd(ne));
|
|
12299
|
-
const re = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, le,
|
|
12300
|
-
re && (A.horizontal[le] = re), se(), Sl(j) && g && m && (A.vertical = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, le,
|
|
12299
|
+
const re = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, le, Q, k, R.ax.horizontal, !1, I, b);
|
|
12300
|
+
re && (A.horizontal[le] = re), se(), Sl(j) && g && m && (A.vertical = Eu(D, r.glyphMap, r.glyphPositions, r.imagePositions, T, ce, p, ne, le, Q, k, R.ax.vertical, !1, I, b));
|
|
12301
12301
|
}
|
|
12302
12302
|
}
|
|
12303
12303
|
let F = !1;
|
|
@@ -12368,8 +12368,8 @@ Use an identity property function instead: \`{ "type": "identity", "property": $
|
|
|
12368
12368
|
}, R.cj = function(r, e) {
|
|
12369
12369
|
return r[0] === e[0] && r[1] === e[1] && r[2] === e[2] && r[3] === e[3] && r[4] === e[4] && r[5] === e[5] && r[6] === e[6] && r[7] === e[7] && r[8] === e[8] && r[9] === e[9] && r[10] === e[10] && r[11] === e[11] && r[12] === e[12] && r[13] === e[13] && r[14] === e[14] && r[15] === e[15];
|
|
12370
12370
|
}, R.ck = function(r, e) {
|
|
12371
|
-
var i = r[0], s = r[1], o = r[2], l = r[3], u = r[4], p = r[5], g = r[6], m = r[7], v = r[8], _ = r[9], T = r[10], b = r[11], I = r[12], M = r[13], A = r[14], D = r[15], L = e[0], k = e[1], F = e[2], O = e[3], j = e[4], Y = e[5],
|
|
12372
|
-
return Math.abs(i - L) <= fe * Math.max(1, Math.abs(i), Math.abs(L)) && Math.abs(s - k) <= fe * Math.max(1, Math.abs(s), Math.abs(k)) && Math.abs(o - F) <= fe * Math.max(1, Math.abs(o), Math.abs(F)) && Math.abs(l - O) <= fe * Math.max(1, Math.abs(l), Math.abs(O)) && Math.abs(u - j) <= fe * Math.max(1, Math.abs(u), Math.abs(j)) && Math.abs(p - Y) <= fe * Math.max(1, Math.abs(p), Math.abs(Y)) && Math.abs(g -
|
|
12371
|
+
var i = r[0], s = r[1], o = r[2], l = r[3], u = r[4], p = r[5], g = r[6], m = r[7], v = r[8], _ = r[9], T = r[10], b = r[11], I = r[12], M = r[13], A = r[14], D = r[15], L = e[0], k = e[1], F = e[2], O = e[3], j = e[4], Y = e[5], Q = e[6], ne = e[7], ie = e[8], le = e[9], ce = e[10], se = e[11], re = e[12], _e = e[13], Se = e[14], be = e[15];
|
|
12372
|
+
return Math.abs(i - L) <= fe * Math.max(1, Math.abs(i), Math.abs(L)) && Math.abs(s - k) <= fe * Math.max(1, Math.abs(s), Math.abs(k)) && Math.abs(o - F) <= fe * Math.max(1, Math.abs(o), Math.abs(F)) && Math.abs(l - O) <= fe * Math.max(1, Math.abs(l), Math.abs(O)) && Math.abs(u - j) <= fe * Math.max(1, Math.abs(u), Math.abs(j)) && Math.abs(p - Y) <= fe * Math.max(1, Math.abs(p), Math.abs(Y)) && Math.abs(g - Q) <= fe * Math.max(1, Math.abs(g), Math.abs(Q)) && Math.abs(m - ne) <= fe * Math.max(1, Math.abs(m), Math.abs(ne)) && Math.abs(v - ie) <= fe * Math.max(1, Math.abs(v), Math.abs(ie)) && Math.abs(_ - le) <= fe * Math.max(1, Math.abs(_), Math.abs(le)) && Math.abs(T - ce) <= fe * Math.max(1, Math.abs(T), Math.abs(ce)) && Math.abs(b - se) <= fe * Math.max(1, Math.abs(b), Math.abs(se)) && Math.abs(I - re) <= fe * Math.max(1, Math.abs(I), Math.abs(re)) && Math.abs(M - _e) <= fe * Math.max(1, Math.abs(M), Math.abs(_e)) && Math.abs(A - Se) <= fe * Math.max(1, Math.abs(A), Math.abs(Se)) && Math.abs(D - be) <= fe * Math.max(1, Math.abs(D), Math.abs(be));
|
|
12373
12373
|
}, R.cl = function(r, e) {
|
|
12374
12374
|
return r[0] = e[0], r[1] = e[1], r[2] = e[2], r[3] = e[3], r[4] = e[4], r[5] = e[5], r[6] = e[6], r[7] = e[7], r[8] = e[8], r[9] = e[9], r[10] = e[10], r[11] = e[11], r[12] = e[12], r[13] = e[13], r[14] = e[14], r[15] = e[15], r;
|
|
12375
12375
|
}, R.cm = (r) => r.type === "circle", R.cn = (r) => r.type === "heatmap", R.co = (r) => r.type === "line", R.cp = (r) => r.type === "fill", R.cq = (r) => r.type === "fill-extrusion", R.cr = (r) => r.type === "hillshade", R.cs = (r) => r.type === "color-relief", R.ct = (r) => r.type === "background", R.cu = (r) => r.type === "custom", R.cv = Qr, R.cw = function(r, e, i) {
|
|
@@ -24731,14 +24731,14 @@ var wy = by();
|
|
|
24731
24731
|
const rm = /* @__PURE__ */ hy(wy);
|
|
24732
24732
|
class Ty {
|
|
24733
24733
|
/* eslint-disable no-this-before-super */
|
|
24734
|
-
constructor(
|
|
24735
|
-
Vu(
|
|
24734
|
+
constructor(J) {
|
|
24735
|
+
Vu(J.id, "id is required"), this.id = J.id, this.type = "custom", this.renderingMode = J.renderingMode || "3d", this.slot = J.slot, this.beforeId = J.beforeId, this.map = null;
|
|
24736
24736
|
}
|
|
24737
24737
|
/* Mapbox custom layer methods */
|
|
24738
|
-
onAdd(
|
|
24739
|
-
this.map =
|
|
24738
|
+
onAdd(J, me) {
|
|
24739
|
+
this.map = J;
|
|
24740
24740
|
}
|
|
24741
|
-
render(
|
|
24741
|
+
render(J, me) {
|
|
24742
24742
|
this.map && Ey(this.map.__deck, this.map, this, me);
|
|
24743
24743
|
}
|
|
24744
24744
|
}
|
|
@@ -24746,12 +24746,12 @@ const Pd = "__UNDEFINED__";
|
|
|
24746
24746
|
function ac(Pe) {
|
|
24747
24747
|
return Pe.props.beforeId ? `deck-layer-group-before:${Pe.props.beforeId}` : Pe.props.slot ? `deck-layer-group-slot:${Pe.props.slot}` : "deck-layer-group-last";
|
|
24748
24748
|
}
|
|
24749
|
-
function Sy(Pe,
|
|
24749
|
+
function Sy(Pe, J, me) {
|
|
24750
24750
|
if (!Pe || !Pe.style || !Pe.style._loaded)
|
|
24751
24751
|
return;
|
|
24752
24752
|
const Me = Ed(me, Boolean);
|
|
24753
|
-
if (
|
|
24754
|
-
const R = Ed(
|
|
24753
|
+
if (J !== me) {
|
|
24754
|
+
const R = Ed(J, Boolean), h = new Set(R.map((ct) => ac(ct))), de = new Set(Me.map((ct) => ac(ct)));
|
|
24755
24755
|
for (const ct of h)
|
|
24756
24756
|
de.has(ct) || Pe.getLayer(ct) && Pe.removeLayer(ct);
|
|
24757
24757
|
}
|
|
@@ -24780,11 +24780,11 @@ function Sy(Pe, Q, me) {
|
|
|
24780
24780
|
}
|
|
24781
24781
|
}
|
|
24782
24782
|
const Ra = "mapbox", Id = 512, Py = Math.PI / 180;
|
|
24783
|
-
function Iy({ map: Pe, deck:
|
|
24783
|
+
function Iy({ map: Pe, deck: J }) {
|
|
24784
24784
|
if (Pe.__deck)
|
|
24785
24785
|
return Pe.__deck;
|
|
24786
|
-
const me =
|
|
24787
|
-
...
|
|
24786
|
+
const me = J.props._customRender, Me = J.props.onLoad, Te = {
|
|
24787
|
+
...J.props,
|
|
24788
24788
|
_customRender: () => {
|
|
24789
24789
|
Pe.triggerRepaint(), me?.("");
|
|
24790
24790
|
}
|
|
@@ -24794,23 +24794,23 @@ function Iy({ map: Pe, deck: Q }) {
|
|
|
24794
24794
|
height: null,
|
|
24795
24795
|
touchAction: "unset",
|
|
24796
24796
|
viewState: lc(Pe)
|
|
24797
|
-
}),
|
|
24798
|
-
Me?.(), nm(
|
|
24799
|
-
},
|
|
24800
|
-
|
|
24801
|
-
}),
|
|
24797
|
+
}), J.isInitialized ? nm(J, Pe) : Te.onLoad = () => {
|
|
24798
|
+
Me?.(), nm(J, Pe);
|
|
24799
|
+
}, J.setProps(Te), Pe.__deck = J, Pe.on("render", () => {
|
|
24800
|
+
J.isInitialized && Ay(J, Pe);
|
|
24801
|
+
}), J;
|
|
24802
24802
|
}
|
|
24803
|
-
function nm(Pe,
|
|
24803
|
+
function nm(Pe, J) {
|
|
24804
24804
|
const me = () => {
|
|
24805
|
-
Pe.isInitialized ? Dy(Pe,
|
|
24805
|
+
Pe.isInitialized ? Dy(Pe, J) : J.off("move", me);
|
|
24806
24806
|
};
|
|
24807
|
-
|
|
24807
|
+
J.on("move", me);
|
|
24808
24808
|
}
|
|
24809
24809
|
function My(Pe) {
|
|
24810
24810
|
Pe.__deck?.finalize(), Pe.__deck = null;
|
|
24811
24811
|
}
|
|
24812
|
-
function Md(Pe,
|
|
24813
|
-
return
|
|
24812
|
+
function Md(Pe, J) {
|
|
24813
|
+
return J ? {
|
|
24814
24814
|
depthWriteEnabled: !0,
|
|
24815
24815
|
depthCompare: "less-equal",
|
|
24816
24816
|
depthBias: 0,
|
|
@@ -24823,11 +24823,11 @@ function Md(Pe, Q) {
|
|
|
24823
24823
|
blendAlphaOperation: "add"
|
|
24824
24824
|
} : {};
|
|
24825
24825
|
}
|
|
24826
|
-
function Ey(Pe,
|
|
24826
|
+
function Ey(Pe, J, me, Me) {
|
|
24827
24827
|
if (!Pe.isInitialized)
|
|
24828
24828
|
return;
|
|
24829
24829
|
let { currentViewport: Te } = Pe.userData, Le = !1;
|
|
24830
|
-
Te || (Te = cm(Pe,
|
|
24830
|
+
Te || (Te = cm(Pe, J, Me), Pe.userData.currentViewport = Te, Le = !0), Te && Pe._drawLayers("mapbox-repaint", {
|
|
24831
24831
|
viewports: [Te],
|
|
24832
24832
|
layerFilter: (R) => {
|
|
24833
24833
|
if (Pe.props.layerFilter && !Pe.props.layerFilter(R))
|
|
@@ -24840,10 +24840,10 @@ function Ey(Pe, Q, me, Me) {
|
|
|
24840
24840
|
});
|
|
24841
24841
|
}
|
|
24842
24842
|
function lm(Pe) {
|
|
24843
|
-
const
|
|
24843
|
+
const J = Pe.getProjection?.(), me = (
|
|
24844
24844
|
// maplibre projection spec
|
|
24845
|
-
|
|
24846
|
-
|
|
24845
|
+
J?.type || // mapbox projection spec
|
|
24846
|
+
J?.name
|
|
24847
24847
|
);
|
|
24848
24848
|
if (me === "globe")
|
|
24849
24849
|
return "globe";
|
|
@@ -24855,10 +24855,10 @@ function Nu(Pe) {
|
|
|
24855
24855
|
return lm(Pe) === "globe" ? new om({ id: Ra }) : new dy({ id: Ra });
|
|
24856
24856
|
}
|
|
24857
24857
|
function lc(Pe) {
|
|
24858
|
-
const { lng:
|
|
24858
|
+
const { lng: J, lat: me } = Pe.getCenter(), Me = {
|
|
24859
24859
|
// Longitude returned by getCenter can be outside of [-180, 180] when zooming near the anti meridian
|
|
24860
24860
|
// https://github.com/visgl/deck.gl/issues/6894
|
|
24861
|
-
longitude: (
|
|
24861
|
+
longitude: (J + 540) % 360 - 180,
|
|
24862
24862
|
latitude: me,
|
|
24863
24863
|
zoom: Pe.getZoom(),
|
|
24864
24864
|
bearing: Pe.getBearing(),
|
|
@@ -24868,43 +24868,43 @@ function lc(Pe) {
|
|
|
24868
24868
|
};
|
|
24869
24869
|
return Pe.getTerrain?.() && Cy(Pe, Me), Me;
|
|
24870
24870
|
}
|
|
24871
|
-
function Cy(Pe,
|
|
24871
|
+
function Cy(Pe, J) {
|
|
24872
24872
|
if (Pe.getFreeCameraOptions) {
|
|
24873
24873
|
const { position: me } = Pe.getFreeCameraOptions();
|
|
24874
24874
|
if (!me || me.z === void 0)
|
|
24875
24875
|
return;
|
|
24876
|
-
const Me = Pe.transform.height, { longitude: Te, latitude: Le, pitch: R } =
|
|
24876
|
+
const Me = Pe.transform.height, { longitude: Te, latitude: Le, pitch: R } = J, h = me.x * Id, de = (1 - me.y) * Id, ct = me.z * Id, Bt = py([Te, Le]), fi = h - Bt[0], Qi = de - Bt[1], At = Math.sqrt(fi * fi + Qi * Qi), si = R * Py, Xe = 1.5 * Me, cr = si < 1e-3 ? (
|
|
24877
24877
|
// Pitch angle too small to deduce the look at point, assume elevation is 0
|
|
24878
24878
|
Xe * Math.cos(si) / ct
|
|
24879
24879
|
) : Xe * Math.sin(si) / At;
|
|
24880
|
-
|
|
24880
|
+
J.zoom = Math.log2(cr);
|
|
24881
24881
|
const mi = Xe * Math.cos(si) / cr, fe = ct - mi;
|
|
24882
|
-
|
|
24883
|
-
} else typeof Pe.transform.elevation == "number" && (
|
|
24882
|
+
J.position = [0, 0, fe / fy(Le)];
|
|
24883
|
+
} else typeof Pe.transform.elevation == "number" && (J.position = [0, 0, Pe.transform.elevation]);
|
|
24884
24884
|
}
|
|
24885
|
-
function cm(Pe,
|
|
24886
|
-
const Me = lc(
|
|
24885
|
+
function cm(Pe, J, me) {
|
|
24886
|
+
const Me = lc(J), Te = Pe.getView(Ra) || Nu(J);
|
|
24887
24887
|
me && (Te.props.nearZMultiplier = 0.2);
|
|
24888
|
-
const Le = me?.nearZ ??
|
|
24889
|
-
return Number.isFinite(Le) && (Me.nearZ = Le /
|
|
24888
|
+
const Le = me?.nearZ ?? J.transform._nearZ, R = me?.farZ ?? J.transform._farZ;
|
|
24889
|
+
return Number.isFinite(Le) && (Me.nearZ = Le / J.transform.height, Me.farZ = R / J.transform.height), Te.makeViewport({
|
|
24890
24890
|
width: Pe.width,
|
|
24891
24891
|
height: Pe.height,
|
|
24892
24892
|
viewState: Me
|
|
24893
24893
|
});
|
|
24894
24894
|
}
|
|
24895
|
-
function Ay(Pe,
|
|
24896
|
-
const Me = Ed(Pe.props.layers, Boolean).some((h) => h && !
|
|
24895
|
+
function Ay(Pe, J) {
|
|
24896
|
+
const Me = Ed(Pe.props.layers, Boolean).some((h) => h && !J.getLayer(ac(h)));
|
|
24897
24897
|
let Te = Pe.getViewports();
|
|
24898
24898
|
const Le = Te.findIndex((h) => h.id === Ra), R = Te.length > 1 || Le < 0;
|
|
24899
24899
|
if (Me || R) {
|
|
24900
24900
|
if (Le >= 0) {
|
|
24901
24901
|
Te = Te.slice();
|
|
24902
|
-
const h = cm(Pe,
|
|
24902
|
+
const h = cm(Pe, J);
|
|
24903
24903
|
h ? Te[Le] = h : Te.splice(Le, 1);
|
|
24904
24904
|
}
|
|
24905
24905
|
Pe._drawLayers("mapbox-repaint", {
|
|
24906
24906
|
viewports: Te,
|
|
24907
|
-
layerFilter: (h) => (!Pe.props.layerFilter || Pe.props.layerFilter(h)) && (h.viewport.id !== Ra || !
|
|
24907
|
+
layerFilter: (h) => (!Pe.props.layerFilter || Pe.props.layerFilter(h)) && (h.viewport.id !== Ra || !J.getLayer(ac(h.layer))),
|
|
24908
24908
|
clearCanvas: !1
|
|
24909
24909
|
});
|
|
24910
24910
|
} else {
|
|
@@ -24913,13 +24913,13 @@ function Ay(Pe, Q) {
|
|
|
24913
24913
|
}
|
|
24914
24914
|
Pe.userData.currentViewport = null;
|
|
24915
24915
|
}
|
|
24916
|
-
function Dy(Pe,
|
|
24916
|
+
function Dy(Pe, J) {
|
|
24917
24917
|
Pe.setProps({
|
|
24918
|
-
viewState: lc(
|
|
24918
|
+
viewState: lc(J)
|
|
24919
24919
|
}), Pe.needsRedraw({ clearRedrawFlags: !0 });
|
|
24920
24920
|
}
|
|
24921
24921
|
class zy {
|
|
24922
|
-
constructor(
|
|
24922
|
+
constructor(J) {
|
|
24923
24923
|
this._handleStyleChange = () => {
|
|
24924
24924
|
if (this._resolveLayers(this._map, this._deck, this._props.layers, this._props.layers), !this._map)
|
|
24925
24925
|
return;
|
|
@@ -24983,17 +24983,17 @@ class zy {
|
|
|
24983
24983
|
return;
|
|
24984
24984
|
}
|
|
24985
24985
|
};
|
|
24986
|
-
const { interleaved: me = !1 } =
|
|
24987
|
-
this._interleaved = me, this._props = this.filterProps(
|
|
24986
|
+
const { interleaved: me = !1 } = J;
|
|
24987
|
+
this._interleaved = me, this._props = this.filterProps(J);
|
|
24988
24988
|
}
|
|
24989
24989
|
/** Filter out props to pass to Deck **/
|
|
24990
|
-
filterProps(
|
|
24991
|
-
const { interleaved: me = !1, useDevicePixels: Me, ...Te } =
|
|
24990
|
+
filterProps(J) {
|
|
24991
|
+
const { interleaved: me = !1, useDevicePixels: Me, ...Te } = J;
|
|
24992
24992
|
return !me && Me !== void 0 && (Te.useDevicePixels = Me), Te;
|
|
24993
24993
|
}
|
|
24994
24994
|
/** Update (partial) props of the underlying Deck instance. */
|
|
24995
|
-
setProps(
|
|
24996
|
-
this._interleaved &&
|
|
24995
|
+
setProps(J) {
|
|
24996
|
+
this._interleaved && J.layers && this._resolveLayers(this._map, this._deck, this._props.layers, J.layers), Object.assign(this._props, this.filterProps(J)), this._deck && this._map && this._deck.setProps({
|
|
24997
24997
|
...this._props,
|
|
24998
24998
|
views: this._getViews(this._map),
|
|
24999
24999
|
parameters: {
|
|
@@ -25005,10 +25005,10 @@ class zy {
|
|
|
25005
25005
|
// The local Map type is for internal typecheck only. It does not necesarily satisefy mapbox/maplibre types at runtime.
|
|
25006
25006
|
// Do not restrict the argument type here to avoid type conflict.
|
|
25007
25007
|
/** Called when the control is added to a map */
|
|
25008
|
-
onAdd(
|
|
25009
|
-
return this._map =
|
|
25008
|
+
onAdd(J) {
|
|
25009
|
+
return this._map = J, this._interleaved ? this._onAddInterleaved(J) : this._onAddOverlaid(J);
|
|
25010
25010
|
}
|
|
25011
|
-
_onAddOverlaid(
|
|
25011
|
+
_onAddOverlaid(J) {
|
|
25012
25012
|
const me = document.createElement("div");
|
|
25013
25013
|
return Object.assign(me.style, {
|
|
25014
25014
|
position: "absolute",
|
|
@@ -25019,51 +25019,51 @@ class zy {
|
|
|
25019
25019
|
}), this._container = me, this._deck = new Qf({
|
|
25020
25020
|
...this._props,
|
|
25021
25021
|
parent: me,
|
|
25022
|
-
parameters: { ...Md(
|
|
25023
|
-
views: this._getViews(
|
|
25024
|
-
viewState: lc(
|
|
25025
|
-
}),
|
|
25022
|
+
parameters: { ...Md(J, !1), ...this._props.parameters },
|
|
25023
|
+
views: this._getViews(J),
|
|
25024
|
+
viewState: lc(J)
|
|
25025
|
+
}), J.on("resize", this._updateContainerSize), J.on("render", this._updateViewState), J.on("mousedown", this._handleMouseEvent), J.on("dragstart", this._handleMouseEvent), J.on("drag", this._handleMouseEvent), J.on("dragend", this._handleMouseEvent), J.on("mousemove", this._handleMouseEvent), J.on("mouseout", this._handleMouseEvent), J.on("click", this._handleMouseEvent), J.on("dblclick", this._handleMouseEvent), this._updateContainerSize(), me;
|
|
25026
25026
|
}
|
|
25027
|
-
_onAddInterleaved(
|
|
25028
|
-
const me =
|
|
25027
|
+
_onAddInterleaved(J) {
|
|
25028
|
+
const me = J.painter.context.gl;
|
|
25029
25029
|
return me instanceof WebGLRenderingContext && my.warn("Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility")(), this._deck = Iy({
|
|
25030
|
-
map:
|
|
25030
|
+
map: J,
|
|
25031
25031
|
deck: new Qf({
|
|
25032
25032
|
...this._props,
|
|
25033
|
-
views: this._getViews(
|
|
25033
|
+
views: this._getViews(J),
|
|
25034
25034
|
gl: me,
|
|
25035
|
-
parameters: { ...Md(
|
|
25035
|
+
parameters: { ...Md(J, !0), ...this._props.parameters }
|
|
25036
25036
|
})
|
|
25037
|
-
}),
|
|
25037
|
+
}), J.on("styledata", this._handleStyleChange), this._resolveLayers(J, this._deck, [], this._props.layers), document.createElement("div");
|
|
25038
25038
|
}
|
|
25039
|
-
_resolveLayers(
|
|
25040
|
-
Sy(
|
|
25039
|
+
_resolveLayers(J, me, Me, Te) {
|
|
25040
|
+
Sy(J, Me, Te);
|
|
25041
25041
|
}
|
|
25042
25042
|
/** Called when the control is removed from a map */
|
|
25043
25043
|
onRemove() {
|
|
25044
|
-
const
|
|
25045
|
-
|
|
25044
|
+
const J = this._map;
|
|
25045
|
+
J && (this._interleaved ? this._onRemoveInterleaved(J) : this._onRemoveOverlaid(J)), this._deck = void 0, this._map = void 0, this._container = void 0;
|
|
25046
25046
|
}
|
|
25047
|
-
_onRemoveOverlaid(
|
|
25048
|
-
|
|
25047
|
+
_onRemoveOverlaid(J) {
|
|
25048
|
+
J.off("resize", this._updateContainerSize), J.off("render", this._updateViewState), J.off("mousedown", this._handleMouseEvent), J.off("dragstart", this._handleMouseEvent), J.off("drag", this._handleMouseEvent), J.off("dragend", this._handleMouseEvent), J.off("mousemove", this._handleMouseEvent), J.off("mouseout", this._handleMouseEvent), J.off("click", this._handleMouseEvent), J.off("dblclick", this._handleMouseEvent), this._deck?.finalize();
|
|
25049
25049
|
}
|
|
25050
|
-
_onRemoveInterleaved(
|
|
25051
|
-
|
|
25050
|
+
_onRemoveInterleaved(J) {
|
|
25051
|
+
J.off("styledata", this._handleStyleChange), this._resolveLayers(J, this._deck, this._props.layers, []), My(J);
|
|
25052
25052
|
}
|
|
25053
25053
|
getDefaultPosition() {
|
|
25054
25054
|
return "top-left";
|
|
25055
25055
|
}
|
|
25056
25056
|
/** Forwards the Deck.pickObject method */
|
|
25057
|
-
pickObject(
|
|
25058
|
-
return Vu(this._deck), this._deck.pickObject(
|
|
25057
|
+
pickObject(J) {
|
|
25058
|
+
return Vu(this._deck), this._deck.pickObject(J);
|
|
25059
25059
|
}
|
|
25060
25060
|
/** Forwards the Deck.pickMultipleObjects method */
|
|
25061
|
-
pickMultipleObjects(
|
|
25062
|
-
return Vu(this._deck), this._deck.pickMultipleObjects(
|
|
25061
|
+
pickMultipleObjects(J) {
|
|
25062
|
+
return Vu(this._deck), this._deck.pickMultipleObjects(J);
|
|
25063
25063
|
}
|
|
25064
25064
|
/** Forwards the Deck.pickObjects method */
|
|
25065
|
-
pickObjects(
|
|
25066
|
-
return Vu(this._deck), this._deck.pickObjects(
|
|
25065
|
+
pickObjects(J) {
|
|
25066
|
+
return Vu(this._deck), this._deck.pickObjects(J);
|
|
25067
25067
|
}
|
|
25068
25068
|
/** Remove from map and releases all resources */
|
|
25069
25069
|
finalize() {
|
|
@@ -25073,11 +25073,11 @@ class zy {
|
|
|
25073
25073
|
getCanvas() {
|
|
25074
25074
|
return this._map ? this._interleaved ? this._map.getCanvas() : this._deck.getCanvas() : null;
|
|
25075
25075
|
}
|
|
25076
|
-
_getViews(
|
|
25076
|
+
_getViews(J) {
|
|
25077
25077
|
if (!this._props.views)
|
|
25078
|
-
return Nu(
|
|
25078
|
+
return Nu(J);
|
|
25079
25079
|
const me = Array.isArray(this._props.views) ? this._props.views : [this._props.views];
|
|
25080
|
-
return me.some((Te) => Te.id === Ra) ? this._props.views : [Nu(
|
|
25080
|
+
return me.some((Te) => Te.id === Ra) ? this._props.views : [Nu(J), ...me];
|
|
25081
25081
|
}
|
|
25082
25082
|
}
|
|
25083
25083
|
class Ry {
|
|
@@ -25105,16 +25105,17 @@ class Ry {
|
|
|
25105
25105
|
*/
|
|
25106
25106
|
initialized = !1;
|
|
25107
25107
|
loadCallbacks = [];
|
|
25108
|
-
constructor(
|
|
25108
|
+
constructor(J, me, Me, Te, Le = !0, R, h = !1) {
|
|
25109
25109
|
this.showAttribution = Le, this.attributionHost = R, this.map = new rm.Map({
|
|
25110
|
-
container:
|
|
25110
|
+
container: J,
|
|
25111
25111
|
style: me.style,
|
|
25112
|
-
// Determinism switch (issue #37 follow-up)
|
|
25113
|
-
//
|
|
25114
|
-
//
|
|
25115
|
-
//
|
|
25116
|
-
//
|
|
25117
|
-
//
|
|
25112
|
+
// Determinism switch (issue #37 follow-up). NOT load-bearing for frame
|
|
25113
|
+
// identity — the idle LATCH below is (isolated 2026-08-26: the warm-
|
|
25114
|
+
// page byte-identity probe passes with the latch alone, because
|
|
25115
|
+
// MapLibre's `idle` waits for fades to complete). Kept because it
|
|
25116
|
+
// shortens EVERY per-frame settle (no fade animation left to wait
|
|
25117
|
+
// out — real wall-clock on a renderer that settles after each camera
|
|
25118
|
+
// write) and de-risks `idle`-semantics drift across MapLibre versions.
|
|
25118
25119
|
fadeDuration: h ? 0 : void 0,
|
|
25119
25120
|
center: [Me.longitude, Me.latitude],
|
|
25120
25121
|
zoom: Me.zoom,
|
|
@@ -25131,11 +25132,37 @@ class Ry {
|
|
|
25131
25132
|
onAfterRender: (de) => {
|
|
25132
25133
|
this.drainDeckCaptures(), Te.onAfterRender?.(de);
|
|
25133
25134
|
}
|
|
25134
|
-
}), this.map.addControl(this.overlay);
|
|
25135
|
+
}), this.map.addControl(this.overlay), this.wireIdleLatch();
|
|
25136
|
+
}
|
|
25137
|
+
/**
|
|
25138
|
+
* whenSettled's basemap gate (issue #37 follow-up), as an EVENT LATCH
|
|
25139
|
+
* rather than a polling predicate: MapLibre's `idle` event is its own
|
|
25140
|
+
* definition of done — camera transitions finished, all requested tiles
|
|
25141
|
+
* loaded, all fades/transitions complete — which is strictly stronger
|
|
25142
|
+
* than `loaded() && areTilesLoaded()` (those say nothing about label
|
|
25143
|
+
* fade/collision animation, the measured source of warm-page frame
|
|
25144
|
+
* nondeterminism). The latch clears on anything that restarts work
|
|
25145
|
+
* (camera writes, a source starting to load, a style change) and sets
|
|
25146
|
+
* again only on the next `idle`, so `isIdle()` stays a synchronous read —
|
|
25147
|
+
* settleOnce's `loaded()` shape — and both lanes plus `onlymapjs record`
|
|
25148
|
+
* inherit it unchanged.
|
|
25149
|
+
*/
|
|
25150
|
+
idleLatch = !1;
|
|
25151
|
+
wireIdleLatch() {
|
|
25152
|
+
this.map.on("idle", () => {
|
|
25153
|
+
this.idleLatch = !0;
|
|
25154
|
+
});
|
|
25155
|
+
for (const J of ["movestart", "dataloading", "sourcedataloading", "styledataloading"])
|
|
25156
|
+
this.map.on(J, () => {
|
|
25157
|
+
this.idleLatch = !1;
|
|
25158
|
+
});
|
|
25135
25159
|
}
|
|
25136
|
-
/** whenSettled's basemap gate (issue #37 follow-up): style + all raster/vector tiles for the current view fully loaded. */
|
|
25137
25160
|
isIdle() {
|
|
25138
|
-
return this.
|
|
25161
|
+
return this.idleLatch;
|
|
25162
|
+
}
|
|
25163
|
+
/** Camera writes from OUR side must clear the latch immediately — the map's own movestart fires a tick later, and a settle read in that gap would see stale idle. */
|
|
25164
|
+
markBusy() {
|
|
25165
|
+
this.idleLatch = !1;
|
|
25139
25166
|
}
|
|
25140
25167
|
/** The overlay deck's live layers — whenSettled's readiness gate (issue #37). */
|
|
25141
25168
|
getDeckLayers() {
|
|
@@ -25151,9 +25178,9 @@ class Ry {
|
|
|
25151
25178
|
pendingCaptureRejects = /* @__PURE__ */ new Set();
|
|
25152
25179
|
drainDeckCaptures() {
|
|
25153
25180
|
if (this.deckCaptures.length === 0) return;
|
|
25154
|
-
const
|
|
25181
|
+
const J = this.deckCaptures;
|
|
25155
25182
|
this.deckCaptures = [];
|
|
25156
|
-
for (const me of
|
|
25183
|
+
for (const me of J) me();
|
|
25157
25184
|
}
|
|
25158
25185
|
/**
|
|
25159
25186
|
* Scene snapshot (spec: "Snapshot API") — one composite canvas of the
|
|
@@ -25166,7 +25193,7 @@ class Ry {
|
|
|
25166
25193
|
* public Deck API, and the access is optional-chained).
|
|
25167
25194
|
*/
|
|
25168
25195
|
captureComposite() {
|
|
25169
|
-
return new Promise((
|
|
25196
|
+
return new Promise((J, me) => {
|
|
25170
25197
|
this.pendingCaptureRejects.add(me);
|
|
25171
25198
|
let Me, Te;
|
|
25172
25199
|
const Le = (h) => {
|
|
@@ -25177,7 +25204,7 @@ class Ry {
|
|
|
25177
25204
|
const h = document.createElement("canvas");
|
|
25178
25205
|
h.width = Me.width, h.height = Me.height;
|
|
25179
25206
|
const de = h.getContext("2d");
|
|
25180
|
-
de.drawImage(Me, 0, 0), Te && de.drawImage(Te, 0, 0, h.width, h.height), this.pendingCaptureRejects.delete(me),
|
|
25207
|
+
de.drawImage(Me, 0, 0), Te && de.drawImage(Te, 0, 0, h.width, h.height), this.pendingCaptureRejects.delete(me), J(h);
|
|
25181
25208
|
};
|
|
25182
25209
|
this.map.once("render", () => {
|
|
25183
25210
|
Me = Le(this.map.getCanvas()), R();
|
|
@@ -25190,12 +25217,12 @@ class Ry {
|
|
|
25190
25217
|
markInitialized() {
|
|
25191
25218
|
if (this.initialized) return;
|
|
25192
25219
|
this.initialized = !0;
|
|
25193
|
-
const
|
|
25220
|
+
const J = this.loadCallbacks;
|
|
25194
25221
|
this.loadCallbacks = [];
|
|
25195
|
-
for (const me of
|
|
25222
|
+
for (const me of J) me();
|
|
25196
25223
|
}
|
|
25197
|
-
onLoad(
|
|
25198
|
-
this.initialized ?
|
|
25224
|
+
onLoad(J) {
|
|
25225
|
+
this.initialized ? J() : this.loadCallbacks.push(J);
|
|
25199
25226
|
}
|
|
25200
25227
|
/** Fires continuously during pan/zoom/rotate — MapLibre's own camera-change event, standing in for deck's onViewStateChange (which doesn't apply — deck isn't driving the camera). */
|
|
25201
25228
|
/**
|
|
@@ -25204,11 +25231,11 @@ class Ry {
|
|
|
25204
25231
|
* event) to gesture-driven move events; our own easeTo/jumpTo/fitBounds
|
|
25205
25232
|
* fire without one. The ecosystem's standard user-vs-programmatic signal.
|
|
25206
25233
|
*/
|
|
25207
|
-
onMove(
|
|
25208
|
-
this.map.on("move", (me) =>
|
|
25234
|
+
onMove(J) {
|
|
25235
|
+
this.map.on("move", (me) => J(me.originalEvent ? "user" : "programmatic"));
|
|
25209
25236
|
}
|
|
25210
|
-
setLayers(
|
|
25211
|
-
this.overlay.setProps({ layers:
|
|
25237
|
+
setLayers(J) {
|
|
25238
|
+
this.overlay.setProps({ layers: J });
|
|
25212
25239
|
}
|
|
25213
25240
|
/**
|
|
25214
25241
|
* Scene lighting (spec: "Scene Lighting") — MapboxOverlay accepts full
|
|
@@ -25216,12 +25243,12 @@ class Ry {
|
|
|
25216
25243
|
* basemap frame dirty, so nudge a repaint; the overlay redraws with the
|
|
25217
25244
|
* map's render pass.
|
|
25218
25245
|
*/
|
|
25219
|
-
setEffects(
|
|
25220
|
-
this.overlay.setProps({ effects:
|
|
25246
|
+
setEffects(J) {
|
|
25247
|
+
this.overlay.setProps({ effects: J }), this.map.triggerRepaint();
|
|
25221
25248
|
}
|
|
25222
25249
|
/** XY snapping (spec: issue #34 Part A) — deck's own pick tolerance, 0 by default; MapboxOverlay forwards the same DeckProps a standalone Deck instance takes. */
|
|
25223
|
-
setPickingRadius(
|
|
25224
|
-
this.overlay.setProps({ pickingRadius:
|
|
25250
|
+
setPickingRadius(J) {
|
|
25251
|
+
this.overlay.setProps({ pickingRadius: J });
|
|
25225
25252
|
}
|
|
25226
25253
|
/**
|
|
25227
25254
|
* Live basemap switch (spec: "Basemap presets & switching"). Deck layers
|
|
@@ -25230,8 +25257,8 @@ class Ry {
|
|
|
25230
25257
|
* MapLibre diffs same-source styles and falls back to a full style reload
|
|
25231
25258
|
* internally when the diff fails (the cross-provider case).
|
|
25232
25259
|
*/
|
|
25233
|
-
setStyle(
|
|
25234
|
-
this.map.setStyle(
|
|
25260
|
+
setStyle(J) {
|
|
25261
|
+
this.markBusy(), this.map.setStyle(J.style), J.attribution !== this.attributionText && this.mountAttribution(J.attribution);
|
|
25235
25262
|
}
|
|
25236
25263
|
/**
|
|
25237
25264
|
* (Re)mounts the compact attribution control. Source-declared attributions
|
|
@@ -25239,8 +25266,8 @@ class Ry {
|
|
|
25239
25266
|
* every style change; only the PRESET-level `attribution` override needs a
|
|
25240
25267
|
* remount, since `customAttribution` is fixed at construction.
|
|
25241
25268
|
*/
|
|
25242
|
-
mountAttribution(
|
|
25243
|
-
if (this.showAttribution && (this.attributionText =
|
|
25269
|
+
mountAttribution(J) {
|
|
25270
|
+
if (this.showAttribution && (this.attributionText = J, this.attribution && (this.map.removeControl(this.attribution), this.attributionElement?.remove(), this.attributionElement = void 0), this.attribution = new rm.AttributionControl({ compact: !0, ...J ? { customAttribution: J } : {} }), this.map.addControl(this.attribution), this.attributionHost)) {
|
|
25244
25271
|
const me = this.map.getContainer().querySelector(".maplibregl-ctrl-attrib");
|
|
25245
25272
|
me && (me.setAttribute("data-om-mandated-chrome-item", "attribution"), me.style.margin = "0", this.attributionHost.appendChild(me), this.attributionElement = me);
|
|
25246
25273
|
}
|
|
@@ -25252,34 +25279,34 @@ class Ry {
|
|
|
25252
25279
|
* while a draw tool is active; drag-pan while a clip-box face handle is
|
|
25253
25280
|
* grabbed, or it fights the map's own camera drag for every mousemove).
|
|
25254
25281
|
*/
|
|
25255
|
-
setInteractive(
|
|
25256
|
-
|
|
25282
|
+
setInteractive(J) {
|
|
25283
|
+
J.doubleClickZoom === !1 ? this.map.doubleClickZoom.disable() : J.doubleClickZoom === !0 && this.map.doubleClickZoom.enable(), J.dragPan === !1 ? this.map.dragPan.disable() : J.dragPan === !0 && this.map.dragPan.enable();
|
|
25257
25284
|
}
|
|
25258
25285
|
isLoaded() {
|
|
25259
25286
|
return this.initialized;
|
|
25260
25287
|
}
|
|
25261
25288
|
getViewport() {
|
|
25262
|
-
const
|
|
25289
|
+
const J = this.map;
|
|
25263
25290
|
return {
|
|
25264
25291
|
project: (me) => {
|
|
25265
|
-
const Me =
|
|
25292
|
+
const Me = J.project([me[0], me[1]]);
|
|
25266
25293
|
return [Me.x, Me.y];
|
|
25267
25294
|
},
|
|
25268
25295
|
getBounds: () => {
|
|
25269
|
-
const me =
|
|
25296
|
+
const me = J.getBounds();
|
|
25270
25297
|
return [me.getWest(), me.getSouth(), me.getEast(), me.getNorth()];
|
|
25271
25298
|
},
|
|
25272
|
-
width:
|
|
25273
|
-
height:
|
|
25299
|
+
width: J.getContainer().clientWidth,
|
|
25300
|
+
height: J.getContainer().clientHeight
|
|
25274
25301
|
};
|
|
25275
25302
|
}
|
|
25276
25303
|
getViewState() {
|
|
25277
|
-
const
|
|
25278
|
-
return { longitude:
|
|
25304
|
+
const J = this.map.getCenter();
|
|
25305
|
+
return { longitude: J.lng, latitude: J.lat, zoom: this.map.getZoom(), pitch: this.map.getPitch(), bearing: this.map.getBearing() };
|
|
25279
25306
|
}
|
|
25280
25307
|
/** Instant recenter/rezoom — the basemap's own camera jump, no deck viewState involved. */
|
|
25281
|
-
jumpTo(
|
|
25282
|
-
this.map.jumpTo(me !== void 0 ? { center:
|
|
25308
|
+
jumpTo(J, me) {
|
|
25309
|
+
this.markBusy(), this.map.jumpTo(me !== void 0 ? { center: J, zoom: me } : { center: J });
|
|
25283
25310
|
}
|
|
25284
25311
|
/**
|
|
25285
25312
|
* Animated camera (spec: "Map Stories / Animation primitives") — MapLibre's
|
|
@@ -25287,18 +25314,19 @@ class Ry {
|
|
|
25287
25314
|
* the direct `easeTo` interpolation. duration 0 degrades to an instant
|
|
25288
25315
|
* move, so this is also the one method that reaches pitch/bearing.
|
|
25289
25316
|
*/
|
|
25290
|
-
easeTo(
|
|
25317
|
+
easeTo(J, me, Me = !1) {
|
|
25318
|
+
this.markBusy();
|
|
25291
25319
|
const Te = { duration: me };
|
|
25292
|
-
for (const [Le, R] of Object.entries(
|
|
25320
|
+
for (const [Le, R] of Object.entries(J)) R !== void 0 && (Te[Le] = R);
|
|
25293
25321
|
Me && me > 0 ? this.map.flyTo(Te) : this.map.easeTo(Te);
|
|
25294
25322
|
}
|
|
25295
|
-
fitBounds(
|
|
25296
|
-
this.map.fitBounds(
|
|
25323
|
+
fitBounds(J, me, Me = 0) {
|
|
25324
|
+
this.map.fitBounds(J, { padding: me, duration: Me });
|
|
25297
25325
|
}
|
|
25298
25326
|
destroy() {
|
|
25299
25327
|
if (this.pendingCaptureRejects.size > 0) {
|
|
25300
|
-
const
|
|
25301
|
-
for (const me of this.pendingCaptureRejects) me(
|
|
25328
|
+
const J = new Error("[onlymapjs] snapshot() canceled — the renderer was torn down before the capture frame rendered.");
|
|
25329
|
+
for (const me of this.pendingCaptureRejects) me(J);
|
|
25302
25330
|
this.pendingCaptureRejects.clear();
|
|
25303
25331
|
}
|
|
25304
25332
|
this.deckCaptures = [], this.attributionElement?.remove(), this.attributionElement = void 0, this.overlay.finalize(), this.map.remove();
|