gis-map-szdp 0.1.6 → 0.1.8

package/dist/gismap.es.js

@@ -1,6 +1,6 @@
 import { createElementBlock as sr, openBlock as je, createElementVNode as re, Fragment as fs, renderList as ds, normalizeClass as Sr, toDisplayString as ps, ref as H, normalizeStyle as di, computed as Ye, watch as sn, onMounted as ko, withDirectives as gs, createBlock as vs, resolveDynamicComponent as ys, unref as Ui, vShow as ms } from "vue";
-import { Feature as Dn, Map as As, View as Is } from "ol";
-import { Tianditu as Wr, TileSuperMapRest as Ln, GetFeaturesBySQLParameters as Ar, FeatureService as Ir } from "@supermap/iclient-ol";
+import { Feature as Ln, Map as As, View as Is } from "ol";
+import { Tianditu as Wr, TileSuperMapRest as Dn, GetFeaturesBySQLParameters as Ar, FeatureService as Ir } from "@supermap/iclient-ol";
 import "@turf/turf";
 import Hi from "ol-echarts";
 var hr = (
@@ -238,7 +238,7 @@ function Ct(i, r, t, e, n) {
 function ln(i, r, t, e) {
   return Ct(i, r, t, e, !0);
 }
-function Lt(i) {
+function Dt(i) {
   i && i.target && (i.target.removeEventListener(i.type, i.listener), An(i));
 }
 var Os = /* @__PURE__ */ function() {
@@ -321,9 +321,9 @@ zr.prototype.un;
 function Ps(i) {
   if (Array.isArray(i))
     for (var r = 0, t = i.length; r < t; ++r)
-      Lt(i[r]);
+      Dt(i[r]);
   else
-    Lt(
+    Dt(
       /** @type {import("./events.js").EventsKey} */
       i
     );
@@ -340,7 +340,7 @@ var Rs = 0;
 function J(i) {
   return i.ol_uid || (i.ol_uid = String(++Rs));
 }
-var Ds = "6.14.1", Wo = /* @__PURE__ */ function() {
+var Ls = "6.14.1", Wo = /* @__PURE__ */ function() {
   var i = function(r, t) {
     return i = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(e, n) {
       e.__proto__ = n;
@@ -422,7 +422,7 @@ const Uo = {
 };
 var _e = typeof navigator < "u" && typeof navigator.userAgent < "u" ? navigator.userAgent.toLowerCase() : "";
 _e.indexOf("firefox");
-var Ls = _e.indexOf("safari") !== -1 && _e.indexOf("chrom") == -1, Ns = Ls && !!(_e.indexOf("version/15.4") >= 0 || _e.match(/cpu (os|iphone os) 15_4 like mac os x/));
+var Ds = _e.indexOf("safari") !== -1 && _e.indexOf("chrom") == -1, Ns = Ds && !!(_e.indexOf("version/15.4") >= 0 || _e.match(/cpu (os|iphone os) 15_4 like mac os x/));
 _e.indexOf("webkit") !== -1 && _e.indexOf("edge") == -1;
 _e.indexOf("macintosh");
 var In = typeof WorkerGlobalScope < "u" && typeof OffscreenCanvas < "u" && self instanceof WorkerGlobalScope, Gs = typeof Image < "u" && Image.prototype.decode;
@@ -495,7 +495,7 @@ var zs = /* @__PURE__ */ function() {
     }, r.prototype.setMap = function(t) {
       this.map_ && Kn(this.element);
       for (var e = 0, n = this.listenerKeys.length; e < n; ++e)
-        Lt(this.listenerKeys[e]);
+        Dt(this.listenerKeys[e]);
       if (this.listenerKeys.length = 0, this.map_ = t, t) {
         var o = this.target_ ? this.target_ : t.getOverlayContainerStopEvent();
         o.appendChild(this.element), this.render !== Or && this.listenerKeys.push(Ct(t, Uo.POSTRENDER, this.render, this)), t.render();
@@ -542,7 +542,7 @@ var zs = /* @__PURE__ */ function() {
 function Jo(i) {
   return i === 1 ? "" : String(Math.round(i * 100) / 100);
 }
-const q = {
+const $ = {
   OPACITY: "opacity",
   VISIBLE: "visible",
   EXTENT: "extent",
@@ -576,7 +576,7 @@ var Ys = /* @__PURE__ */ function() {
   function(i) {
     Ys(r, i);
     function r(t) {
-      var e = this, n = "v" + Ds.split("-")[0], o = "Assertion failed. See https://openlayers.org/en/" + n + "/doc/errors/#" + t + " for details.";
+      var e = this, n = "v" + Ls.split("-")[0], o = "Assertion failed. See https://openlayers.org/en/" + n + "/doc/errors/#" + t + " for details.";
       return e = i.call(this, o) || this, e.code = t, e.name = "AssertionError", e.message = o, e;
     }
     return r;
@@ -682,7 +682,7 @@ var Us = /* @__PURE__ */ function() {
       var e = i.call(this) || this;
       e.on, e.once, e.un, e.background_ = t.background;
       var n = Nt({}, t);
-      return typeof t.properties == "object" && (delete n.properties, Nt(n, t.properties)), n[q.OPACITY] = t.opacity !== void 0 ? t.opacity : 1, nt(typeof n[q.OPACITY] == "number", 64), n[q.VISIBLE] = t.visible !== void 0 ? t.visible : !0, n[q.Z_INDEX] = t.zIndex, n[q.MAX_RESOLUTION] = t.maxResolution !== void 0 ? t.maxResolution : 1 / 0, n[q.MIN_RESOLUTION] = t.minResolution !== void 0 ? t.minResolution : 0, n[q.MIN_ZOOM] = t.minZoom !== void 0 ? t.minZoom : -1 / 0, n[q.MAX_ZOOM] = t.maxZoom !== void 0 ? t.maxZoom : 1 / 0, e.className_ = n.className !== void 0 ? n.className : "ol-layer", delete n.className, e.setProperties(n), e.state_ = null, e;
+      return typeof t.properties == "object" && (delete n.properties, Nt(n, t.properties)), n[$.OPACITY] = t.opacity !== void 0 ? t.opacity : 1, nt(typeof n[$.OPACITY] == "number", 64), n[$.VISIBLE] = t.visible !== void 0 ? t.visible : !0, n[$.Z_INDEX] = t.zIndex, n[$.MAX_RESOLUTION] = t.maxResolution !== void 0 ? t.maxResolution : 1 / 0, n[$.MIN_RESOLUTION] = t.minResolution !== void 0 ? t.minResolution : 0, n[$.MIN_ZOOM] = t.minZoom !== void 0 ? t.minZoom : -1 / 0, n[$.MAX_ZOOM] = t.maxZoom !== void 0 ? t.maxZoom : 1 / 0, e.className_ = n.className !== void 0 ? n.className : "ol-layer", delete n.className, e.setProperties(n), e.state_ = null, e;
     }
     return r.prototype.getBackground = function() {
       return this.background_;
@@ -702,63 +702,63 @@ var Us = /* @__PURE__ */ function() {
     }, r.prototype.getExtent = function() {
       return (
         /** @type {import("../extent.js").Extent|undefined} */
-        this.get(q.EXTENT)
+        this.get($.EXTENT)
       );
     }, r.prototype.getMaxResolution = function() {
       return (
         /** @type {number} */
-        this.get(q.MAX_RESOLUTION)
+        this.get($.MAX_RESOLUTION)
       );
     }, r.prototype.getMinResolution = function() {
       return (
         /** @type {number} */
-        this.get(q.MIN_RESOLUTION)
+        this.get($.MIN_RESOLUTION)
       );
     }, r.prototype.getMinZoom = function() {
       return (
         /** @type {number} */
-        this.get(q.MIN_ZOOM)
+        this.get($.MIN_ZOOM)
       );
     }, r.prototype.getMaxZoom = function() {
       return (
         /** @type {number} */
-        this.get(q.MAX_ZOOM)
+        this.get($.MAX_ZOOM)
       );
     }, r.prototype.getOpacity = function() {
       return (
         /** @type {number} */
-        this.get(q.OPACITY)
+        this.get($.OPACITY)
       );
     }, r.prototype.getSourceState = function() {
       return W();
     }, r.prototype.getVisible = function() {
       return (
         /** @type {boolean} */
-        this.get(q.VISIBLE)
+        this.get($.VISIBLE)
       );
     }, r.prototype.getZIndex = function() {
       return (
         /** @type {number} */
-        this.get(q.Z_INDEX)
+        this.get($.Z_INDEX)
       );
     }, r.prototype.setBackground = function(t) {
       this.background_ = t, this.changed();
     }, r.prototype.setExtent = function(t) {
-      this.set(q.EXTENT, t);
+      this.set($.EXTENT, t);
     }, r.prototype.setMaxResolution = function(t) {
-      this.set(q.MAX_RESOLUTION, t);
+      this.set($.MAX_RESOLUTION, t);
     }, r.prototype.setMinResolution = function(t) {
-      this.set(q.MIN_RESOLUTION, t);
+      this.set($.MIN_RESOLUTION, t);
     }, r.prototype.setMaxZoom = function(t) {
-      this.set(q.MAX_ZOOM, t);
+      this.set($.MAX_ZOOM, t);
     }, r.prototype.setMinZoom = function(t) {
-      this.set(q.MIN_ZOOM, t);
+      this.set($.MIN_ZOOM, t);
     }, r.prototype.setOpacity = function(t) {
-      nt(typeof t == "number", 64), this.set(q.OPACITY, t);
+      nt(typeof t == "number", 64), this.set($.OPACITY, t);
     }, r.prototype.setVisible = function(t) {
-      this.set(q.VISIBLE, t);
+      this.set($.VISIBLE, t);
     }, r.prototype.setZIndex = function(t) {
-      this.set(q.Z_INDEX, t);
+      this.set($.Z_INDEX, t);
     }, r.prototype.disposeInternal = function() {
       this.state_ && (this.state_.layer = null, this.state_ = null), i.prototype.disposeInternal.call(this);
     }, r;
@@ -820,7 +820,7 @@ var Vs = /* @__PURE__ */ function() {
     Vs(r, i);
     function r(t) {
       var e = this, n = Nt({}, t);
-      delete n.source, e = i.call(this, n) || this, e.on, e.once, e.un, e.mapPrecomposeKey_ = null, e.mapRenderKey_ = null, e.sourceChangeKey_ = null, e.renderer_ = null, e.rendered = !1, t.render && (e.render = t.render), t.map && e.setMap(t.map), e.addChangeListener(q.SOURCE, e.handleSourcePropertyChange_);
+      delete n.source, e = i.call(this, n) || this, e.on, e.once, e.un, e.mapPrecomposeKey_ = null, e.mapRenderKey_ = null, e.sourceChangeKey_ = null, e.renderer_ = null, e.rendered = !1, t.render && (e.render = t.render), t.map && e.setMap(t.map), e.addChangeListener($.SOURCE, e.handleSourcePropertyChange_);
       var o = t.source ? (
         /** @type {SourceType} */
         t.source
@@ -836,7 +836,7 @@ var Vs = /* @__PURE__ */ function() {
     }, r.prototype.getSource = function() {
       return (
         /** @type {SourceType} */
-        this.get(q.SOURCE) || null
+        this.get($.SOURCE) || null
       );
     }, r.prototype.getRenderSource = function() {
       return this.getSource();
@@ -846,7 +846,7 @@ var Vs = /* @__PURE__ */ function() {
     }, r.prototype.handleSourceChange_ = function() {
       this.changed();
     }, r.prototype.handleSourcePropertyChange_ = function() {
-      this.sourceChangeKey_ && (Lt(this.sourceChangeKey_), this.sourceChangeKey_ = null);
+      this.sourceChangeKey_ && (Dt(this.sourceChangeKey_), this.sourceChangeKey_ = null);
       var t = this.getSource();
       t && (this.sourceChangeKey_ = Ct(t, dt.CHANGE, this.handleSourceChange_, this)), this.changed();
     }, r.prototype.getFeatures = function(t) {
@@ -862,11 +862,11 @@ var Vs = /* @__PURE__ */ function() {
     }, r.prototype.unrender = function() {
       this.rendered = !1;
     }, r.prototype.setMapInternal = function(t) {
-      t || this.unrender(), this.set(q.MAP, t);
+      t || this.unrender(), this.set($.MAP, t);
     }, r.prototype.getMapInternal = function() {
-      return this.get(q.MAP);
+      return this.get($.MAP);
     }, r.prototype.setMap = function(t) {
-      this.mapPrecomposeKey_ && (Lt(this.mapPrecomposeKey_), this.mapPrecomposeKey_ = null), t || this.changed(), this.mapRenderKey_ && (Lt(this.mapRenderKey_), this.mapRenderKey_ = null), t && (this.mapPrecomposeKey_ = Ct(t, ue.PRECOMPOSE, function(e) {
+      this.mapPrecomposeKey_ && (Dt(this.mapPrecomposeKey_), this.mapPrecomposeKey_ = null), t || this.changed(), this.mapRenderKey_ && (Dt(this.mapRenderKey_), this.mapRenderKey_ = null), t && (this.mapPrecomposeKey_ = Ct(t, ue.PRECOMPOSE, function(e) {
         var n = (
           /** @type {import("../render/Event.js").default} */
           e
@@ -876,7 +876,7 @@ var Vs = /* @__PURE__ */ function() {
         }), 67), o.push(a);
       }, this), this.mapRenderKey_ = Ct(this, dt.CHANGE, t.render, t), this.changed());
     }, r.prototype.setSource = function(t) {
-      this.set(q.SOURCE, t);
+      this.set($.SOURCE, t);
     }, r.prototype.getRenderer = function() {
       return this.renderer_ || (this.renderer_ = this.createRenderer()), this.renderer_;
     }, r.prototype.hasRenderer = function() {
@@ -1667,7 +1667,7 @@ function Ml(i, r, t, e) {
     });
   });
 }
-function Le(i, r) {
+function De(i, r) {
   if (i === r)
     return !0;
   var t = i.getUnits() === r.getUnits();
@@ -1699,7 +1699,7 @@ function Pl() {
 }
 Pl();
 var ca = new Array(6);
-function Dt() {
+function Lt() {
   return [1, 0, 0, 1, 0, 0];
 }
 function Gn(i) {
@@ -1719,11 +1719,11 @@ function ft(i, r) {
   var t = r[0], e = r[1];
   return r[0] = i[0] * t + i[2] * e + i[4], r[1] = i[1] * t + i[3] * e + i[5], r;
 }
-function Dl(i, r) {
+function Ll(i, r) {
   var t = Math.cos(r), e = Math.sin(r);
   return Ti(i, Cn(ca, t, e, -e, t, 0, 0));
 }
-function Ll(i, r, t) {
+function Dl(i, r, t) {
   return Ti(i, Cn(ca, r, 0, 0, t, 0, 0));
 }
 function Nl(i, r, t) {
@@ -1875,7 +1875,7 @@ var uo = new Yl(), kl = /* @__PURE__ */ function() {
     }
     return r;
   }(hr)
-), pa = "10px sans-serif", fe = "#000", fn = "round", Pr = [], Rr = 0, cr = "round", Dr = 10, Lr = "#000", Nr = "center", dn = "middle", be = [0, 0, 0, 0], Gr = 1, ve = new Pe(), Zl = new br();
+), pa = "10px sans-serif", fe = "#000", fn = "round", Pr = [], Rr = 0, cr = "round", Lr = 10, Dr = "#000", Nr = "center", dn = "middle", be = [0, 0, 0, 0], Gr = 1, ve = new Pe(), Zl = new br();
 Zl.setSize = function() {
   console.warn("labelCache is deprecated.");
 };
@@ -2071,7 +2071,7 @@ var Jl = /* @__PURE__ */ function() {
       var t = this.getElement();
       t && this.element.appendChild(t);
     }, r.prototype.handleMapChanged = function() {
-      this.mapPostrenderListenerKey && (Kn(this.element), Lt(this.mapPostrenderListenerKey), this.mapPostrenderListenerKey = null);
+      this.mapPostrenderListenerKey && (Kn(this.element), Dt(this.mapPostrenderListenerKey), this.mapPostrenderListenerKey = null);
       var t = this.getMap();
       if (t) {
         this.mapPostrenderListenerKey = Ct(t, Uo.POSTRENDER, this.render, this), this.updatePixelPosition();
@@ -2219,7 +2219,7 @@ var tu = /* @__PURE__ */ function() {
     }
     r.prototype = t === null ? Object.create(t) : (e.prototype = t.prototype, new e());
   };
-}(), ho = Dt(), ma = (
+}(), ho = Lt(), ma = (
   /** @class */
   function(i) {
     tu(r, i);
@@ -2521,21 +2521,21 @@ function lu(i, r, t, e, n, o, a, s) {
   }
   return a;
 }
-function De(i, r) {
+function Le(i, r) {
   return r * Math.round(i / r);
 }
 function uu(i, r, t, e, n, o, a) {
   if (r == t)
     return a;
-  var s = De(i[r], n), l = De(i[r + 1], n);
+  var s = Le(i[r], n), l = Le(i[r + 1], n);
   r += e, o[a++] = s, o[a++] = l;
   var u, c;
   do
-    if (u = De(i[r], n), c = De(i[r + 1], n), r += e, r == t)
+    if (u = Le(i[r], n), c = Le(i[r + 1], n), r += e, r == t)
       return o[a++] = u, o[a++] = c, a;
   while (u == s && c == l);
   for (; r < t; ) {
-    var h = De(i[r], n), f = De(i[r + 1], n);
+    var h = Le(i[r], n), f = Le(i[r + 1], n);
     if (r += e, !(h == u && f == c)) {
       var d = u - s, p = c - l, g = h - s, v = f - l;
       if (d * v == p * g && (d < 0 && g < d || d == g || d > 0 && g > d) && (p < 0 && v < p || p == v || p > 0 && v > p)) {
@@ -2984,7 +2984,7 @@ var _u = /* @__PURE__ */ function() {
     }
     r.prototype = t === null ? Object.create(t) : (e.prototype = t.prototype, new e());
   };
-}(), Di = (
+}(), Li = (
   /** @class */
   function(i) {
     _u(r, i);
@@ -3033,7 +3033,7 @@ var _u = /* @__PURE__ */ function() {
     }, r.prototype.handleGeometryChange_ = function() {
       this.changed();
     }, r.prototype.handleGeometryChanged_ = function() {
-      this.geometryChangeKey_ && (Lt(this.geometryChangeKey_), this.geometryChangeKey_ = null);
+      this.geometryChangeKey_ && (Dt(this.geometryChangeKey_), this.geometryChangeKey_ = null);
       var t = this.getGeometry();
       t && (this.geometryChangeKey_ = Ct(t, dt.CHANGE, this.handleGeometryChange_, this)), this.changed();
     }, r.prototype.setGeometry = function(t) {
@@ -3438,15 +3438,15 @@ var Ou = /* @__PURE__ */ function() {
       var g = e / 2 / p, v = e / 2 * (f / d), m = Math.sqrt((o + g) * (o + g) + v * v), E = m - o;
       if (this.radius2_ === void 0 || t === "bevel")
         return E * 2;
-      var y = o * Math.sin(u), A = Math.sqrt(o * o - y * y), S = a - A, L = Math.sqrt(y * y + S * S), D = L / y;
-      if (D <= n) {
-        var x = D * e / 2 - a - o;
+      var y = o * Math.sin(u), A = Math.sqrt(o * o - y * y), S = a - A, D = Math.sqrt(y * y + S * S), L = D / y;
+      if (L <= n) {
+        var x = L * e / 2 - a - o;
         return 2 * Math.max(E, x);
       }
       return E * 2;
     }, r.prototype.createRenderOptions = function() {
       var t = cr, e = 0, n = null, o = 0, a, s = 0;
-      this.stroke_ && (a = this.stroke_.getColor(), a === null && (a = Lr), a = ie(a), s = this.stroke_.getWidth(), s === void 0 && (s = Gr), n = this.stroke_.getLineDash(), o = this.stroke_.getLineDashOffset(), t = this.stroke_.getLineJoin(), t === void 0 && (t = cr), e = this.stroke_.getMiterLimit(), e === void 0 && (e = Dr));
+      this.stroke_ && (a = this.stroke_.getColor(), a === null && (a = Dr), a = ie(a), s = this.stroke_.getWidth(), s === void 0 && (s = Gr), n = this.stroke_.getLineDash(), o = this.stroke_.getLineDashOffset(), t = this.stroke_.getLineJoin(), t === void 0 && (t = cr), e = this.stroke_.getMiterLimit(), e === void 0 && (e = Lr));
       var l = this.calculateLineJoinSize_(t, s, e), u = Math.max(this.radius_, this.radius2_ || 0), c = Math.ceil(2 * u + l);
       return {
         strokeStyle: a,
@@ -3608,7 +3608,7 @@ var Ou = /* @__PURE__ */ function() {
     }, i;
   }()
 );
-function Du(i) {
+function Lu(i) {
   var r;
   if (typeof i == "function")
     r = i;
@@ -3632,7 +3632,7 @@ function Du(i) {
   return r;
 }
 var Fn = null;
-function Lu(i, r) {
+function Du(i, r) {
   if (!Fn) {
     var t = new Yt({
       color: "rgba(255,255,255,0.4)"
@@ -3763,13 +3763,13 @@ var Nu = "#333", Ne = (
   }()
 );
 function Gu(i, r, t, e, n) {
-  Da(i, r, t || 0, e || i.length - 1, n || Fu);
+  La(i, r, t || 0, e || i.length - 1, n || Fu);
 }
-function Da(i, r, t, e, n) {
+function La(i, r, t, e, n) {
   for (; e > t; ) {
     if (e - t > 600) {
       var o = e - t + 1, a = r - t + 1, s = Math.log(o), l = 0.5 * Math.exp(2 * s / 3), u = 0.5 * Math.sqrt(s * l * (o - l) / o) * (a - o / 2 < 0 ? -1 : 1), c = Math.max(t, Math.floor(r - a * l / o + u)), h = Math.min(e, Math.floor(r + (o - a) * l / o + u));
-      Da(i, r, c, h, n);
+      La(i, r, c, h, n);
     }
     var f = i[r], d = t, p = e;
     for (Er(i, t, r), n(i[e], f) > 0 && Er(i, t, e); d < p; ) {
@@ -3786,7 +3786,7 @@ function Er(i, r, t) {
 function Fu(i, r) {
   return i < r ? -1 : i > r ? 1 : 0;
 }
-let La = class {
+let Da = class {
   constructor(r = 9) {
     this._maxEntries = Math.max(4, r), this._minEntries = Math.max(2, Math.ceil(this._maxEntries * 0.4)), this.clear();
   }
@@ -4051,7 +4051,7 @@ var ku = /* @__PURE__ */ function() {
   };
 }(), Ao = {
   RENDER_ORDER: "renderOrder"
-}, Li = (
+}, Di = (
   /** @class */
   function(i) {
     ku(r, i);
@@ -4079,11 +4079,11 @@ var ku = /* @__PURE__ */ function() {
     }, r.prototype.getUpdateWhileInteracting = function() {
       return this.updateWhileInteracting_;
     }, r.prototype.renderDeclutter = function(t) {
-      t.declutterTree || (t.declutterTree = new La(9)), this.getRenderer().renderDeclutter(t);
+      t.declutterTree || (t.declutterTree = new Da(9)), this.getRenderer().renderDeclutter(t);
     }, r.prototype.setRenderOrder = function(t) {
       this.set(Ao.RENDER_ORDER, t);
     }, r.prototype.setStyle = function(t) {
-      this.style_ = t !== void 0 ? t : Lu, this.styleFunction_ = t === null ? void 0 : Du(this.style_), this.changed();
+      this.style_ = t !== void 0 ? t : Du, this.styleFunction_ = t === null ? void 0 : Lu(this.style_), this.changed();
     }, r;
   }(qo)
 ), X = {
@@ -4317,7 +4317,7 @@ var ku = /* @__PURE__ */ function() {
         n.fillStyle = void 0;
       if (e) {
         var a = e.getColor();
-        n.strokeStyle = ie(a || Lr);
+        n.strokeStyle = ie(a || Dr);
         var s = e.getLineCap();
         n.lineCap = s !== void 0 ? s : fn;
         var l = e.getLineDash();
@@ -4329,7 +4329,7 @@ var ku = /* @__PURE__ */ function() {
         var h = e.getWidth();
         n.lineWidth = h !== void 0 ? h : Gr;
         var f = e.getMiterLimit();
-        n.miterLimit = f !== void 0 ? f : Dr, n.lineWidth > this.maxLineWidth && (this.maxLineWidth = n.lineWidth, this.bufferedMaxExtent_ = null);
+        n.miterLimit = f !== void 0 ? f : Lr, n.lineWidth > this.maxLineWidth && (this.maxLineWidth = n.lineWidth, this.bufferedMaxExtent_ = null);
       } else
         n.strokeStyle = void 0, n.lineCap = void 0, n.lineDash = null, n.lineDashOffset = void 0, n.lineJoin = void 0, n.lineWidth = void 0, n.miterLimit = void 0;
     }, r.prototype.createFill = function(t) {
@@ -4668,7 +4668,7 @@ var ku = /* @__PURE__ */ function() {
       var t = this.tolerance;
       if (t !== 0)
         for (var e = this.coordinates, n = 0, o = e.length; n < o; ++n)
-          e[n] = De(e[n], t);
+          e[n] = Le(e[n], t);
       return i.prototype.finish.call(this);
     }, r.prototype.setFillStrokeStyles_ = function() {
       var t = this.state, e = t.fillStyle;
@@ -4759,12 +4759,12 @@ var Qu = /* @__PURE__ */ function() {
               E = f[y];
             for (var p = m; p < E; p += h)
               s.push(c[p], c[p + 1]);
-            var L = s.length;
-            m = f[y], this.drawChars_(l, L), l = L;
+            var D = s.length;
+            m = f[y], this.drawChars_(l, D), l = D;
           }
           this.endGeometry(e);
         } else {
-          var D = a.overflow ? null : [];
+          var L = a.overflow ? null : [];
           switch (u) {
             case k.POINT:
             case k.MULTI_POINT:
@@ -4785,7 +4785,7 @@ var Qu = /* @__PURE__ */ function() {
               break;
             case k.POLYGON:
               c = /** @type {import("../../geom/Polygon.js").default} */
-              t.getFlatInteriorPoint(), a.overflow || D.push(c[2] / this.resolution), h = 3;
+              t.getFlatInteriorPoint(), a.overflow || L.push(c[2] / this.resolution), h = 3;
               break;
             case k.MULTI_POLYGON:
               var x = (
@@ -4794,18 +4794,18 @@ var Qu = /* @__PURE__ */ function() {
               );
               c = [];
               for (var p = 0, g = x.length; p < g; p += 3)
-                a.overflow || D.push(x[p + 2] / this.resolution), c.push(x[p], x[p + 1]);
+                a.overflow || L.push(x[p + 2] / this.resolution), c.push(x[p], x[p + 1]);
               if (c.length === 0)
                 return;
               h = 2;
               break;
           }
-          var L = this.appendFlatPointCoordinates(c, h);
-          if (L === l)
+          var D = this.appendFlatPointCoordinates(c, h);
+          if (D === l)
             return;
-          if (D && (L - l) / 2 !== c.length / h) {
+          if (L && (D - l) / 2 !== c.length / h) {
             var T = l / 2;
-            D = D.filter(function(j, G) {
+            L = L.filter(function(B, G) {
               var b = s[(T + G) * 2] === c[G * h] && s[(T + G) * 2 + 1] === c[G * h + 1];
               return b || --T, b;
             });
@@ -4820,7 +4820,7 @@ var Qu = /* @__PURE__ */ function() {
           this.instructions.push([
             X.DRAW_IMAGE,
             l,
-            L,
+            D,
             null,
             NaN,
             NaN,
@@ -4833,8 +4833,8 @@ var Qu = /* @__PURE__ */ function() {
             [1, 1],
             NaN,
             this.declutterImageWithText_,
-            C == be ? be : C.map(function(j) {
-              return j * z;
+            C == be ? be : C.map(function(B) {
+              return B * z;
             }),
             !!a.backgroundFill,
             !!a.backgroundStroke,
@@ -4844,13 +4844,13 @@ var Qu = /* @__PURE__ */ function() {
             this.fillKey_,
             this.textOffsetX_,
             this.textOffsetY_,
-            D
+            L
           ]);
           var w = 1 / z;
           this.hitDetectionInstructions.push([
             X.DRAW_IMAGE,
             l,
-            L,
+            D,
             null,
             NaN,
             NaN,
@@ -4872,7 +4872,7 @@ var Qu = /* @__PURE__ */ function() {
             this.fillKey_,
             this.textOffsetX_,
             this.textOffsetY_,
-            D
+            L
           ]), this.endGeometry(e);
         }
       }
@@ -4948,7 +4948,7 @@ var Qu = /* @__PURE__ */ function() {
           a = this.textStrokeState_, a || (a = /** @type {import("../canvas.js").StrokeState} */
           {}, this.textStrokeState_ = a);
           var u = l.getLineDash(), c = l.getLineDashOffset(), h = l.getWidth(), f = l.getMiterLimit();
-          a.lineCap = l.getLineCap() || fn, a.lineDash = u ? u.slice() : Pr, a.lineDashOffset = c === void 0 ? Rr : c, a.lineJoin = l.getLineJoin() || cr, a.lineWidth = h === void 0 ? Gr : h, a.miterLimit = f === void 0 ? Dr : f, a.strokeStyle = ie(l.getColor() || Lr);
+          a.lineCap = l.getLineCap() || fn, a.lineDash = u ? u.slice() : Pr, a.lineDashOffset = c === void 0 ? Rr : c, a.lineJoin = l.getLineJoin() || cr, a.lineWidth = h === void 0 ? Gr : h, a.miterLimit = f === void 0 ? Lr : f, a.strokeStyle = ie(l.getColor() || Dr);
         }
         n = this.textState_;
         var d = t.getFont() || pa;
@@ -5094,7 +5094,7 @@ var Fa = (
     tc(r, i);
     function r(t) {
       var e = i.call(this, t) || this;
-      return e.container = null, e.renderedResolution, e.tempTransform = Dt(), e.pixelTransform = Dt(), e.inversePixelTransform = Dt(), e.context = null, e.containerReused = !1, e.pixelContext_ = null, e.frameState = null, e;
+      return e.container = null, e.renderedResolution, e.tempTransform = Lt(), e.pixelTransform = Lt(), e.inversePixelTransform = Lt(), e.context = null, e.containerReused = !1, e.pixelContext_ = null, e.frameState = null, e;
     }
     return r.prototype.getImageData = function(t, e, n) {
       wr || ec(), wr.clearRect(0, 0, 1, 1);
@@ -5180,7 +5180,7 @@ function rc(i, r, t, e, n, o, a, s, l, u, c, h) {
   do
     E();
   while (r < t - e && m + v < o);
-  for (var y = v === 0 ? 0 : (o - m) / v, A = le(p, f, y), S = le(g, d, y), L = r - e, D = m, x = o + s * l(u, n, c); r < t - e && m + v < x; )
+  for (var y = v === 0 ? 0 : (o - m) / v, A = le(p, f, y), S = le(g, d, y), D = r - e, L = m, x = o + s * l(u, n, c); r < t - e && m + v < x; )
     E();
   y = v === 0 ? 0 : (x - m) / v;
   var T = le(p, f, y), C = le(g, d, y), R;
@@ -5189,13 +5189,13 @@ function rc(i, r, t, e, n, o, a, s, l, u, c, h) {
     ya(O, 0, 4, 2, h, O, O), R = O[0] > O[2];
   } else
     R = A > T;
-  var N = Math.PI, F = [], z = L + e === r;
-  r = L, v = 0, m = D, f = i[r], d = i[r + 1];
+  var N = Math.PI, F = [], z = D + e === r;
+  r = D, v = 0, m = L, f = i[r], d = i[r + 1];
   var w;
   if (z) {
     E(), w = Math.atan2(d - g, f - p), R && (w += w > 0 ? -N : N);
-    var _ = (T + A) / 2, j = (C + S) / 2;
-    return F[0] = [_, j, (x - o) / 2, w, n], F;
+    var _ = (T + A) / 2, B = (C + S) / 2;
+    return F[0] = [_, B, (x - o) / 2, w, n], F;
   }
   for (var G = 0, b = n.length; G < b; ) {
     E();
@@ -5207,7 +5207,7 @@ function rc(i, r, t, e, n, o, a, s, l, u, c, h) {
     }
     w = Z;
     for (var M = G, I = 0; G < b; ++G) {
-      var B = R ? b - G - 1 : G, Y = s * l(u, n[B], c);
+      var j = R ? b - G - 1 : G, Y = s * l(u, n[j], c);
       if (r + e < t && m + v < o + I + Y / 2)
         break;
       I += Y;
@@ -5215,8 +5215,8 @@ function rc(i, r, t, e, n, o, a, s, l, u, c, h) {
     if (G !== M) {
       var V = R ? n.substring(b - M, b - G) : n.substring(M, G);
       y = v === 0 ? 0 : (o + I / 2 - m) / v;
-      var _ = le(p, f, y), j = le(g, d, y);
-      F.push([_, j, I / 2, Z, V]), o += I;
+      var _ = le(p, f, y), B = le(g, d, y);
+      F.push([_, B, I / 2, Z, V]), o += I;
     }
   }
   return F;
@@ -5241,7 +5241,7 @@ var oc = (
   /** @class */
   function() {
     function i(r, t, e, n) {
-      this.overlaps = e, this.pixelRatio = t, this.resolution = r, this.alignFill_, this.instructions = n.instructions, this.coordinates = n.coordinates, this.coordinateCache_ = {}, this.renderedTransform_ = Dt(), this.hitDetectionInstructions = n.hitDetectionInstructions, this.pixelCoordinates_ = null, this.viewRotation_ = 0, this.fillStates = n.fillStates || {}, this.strokeStates = n.strokeStates || {}, this.textStates = n.textStates || {}, this.widths_ = {}, this.labels_ = {};
+      this.overlaps = e, this.pixelRatio = t, this.resolution = r, this.alignFill_, this.instructions = n.instructions, this.coordinates = n.coordinates, this.coordinateCache_ = {}, this.renderedTransform_ = Lt(), this.hitDetectionInstructions = n.hitDetectionInstructions, this.pixelCoordinates_ = null, this.viewRotation_ = 0, this.fillStates = n.fillStates || {}, this.strokeStates = n.strokeStates || {}, this.textStates = n.textStates || {}, this.widths_ = {}, this.labels_ = {};
     }
     return i.prototype.createLabel = function(r, t, e, n) {
       var o = r + t + e + n;
@@ -5251,34 +5251,34 @@ var oc = (
         l.scale[0] * u,
         l.scale[1] * u
       ], h = Array.isArray(r), f = Co(h ? r[0] : r, l.textAlign || Nr), d = n && a.lineWidth ? a.lineWidth : 0, p = h ? r : r.split(`
-`).reduce(ic, []), g = Ul(l, p), v = g.width, m = g.height, E = g.widths, y = g.heights, A = g.lineWidths, S = v + d, L = [], D = (S + 2) * c[0], x = (m + d) * c[1], T = {
-        width: D < 0 ? Math.floor(D) : Math.ceil(D),
+`).reduce(ic, []), g = Ul(l, p), v = g.width, m = g.height, E = g.widths, y = g.heights, A = g.lineWidths, S = v + d, D = [], L = (S + 2) * c[0], x = (m + d) * c[1], T = {
+        width: L < 0 ? Math.floor(L) : Math.ceil(L),
         height: x < 0 ? Math.floor(x) : Math.ceil(x),
-        contextInstructions: L
+        contextInstructions: D
       };
-      if ((c[0] != 1 || c[1] != 1) && L.push("scale", c), n) {
-        L.push("strokeStyle", a.strokeStyle), L.push("lineWidth", d), L.push("lineCap", a.lineCap), L.push("lineJoin", a.lineJoin), L.push("miterLimit", a.miterLimit);
+      if ((c[0] != 1 || c[1] != 1) && D.push("scale", c), n) {
+        D.push("strokeStyle", a.strokeStyle), D.push("lineWidth", d), D.push("lineCap", a.lineCap), D.push("lineJoin", a.lineJoin), D.push("miterLimit", a.miterLimit);
         var C = In ? OffscreenCanvasRenderingContext2D : CanvasRenderingContext2D;
-        C.prototype.setLineDash && (L.push("setLineDash", [a.lineDash]), L.push("lineDashOffset", a.lineDashOffset));
+        C.prototype.setLineDash && (D.push("setLineDash", [a.lineDash]), D.push("lineDashOffset", a.lineDashOffset));
       }
-      e && L.push("fillStyle", s.fillStyle), L.push("textBaseline", "middle"), L.push("textAlign", "center");
-      for (var R = 0.5 - f, O = f * S + R * d, N = [], F = [], z = 0, w = 0, _ = 0, j = 0, G, b = 0, Z = p.length; b < Z; b += 2) {
+      e && D.push("fillStyle", s.fillStyle), D.push("textBaseline", "middle"), D.push("textAlign", "center");
+      for (var R = 0.5 - f, O = f * S + R * d, N = [], F = [], z = 0, w = 0, _ = 0, B = 0, G, b = 0, Z = p.length; b < Z; b += 2) {
         var P = p[b];
         if (P === `
 `) {
-          w += z, z = 0, O = f * S + R * d, ++j;
+          w += z, z = 0, O = f * S + R * d, ++B;
           continue;
         }
         var M = p[b + 1] || l.font;
         M !== G && (n && N.push("font", M), e && F.push("font", M), G = M), z = Math.max(z, y[_]);
         var I = [
           P,
-          O + R * E[_] + f * (E[_] - A[j]),
+          O + R * E[_] + f * (E[_] - A[B]),
           0.5 * (d + z) + w
         ];
         O += E[_], n && N.push("strokeText", I), e && F.push("fillText", I), ++_;
       }
-      return Array.prototype.push.apply(L, N), Array.prototype.push.apply(L, F), this.labels_[o] = T, T;
+      return Array.prototype.push.apply(D, N), Array.prototype.push.apply(D, F), this.labels_[o] = T, T;
     }, i.prototype.replayTextBackground_ = function(r, t, e, n, o, a, s) {
       r.beginPath(), r.moveTo.apply(r, t), r.lineTo.apply(r, e), r.lineTo.apply(r, n), r.lineTo.apply(r, o), r.lineTo.apply(r, t), a && (this.alignFill_ = /** @type {boolean} */
       a[2], this.fill_(r)), s && (this.setStrokeStyle_(
@@ -5288,10 +5288,10 @@ var oc = (
       ), r.stroke());
     }, i.prototype.calculateImageOrLabelDimensions_ = function(r, t, e, n, o, a, s, l, u, c, h, f, d, p, g, v) {
       s *= f[0], l *= f[1];
-      var m = e - s, E = n - l, y = o + u > r ? r - u : o, A = a + c > t ? t - c : a, S = p[3] + y * f[0] + p[1], L = p[0] + A * f[1] + p[2], D = m - p[3], x = E - p[0];
-      (g || h !== 0) && (ye[0] = D, me[0] = D, ye[1] = x, ae[1] = x, ae[0] = D + S, se[0] = ae[0], se[1] = x + L, me[1] = se[1]);
+      var m = e - s, E = n - l, y = o + u > r ? r - u : o, A = a + c > t ? t - c : a, S = p[3] + y * f[0] + p[1], D = p[0] + A * f[1] + p[2], L = m - p[3], x = E - p[0];
+      (g || h !== 0) && (ye[0] = L, me[0] = L, ye[1] = x, ae[1] = x, ae[0] = L + S, se[0] = ae[0], se[1] = x + D, me[1] = se[1]);
       var T;
-      return h !== 0 ? (T = oe(Dt(), e, n, 1, 1, h, -e, -n), ft(T, ye), ft(T, ae), ft(T, se), ft(T, me), we(Math.min(ye[0], ae[0], se[0], me[0]), Math.min(ye[1], ae[1], se[1], me[1]), Math.max(ye[0], ae[0], se[0], me[0]), Math.max(ye[1], ae[1], se[1], me[1]), qe)) : we(Math.min(D, D + S), Math.min(x, x + L), Math.max(D, D + S), Math.max(x, x + L), qe), d && (m = Math.round(m), E = Math.round(E)), {
+      return h !== 0 ? (T = oe(Lt(), e, n, 1, 1, h, -e, -n), ft(T, ye), ft(T, ae), ft(T, se), ft(T, me), we(Math.min(ye[0], ae[0], se[0], me[0]), Math.min(ye[1], ae[1], se[1], me[1]), Math.max(ye[0], ae[0], se[0], me[0]), Math.max(ye[1], ae[1], se[1], me[1]), qe)) : we(Math.min(L, L + S), Math.min(x, x + D), Math.max(L, L + S), Math.max(x, x + D), qe), d && (m = Math.round(m), E = Math.round(E)), {
         drawImageX: m,
         drawImageY: E,
         drawImageW: y,
@@ -5348,7 +5348,7 @@ var oc = (
     }, i.prototype.execute_ = function(r, t, e, n, o, a, s, l) {
       var u;
       this.pixelCoordinates_ && Oe(e, this.renderedTransform_) ? u = this.pixelCoordinates_ : (this.pixelCoordinates_ || (this.pixelCoordinates_ = []), u = Ze(this.coordinates, 0, this.coordinates.length, 2, e, this.pixelCoordinates_), Rl(this.renderedTransform_, e));
-      for (var c = 0, h = n.length, f = 0, d, p, g, v, m, E, y, A, S, L, D, x, T = 0, C = 0, R = null, O = null, N = this.coordinateCache_, F = this.viewRotation_, z = Math.round(Math.atan2(-e[1], e[0]) * 1e12) / 1e12, w = (
+      for (var c = 0, h = n.length, f = 0, d, p, g, v, m, E, y, A, S, D, L, x, T = 0, C = 0, R = null, O = null, N = this.coordinateCache_, F = this.viewRotation_, z = Math.round(Math.atan2(-e[1], e[0]) * 1e12) / 1e12, w = (
         /** @type {import("../../render.js").State} */
         {
           context: r,
@@ -5356,15 +5356,15 @@ var oc = (
           resolution: this.resolution,
           rotation: F
         }
-      ), _ = this.instructions != n || this.overlaps ? 0 : 200, j, G, b, Z; c < h; ) {
+      ), _ = this.instructions != n || this.overlaps ? 0 : 200, B, G, b, Z; c < h; ) {
         var P = n[c], M = (
           /** @type {import("./Instruction.js").default} */
           P[0]
         );
         switch (M) {
           case X.BEGIN_GEOMETRY:
-            j = /** @type {import("../../Feature.js").FeatureLike} */
-            P[1], Z = P[3], j.getGeometry() ? s !== void 0 && !bt(s, Z.getExtent()) ? c = /** @type {number} */
+            B = /** @type {import("../../Feature.js").FeatureLike} */
+            P[1], Z = P[3], B.getGeometry() ? s !== void 0 && !bt(s, Z.getExtent()) ? c = /** @type {number} */
             P[2] + 1 : ++c : c = /** @type {number} */
             P[2];
             break;
@@ -5374,8 +5374,8 @@ var oc = (
           case X.CIRCLE:
             f = /** @type {number} */
             P[1];
-            var I = u[f], B = u[f + 1], Y = u[f + 2], V = u[f + 3], Q = Y - I, $ = V - B, Ot = Math.sqrt(Q * Q + $ * $);
-            r.moveTo(I + Ot, B), r.arc(I, B, Ot, 0, 2 * Math.PI, !0), ++c;
+            var I = u[f], j = u[f + 1], Y = u[f + 2], V = u[f + 3], Q = Y - I, tt = V - j, Ot = Math.sqrt(Q * Q + tt * tt);
+            r.moveTo(I + Ot, j), r.arc(I, j, Ot, 0, 2 * Math.PI, !0), ++c;
             break;
           case X.CLOSE_PATH:
             r.closePath(), ++c;
@@ -5387,7 +5387,7 @@ var oc = (
               /** @type {import("../../geom/SimpleGeometry.js").default} */
               P[3]
             ), de = P[4], pe = P.length == 6 ? P[5] : void 0;
-            w.geometry = Gt, w.feature = j, c in N || (N[c] = []);
+            w.geometry = Gt, w.feature = B, c in N || (N[c] = []);
             var Wt = N[c];
             pe ? pe(u, f, d, 2, Wt) : (Wt[0] = u[f], Wt[1] = u[f + 1], Wt.length = 2), de(Wt, w), ++c;
             break;
@@ -5416,7 +5416,7 @@ var oc = (
             ), it = (
               /** @type {number} */
               P[11]
-            ), tt = (
+            ), q = (
               /** @type {import("../../size.js").Size} */
               P[12]
             ), lt = (
@@ -5428,11 +5428,11 @@ var oc = (
             );
             if (!A && P.length >= 19) {
               S = /** @type {string} */
-              P[18], L = /** @type {string} */
-              P[19], D = /** @type {string} */
+              P[18], D = /** @type {string} */
+              P[19], L = /** @type {string} */
               P[20], x = /** @type {string} */
               P[21];
-              var ot = this.drawLabelWithPointPlacement_(S, L, D, x);
+              var ot = this.drawLabelWithPointPlacement_(S, D, L, x);
               A = ot.label, P[3] = A;
               var wt = (
                 /** @type {number} */
@@ -5455,7 +5455,7 @@ var oc = (
             P[17]) : (gt = be, It = !1, Pt = !1), et && z ? it += F : !et && !z && (it -= F);
             for (var Ut = 0; f < d; f += 2)
               if (!(Bt && Bt[Ut++] < lt / this.pixelRatio)) {
-                var pt = this.calculateImageOrLabelDimensions_(A.width, A.height, u[f], u[f + 1], lt, te, p, g, yt, st, it, tt, o, gt, It || Pt, j), Je = [
+                var pt = this.calculateImageOrLabelDimensions_(A.width, A.height, u[f], u[f + 1], lt, te, p, g, yt, st, it, q, o, gt, It || Pt, B), Je = [
                   r,
                   t,
                   A,
@@ -5509,36 +5509,36 @@ var oc = (
               /** @type {number} */
               P[8]
             );
-            D = /** @type {string} */
+            L = /** @type {string} */
             P[9];
             var On = (
               /** @type {number} */
               P[10]
             );
             S = /** @type {string} */
-            P[11], L = /** @type {string} */
+            P[11], D = /** @type {string} */
             P[12];
             var ki = [
               /** @type {number} */
               P[13],
               /** @type {number} */
               P[13]
-            ], Pn = this.textStates[L], pr = Pn.font, gr = [
+            ], Pn = this.textStates[D], pr = Pn.font, gr = [
               Pn.scale[0] * ji,
               Pn.scale[1] * ji
             ], vr = void 0;
             pr in this.widths_ ? vr = this.widths_[pr] : (vr = {}, this.widths_[pr] = vr);
             var Zi = Sa(u, kr, Bi, 2), Xi = Math.abs(gr[0]) * co(pr, S, vr);
             if (ss || Xi <= Zi) {
-              var us = this.textStates[L].textAlign, cs = (Zi - Xi) * vn[us], yr = rc(u, kr, Bi, 2, S, cs, ls, Math.abs(gr[0]), co, pr, vr, z ? 0 : this.viewRotation_);
+              var us = this.textStates[D].textAlign, cs = (Zi - Xi) * vn[us], yr = rc(u, kr, Bi, 2, S, cs, ls, Math.abs(gr[0]), co, pr, vr, z ? 0 : this.viewRotation_);
               t: if (yr) {
                 var mr = [], ge = void 0, Zr = void 0, Xr = void 0, Ft = void 0, Ht = void 0;
-                if (D)
+                if (L)
                   for (ge = 0, Zr = yr.length; ge < Zr; ++ge) {
                     Ht = yr[ge], Xr = /** @type {string} */
-                    Ht[4], Ft = this.createLabel(Xr, L, "", D), p = /** @type {number} */
+                    Ht[4], Ft = this.createLabel(Xr, D, "", L), p = /** @type {number} */
                     Ht[2] + (gr[0] < 0 ? -On : On), g = Sn * Ft.height + (0.5 - Sn) * 2 * On * gr[1] / gr[0] - Yi;
-                    var pt = this.calculateImageOrLabelDimensions_(Ft.width, Ft.height, Ht[0], Ht[1], Ft.width, Ft.height, p, g, 0, 0, Ht[3], ki, !1, be, !1, j);
+                    var pt = this.calculateImageOrLabelDimensions_(Ft.width, Ft.height, Ht[0], Ht[1], Ft.width, Ft.height, p, g, 0, 0, Ht[3], ki, !1, be, !1, B);
                     if (l && l.collides(pt.declutterBox))
                       break t;
                     mr.push([
@@ -5554,9 +5554,9 @@ var oc = (
                 if (x)
                   for (ge = 0, Zr = yr.length; ge < Zr; ++ge) {
                     Ht = yr[ge], Xr = /** @type {string} */
-                    Ht[4], Ft = this.createLabel(Xr, L, x, ""), p = /** @type {number} */
+                    Ht[4], Ft = this.createLabel(Xr, D, x, ""), p = /** @type {number} */
                     Ht[2], g = Sn * Ft.height - Yi;
-                    var pt = this.calculateImageOrLabelDimensions_(Ft.width, Ft.height, Ht[0], Ht[1], Ft.width, Ft.height, p, g, 0, 0, Ht[3], ki, !1, be, !1, j);
+                    var pt = this.calculateImageOrLabelDimensions_(Ft.width, Ft.height, Ht[0], Ht[1], Ft.width, Ft.height, p, g, 0, 0, Ht[3], ki, !1, be, !1, B);
                     if (l && l.collides(pt.declutterBox))
                       break t;
                     mr.push([
@@ -5578,9 +5578,9 @@ var oc = (
             break;
           case X.END_GEOMETRY:
             if (a !== void 0) {
-              j = /** @type {import("../../Feature.js").FeatureLike} */
+              B = /** @type {import("../../Feature.js").FeatureLike} */
               P[1];
-              var Wi = a(j, Z);
+              var Wi = a(B, Z);
               if (Wi)
                 return Wi;
             }
@@ -5633,7 +5633,7 @@ var oc = (
   /** @class */
   function() {
     function i(r, t, e, n, o, a) {
-      this.maxExtent_ = r, this.overlaps_ = n, this.pixelRatio_ = e, this.resolution_ = t, this.renderBuffer_ = a, this.executorsByZIndex_ = {}, this.hitDetectionContext_ = null, this.hitDetectionTransform_ = Dt(), this.createExecutors_(o);
+      this.maxExtent_ = r, this.overlaps_ = n, this.pixelRatio_ = e, this.resolution_ = t, this.renderBuffer_ = a, this.executorsByZIndex_ = {}, this.hitDetectionContext_ = null, this.hitDetectionTransform_ = Lt(), this.createExecutors_(o);
     }
     return i.prototype.clip = function(r, t) {
       var e = this.getClipCoords(t);
@@ -5663,11 +5663,11 @@ var oc = (
       var h;
       this.renderBuffer_ !== void 0 && (h = zt(), Mr(h, r), jr(h, t * (this.renderBuffer_ + n), h));
       var f = ac(n), d;
-      function p(L, D) {
+      function p(D, L) {
         for (var x = c.getImageData(0, 0, s, s).data, T = 0, C = f.length; T < C; T++)
           if (x[f[T]] > 0) {
-            if (!a || d !== ut.IMAGE && d !== ut.TEXT || a.indexOf(L) !== -1) {
-              var R = (f[T] - 3) / 4, O = n - R % s, N = n - (R / s | 0), F = o(L, D, O * O + N * N);
+            if (!a || d !== ut.IMAGE && d !== ut.TEXT || a.indexOf(D) !== -1) {
+              var R = (f[T] - 3) / 4, O = n - R % s, N = n - (R / s | 0), F = o(D, L, O * O + N * N);
               if (F)
                 return F;
             }
@@ -5745,7 +5745,7 @@ var sc = /* @__PURE__ */ function() {
     sc(r, i);
     function r(t, e, n, o, a, s, l) {
       var u = i.call(this) || this;
-      return u.context_ = t, u.pixelRatio_ = e, u.extent_ = n, u.transform_ = o, u.viewRotation_ = a, u.squaredTolerance_ = s, u.userTransform_ = l, u.contextFillState_ = null, u.contextStrokeState_ = null, u.contextTextState_ = null, u.fillState_ = null, u.strokeState_ = null, u.image_ = null, u.imageAnchorX_ = 0, u.imageAnchorY_ = 0, u.imageHeight_ = 0, u.imageOpacity_ = 0, u.imageOriginX_ = 0, u.imageOriginY_ = 0, u.imageRotateWithView_ = !1, u.imageRotation_ = 0, u.imageScale_ = [0, 0], u.imageWidth_ = 0, u.text_ = "", u.textOffsetX_ = 0, u.textOffsetY_ = 0, u.textRotateWithView_ = !1, u.textRotation_ = 0, u.textScale_ = [0, 0], u.textFillState_ = null, u.textStrokeState_ = null, u.textState_ = null, u.pixelCoordinates_ = [], u.tmpLocalTransform_ = Dt(), u;
+      return u.context_ = t, u.pixelRatio_ = e, u.extent_ = n, u.transform_ = o, u.viewRotation_ = a, u.squaredTolerance_ = s, u.userTransform_ = l, u.contextFillState_ = null, u.contextStrokeState_ = null, u.contextTextState_ = null, u.fillState_ = null, u.strokeState_ = null, u.image_ = null, u.imageAnchorX_ = 0, u.imageAnchorY_ = 0, u.imageHeight_ = 0, u.imageOpacity_ = 0, u.imageOriginX_ = 0, u.imageOriginY_ = 0, u.imageRotateWithView_ = !1, u.imageRotation_ = 0, u.imageScale_ = [0, 0], u.imageWidth_ = 0, u.text_ = "", u.textOffsetX_ = 0, u.textOffsetY_ = 0, u.textRotateWithView_ = !1, u.textRotation_ = 0, u.textScale_ = [0, 0], u.textFillState_ = null, u.textStrokeState_ = null, u.textState_ = null, u.pixelCoordinates_ = [], u.tmpLocalTransform_ = Lt(), u;
     }
     return r.prototype.drawImages_ = function(t, e, n, o) {
       if (this.image_) {
@@ -5991,8 +5991,8 @@ var sc = /* @__PURE__ */ function() {
           lineDashOffset: (u || Rr) * this.pixelRatio_,
           lineJoin: c !== void 0 ? c : cr,
           lineWidth: (h !== void 0 ? h : Gr) * this.pixelRatio_,
-          miterLimit: f !== void 0 ? f : Dr,
-          strokeStyle: ie(a || Lr)
+          miterLimit: f !== void 0 ? f : Lr,
+          strokeStyle: ie(a || Dr)
         };
       }
     }, r.prototype.setImageStyle = function(t) {
@@ -6027,8 +6027,8 @@ var sc = /* @__PURE__ */ function() {
             lineDashOffset: u || Rr,
             lineJoin: c !== void 0 ? c : cr,
             lineWidth: h !== void 0 ? h : Gr,
-            miterLimit: f !== void 0 ? f : Dr,
-            strokeStyle: ie(a || Lr)
+            miterLimit: f !== void 0 ? f : Lr,
+            strokeStyle: ie(a || Dr)
           };
         }
         var d = t.getFont(), p = t.getOffsetX(), g = t.getOffsetY(), v = t.getRotateWithView(), m = t.getRotation(), E = t.getScaleArray(), y = t.getText(), A = t.getTextAlign(), S = t.getTextBaseline();
@@ -6036,8 +6036,8 @@ var sc = /* @__PURE__ */ function() {
           font: d !== void 0 ? d : pa,
           textAlign: A !== void 0 ? A : Nr,
           textBaseline: S !== void 0 ? S : dn
-        }, this.text_ = y !== void 0 ? Array.isArray(y) ? y.reduce(function(L, D, x) {
-          return L += x % 2 ? " " : D;
+        }, this.text_ = y !== void 0 ? Array.isArray(y) ? y.reduce(function(D, L, x) {
+          return D += x % 2 ? " " : L;
         }, "") : y : "", this.textOffsetX_ = p !== void 0 ? this.pixelRatio_ * p : 0, this.textOffsetY_ = g !== void 0 ? this.pixelRatio_ * g : 0, this.textRotateWithView_ = v !== void 0 ? v : !1, this.textRotation_ = m !== void 0 ? m : 0, this.textScale_ = [
           this.pixelRatio_ * E[0],
           this.pixelRatio_ * E[1]
@@ -6175,7 +6175,7 @@ function Ni(i, r, t) {
   }).catch(function(l) {
     n && (a ? r() : t());
   })) : s.push(ln(e, dt.ERROR, t)), function() {
-    n = !1, s.forEach(Lt);
+    n = !1, s.forEach(Dt);
   };
 }
 var fc = /* @__PURE__ */ function() {
@@ -6400,14 +6400,14 @@ function vc(i, r, t, e, n, o, a) {
       var E = m(v, o);
       if (E) {
         Array.isArray(E) || (E = [E]);
-        for (var y = g * d, A = "#" + ("000000" + y.toString(16)).slice(-6), S = 0, L = E.length; S < L; ++S) {
-          var D = E[S], x = D.getGeometryFunction()(v);
+        for (var y = g * d, A = "#" + ("000000" + y.toString(16)).slice(-6), S = 0, D = E.length; S < D; ++S) {
+          var L = E[S], x = L.getGeometryFunction()(v);
           if (!(!x || !bt(n, x.getExtent()))) {
-            var T = D.clone(), C = T.getFill();
+            var T = L.clone(), C = T.getFill();
             C && C.setColor(A);
             var R = T.getStroke();
             R && (R.setColor(A), R.setLineDash(null)), T.setText(void 0);
-            var O = D.getImage();
+            var O = L.getImage();
             if (O && O.getOpacity() !== 0) {
               var N = O.getImageSize();
               if (!N)
@@ -6434,10 +6434,10 @@ function vc(i, r, t, e, n, o, a) {
       }
     }
   }
-  for (var j = Object.keys(p).map(Number).sort(Xe), g = 0, G = j.length; g < G; ++g) {
-    var _ = p[j[g]];
+  for (var B = Object.keys(p).map(Number).sort(Xe), g = 0, G = B.length; g < G; ++g) {
+    var _ = p[B[g]];
     for (var b in _)
-      for (var Z = _[b], S = 0, L = Z.length; S < L; S += 2) {
+      for (var Z = _[b], S = 0, D = Z.length; S < D; S += 2) {
         h.setStyle(Z[S + 1]);
         for (var P = 0, M = r.length; P < M; ++P)
           h.setTransform(r[P]), h.drawGeometry(Z[S]);
@@ -6630,11 +6630,11 @@ var Pc = /* @__PURE__ */ function() {
       return e.boundHandleStyleImageChange_ = e.handleStyleImageChange_.bind(e), e.animatingOrInteracting_, e.dirty_ = !1, e.hitDetectionImageData_ = null, e.renderedFeatures_ = null, e.renderedRevision_ = -1, e.renderedResolution_ = NaN, e.renderedExtent_ = zt(), e.wrappedRenderedExtent_ = zt(), e.renderedRotation_, e.renderedCenter_ = null, e.renderedProjection_ = null, e.renderedRenderOrder_ = null, e.replayGroup_ = null, e.replayGroupChanged = !0, e.declutterExecutorGroup = null, e.clipping = !0, e;
     }
     return r.prototype.renderWorlds = function(t, e, n) {
-      var o = e.extent, a = e.viewState, s = a.center, l = a.resolution, u = a.projection, c = a.rotation, h = u.getExtent(), f = this.getLayer().getSource(), d = e.pixelRatio, p = e.viewHints, g = !(p[ar.ANIMATING] || p[ar.INTERACTING]), v = this.context, m = Math.round(e.size[0] * d), E = Math.round(e.size[1] * d), y = f.getWrapX() && u.canWrapX(), A = y ? xt(h) : null, S = y ? Math.ceil((o[2] - h[2]) / A) + 1 : 1, L = y ? Math.floor((o[0] - h[0]) / A) : 0;
+      var o = e.extent, a = e.viewState, s = a.center, l = a.resolution, u = a.projection, c = a.rotation, h = u.getExtent(), f = this.getLayer().getSource(), d = e.pixelRatio, p = e.viewHints, g = !(p[ar.ANIMATING] || p[ar.INTERACTING]), v = this.context, m = Math.round(e.size[0] * d), E = Math.round(e.size[1] * d), y = f.getWrapX() && u.canWrapX(), A = y ? xt(h) : null, S = y ? Math.ceil((o[2] - h[2]) / A) + 1 : 1, D = y ? Math.floor((o[0] - h[0]) / A) : 0;
       do {
-        var D = this.getRenderTransform(s, l, c, d, m, E, L * A);
-        t.execute(v, 1, D, c, g, void 0, n);
-      } while (++L < S);
+        var L = this.getRenderTransform(s, l, c, d, m, E, D * A);
+        t.execute(v, 1, L, c, g, void 0, n);
+      } while (++D < S);
     }, r.prototype.renderDeclutter = function(t) {
       this.declutterExecutorGroup && this.renderWorlds(this.declutterExecutorGroup, t, t.declutterTree);
     }, r.prototype.renderFrame = function(t, e) {
@@ -6727,18 +6727,18 @@ var Pc = /* @__PURE__ */ function() {
       v === void 0 && (v = Ac);
       var m = c.center.slice(), E = jr(u, g * f), y = E.slice(), A = [E.slice()], S = h.getExtent();
       if (n.getWrapX() && h.canWrapX() && !Fe(S, t.extent)) {
-        var L = xt(S), D = Math.max(xt(E) / 2, L);
-        E[0] = S[0] - D, E[2] = S[2] + D, xl(m, h);
+        var D = xt(S), L = Math.max(xt(E) / 2, D);
+        E[0] = S[0] - L, E[2] = S[2] + L, xl(m, h);
         var x = Al(A[0], h);
         x[0] < S[0] && x[2] < S[2] ? A.push([
-          x[0] + L,
+          x[0] + D,
           x[1],
-          x[2] + L,
+          x[2] + D,
           x[3]
         ]) : x[0] > S[0] && x[2] > S[2] && A.push([
-          x[0] - L,
+          x[0] - D,
           x[1],
-          x[2] - L,
+          x[2] - D,
           x[3]
         ]);
       }
@@ -6766,7 +6766,7 @@ var Pc = /* @__PURE__ */ function() {
       for (var O = 0, N = _.length; O < N; ++O)
         z(_[O]);
       this.renderedFeatures_ = _;
-      var j = T.finish(), G = new _o(E, f, d, n.getOverlaps(), j, e.getRenderBuffer());
+      var B = T.finish(), G = new _o(E, f, d, n.getOverlaps(), B, e.getRenderBuffer());
       return C && (this.declutterExecutorGroup = new _o(E, f, d, n.getOverlaps(), C.finish(), e.getRenderBuffer())), this.renderedResolution_ = f, this.renderedRevision_ = p, this.renderedRenderOrder_ = v, this.renderedExtent_ = y, this.wrappedRenderedExtent_ = E, this.renderedCenter_ = m, this.renderedProjection_ = h, this.replayGroup_ = G, this.hitDetectionImageData_ = null, this.replayGroupChanged = !0, !0;
     }, r.prototype.renderFeature = function(t, e, n, o, a, s) {
       if (!n)
@@ -6780,7 +6780,7 @@ var Pc = /* @__PURE__ */ function() {
       return l;
     }, r;
   }(Fa)
-), Dc = /* @__PURE__ */ function() {
+), Lc = /* @__PURE__ */ function() {
   var i = function(r, t) {
     return i = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(e, n) {
       e.__proto__ = n;
@@ -6800,19 +6800,19 @@ var Pc = /* @__PURE__ */ function() {
 }(), qt = (
   /** @class */
   function(i) {
-    Dc(r, i);
+    Lc(r, i);
     function r(t) {
       return i.call(this, t) || this;
     }
     return r.prototype.createRenderer = function() {
       return new Rc(this);
     }, r;
-  }(Li)
+  }(Di)
 ), Mo = (
   /** @class */
   function() {
     function i(r) {
-      this.rbush_ = new La(r), this.items_ = {};
+      this.rbush_ = new Da(r), this.items_ = {};
     }
     return i.prototype.insert = function(r, t) {
       var e = {
@@ -6878,7 +6878,7 @@ var Pc = /* @__PURE__ */ function() {
         this.items_[t] = r.items_[t];
     }, i;
   }()
-), Lc = /* @__PURE__ */ function() {
+), Dc = /* @__PURE__ */ function() {
   var i = function(r, t) {
     return i = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(e, n) {
       e.__proto__ = n;
@@ -6898,7 +6898,7 @@ var Pc = /* @__PURE__ */ function() {
 }(), Ba = (
   /** @class */
   function(i) {
-    Lc(r, i);
+    Dc(r, i);
     function r(t) {
       var e = i.call(this) || this;
       e.projection = _t(t.projection), e.attributions_ = So(t.attributions), e.attributionsCollapsible_ = t.attributionsCollapsible !== void 0 ? t.attributionsCollapsible : !0, e.loading = !1, e.state_ = t.state !== void 0 ? t.state : En.READY, e.wrapX_ = t.wrapX !== void 0 ? t.wrapX : !1, e.interpolate_ = !!t.interpolate, e.viewResolver = null, e.viewRejector = null;
@@ -7177,7 +7177,7 @@ var ja = /* @__PURE__ */ function() {
       if (t) {
         for (var e in this.featureChangeKeys_) {
           var n = this.featureChangeKeys_[e];
-          n.forEach(Lt);
+          n.forEach(Dt);
         }
         this.featuresCollection_ || (this.featureChangeKeys_ = {}, this.idIndex_ = {}, this.uidIndex_ = {});
       } else if (this.featuresRtree_) {
@@ -7328,7 +7328,7 @@ var ja = /* @__PURE__ */ function() {
     }, r.prototype.removeFeatureInternal = function(t) {
       var e = J(t), n = this.featureChangeKeys_[e];
       if (n) {
-        n.forEach(Lt), delete this.featureChangeKeys_[e];
+        n.forEach(Dt), delete this.featureChangeKeys_[e];
         var o = t.getId();
         return o !== void 0 && delete this.idIndex_[o.toString()], delete this.uidIndex_[e], this.dispatchEvent(new Ae(Rt.REMOVEFEATURE, t)), t;
       }
@@ -7534,13 +7534,13 @@ var Wc = /* @__PURE__ */ function() {
   UNSIGNED_INT: jc,
   FLOAT: Ya
 }, mn = {};
-function Do(i) {
+function Lo(i) {
   return "shared/" + i;
 }
-var Lo = 0;
+var Do = 0;
 function Uc() {
-  var i = "unique/" + Lo;
-  return Lo += 1, i;
+  var i = "unique/" + Do;
+  return Do += 1, i;
 }
 function Hc(i) {
   var r = mn[i];
@@ -7563,7 +7563,7 @@ var Jc = (
     Wc(r, i);
     function r(t) {
       var e = i.call(this) || this, n = t || {};
-      e.boundHandleWebGLContextLost_ = e.handleWebGLContextLost.bind(e), e.boundHandleWebGLContextRestored_ = e.handleWebGLContextRestored.bind(e), e.canvasCacheKey_ = n.canvasCacheKey ? Do(n.canvasCacheKey) : Uc(), e.canvas_ = Hc(e.canvasCacheKey_), e.gl_ = ka(e.canvas_), e.bufferCache_ = {}, e.extensionCache_ = {}, e.currentProgram_ = null, e.canvas_.addEventListener(tn.LOST, e.boundHandleWebGLContextLost_), e.canvas_.addEventListener(tn.RESTORED, e.boundHandleWebGLContextRestored_), e.offsetRotateMatrix_ = Dt(), e.offsetScaleMatrix_ = Dt(), e.tmpMat4_ = Xc(), e.uniformLocations_ = {}, e.attribLocations_ = {}, e.uniforms_ = [], n.uniforms && e.setUniforms(n.uniforms);
+      e.boundHandleWebGLContextLost_ = e.handleWebGLContextLost.bind(e), e.boundHandleWebGLContextRestored_ = e.handleWebGLContextRestored.bind(e), e.canvasCacheKey_ = n.canvasCacheKey ? Lo(n.canvasCacheKey) : Uc(), e.canvas_ = Hc(e.canvasCacheKey_), e.gl_ = ka(e.canvas_), e.bufferCache_ = {}, e.extensionCache_ = {}, e.currentProgram_ = null, e.canvas_.addEventListener(tn.LOST, e.boundHandleWebGLContextLost_), e.canvas_.addEventListener(tn.RESTORED, e.boundHandleWebGLContextRestored_), e.offsetRotateMatrix_ = Lt(), e.offsetScaleMatrix_ = Lt(), e.tmpMat4_ = Xc(), e.uniformLocations_ = {}, e.attribLocations_ = {}, e.uniforms_ = [], n.uniforms && e.setUniforms(n.uniforms);
       var o = e.getGL();
       return e.postProcessPasses_ = n.postProcesses ? n.postProcesses.map(function(a) {
         return new Ro({
@@ -7584,7 +7584,7 @@ var Jc = (
         });
       this.uniformLocations_ = {};
     }, r.prototype.canvasCacheKeyMatches = function(t) {
-      return this.canvasCacheKey_ === Do(t);
+      return this.canvasCacheKey_ === Lo(t);
     }, r.prototype.getExtension = function(t) {
       if (t in this.extensionCache_)
         return this.extensionCache_[t];
@@ -7631,9 +7631,9 @@ var Jc = (
       return this.gl_;
     }, r.prototype.applyFrameState = function(t) {
       var e = t.size, n = t.viewState.rotation, o = Gn(this.offsetScaleMatrix_);
-      Ll(o, 2 / e[0], 2 / e[1]);
+      Dl(o, 2 / e[0], 2 / e[1]);
       var a = Gn(this.offsetRotateMatrix_);
-      n !== 0 && Dl(a, -n), this.setUniformMatrixValue(nr.OFFSET_SCALE_MATRIX, Xn(this.tmpMat4_, o)), this.setUniformMatrixValue(nr.OFFSET_ROTATION_MATRIX, Xn(this.tmpMat4_, a)), this.setUniformFloatValue(nr.TIME, (Date.now() - this.startTime_) * 1e-3), this.setUniformFloatValue(nr.ZOOM, t.viewState.zoom), this.setUniformFloatValue(nr.RESOLUTION, t.viewState.resolution);
+      n !== 0 && Ll(a, -n), this.setUniformMatrixValue(nr.OFFSET_SCALE_MATRIX, Xn(this.tmpMat4_, o)), this.setUniformMatrixValue(nr.OFFSET_ROTATION_MATRIX, Xn(this.tmpMat4_, a)), this.setUniformFloatValue(nr.TIME, (Date.now() - this.startTime_) * 1e-3), this.setUniformFloatValue(nr.ZOOM, t.viewState.zoom), this.setUniformFloatValue(nr.RESOLUTION, t.viewState.resolution);
     }, r.prototype.applyUniforms = function(t) {
       var e = this.getGL(), n, o = 0;
       this.uniforms_.forEach((function(a) {
@@ -7758,7 +7758,7 @@ var Kc = /* @__PURE__ */ function() {
     Kc(r, i);
     function r(t, e) {
       var n = i.call(this, t) || this, o = e || {};
-      return n.inversePixelTransform_ = Dt(), n.pixelContext_ = null, n.postProcesses_ = o.postProcesses, n.uniforms_ = o.uniforms, n.helper, t.addChangeListener(q.MAP, n.removeHelper.bind(n)), n.dispatchPreComposeEvent = n.dispatchPreComposeEvent.bind(n), n.dispatchPostComposeEvent = n.dispatchPostComposeEvent.bind(n), n;
+      return n.inversePixelTransform_ = Lt(), n.pixelContext_ = null, n.postProcesses_ = o.postProcesses, n.uniforms_ = o.uniforms, n.helper, t.addChangeListener($.MAP, n.removeHelper.bind(n)), n.dispatchPreComposeEvent = n.dispatchPreComposeEvent.bind(n), n.dispatchPostComposeEvent = n.dispatchPostComposeEvent.bind(n), n;
     }
     return r.prototype.dispatchPreComposeEvent = function(t, e) {
       var n = this.getLayer();
@@ -7911,7 +7911,7 @@ var nh = /* @__PURE__ */ function() {
   function(i) {
     nh(r, i);
     function r(t, e) {
-      var n = this, o = e.uniforms || {}, a = Dt();
+      var n = this, o = e.uniforms || {}, a = Lt();
       o[nr.PROJECTION_MATRIX] = a, n = i.call(this, t, {
         uniforms: o,
         postProcesses: e.postProcesses
@@ -7955,7 +7955,7 @@ var nh = /* @__PURE__ */ function() {
           size: 1,
           type: Kt.FLOAT
         }
-      ].concat(s), n.customAttributes = e.attributes ? e.attributes : [], n.previousExtent_ = zt(), n.currentTransform_ = a, n.renderTransform_ = Dt(), n.invertRenderTransform_ = Dt(), n.renderInstructions_ = new Float32Array(0), n.hitRenderInstructions_ = new Float32Array(0), n.hitRenderTarget_, n.generateBuffersRun_ = 0, n.worker_ = rh(), n.worker_.addEventListener(
+      ].concat(s), n.customAttributes = e.attributes ? e.attributes : [], n.previousExtent_ = zt(), n.currentTransform_ = a, n.renderTransform_ = Lt(), n.invertRenderTransform_ = Lt(), n.renderInstructions_ = new Float32Array(0), n.hitRenderInstructions_ = new Float32Array(0), n.hitRenderTarget_, n.generateBuffersRun_ = 0, n.worker_ = rh(), n.worker_.addEventListener(
         "message",
         /**
          * @param {*} event Event.
@@ -8014,12 +8014,12 @@ var nh = /* @__PURE__ */ function() {
     }, r.prototype.prepareFrameInternal = function(t) {
       var e = this.getLayer(), n = e.getSource(), o = t.viewState, a = !t.viewHints[ar.ANIMATING] && !t.viewHints[ar.INTERACTING], s = !Tn(this.previousExtent_, t.extent), l = this.sourceRevision_ < n.getRevision();
       if (l && (this.sourceRevision_ = n.getRevision()), a && (s || l)) {
-        var u = o.projection, c = o.resolution, h = e instanceof Li ? e.getRenderBuffer() : 0, f = jr(t.extent, h * c);
+        var u = o.projection, c = o.resolution, h = e instanceof Di ? e.getRenderBuffer() : 0, f = jr(t.extent, h * c);
         n.loadFeatures(f, c, u), this.rebuildBuffers_(t), this.previousExtent_ = t.extent.slice();
       }
       return this.helper.makeProjectionTransform(t, this.currentTransform_), Ti(this.currentTransform_, this.invertRenderTransform_), this.helper.useProgram(this.program_), this.helper.prepareDraw(t), this.helper.bindBuffer(this.verticesBuffer_), this.helper.bindBuffer(this.indicesBuffer_), this.helper.enableAttributes(this.attributes), !0;
     }, r.prototype.rebuildBuffers_ = function(t) {
-      var e = Dt();
+      var e = Lt();
       this.helper.makeProjectionTransform(t, e);
       var n = (2 + this.customAttributes.length) * this.featureCount_;
       if ((!this.renderInstructions_ || this.renderInstructions_.length !== n) && (this.renderInstructions_ = new Float32Array(n)), this.hitDetectionEnabled_) {
@@ -8066,7 +8066,7 @@ var nh = /* @__PURE__ */ function() {
       }
     }, r.prototype.disposeInternal = function() {
       this.worker_.terminate(), this.layer_ = null, this.sourceListenKeys_.forEach(function(t) {
-        Lt(t);
+        Dt(t);
       }), this.sourceListenKeys_ = null, i.prototype.disposeInternal.call(this);
     }, r;
   }(qc)
@@ -8258,7 +8258,7 @@ var nh = /* @__PURE__ */ function() {
       });
     }, r.prototype.renderDeclutter = function() {
     }, r;
-  }(Li)
+  }(Di)
 );
 function lh(i) {
   for (var r = 1, t = 256, e = Xt(r, t), n = e.createLinearGradient(0, 0, r, t), o = 1 / (i.length - 1), a = 0, s = i.length; a < s; ++a)
@@ -8313,7 +8313,7 @@ var uh = 0.5, ui = {
 );
 function Xa(i, r, t) {
   var e = t ? _t(t.featureProjection) : null, n = t ? _t(t.dataProjection) : null, o;
-  if (e && n && !Le(e, n) ? o = (r ? i.clone() : i).transform(r ? e : n, r ? n : e) : o = i, r && t && /** @type {WriteOptions} */
+  if (e && n && !De(e, n) ? o = (r ? i.clone() : i).transform(r ? e : n, r ? n : e) : o = i, r && t && /** @type {WriteOptions} */
   t.decimals !== void 0) {
     var a = Math.pow(
       10,
@@ -8658,7 +8658,7 @@ var vh = /* @__PURE__ */ function() {
       return e.geometries_ = t || null, e.changeEventsKeys_ = [], e.listenGeometriesChange_(), e;
     }
     return r.prototype.unlistenGeometriesChange_ = function() {
-      this.changeEventsKeys_.forEach(Lt), this.changeEventsKeys_.length = 0;
+      this.changeEventsKeys_.forEach(Dt), this.changeEventsKeys_.length = 0;
     }, r.prototype.listenGeometriesChange_ = function() {
       if (this.geometries_)
         for (var t = 0, e = this.geometries_.length; t < e; ++t)
@@ -8894,8 +8894,8 @@ var Th = 10, Go = 0.25, Ch = (
               [y.source[2][0], y.source[2][1]]
             ];
             A[0][0] - E > this.sourceWorldWidth_ / 2 && (A[0][0] -= this.sourceWorldWidth_), A[1][0] - E > this.sourceWorldWidth_ / 2 && (A[1][0] -= this.sourceWorldWidth_), A[2][0] - E > this.sourceWorldWidth_ / 2 && (A[2][0] -= this.sourceWorldWidth_);
-            var S = Math.min(A[0][0], A[1][0], A[2][0]), L = Math.max(A[0][0], A[1][0], A[2][0]);
-            L - S < this.sourceWorldWidth_ / 2 && (y.source = A);
+            var S = Math.min(A[0][0], A[1][0], A[2][0]), D = Math.max(A[0][0], A[1][0], A[2][0]);
+            D - S < this.sourceWorldWidth_ / 2 && (y.source = A);
           }
         }).bind(this));
       }
@@ -8934,8 +8934,8 @@ var Th = 10, Go = 0.25, Ch = (
               A = S - nn(y[0], f);
             } else
               A = (o[0] + s[0]) / 2 - y[0];
-            var L = (o[1] + s[1]) / 2 - y[1], D = A * A + L * L;
-            p = D > this.errorThresholdSquared_;
+            var D = (o[1] + s[1]) / 2 - y[1], L = A * A + D * D;
+            p = L > this.errorThresholdSquared_;
           }
           if (p) {
             if (Math.abs(r[0] - e[0]) <= Math.abs(r[1] - e[1])) {
@@ -9009,38 +9009,38 @@ function Mh(i, r, t, e, n, o, a, s, l, u, c, h) {
   }
   f.globalCompositeOperation = "lighter";
   var p = zt();
-  l.forEach(function(A, S, L) {
+  l.forEach(function(A, S, D) {
     aa(p, A.extent);
   });
   var g = xt(p), v = Me(p), m = Xt(Math.round(t * g / e), Math.round(t * v / e));
   h || Nt(m, ui);
   var E = t / e;
-  l.forEach(function(A, S, L) {
-    var D = A.extent[0] - p[0], x = -(A.extent[3] - p[3]), T = xt(A.extent), C = Me(A.extent);
-    A.image.width > 0 && A.image.height > 0 && m.drawImage(A.image, u, u, A.image.width - 2 * u, A.image.height - 2 * u, D * E, x * E, T * E, C * E);
+  l.forEach(function(A, S, D) {
+    var L = A.extent[0] - p[0], x = -(A.extent[3] - p[3]), T = xt(A.extent), C = Me(A.extent);
+    A.image.width > 0 && A.image.height > 0 && m.drawImage(A.image, u, u, A.image.width - 2 * u, A.image.height - 2 * u, L * E, x * E, T * E, C * E);
   });
   var y = He(a);
-  return s.getTriangles().forEach(function(A, S, L) {
-    var D = A.source, x = A.target, T = D[0][0], C = D[0][1], R = D[1][0], O = D[1][1], N = D[2][0], F = D[2][1], z = d((x[0][0] - y[0]) / o), w = d(-(x[0][1] - y[1]) / o), _ = d((x[1][0] - y[0]) / o), j = d(-(x[1][1] - y[1]) / o), G = d((x[2][0] - y[0]) / o), b = d(-(x[2][1] - y[1]) / o), Z = T, P = C;
+  return s.getTriangles().forEach(function(A, S, D) {
+    var L = A.source, x = A.target, T = L[0][0], C = L[0][1], R = L[1][0], O = L[1][1], N = L[2][0], F = L[2][1], z = d((x[0][0] - y[0]) / o), w = d(-(x[0][1] - y[1]) / o), _ = d((x[1][0] - y[0]) / o), B = d(-(x[1][1] - y[1]) / o), G = d((x[2][0] - y[0]) / o), b = d(-(x[2][1] - y[1]) / o), Z = T, P = C;
     T = 0, C = 0, R -= Z, O -= P, N -= Z, F -= P;
     var M = [
       [R, O, 0, 0, _ - z],
       [N, F, 0, 0, G - z],
-      [0, 0, R, O, j - w],
+      [0, 0, R, O, B - w],
       [0, 0, N, F, b - w]
     ], I = Ws(M);
     if (I) {
       if (f.save(), f.beginPath(), _h() || !h) {
-        f.moveTo(_, j);
-        for (var B = 4, Y = z - _, V = w - j, Q = 0; Q < B; Q++)
-          f.lineTo(_ + d((Q + 1) * Y / B), j + d(Q * V / (B - 1))), Q != B - 1 && f.lineTo(_ + d((Q + 1) * Y / B), j + d((Q + 1) * V / (B - 1)));
+        f.moveTo(_, B);
+        for (var j = 4, Y = z - _, V = w - B, Q = 0; Q < j; Q++)
+          f.lineTo(_ + d((Q + 1) * Y / j), B + d(Q * V / (j - 1))), Q != j - 1 && f.lineTo(_ + d((Q + 1) * Y / j), B + d((Q + 1) * V / (j - 1)));
         f.lineTo(G, b);
       } else
-        f.moveTo(_, j), f.lineTo(z, w), f.lineTo(G, b);
+        f.moveTo(_, B), f.lineTo(z, w), f.lineTo(G, b);
       f.clip(), f.transform(I[0], I[2], I[1], I[3], z, w), f.translate(p[0] - Z, p[3] - P), f.scale(e / t, -e / t), f.drawImage(m.canvas, 0, 0), f.restore();
     }
-  }), c && (f.save(), f.globalCompositeOperation = "source-over", f.strokeStyle = "black", f.lineWidth = 1, s.getTriangles().forEach(function(A, S, L) {
-    var D = A.target, x = (D[0][0] - y[0]) / o, T = -(D[0][1] - y[1]) / o, C = (D[1][0] - y[0]) / o, R = -(D[1][1] - y[1]) / o, O = (D[2][0] - y[0]) / o, N = -(D[2][1] - y[1]) / o;
+  }), c && (f.save(), f.globalCompositeOperation = "source-over", f.strokeStyle = "black", f.lineWidth = 1, s.getTriangles().forEach(function(A, S, D) {
+    var L = A.target, x = (L[0][0] - y[0]) / o, T = -(L[0][1] - y[1]) / o, C = (L[1][0] - y[0]) / o, R = -(L[1][1] - y[1]) / o, O = (L[2][0] - y[0]) / o, N = -(L[2][1] - y[1]) / o;
     f.beginPath(), f.moveTo(C, R), f.lineTo(x, T), f.lineTo(O, N), f.closePath(), f.stroke();
   }), f.restore()), f.canvas;
 }
@@ -9076,15 +9076,15 @@ var Sh = /* @__PURE__ */ function() {
       var A = o.getResolution(p.wrappedTileCoord_[0]), S = wh(t, n, E, A);
       if (!isFinite(S) || S <= 0)
         return p.state = U.EMPTY, p;
-      var L = h !== void 0 ? h : uh;
-      if (p.triangulation_ = new Ch(t, n, E, m, S * L, A), p.triangulation_.getTriangles().length === 0)
+      var D = h !== void 0 ? h : uh;
+      if (p.triangulation_ = new Ch(t, n, E, m, S * D, A), p.triangulation_.getTriangles().length === 0)
         return p.state = U.EMPTY, p;
       p.sourceZ_ = e.getZForResolution(S);
-      var D = p.triangulation_.calculateSourceExtent();
-      if (m && (t.canWrapX() ? (D[1] = $t(D[1], m[1], m[3]), D[3] = $t(D[3], m[1], m[3])) : D = on(D, m)), !ti(D))
+      var L = p.triangulation_.calculateSourceExtent();
+      if (m && (t.canWrapX() ? (L[1] = $t(L[1], m[1], m[3]), L[3] = $t(L[3], m[1], m[3])) : L = on(L, m)), !ti(L))
         p.state = U.EMPTY;
       else {
-        for (var x = e.getTileRangeForExtentAndZ(D, p.sourceZ_), T = x.minX; T <= x.maxX; T++)
+        for (var x = e.getTileRangeForExtentAndZ(L, p.sourceZ_), T = x.minX; T <= x.maxX; T++)
           for (var C = x.minY; C <= x.maxY; C++) {
             var R = c(p.sourceZ_, T, C, l);
             R && p.sourceTiles_.push(R);
@@ -9119,7 +9119,7 @@ var Sh = /* @__PURE__ */ function() {
             t++;
             var s = Ct(e, dt.CHANGE, function(l) {
               var u = e.getState();
-              (u == U.LOADED || u == U.ERROR || u == U.EMPTY) && (Lt(s), t--, t === 0 && (this.unlistenSources_(), this.reproject_()));
+              (u == U.LOADED || u == U.ERROR || u == U.EMPTY) && (Dt(s), t--, t === 0 && (this.unlistenSources_(), this.reproject_()));
             }, this);
             this.sourcesListenerKeys_.push(s);
           }
@@ -9129,7 +9129,7 @@ var Sh = /* @__PURE__ */ function() {
         });
       }
     }, r.prototype.unlistenSources_ = function() {
-      this.sourcesListenerKeys_.forEach(Lt), this.sourcesListenerKeys_ = null;
+      this.sourcesListenerKeys_.forEach(Dt), this.sourcesListenerKeys_ = null;
     }, r;
   }(Ua)
 ), Fi = (
@@ -9219,13 +9219,13 @@ var Oh = /* @__PURE__ */ function() {
       E && (m = on(m, ei(n.extent)));
       var y = f.getTilePixelRatio(c), A = Math.round(t.size[0] * y), S = Math.round(t.size[1] * y);
       if (u) {
-        var L = Math.round(Math.sqrt(A * A + S * S));
-        A = L, S = L;
+        var D = Math.round(Math.sqrt(A * A + S * S));
+        A = D, S = D;
       }
-      var D = v * A / 2 / y, x = v * S / 2 / y, T = [
-        l[0] - D,
+      var L = v * A / 2 / y, x = v * S / 2 / y, T = [
+        l[0] - L,
         l[1] - x,
-        l[0] + D,
+        l[0] + L,
         l[1] + x
       ], C = p.getTileRangeForExtentAndZ(m, g), R = {};
       R[g] = {};
@@ -9235,13 +9235,13 @@ var Oh = /* @__PURE__ */ function() {
         for (var w = C.minY; w <= C.maxY; ++w) {
           var _ = this.getTile(g, z, w, t);
           if (this.isDrawableTile(_)) {
-            var j = J(this);
+            var B = J(this);
             if (_.getState() == U.LOADED) {
               R[g][_.tileCoord.toString()] = _;
-              var G = _.inTransition(j);
+              var G = _.inTransition(B);
               !this.newTiles_ && (G || this.renderedTiles.indexOf(_) === -1) && (this.newTiles_ = !0);
             }
-            if (_.getAlpha(j, t.time) === 1)
+            if (_.getAlpha(B, t.time) === 1)
               continue;
           }
           var b = p.getTileCoordChildTileRange(_.tileCoord, F, N), Z = !1;
@@ -9251,37 +9251,37 @@ var Oh = /* @__PURE__ */ function() {
       oe(this.pixelTransform, t.size[0] / 2, t.size[1] / 2, 1 / y, 1 / y, u, -A / 2, -S / 2);
       var M = ha(this.pixelTransform);
       this.useContainer(e, M, n.opacity, this.getBackground(t));
-      var I = this.context, B = I.canvas;
-      Ci(this.inversePixelTransform, this.pixelTransform), oe(this.tempTransform, A / 2, S / 2, P, P, 0, -A / 2, -S / 2), B.width != A || B.height != S ? (B.width = A, B.height = S) : this.containerReused || I.clearRect(0, 0, A, S), E && this.clipUnrotated(I, t, E), f.getInterpolate() || Nt(I, ui), this.preRender(I, t), this.renderedTiles.length = 0;
+      var I = this.context, j = I.canvas;
+      Ci(this.inversePixelTransform, this.pixelTransform), oe(this.tempTransform, A / 2, S / 2, P, P, 0, -A / 2, -S / 2), j.width != A || j.height != S ? (j.width = A, j.height = S) : this.containerReused || I.clearRect(0, 0, A, S), E && this.clipUnrotated(I, t, E), f.getInterpolate() || Nt(I, ui), this.preRender(I, t), this.renderedTiles.length = 0;
       var Y = Object.keys(R).map(Number);
       Y.sort(Xe);
-      var V, Q, $;
+      var V, Q, tt;
       n.opacity === 1 && (!this.containerReused || f.getOpaque(t.viewState.projection)) ? Y = Y.reverse() : (V = [], Q = []);
       for (var Ot = Y.length - 1; Ot >= 0; --Ot) {
         var Gt = Y[Ot], de = f.getTilePixelSize(Gt, c, a), pe = p.getResolution(Gt), Wt = pe / v, te = de[0] * Wt * P, K = de[1] * Wt * P, yt = p.getTileCoordForCoordAndZ(He(T), Gt), st = p.getTileCoordExtent(yt), et = ft(this.tempTransform, [
           y * (st[0] - T[0]) / v,
           y * (T[3] - st[3]) / v
-        ]), it = y * f.getGutterForProjection(a), tt = R[Gt];
-        for (var lt in tt) {
+        ]), it = y * f.getGutterForProjection(a), q = R[Gt];
+        for (var lt in q) {
           var _ = (
             /** @type {import("../../ImageTile.js").default} */
-            tt[lt]
+            q[lt]
           ), ct = _.tileCoord, ot = yt[1] - ct[1], wt = Math.round(et[0] - (ot - 1) * te), Tt = yt[2] - ct[2], Bt = Math.round(et[1] - (Tt - 1) * K), z = Math.round(et[0] - ot * te), w = Math.round(et[1] - Tt * K), gt = wt - z, It = Bt - w, Pt = g === Gt, G = Pt && _.getAlpha(J(this), t.time) !== 1, Ut = !1;
           if (!G)
             if (V) {
-              $ = [z, w, z + gt, w, z + gt, w + It, z, w + It];
+              tt = [z, w, z + gt, w, z + gt, w + It, z, w + It];
               for (var pt = 0, Je = V.length; pt < Je; ++pt)
                 if (g !== Gt && Gt < Q[pt]) {
                   var mt = V[pt];
-                  bt([z, w, z + gt, w + It], [mt[0], mt[3], mt[4], mt[7]]) && (Ut || (I.save(), Ut = !0), I.beginPath(), I.moveTo($[0], $[1]), I.lineTo($[2], $[3]), I.lineTo($[4], $[5]), I.lineTo($[6], $[7]), I.moveTo(mt[6], mt[7]), I.lineTo(mt[4], mt[5]), I.lineTo(mt[2], mt[3]), I.lineTo(mt[0], mt[1]), I.clip());
+                  bt([z, w, z + gt, w + It], [mt[0], mt[3], mt[4], mt[7]]) && (Ut || (I.save(), Ut = !0), I.beginPath(), I.moveTo(tt[0], tt[1]), I.lineTo(tt[2], tt[3]), I.lineTo(tt[4], tt[5]), I.lineTo(tt[6], tt[7]), I.moveTo(mt[6], mt[7]), I.lineTo(mt[4], mt[5]), I.lineTo(mt[2], mt[3]), I.lineTo(mt[0], mt[1]), I.clip());
                 }
-              V.push($), Q.push(Gt);
+              V.push(tt), Q.push(Gt);
             } else
               I.clearRect(z, w, gt, It);
           this.drawTileImage(_, t, z, w, gt, It, it, Pt), V && !G ? (Ut && I.restore(), this.renderedTiles.unshift(_)) : this.renderedTiles.push(_), this.updateUsedTiles(t.usedTiles, f, _);
         }
       }
-      this.renderedRevision = d, this.renderedResolution = v, this.extentChanged = !this.renderedExtent_ || !Tn(this.renderedExtent_, T), this.renderedExtent_ = T, this.renderedPixelRatio = c, this.renderedProjection = a, this.manageTilePyramid(t, f, p, c, a, m, g, h.getPreload()), this.scheduleExpireCache(t, f), this.postRender(I, t), n.extent && I.restore(), Nt(I, ch), M !== B.style.transform && (B.style.transform = M);
+      this.renderedRevision = d, this.renderedResolution = v, this.extentChanged = !this.renderedExtent_ || !Tn(this.renderedExtent_, T), this.renderedExtent_ = T, this.renderedPixelRatio = c, this.renderedProjection = a, this.manageTilePyramid(t, f, p, c, a, m, g, h.getPreload()), this.scheduleExpireCache(t, f), this.postRender(I, t), n.extent && I.restore(), Nt(I, ch), M !== j.style.transform && (j.style.transform = M);
       var At = Jo(n.opacity), Mt = this.container;
       return At !== Mt.style.opacity && (Mt.style.opacity = At), this.container;
     }, r.prototype.drawTileImage = function(t, e, n, o, a, s, l, u) {
@@ -9404,10 +9404,10 @@ function Mn(i, r, t) {
 function Ja(i) {
   return Mn(i[0], i[1], i[2]);
 }
-function Dh(i) {
+function Lh(i) {
   return i.split("/").map(Number);
 }
-function Lh(i) {
+function Dh(i) {
   return (i[1] << i[0]) + i[2];
 }
 function Nh(i, r) {
@@ -9450,7 +9450,7 @@ var Gh = /* @__PURE__ */ function() {
       }
     }, r.prototype.pruneExceptNewestZ = function() {
       if (this.getCount() !== 0) {
-        var t = this.peekFirstKey(), e = Dh(t), n = e[0];
+        var t = this.peekFirstKey(), e = Lh(t), n = e[0];
         this.forEach((function(o) {
           o.tileCoord[0] !== n && (this.remove(Ja(o.tileCoord)), o.release());
         }).bind(this));
@@ -9715,7 +9715,7 @@ var ts = /* @__PURE__ */ function() {
       return this.tileGrid ? this.tileGrid : qa(t);
     }, r.prototype.getTileCacheForProjection = function(t) {
       return nt(
-        Le(this.getProjection(), t),
+        De(this.getProjection(), t),
         68
         // A VectorTile source can only be rendered if it has a projection compatible with the view projection.
       ), this.tileCache;
@@ -9783,7 +9783,7 @@ function Wh(i) {
      */
     function(r, t, e) {
       if (r) {
-        var n = Lh(r), o = nn(n, i.length);
+        var n = Dh(r), o = nn(n, i.length);
         return i[o](r, t, e);
       } else
         return;
@@ -9976,7 +9976,7 @@ var Kh = /* @__PURE__ */ function() {
         ),
         properties: null
       };
-      var o = ci(n.geometry, e), a = new Di();
+      var o = ci(n.geometry, e), a = new Li();
       return this.geometryName_ ? a.setGeometryName(this.geometryName_) : this.extractGeometryName_ && "geometry_name" in n !== void 0 && a.setGeometryName(n.geometry_name), a.setGeometry(o), "id" in n && a.setId(n.id), n.properties && a.setProperties(n.properties, !0), a;
     }, r.prototype.readFeaturesFromObject = function(t, e) {
       var n = (
@@ -10287,23 +10287,23 @@ var df = /* @__PURE__ */ function() {
         a.expireCache(a == n ? e : {});
       }
     }, r.prototype.getGutterForProjection = function(t) {
-      return this.getProjection() && t && !Le(this.getProjection(), t) ? 0 : this.getGutter();
+      return this.getProjection() && t && !De(this.getProjection(), t) ? 0 : this.getGutter();
     }, r.prototype.getGutter = function() {
       return 0;
     }, r.prototype.getKey = function() {
       var t = i.prototype.getKey.call(this);
       return this.getInterpolate() || (t += ":disable-interpolation"), t;
     }, r.prototype.getOpaque = function(t) {
-      return this.getProjection() && t && !Le(this.getProjection(), t) ? !1 : i.prototype.getOpaque.call(this, t);
+      return this.getProjection() && t && !De(this.getProjection(), t) ? !1 : i.prototype.getOpaque.call(this, t);
     }, r.prototype.getTileGridForProjection = function(t) {
       var e = this.getProjection();
-      if (this.tileGrid && (!e || Le(e, t)))
+      if (this.tileGrid && (!e || De(e, t)))
         return this.tileGrid;
       var n = J(t);
       return n in this.tileGridForProjection || (this.tileGridForProjection[n] = qa(t)), this.tileGridForProjection[n];
     }, r.prototype.getTileCacheForProjection = function(t) {
       var e = this.getProjection();
-      if (!e || Le(e, t))
+      if (!e || De(e, t))
         return this.tileCache;
       var n = J(t);
       return n in this.tileCacheForProjection || (this.tileCacheForProjection[n] = new Qa(this.tileCache.highWaterMark)), this.tileCacheForProjection[n];
@@ -10312,7 +10312,7 @@ var df = /* @__PURE__ */ function() {
       return h.key = s, h.addEventListener(dt.CHANGE, this.handleTileChange.bind(this)), h;
     }, r.prototype.getTile = function(t, e, n, o, a) {
       var s = this.getProjection();
-      if (!s || !a || Le(s, a))
+      if (!s || !a || De(s, a))
         return this.getTileInternal(t, e, n, o, s || a);
       var l = this.getTileCacheForProjection(a), u = [t, e, n], c = void 0, h = Ja(u);
       l.containsKey(h) && (c = l.get(h));
@@ -10559,7 +10559,7 @@ var vf = /* @__PURE__ */ function() {
         n[0] * (1 - l) + s[0] * l,
         n[1] * (1 - l) + s[1] * l
       ]);
-      return this.createCustomCluster_ ? this.createCustomCluster_(u, t) : new Di({
+      return this.createCustomCluster_ ? this.createCustomCluster_(u, t) : new Li({
         geometry: u,
         features: t
       });
@@ -10641,7 +10641,7 @@ const Sf = /* @__PURE__ */ zi(xf, [["render", Mf], ["__scopeId", "data-v-b440b5a
 function rs(i, r, t, e, n, o, a) {
   const l = a || "cb48e2a640a7b1c9b559da93318b633c", u = H(null), c = H(!1), h = H(null), f = H(null), d = H(null), p = H(null), g = H(null), v = H(null), m = H(null), E = H(null), y = H(null), A = H(null);
   H(null);
-  const S = H(null), L = H(null), D = H(null), x = H(null), T = H(null), C = H(null), R = "http://service.sdmap.gov.cn/tileservice/dsfg_asdxb?", O = "https://service.sdmap.gov.cn/tileservice/dsfg_qsb?", N = "https://service.sdmap.gov.cn/tileservice/sdrasterpubmap?", F = "http://10.166.157.209:8090/iserver/services/map-road20/rest/maps/roadData", z = "http://jsgl.sdgsbim.com:8602/iserver/services/map-JiNanGaoSuLuWangv4/rest/maps/dashLine@济南高速路网v4", w = "http://10.166.157.209:8090/iserver/services/map-ZH20/rest/maps/ZHData20", _ = "/china_full.json", j = "#1b2639", G = "#eeeee9", b = "#adb0aa", Z = "#3578E0", P = "#b4b4b1", M = "#d3d3d3", I = Ye(() => ["dark", "light", "yingxiang"].includes(r.value) ? r.value : "dark"), B = () => {
+  const S = H(null), D = H(null), L = H(null), x = H(null), T = H(null), C = H(null), R = "http://service.sdmap.gov.cn/tileservice/dsfg_asdxb?", O = "https://service.sdmap.gov.cn/tileservice/dsfg_qsb?", N = "https://service.sdmap.gov.cn/tileservice/sdrasterpubmap?", F = "http://10.166.157.209:8090/iserver/services/map-road20/rest/maps/roadData", z = "http://jsgl.sdgsbim.com:8602/iserver/services/map-JiNanGaoSuLuWangv4/rest/maps/dashLine@济南高速路网v4", w = "http://10.166.157.209:8090/iserver/services/map-ZH20/rest/maps/ZHData20", _ = "/china_full.json", B = "#1b2639", G = "#eeeee9", b = "#adb0aa", Z = "#3578E0", P = "#b4b4b1", M = "#d3d3d3", I = Ye(() => ["dark", "light", "yingxiang"].includes(r.value) ? r.value : "dark"), j = () => {
     let K;
     I.value === "light" ? K = O : I.value === "yingxiang" ? K = N : K = R, d.value = new Ee({
       source: new Wr({
@@ -10688,8 +10688,8 @@ function rs(i, r, t, e, n, o, a) {
       stopEvent: !0,
       autoPan: !1
     }), i.value.addOverlay(p.value), i.value.on("click", (it) => {
-      let tt = it.coordinate;
-      g.value = tt;
+      let q = it.coordinate;
+      g.value = q;
       let lt = document.getElementById("popupHeaderTitle"), ct = i.value.forEachFeatureAtPixel(
         it.pixel,
         (ot, wt) => {
@@ -10706,11 +10706,11 @@ function rs(i, r, t, e, n, o, a) {
               let wt = Number(
                 document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]
               ), Tt = v.value / 153.6 * wt, Bt = m.value / 153.6 * wt;
-              p.value.setPosition(tt), p.value.setOffset([
+              p.value.setPosition(q), p.value.setOffset([
                 -Bt / 2,
                 -Tt
               ]);
-              let gt = i.value.getPixelFromCoordinate(tt), It = [gt[0], gt[1] - 150], Pt = i.value.getCoordinateFromPixel(It);
+              let gt = i.value.getPixelFromCoordinate(q), It = [gt[0], gt[1] - 150], Pt = i.value.getCoordinateFromPixel(It);
               i.value.getView().animate({
                 center: Pt,
                 duration: 800
@@ -10726,7 +10726,7 @@ function rs(i, r, t, e, n, o, a) {
             if (ot) {
               if (ot.isDrawn) return;
               if (ot.popoup === !1) {
-                t("clickPointEvent", ot);
+                t("clickPointEvent", ot, q);
                 return;
               }
               const Ut = ot.type;
@@ -10736,11 +10736,11 @@ function rs(i, r, t, e, n, o, a) {
             let wt = Number(
               document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]
             ), Tt = v.value / 153.6 * wt, Bt = m.value / 153.6 * wt;
-            p.value.setPosition(tt), p.value.setOffset([
+            p.value.setPosition(q), p.value.setOffset([
               -Bt / 2,
               -Tt
             ]);
-            let gt = i.value.getPixelFromCoordinate(tt), It = [gt[0], gt[1] - 150], Pt = i.value.getCoordinateFromPixel(It);
+            let gt = i.value.getPixelFromCoordinate(q), It = [gt[0], gt[1] - 150], Pt = i.value.getCoordinateFromPixel(It);
             i.value.getView().animate({
               center: Pt,
               duration: 800
@@ -10751,7 +10751,7 @@ function rs(i, r, t, e, n, o, a) {
           if (ot) {
             if (ot.isDrawn) return;
             if (ot.popoup === !1) {
-              t("clickPointEvent", ot);
+              t("clickPointEvent", ot, q);
               return;
             }
             n();
@@ -10769,11 +10769,11 @@ function rs(i, r, t, e, n, o, a) {
           let wt = Number(
             document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]
           ), Tt = v.value / 192 * wt, Bt = m.value / 192 * wt;
-          p.value.setPosition(tt), p.value.setOffset([
+          p.value.setPosition(q), p.value.setOffset([
             -Bt / 2,
             -Tt
           ]);
-          let gt = i.value.getPixelFromCoordinate(tt), It = [gt[0], gt[1] - 120], Pt = i.value.getCoordinateFromPixel(It);
+          let gt = i.value.getPixelFromCoordinate(q), It = [gt[0], gt[1] - 120], Pt = i.value.getCoordinateFromPixel(It);
           i.value.getView().animate({
             center: Pt,
             duration: 800
@@ -10788,20 +10788,20 @@ function rs(i, r, t, e, n, o, a) {
       et = setTimeout(() => {
         et = null;
       }, 50);
-      let tt = i.value.forEachFeatureAtPixel(it.pixel, (lt) => lt);
-      if (tt !== u.value) {
-        if (u.value && t("pointerOutEvent", u.value.getProperties()), tt) {
+      let q = i.value.forEachFeatureAtPixel(it.pixel, (lt) => lt);
+      if (q !== u.value) {
+        if (u.value && t("pointerOutEvent", u.value.getProperties()), q) {
           let lt = null;
-          if (tt.getProperties().longitude && tt.getProperties().latitude) {
+          if (q.getProperties().longitude && q.getProperties().latitude) {
             let ct = [
-              tt.getProperties().longitude,
-              tt.getProperties().latitude
+              q.getProperties().longitude,
+              q.getProperties().latitude
             ];
             lt = i.value.getPixelFromCoordinate(ct);
           }
-          t("pointerMoveEvent", tt.getProperties(), lt);
+          t("pointerMoveEvent", q.getProperties(), lt);
         }
-        u.value = tt;
+        u.value = q;
       }
     });
   }, Y = (K, yt, st) => {
@@ -10824,7 +10824,7 @@ function rs(i, r, t, e, n, o, a) {
           })
         }),
         zIndex: 3,
-        style: function(tt) {
+        style: function(q) {
           return new rt({
             fill: new Yt({
               color: yt
@@ -10838,9 +10838,9 @@ function rs(i, r, t, e, n, o, a) {
       }), i.value.addLayer(E.value);
     });
   }, V = () => {
-    D.value && i.value.removeLayer(D.value), D.value = new Ee({
+    L.value && i.value.removeLayer(L.value), L.value = new Ee({
       layerName: "baseRoadlayer",
-      source: new Ln({
+      source: new Dn({
         url: F,
         wrapX: !0,
         cacheEnabled: !0
@@ -10849,9 +10849,9 @@ function rs(i, r, t, e, n, o, a) {
       projection: "EPSG:4326",
       maxTilesLoading: 8,
       preload: 0
-    }), i.value.addLayer(D.value), x.value && i.value.removeLayer(x.value), x.value = new Ee({
+    }), i.value.addLayer(L.value), x.value && i.value.removeLayer(x.value), x.value = new Ee({
       layerName: "roadLinelayer",
-      source: new Ln({
+      source: new Dn({
         url: z,
         wrapX: !0,
         cacheEnabled: !0
@@ -10865,19 +10865,19 @@ function rs(i, r, t, e, n, o, a) {
     const K = i.value.getView();
     let yt = null;
     const st = () => {
-      K.getZoom() < 15 ? (D.value.getVisible() || D.value.setVisible(!0), x.value.getVisible() && x.value.setVisible(!1)) : (D.value.getVisible() && D.value.setVisible(!1), x.value.getVisible() || x.value.setVisible(!0));
+      K.getZoom() < 15 ? (L.value.getVisible() || L.value.setVisible(!0), x.value.getVisible() && x.value.setVisible(!1)) : (L.value.getVisible() && L.value.setVisible(!1), x.value.getVisible() || x.value.setVisible(!0));
     };
     return st(), K.on("change:resolution", () => {
       yt && clearTimeout(yt), yt = setTimeout(st, 150);
     }), {
-      baseRoadlayer: D.value,
+      baseRoadlayer: L.value,
       roadLinelayer: x.value
     };
   }, Q = () => {
-    D.value && (i.value.removeLayer(D.value), D.value = null), x.value && (i.value.removeLayer(x.value), x.value = null);
-  }, $ = () => (T.value && i.value.removeLayer(T.value), T.value = new Ee({
+    L.value && (i.value.removeLayer(L.value), L.value = null), x.value && (i.value.removeLayer(x.value), x.value = null);
+  }, tt = () => (T.value && i.value.removeLayer(T.value), T.value = new Ee({
     layerName: "pileLayer",
-    source: new Ln({
+    source: new Dn({
       url: w,
       wrapX: !0,
       cacheEnabled: !0
@@ -10891,9 +10891,9 @@ function rs(i, r, t, e, n, o, a) {
   }, Gt = () => {
     const K = /* @__PURE__ */ new Date(), yt = K.getFullYear();
     let st = K.getMonth() + 1, et = K.getDate();
-    const it = K.getHours(), tt = K.getMinutes(), lt = K.getSeconds();
+    const it = K.getHours(), q = K.getMinutes(), lt = K.getSeconds();
     st >= 1 && st <= 9 && (st = "0" + st), et >= 1 && et <= 9 && (et = "0" + et);
-    const ct = yt + "-" + st + "-" + et + " " + it + ":" + tt + ":" + lt;
+    const ct = yt + "-" + st + "-" + et + " " + it + ":" + q + ":" + lt;
     return new Date(
       ct.replace(new RegExp("-", "gm"), "/")
     ).getTime();
@@ -10908,8 +10908,8 @@ function rs(i, r, t, e, n, o, a) {
       zIndex: K.zIndex || 9,
       minZoom: K.minZoom ?? 13
     }), C.value.on("prerender", (st) => {
-      const et = st.context, it = i.value.getView().getZoom(), tt = yt * (256 * Math.pow(2, it)) / 360, lt = 5e-5 * (256 * Math.pow(2, it)) / 360;
-      et.save(), et.translate(tt, lt);
+      const et = st.context, it = i.value.getView().getZoom(), q = yt * (256 * Math.pow(2, it)) / 360, lt = 5e-5 * (256 * Math.pow(2, it)) / 360;
+      et.save(), et.translate(q, lt);
     }), C.value.on("postrender", (st) => {
       st.context.restore();
     }), i.value.addLayer(C.value), C.value;
@@ -10923,7 +10923,7 @@ function rs(i, r, t, e, n, o, a) {
     zIndex: 1,
     maxTilesLoading: 8,
     preload: 0
-  }), i.value.addLayer(S.value), L.value && i.value.removeLayer(L.value), L.value = new Ee({
+  }), i.value.addLayer(S.value), D.value && i.value.removeLayer(D.value), D.value = new Ee({
     source: new Wr({
       layerType: "img",
       isLabel: !0,
@@ -10932,14 +10932,14 @@ function rs(i, r, t, e, n, o, a) {
     zIndex: 2,
     maxTilesLoading: 8,
     preload: 0
-  }), i.value.addLayer(L.value), {
+  }), i.value.addLayer(D.value), {
     yingxiangLayer: S.value,
-    yingxiangBZLayer: L.value
+    yingxiangBZLayer: D.value
   }), te = () => {
-    S.value && (i.value.removeLayer(S.value), S.value = null), L.value && (i.value.removeLayer(L.value), L.value = null);
+    S.value && (i.value.removeLayer(S.value), S.value = null), D.value && (i.value.removeLayer(D.value), D.value = null);
   };
   return sn(r, (K) => {
-    K === "dark" ? Y(R, j, Z) : K === "light" ? Y(O, G, P) : K === "yingxiang" && Y(N, b, M);
+    K === "dark" ? Y(R, B, Z) : K === "light" ? Y(O, G, P) : K === "yingxiang" && Y(N, b, M);
   }), {
     lastHoverFeature: u,
     isCluster: c,
@@ -10954,18 +10954,18 @@ function rs(i, r, t, e, n, o, a) {
     currentTabComponent: y,
     popupAttributes: A,
     shandongYingxiangLayer: S,
-    shandongYingxiangBZLayer: L,
-    baseRoadlayer: D,
+    shandongYingxiangBZLayer: D,
+    baseRoadlayer: L,
     roadLinelayer: x,
     pileLayer: T,
     gaodeTrafficLayer: C,
     normalizedThemeStyle: I,
-    initBaseLayers: B,
+    initBaseLayers: j,
     loadShandongYingxiangLayer: Wt,
     removeShandongYingxiangLayer: te,
     loadShandongRoadLayer: V,
     removeShandongRoadLayer: Q,
-    loadPileLayer: $,
+    loadPileLayer: tt,
     removePileLayer: Ot,
     loadGaodeTrafficLayer: de,
     removeGaodeTrafficLayer: pe
@@ -10983,15 +10983,18 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
         o.value = C.popupHeight, a.value = C.popupWidth, s.value = es, l.value = C, O && (O.innerHTML = C.popupTitle || ""), p(R, 10);
         break;
     }
+    if (!u.value) return;
+    let N = Number(
+      document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]
+    ), F = o.value / 153.6 * N, z = a.value / 153.6 * N;
+    u.value.setPosition(R), u.value.setOffset([-z / 2, -F]);
+    let w = i.value.value.getPixelFromCoordinate(R), _ = [w[0], w[1] - 17], B = i.value.value.getCoordinateFromPixel(_);
     setTimeout(() => {
-      if (!u.value) return;
-      let N = Number(
-        document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]
-      ), F = o.value / 153.6 * N, z = a.value / 153.6 * N;
-      T == "customPoint" ? setTimeout(() => {
-        u.value && (u.value.setPosition(R), u.value.setOffset([-z / 2.45, -F + 80]));
-      }, 100) : (u.value.setPosition(R), u.value.setOffset([-z / 2, -F]));
-    }, 0);
+      i.value.value.getView().animate({
+        center: B,
+        duration: 1500
+      });
+    }, 10);
   }, p = (T, C) => {
     if (!i || !i.value || !i.value.value) {
       console.error("Map reference is not valid");
@@ -11017,13 +11020,13 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     }
     let z = new Jt();
     if (T.pointList.forEach((w) => {
-      let _ = new Dn({
+      let _ = new Ln({
         title: "要素点",
         // geometry: new Point(fromLonLat([data.longitude, data.latitude])),
         geometry: new Se([w.longitude, w.latitude])
       });
       _.set("type", w.type), _.set("iconUrl", w.iconUrl), _.set("popoup", w.popoup), _.set("popupTitle", w.popupTitle), _.set("popupUrl", w.popupUrl), _.set("popupWidth", w.popupWidth), _.set("popupHeight", w.popupHeight), _.set("otherInfo", w.otherInfo), _.set("longitude", w.longitude), _.set("latitude", w.latitude), _.set("isVisible", !1), _.set("layerId", C);
-      let j = [
+      let B = [
         new rt({
           image: new ht({
             src: w.iconUrl,
@@ -11061,15 +11064,15 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           zIndex: 60
         })
       ];
-      _.setStyle(j), z.addFeature(_);
+      _.setStyle(B), z.addFeature(_);
     }), R) {
       O.value = new qt({
         layerName: C,
         zIndex: 999,
         style: function(_) {
-          const j = _.get("features").length;
+          const B = _.get("features").length;
           let G;
-          if (j > 1) {
+          if (B > 1) {
             new rt({
               image: new Pa({
                 fill: new Yt({
@@ -11088,7 +11091,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: 2,
                 font: "bold 16px sans-serif",
-                text: j.toString()
+                text: B.toString()
               })
             });
             let b = new rt({
@@ -11101,7 +11104,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: -2,
                 font: "14px sans-serif",
-                text: j.toString()
+                text: B.toString()
               })
             }), Z = new rt({
               image: new ht({
@@ -11113,7 +11116,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: -2,
                 font: "14px sans-serif",
-                text: j.toString()
+                text: B.toString()
               })
             }), P = new rt({
               image: new ht({
@@ -11126,7 +11129,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: 16,
                 font: "14px sans-serif",
-                text: j.toString()
+                text: B.toString()
               })
             });
             if (i.value.value.getView().getZoom() < 18)
@@ -11160,7 +11163,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     }
     let O = [];
     T.forEach((F) => {
-      let z = F.xyArr.map((_) => _), w = new Dn({
+      let z = F.xyArr.map((_) => _), w = new Ln({
         geometry: new gn(z)
       });
       w.set("popoup", F.popoup), w.set("otherInfo", F.otherInfo), w.setStyle(
@@ -11191,7 +11194,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     let O = [];
     T.forEach((F) => {
       if (F.longitude !== void 0 && F.latitude !== void 0) {
-        let z = new Dn({
+        let z = new Ln({
           geometry: new Se([F.longitude, F.latitude]),
           weight: F.weight || 1
           // 使用数据中的权重值，如果没有则默认为1
@@ -11259,25 +11262,25 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     O.appendTo(i.value.value);
     let N = function(M) {
       let I = [];
-      for (let B = 0; B < M.length; B++) {
-        let Y = M[B].latlng;
+      for (let j = 0; j < M.length; j++) {
+        let Y = M[j].latlng;
         if (Y) {
-          let V = M[B].bar_data || [0];
+          let V = M[j].bar_data || [0];
           Array.isArray(V) || (V = [V]);
-          let Q = M[B].bar_names || ["数据1"];
+          let Q = M[j].bar_names || ["数据1"];
           Array.isArray(Q) || (Q = [Q]);
-          let $ = M[B].bar_units || ["单位"];
-          Array.isArray($) || ($ = [$]), I.push({
-            name: M[B].city,
+          let tt = M[j].bar_units || ["单位"];
+          Array.isArray(tt) || (tt = [tt]), I.push({
+            name: M[j].city,
             value: Y,
             // 不再使用level字段
-            bar_count: M[B].bar_count || 1,
+            bar_count: M[j].bar_count || 1,
             // 默认显示一根柱子
-            color: Array.isArray(M[B].color) ? M[B].color : M[B].color ? [M[B].color, "#ff7f00"] : ["#efda18", "#ff7f00"],
+            color: Array.isArray(M[j].color) ? M[j].color : M[j].color ? [M[j].color, "#ff7f00"] : ["#efda18", "#ff7f00"],
             // 默认颜色
             bar_data: V,
             bar_names: Q,
-            bar_units: $
+            bar_units: tt
           });
         }
       }
@@ -11286,7 +11289,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     const F = N(C).reduce((M, I) => M.concat(I.bar_data), []), z = Math.max(...F, 1), w = (M) => {
       let I;
       if (typeof M == "string" && M.startsWith("#")) {
-        const B = M.replace("#", ""), Y = parseInt(B.substring(0, 2), 16), V = parseInt(B.substring(2, 4), 16), Q = parseInt(B.substring(4, 6), 16);
+        const j = M.replace("#", ""), Y = parseInt(j.substring(0, 2), 16), V = parseInt(j.substring(2, 4), 16), Q = parseInt(j.substring(4, 6), 16);
         I = `rgba(${Y}, ${V}, ${Q}, 1)`;
       } else
         I = M;
@@ -11325,13 +11328,13 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       };
     }, _ = N(C).filter(
       (M) => M.bar_count === 1
-    ), j = N(C).filter(
+    ), B = N(C).filter(
       (M) => M.bar_count > 1
-    ), G = j.map((M) => ({
+    ), G = B.map((M) => ({
       ...M,
       value: [M.value[0], M.value[1], M.bar_data[0]]
       // 使用第一个数据值
-    })), b = j.map((M) => ({
+    })), b = B.map((M) => ({
       ...M,
       value: [M.value[0], M.value[1], M.bar_data[1] || 0]
       // 使用第二个数据值
@@ -11346,14 +11349,14 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
         trigger: "item",
         formatter: function(M) {
           if (M.seriesName === "车流量") {
-            const I = M.data.bar_names[0] || "数据", B = M.data.bar_data[0] || 0, Y = M.data.bar_units[0] || "";
-            return `${M.data.name}<br/>${I}: ${B}${Y}`;
+            const I = M.data.bar_names[0] || "数据", j = M.data.bar_data[0] || 0, Y = M.data.bar_units[0] || "";
+            return `${M.data.name}<br/>${I}: ${j}${Y}`;
           } else if (M.seriesName === "车流量1") {
-            const I = M.data.bar_names[0] || "数据1", B = M.data.bar_data[0] || 0, Y = M.data.bar_units[0] || "";
-            return `${M.data.name}<br/>${I}: ${B}${Y}`;
+            const I = M.data.bar_names[0] || "数据1", j = M.data.bar_data[0] || 0, Y = M.data.bar_units[0] || "";
+            return `${M.data.name}<br/>${I}: ${j}${Y}`;
           } else if (M.seriesName === "车流量2") {
-            const I = M.data.bar_names[1] || "数据2", B = M.data.bar_data[1] || 0, Y = M.data.bar_units[1] || "";
-            return `${M.data.name}<br/>${I}: ${B}${Y}`;
+            const I = M.data.bar_names[1] || "数据2", j = M.data.bar_data[1] || 0, Y = M.data.bar_units[1] || "";
+            return `${M.data.name}<br/>${I}: ${j}${Y}`;
           }
           return `${M.data.name}<br/>数据: ${M.data.bar_data[0] || 0}${M.data.bar_units[0] || ""}`;
         },
@@ -11371,8 +11374,8 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: Z,
           symbolSize: function(M) {
-            const I = M[2] || 0, B = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, B];
+            const I = M[2] || 0, j = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, j];
           },
           symbolOffset: [0, "-50%"],
           rippleEffect: {
@@ -11396,8 +11399,8 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: G,
           symbolSize: function(M) {
-            const I = M[2] || 0, B = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, B];
+            const I = M[2] || 0, j = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, j];
           },
           symbolOffset: [-8, "-50%"],
           // 左移第一个柱子
@@ -11422,8 +11425,8 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: b,
           symbolSize: function(M) {
-            const I = M[2] || 0, B = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, B];
+            const I = M[2] || 0, j = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, j];
           },
           symbolOffset: [8, "-50%"],
           // 右移第二个柱子
@@ -11447,16 +11450,16 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     return O && (O.setChartOptions(P), setTimeout(() => {
       O.$chart && O.$chart.on("click", function(M) {
         if (t && typeof t == "function") {
-          let I = M.data, B = I.value[0], Y = I.value[1], V = null;
-          if (B && Y) {
-            let Q = [B, Y];
+          let I = M.data, j = I.value[0], Y = I.value[1], V = null;
+          if (j && Y) {
+            let Q = [j, Y];
             i && i.value && i.value.value && (V = i.value.value.getPixelFromCoordinate(Q));
           }
           t("barClick", I, V);
         }
       });
     }, 0)), O;
-  }, L = (T) => {
+  }, D = (T) => {
     if (!i || !i.value || !i.value.value) {
       console.error("Map reference is not valid");
       return;
@@ -11468,32 +11471,32 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     });
     O.appendTo(i.value.value);
     let N = function(I) {
-      let B = [];
+      let j = [];
       for (let Y = 0; Y < I.length; Y++) {
         let V = I[Y].latlng;
         if (V) {
           let Q = I[Y].bar_data || [0];
           Array.isArray(Q) || (Q = [Q]);
-          let $ = I[Y].bar_names || ["数据1"];
-          Array.isArray($) || ($ = [$]);
+          let tt = I[Y].bar_names || ["数据1"];
+          Array.isArray(tt) || (tt = [tt]);
           let Ot = I[Y].bar_units || ["单位"];
-          Array.isArray(Ot) || (Ot = [Ot]), B.push({
+          Array.isArray(Ot) || (Ot = [Ot]), j.push({
             name: I[Y].city,
             value: V,
             bar_count: I[Y].bar_count || 1,
             color: Array.isArray(I[Y].color) ? I[Y].color : I[Y].color ? [I[Y].color, "#ff7f00"] : ["#0097fb", "#30eca6"],
             bar_data: Q,
-            bar_names: $,
+            bar_names: tt,
             bar_units: Ot
           });
         }
       }
-      return B;
+      return j;
     };
-    const F = N(C).reduce((I, B) => I.concat(B.bar_data), []), z = Math.max(...F, 1), w = (I) => {
-      const B = I || 0;
+    const F = N(C).reduce((I, j) => I.concat(j.bar_data), []), z = Math.max(...F, 1), w = (I) => {
+      const j = I || 0;
       let Y = [];
-      return B < 300 ? Y = [
+      return j < 300 ? Y = [
         {
           offset: 0,
           color: "rgba(44, 104, 226, 1)"
@@ -11502,7 +11505,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           offset: 1,
           color: "rgba(44, 104, 226, 0.5)"
         }
-      ] : B < 1e3 ? Y = [
+      ] : j < 1e3 ? Y = [
         {
           offset: 0,
           color: "rgba(23, 221, 174, 1)"
@@ -11511,7 +11514,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           offset: 1,
           color: "rgba(44, 104, 226, 0.5)"
         }
-      ] : B < 2e3 ? Y = [
+      ] : j < 2e3 ? Y = [
         {
           offset: 0,
           color: "rgba(255, 213, 114, 1)"
@@ -11552,15 +11555,15 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       };
     }, _ = N(C).filter(
       (I) => I.bar_count === 1
-    ), j = N(C).filter(
+    ), B = N(C).filter(
       (I) => I.bar_count > 1
     ), G = _.map((I) => ({
       ...I,
       value: [I.value[0], I.value[1], I.bar_data[0]]
-    })), b = j.map((I) => ({
+    })), b = B.map((I) => ({
       ...I,
       value: [I.value[0], I.value[1], I.bar_data[0]]
-    })), Z = j.map((I) => ({
+    })), Z = B.map((I) => ({
       ...I,
       value: [I.value[0], I.value[1], I.bar_data[1] || 0]
     })), P = "path://M12.000,-0.000 C12.000,-0.000 16.074,60.121 22.731,60.121 C26.173,60.121 -3.234,60.121 0.511,60.121 C7.072,60.121 12.000,-0.000 12.000,-0.000 Z";
@@ -11571,14 +11574,14 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
         trigger: "item",
         formatter: function(I) {
           if (I.seriesName === "singleBar") {
-            const B = I.data.bar_names[0] || "数据", Y = I.data.bar_data[0] || 0, V = I.data.bar_units[0] || "";
-            return `${I.data.name}<br/>${B}: ${Y}${V}`;
+            const j = I.data.bar_names[0] || "数据", Y = I.data.bar_data[0] || 0, V = I.data.bar_units[0] || "";
+            return `${I.data.name}<br/>${j}: ${Y}${V}`;
           } else if (I.seriesName === "doubleBar1") {
-            const B = I.data.bar_names[0] || "数据1", Y = I.data.bar_data[0] || 0, V = I.data.bar_units[0] || "";
-            return `${I.data.name}<br/>${B}: ${Y}${V}`;
+            const j = I.data.bar_names[0] || "数据1", Y = I.data.bar_data[0] || 0, V = I.data.bar_units[0] || "";
+            return `${I.data.name}<br/>${j}: ${Y}${V}`;
           } else if (I.seriesName === "doubleBar2") {
-            const B = I.data.bar_names[1] || "数据2", Y = I.data.bar_data[1] || 0, V = I.data.bar_units[1] || "";
-            return `${I.data.name}<br/>${B}: ${Y}${V}`;
+            const j = I.data.bar_names[1] || "数据2", Y = I.data.bar_data[1] || 0, V = I.data.bar_units[1] || "";
+            return `${I.data.name}<br/>${j}: ${Y}${V}`;
           }
           return `${I.data.name}`;
         },
@@ -11599,7 +11602,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: G,
           symbolSize: function(I) {
-            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
+            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [0, "-50%"],
@@ -11619,7 +11622,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: b,
           symbolSize: function(I) {
-            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
+            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [-8, "-50%"],
@@ -11639,7 +11642,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: Z,
           symbolSize: function(I) {
-            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
+            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [8, "-50%"],
@@ -11658,16 +11661,16 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     return O && (O.setChartOptions(M), setTimeout(() => {
       O.$chart && O.$chart.on("click", function(I) {
         if (t && typeof t == "function") {
-          let B = I.data, Y = B.value[0], V = B.value[1], Q = null;
+          let j = I.data, Y = j.value[0], V = j.value[1], Q = null;
           if (Y && V) {
-            let $ = [Y, V];
-            i && i.value && i.value.value && (Q = i.value.value.getPixelFromCoordinate($));
+            let tt = [Y, V];
+            i && i.value && i.value.value && (Q = i.value.value.getPixelFromCoordinate(tt));
           }
-          t("barClick", B, Q);
+          t("barClick", j, Q);
         }
       });
     }, 0)), O;
-  }, D = (T) => {
+  }, L = (T) => {
     if (!i || !i.value || !i.value.value) {
       console.error("Map reference is not valid");
       return;
@@ -11683,11 +11686,11 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     }
   }, x = (T) => {
     const C = 3.141592653589793, R = 6378245, O = 0.006693421622965943, N = (w, _) => !(w > 73.66 && w < 135.05 && _ > 3.86 && _ < 53.55), F = (w, _) => {
-      let j = -100 + 2 * w + 3 * _ + 0.2 * _ * _ + 0.1 * w * _ + 0.2 * Math.sqrt(Math.abs(w));
-      return j += (20 * Math.sin(6 * w * C) + 20 * Math.sin(2 * w * C)) * 2 / 3, j += (20 * Math.sin(_ * C) + 40 * Math.sin(_ / 3 * C)) * 2 / 3, j += (160 * Math.sin(_ / 12 * C) + 320 * Math.sin(_ * C / 30)) * 2 / 3, j;
+      let B = -100 + 2 * w + 3 * _ + 0.2 * _ * _ + 0.1 * w * _ + 0.2 * Math.sqrt(Math.abs(w));
+      return B += (20 * Math.sin(6 * w * C) + 20 * Math.sin(2 * w * C)) * 2 / 3, B += (20 * Math.sin(_ * C) + 40 * Math.sin(_ / 3 * C)) * 2 / 3, B += (160 * Math.sin(_ / 12 * C) + 320 * Math.sin(_ * C / 30)) * 2 / 3, B;
     }, z = (w, _) => {
-      let j = 300 + w + 2 * _ + 0.1 * w * w + 0.1 * w * _ + 0.1 * Math.sqrt(Math.abs(w));
-      return j += (20 * Math.sin(6 * w * C) + 20 * Math.sin(2 * w * C)) * 2 / 3, j += (20 * Math.sin(w * C) + 40 * Math.sin(w / 3 * C)) * 2 / 3, j += (150 * Math.sin(w / 12 * C) + 300 * Math.sin(w / 30 * C)) * 2 / 3, j;
+      let B = 300 + w + 2 * _ + 0.1 * w * w + 0.1 * w * _ + 0.1 * Math.sqrt(Math.abs(w));
+      return B += (20 * Math.sin(6 * w * C) + 20 * Math.sin(2 * w * C)) * 2 / 3, B += (20 * Math.sin(w * C) + 40 * Math.sin(w / 3 * C)) * 2 / 3, B += (150 * Math.sin(w / 12 * C) + 300 * Math.sin(w / 30 * C)) * 2 / 3, B;
     };
     if (!Array.isArray(T) || T.length === 0)
       throw new Error("Invalid coordinates: must be a non-empty array");
@@ -11695,13 +11698,13 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       const [w, _] = T;
       if (N(w, _))
         return [w, _];
-      let j = F(w - 105, _ - 35), G = z(w - 105, _ - 35);
+      let B = F(w - 105, _ - 35), G = z(w - 105, _ - 35);
       const b = _ / 180 * C;
       let Z = Math.sin(b);
       Z = 1 - O * Z * Z;
       const P = Math.sqrt(Z);
-      j = j * 180 / (R * (1 - O) / (Z * P) * C), G = G * 180 / (R / P * Math.cos(b) * C);
-      const M = _ + j, I = w + G;
+      B = B * 180 / (R * (1 - O) / (Z * P) * C), G = G * 180 / (R / P * Math.cos(b) * C);
+      const M = _ + B, I = w + G;
       return [w * 2 - I, _ * 2 - M];
     } else {
       if (Array.isArray(T[0]))
@@ -11726,8 +11729,8 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     findLayerByName: y,
     isLayerInMap: A,
     initEchartsLayer: S,
-    initPictorialBarLayer: L,
-    removeEchartsLayer: D,
+    initPictorialBarLayer: D,
+    removeEchartsLayer: L,
     gcj02towgs84: x
   };
 }
@@ -11850,7 +11853,7 @@ function Pf(i) {
     });
     let _ = "1=1";
     x.devStatus !== void 0 && x.devStatus !== null && x.devStatus !== "" && (_ = `DEV_STATUS='${x.devStatus}'`);
-    const j = new Ar({
+    const B = new Ar({
       queryParameter: {
         name: "sde_point_toll_station@ceshi",
         attributeFilter: _,
@@ -11861,7 +11864,7 @@ function Pf(i) {
       datasetNames: ["ceshi:sde_point_toll_station"],
       returnContent: !0
     });
-    new Ir(s).getFeaturesBySQL(j).then(function(b) {
+    new Ir(s).getFeaturesBySQL(B).then(function(b) {
       new Ge().readFeatures(b.result.features, {
         dataProjection: "EPSG:4326",
         featureProjection: "EPSG:4326"
@@ -12067,10 +12070,10 @@ function Pf(i) {
         opacity: 1
       })
     }), z = {}, w = function(_) {
-      const j = _.get("features") ? _.get("features").length : 1;
-      if (j === 1)
+      const B = _.get("features") ? _.get("features").length : 1;
+      if (B === 1)
         return _.get("features")[0].getStyle();
-      let G = z[j];
+      let G = z[B];
       return G || (G = new rt({
         image: new ht({
           src: Qn.cameraNormal,
@@ -12079,7 +12082,7 @@ function Pf(i) {
           opacity: 1
         }),
         text: new Ne({
-          text: j.toString(),
+          text: B.toString(),
           fill: new Yt({
             color: "#ff0000"
           }),
@@ -12091,7 +12094,7 @@ function Pf(i) {
           offsetY: -35,
           offsetX: 15
         })
-      }), z[j] = G), G;
+      }), z[B] = G), G;
     };
     a.value = new qt({
       layerName: "cameraLayer",
@@ -12106,14 +12109,14 @@ function Pf(i) {
       },
       body: JSON.stringify({ devStatus: "" })
     }).then((_) => _.json()).then((_) => {
-      const j = [];
+      const B = [];
       _ && _.data && Array.isArray(_.data) && _.data.forEach((G) => {
-        const b = new Di({
+        const b = new Li({
           geometry: new Se([parseFloat(G.x), parseFloat(G.y)]),
           ...G
         }), Z = G.devStatus;
-        Z === 1 || Z === "1" ? b.setStyle(N) : Z === 2 || Z === "2" ? b.setStyle(F) : b.setStyle(N), b.set("popoup", !1), b.set("type", "camera"), j.push(b);
-      }), R.addFeatures(j), i.value.addLayer(a.value), T(a.value);
+        Z === 1 || Z === "1" ? b.setStyle(N) : Z === 2 || Z === "2" ? b.setStyle(F) : b.setStyle(N), b.set("popoup", !1), b.set("type", "camera"), B.push(b);
+      }), R.addFeatures(B), i.value.addLayer(a.value), T(a.value);
     }).catch(function(_) {
       console.error("加载摄像机数据失败:", _), C(_);
     });
@@ -12164,7 +12167,7 @@ function Pf(i) {
     }
   };
 }
-const Rf = { id: "popupContent" }, Df = {
+const Rf = { id: "popupContent" }, Lf = {
   __name: "index",
   props: {
     mapBoxHeight: {
@@ -12234,8 +12237,8 @@ const Rf = { id: "popupContent" }, Df = {
       overlayPopup: y,
       currentTabComponent: A,
       popupAttributes: S,
-      popupHeight: L,
-      popupWidth: D,
+      popupHeight: D,
+      popupWidth: L,
       loadShandongYingxiangLayer: x,
       removeShandongYingxiangLayer: T,
       loadShandongRoadLayer: C,
@@ -12254,18 +12257,18 @@ const Rf = { id: "popupContent" }, Df = {
       e.tiandituKey
     ), w = H([]), {
       fwqLayer: _,
-      loadFWQLayer: j,
+      loadFWQLayer: B,
       removeFWQLayer: G,
       sfzLayer: b,
       loadSFZLayer: Z,
       removeSFZLayer: P,
       qbbLayer: M,
       loadQBBLayer: I,
-      removeQBBLayer: B,
+      removeQBBLayer: j,
       lgzxLayer: Y,
       loadLGZXLayer: V,
       removeLGZXLayer: Q,
-      qzzdLayer: $,
+      qzzdLayer: tt,
       loadQZZDLayer: Ot,
       removeQZZDLayer: Gt,
       cameraLayer: de,
@@ -12280,7 +12283,7 @@ const Rf = { id: "popupContent" }, Df = {
       gongganTextLayerList: et,
       sourceWithTextList: it,
       // 方法
-      openPopupByattr: tt,
+      openPopupByattr: q,
       zoomInBylatlon: lt,
       addPointByArr: ct,
       addLineByArr: ot,
@@ -12298,8 +12301,8 @@ const Rf = { id: "popupContent" }, Df = {
       n,
       g,
       v,
-      L,
       D,
+      L,
       A,
       S,
       y
@@ -12334,7 +12337,7 @@ const Rf = { id: "popupContent" }, Df = {
       Je();
     }), r({
       map: o,
-      openPopupByattr: tt,
+      openPopupByattr: q,
       zoomInBylatlon: lt,
       initEchartsLayer: It,
       initPictorialBarLayer: Pt,
@@ -12357,18 +12360,18 @@ const Rf = { id: "popupContent" }, Df = {
       loadGaodeTrafficLayer: F,
       removeGaodeTrafficLayer: z,
       fwqLayer: _,
-      loadFWQLayer: j,
+      loadFWQLayer: B,
       removeFWQLayer: G,
       sfzLayer: b,
       loadSFZLayer: Z,
       removeSFZLayer: P,
       qbbLayer: M,
       loadQBBLayer: I,
-      removeQBBLayer: B,
+      removeQBBLayer: j,
       lgzxLayer: Y,
       loadLGZXLayer: V,
       removeLGZXLayer: Q,
-      qzzdLayer: $,
+      qzzdLayer: tt,
       loadQZZDLayer: Ot,
       removeQZZDLayer: Gt,
       cameraLayer: de,
@@ -12412,7 +12415,7 @@ const Rf = { id: "popupContent" }, Df = {
       ])
     ], 2));
   }
-}, is = /* @__PURE__ */ zi(Df, [["__scopeId", "data-v-410c6e81"]]);
+}, is = /* @__PURE__ */ zi(Lf, [["__scopeId", "data-v-410c6e81"]]);
 function os(i, r, t, e, n) {
   let o = null;
   return {
@@ -12498,8 +12501,8 @@ function os(i, r, t, e, n) {
         });
       }, l.ScreenSpaceEventType.LEFT_CLICK);
       const g = () => {
-        const A = u.camera, L = l.Ellipsoid.WGS84.cartesianToCartographic(A.position), D = l.Math.toDegrees(L.longitude), x = l.Math.toDegrees(L.latitude), T = L.height, C = l.Math.toDegrees(A.heading), R = l.Math.toDegrees(A.pitch), O = l.Math.toDegrees(A.roll);
-        console.log("=== 当前相机位置 ==="), console.log(`center: [${D.toFixed(6)}, ${x.toFixed(6)}, ${T.toFixed(2)}]`), console.log(`heading: ${C.toFixed(6)}, pitch: ${R.toFixed(6)}, roll: ${O.toFixed(6)}`), console.log(""), console.log("初始化代码示例:"), console.log("viewer.camera.setView({"), console.log(`  destination: Cesium.Cartesian3.fromDegrees(${D.toFixed(6)}, ${x.toFixed(6)}, ${T.toFixed(2)}),`), console.log("  orientation: {"), console.log(`    heading: Cesium.Math.toRadians(${C.toFixed(6)}),`), console.log(`    pitch: Cesium.Math.toRadians(${R.toFixed(6)}),`), console.log(`    roll: Cesium.Math.toRadians(${O.toFixed(6)})`), console.log("  }"), console.log("});");
+        const A = u.camera, D = l.Ellipsoid.WGS84.cartesianToCartographic(A.position), L = l.Math.toDegrees(D.longitude), x = l.Math.toDegrees(D.latitude), T = D.height, C = l.Math.toDegrees(A.heading), R = l.Math.toDegrees(A.pitch), O = l.Math.toDegrees(A.roll);
+        console.log("=== 当前相机位置 ==="), console.log(`center: [${L.toFixed(6)}, ${x.toFixed(6)}, ${T.toFixed(2)}]`), console.log(`heading: ${C.toFixed(6)}, pitch: ${R.toFixed(6)}, roll: ${O.toFixed(6)}`), console.log(""), console.log("初始化代码示例:"), console.log("viewer.camera.setView({"), console.log(`  destination: Cesium.Cartesian3.fromDegrees(${L.toFixed(6)}, ${x.toFixed(6)}, ${T.toFixed(2)}),`), console.log("  orientation: {"), console.log(`    heading: Cesium.Math.toRadians(${C.toFixed(6)}),`), console.log(`    pitch: Cesium.Math.toRadians(${R.toFixed(6)}),`), console.log(`    roll: Cesium.Math.toRadians(${O.toFixed(6)})`), console.log("  }"), console.log("});");
       };
       window.printCameraPosition = g, document.addEventListener("keydown", (A) => {
         A.key.toLowerCase() === "p" && g();
@@ -12571,7 +12574,7 @@ function os(i, r, t, e, n) {
     }
   };
 }
-const Lf = {
+const Df = {
   __name: "index",
   props: {
     mapBoxHeight: {
@@ -12660,7 +12663,7 @@ const Lf = {
       }, null, 6)
     ], 2));
   }
-}, as = /* @__PURE__ */ zi(Lf, [["__scopeId", "data-v-6f6bf221"]]), Nf = (i) => {
+}, as = /* @__PURE__ */ zi(Df, [["__scopeId", "data-v-6f6bf221"]]), Nf = (i) => {
   i.component("GisMap2D", is), i.component("GisMap3D", as);
 }, Yf = {
   install: Nf,