gis-map-szdp 0.1.8 → 0.1.9

package/dist/gismap.es.js

@@ -4805,7 +4805,7 @@ var Qu = /* @__PURE__ */ function() {
             return;
           if (L && (D - l) / 2 !== c.length / h) {
             var T = l / 2;
-            L = L.filter(function(B, G) {
+            L = L.filter(function(j, G) {
               var b = s[(T + G) * 2] === c[G * h] && s[(T + G) * 2 + 1] === c[G * h + 1];
               return b || --T, b;
             });
@@ -4833,8 +4833,8 @@ var Qu = /* @__PURE__ */ function() {
             [1, 1],
             NaN,
             this.declutterImageWithText_,
-            C == be ? be : C.map(function(B) {
-              return B * z;
+            C == be ? be : C.map(function(j) {
+              return j * z;
             }),
             !!a.backgroundFill,
             !!a.backgroundStroke,
@@ -5194,8 +5194,8 @@ function rc(i, r, t, e, n, o, a, s, l, u, c, h) {
   var w;
   if (z) {
     E(), w = Math.atan2(d - g, f - p), R && (w += w > 0 ? -N : N);
-    var _ = (T + A) / 2, B = (C + S) / 2;
-    return F[0] = [_, B, (x - o) / 2, w, n], F;
+    var _ = (T + A) / 2, j = (C + S) / 2;
+    return F[0] = [_, j, (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 j = R ? b - G - 1 : G, Y = s * l(u, n[j], c);
+      var B = R ? b - G - 1 : G, Y = s * l(u, n[B], 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), B = le(g, d, y);
-      F.push([_, B, I / 2, Z, V]), o += I;
+      var _ = le(p, f, y), j = le(g, d, y);
+      F.push([_, j, I / 2, Z, V]), o += I;
     }
   }
   return F;
@@ -5262,18 +5262,18 @@ var oc = (
         C.prototype.setLineDash && (D.push("setLineDash", [a.lineDash]), D.push("lineDashOffset", a.lineDashOffset));
       }
       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) {
+      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) {
         var P = p[b];
         if (P === `
 `) {
-          w += z, z = 0, O = f * S + R * d, ++B;
+          w += z, z = 0, O = f * S + R * d, ++j;
           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[B]),
+          O + R * E[_] + f * (E[_] - A[j]),
           0.5 * (d + z) + w
         ];
         O += E[_], n && N.push("strokeText", I), e && F.push("fillText", I), ++_;
@@ -5356,15 +5356,15 @@ var oc = (
           resolution: this.resolution,
           rotation: F
         }
-      ), _ = this.instructions != n || this.overlaps ? 0 : 200, B, G, b, Z; c < h; ) {
+      ), _ = this.instructions != n || this.overlaps ? 0 : 200, j, G, b, Z; c < h; ) {
         var P = n[c], M = (
           /** @type {import("./Instruction.js").default} */
           P[0]
         );
         switch (M) {
           case X.BEGIN_GEOMETRY:
-            B = /** @type {import("../../Feature.js").FeatureLike} */
-            P[1], Z = P[3], B.getGeometry() ? s !== void 0 && !bt(s, Z.getExtent()) ? c = /** @type {number} */
+            j = /** @type {import("../../Feature.js").FeatureLike} */
+            P[1], Z = P[3], j.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], 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;
+            var I = u[f], B = u[f + 1], Y = u[f + 2], V = u[f + 3], Q = Y - I, tt = V - B, Ot = Math.sqrt(Q * Q + tt * tt);
+            r.moveTo(I + Ot, B), r.arc(I, B, 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 = B, c in N || (N[c] = []);
+            w.geometry = Gt, w.feature = j, 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;
@@ -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, q, o, gt, It || Pt, B), 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, j), Je = [
                   r,
                   t,
                   A,
@@ -5538,7 +5538,7 @@ var oc = (
                     Ht = yr[ge], Xr = /** @type {string} */
                     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, B);
+                    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);
                     if (l && l.collides(pt.declutterBox))
                       break t;
                     mr.push([
@@ -5556,7 +5556,7 @@ var oc = (
                     Ht = yr[ge], Xr = /** @type {string} */
                     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, B);
+                    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);
                     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) {
-              B = /** @type {import("../../Feature.js").FeatureLike} */
+              j = /** @type {import("../../Feature.js").FeatureLike} */
               P[1];
-              var Wi = a(B, Z);
+              var Wi = a(j, Z);
               if (Wi)
                 return Wi;
             }
@@ -6434,8 +6434,8 @@ function vc(i, r, t, e, n, o, a) {
       }
     }
   }
-  for (var B = Object.keys(p).map(Number).sort(Xe), g = 0, G = B.length; g < G; ++g) {
-    var _ = p[B[g]];
+  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 in _)
       for (var Z = _[b], S = 0, D = Z.length; S < D; S += 2) {
         h.setStyle(Z[S + 1]);
@@ -6766,7 +6766,7 @@ var Pc = /* @__PURE__ */ function() {
       for (var O = 0, N = _.length; O < N; ++O)
         z(_[O]);
       this.renderedFeatures_ = _;
-      var B = T.finish(), G = new _o(E, f, d, n.getOverlaps(), B, e.getRenderBuffer());
+      var j = T.finish(), G = new _o(E, f, d, n.getOverlaps(), j, 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)
@@ -9021,22 +9021,22 @@ function Mh(i, r, t, e, n, o, a, s, l, u, c, h) {
   });
   var y = He(a);
   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;
+    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), 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;
     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, B - w],
+      [0, 0, R, O, j - w],
       [0, 0, N, F, b - w]
     ], I = Ws(M);
     if (I) {
       if (f.save(), f.beginPath(), _h() || !h) {
-        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.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.lineTo(G, b);
       } else
-        f.moveTo(_, B), f.lineTo(z, w), f.lineTo(G, b);
+        f.moveTo(_, j), 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, D) {
@@ -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 B = J(this);
+            var j = J(this);
             if (_.getState() == U.LOADED) {
               R[g][_.tileCoord.toString()] = _;
-              var G = _.inTransition(B);
+              var G = _.inTransition(j);
               !this.newTiles_ && (G || this.renderedTiles.indexOf(_) === -1) && (this.newTiles_ = !0);
             }
-            if (_.getAlpha(B, t.time) === 1)
+            if (_.getAlpha(j, t.time) === 1)
               continue;
           }
           var b = p.getTileCoordChildTileRange(_.tileCoord, F, N), Z = !1;
@@ -9251,8 +9251,8 @@ 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, 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 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 Y = Object.keys(R).map(Number);
       Y.sort(Xe);
       var V, Q, tt;
@@ -9281,7 +9281,7 @@ var Oh = /* @__PURE__ */ function() {
           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 !== j.style.transform && (j.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 !== B.style.transform && (B.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) {
@@ -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), 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 = () => {
+  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", j = "#1b2639", G = "#eeeee9", b = "#adb0aa", Z = "#3578E0", P = "#b4b4b1", M = "#d3d3d3", I = Ye(() => ["dark", "light", "yingxiang"].includes(r.value) ? r.value : "dark"), B = () => {
     let K;
     I.value === "light" ? K = O : I.value === "yingxiang" ? K = N : K = R, d.value = new Ee({
       source: new Wr({
@@ -10939,7 +10939,7 @@ function rs(i, r, t, e, n, o, a) {
     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, B, Z) : K === "light" ? Y(O, G, P) : K === "yingxiang" && Y(N, b, M);
+    K === "dark" ? Y(R, j, Z) : K === "light" ? Y(O, G, P) : K === "yingxiang" && Y(N, b, M);
   }), {
     lastHoverFeature: u,
     isCluster: c,
@@ -10960,7 +10960,7 @@ function rs(i, r, t, e, n, o, a) {
     pileLayer: T,
     gaodeTrafficLayer: C,
     normalizedThemeStyle: I,
-    initBaseLayers: j,
+    initBaseLayers: B,
     loadShandongYingxiangLayer: Wt,
     removeShandongYingxiangLayer: te,
     loadShandongRoadLayer: V,
@@ -10988,13 +10988,6 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       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(() => {
-      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");
@@ -11026,7 +11019,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
         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 B = [
+      let j = [
         new rt({
           image: new ht({
             src: w.iconUrl,
@@ -11064,15 +11057,15 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           zIndex: 60
         })
       ];
-      _.setStyle(B), z.addFeature(_);
+      _.setStyle(j), z.addFeature(_);
     }), R) {
       O.value = new qt({
         layerName: C,
         zIndex: 999,
         style: function(_) {
-          const B = _.get("features").length;
+          const j = _.get("features").length;
           let G;
-          if (B > 1) {
+          if (j > 1) {
             new rt({
               image: new Pa({
                 fill: new Yt({
@@ -11091,7 +11084,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: 2,
                 font: "bold 16px sans-serif",
-                text: B.toString()
+                text: j.toString()
               })
             });
             let b = new rt({
@@ -11104,7 +11097,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: -2,
                 font: "14px sans-serif",
-                text: B.toString()
+                text: j.toString()
               })
             }), Z = new rt({
               image: new ht({
@@ -11116,7 +11109,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: -2,
                 font: "14px sans-serif",
-                text: B.toString()
+                text: j.toString()
               })
             }), P = new rt({
               image: new ht({
@@ -11129,7 +11122,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
                 }),
                 offsetY: 16,
                 font: "14px sans-serif",
-                text: B.toString()
+                text: j.toString()
               })
             });
             if (i.value.value.getView().getZoom() < 18)
@@ -11262,21 +11255,21 @@ 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 j = 0; j < M.length; j++) {
-        let Y = M[j].latlng;
+      for (let B = 0; B < M.length; B++) {
+        let Y = M[B].latlng;
         if (Y) {
-          let V = M[j].bar_data || [0];
+          let V = M[B].bar_data || [0];
           Array.isArray(V) || (V = [V]);
-          let Q = M[j].bar_names || ["数据1"];
+          let Q = M[B].bar_names || ["数据1"];
           Array.isArray(Q) || (Q = [Q]);
-          let tt = M[j].bar_units || ["单位"];
+          let tt = M[B].bar_units || ["单位"];
           Array.isArray(tt) || (tt = [tt]), I.push({
-            name: M[j].city,
+            name: M[B].city,
             value: Y,
             // 不再使用level字段
-            bar_count: M[j].bar_count || 1,
+            bar_count: M[B].bar_count || 1,
             // 默认显示一根柱子
-            color: Array.isArray(M[j].color) ? M[j].color : M[j].color ? [M[j].color, "#ff7f00"] : ["#efda18", "#ff7f00"],
+            color: Array.isArray(M[B].color) ? M[B].color : M[B].color ? [M[B].color, "#ff7f00"] : ["#efda18", "#ff7f00"],
             // 默认颜色
             bar_data: V,
             bar_names: Q,
@@ -11289,7 +11282,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 j = M.replace("#", ""), Y = parseInt(j.substring(0, 2), 16), V = parseInt(j.substring(2, 4), 16), Q = parseInt(j.substring(4, 6), 16);
+        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);
         I = `rgba(${Y}, ${V}, ${Q}, 1)`;
       } else
         I = M;
@@ -11328,13 +11321,13 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       };
     }, _ = N(C).filter(
       (M) => M.bar_count === 1
-    ), B = N(C).filter(
+    ), j = N(C).filter(
       (M) => M.bar_count > 1
-    ), G = B.map((M) => ({
+    ), G = j.map((M) => ({
       ...M,
       value: [M.value[0], M.value[1], M.bar_data[0]]
       // 使用第一个数据值
-    })), b = B.map((M) => ({
+    })), b = j.map((M) => ({
       ...M,
       value: [M.value[0], M.value[1], M.bar_data[1] || 0]
       // 使用第二个数据值
@@ -11349,14 +11342,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] || "数据", j = M.data.bar_data[0] || 0, Y = M.data.bar_units[0] || "";
-            return `${M.data.name}<br/>${I}: ${j}${Y}`;
+            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}`;
           } else if (M.seriesName === "车流量1") {
-            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}`;
+            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}`;
           } else if (M.seriesName === "车流量2") {
-            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}`;
+            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}`;
           }
           return `${M.data.name}<br/>数据: ${M.data.bar_data[0] || 0}${M.data.bar_units[0] || ""}`;
         },
@@ -11374,8 +11367,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, j = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, j];
+            const I = M[2] || 0, B = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, B];
           },
           symbolOffset: [0, "-50%"],
           rippleEffect: {
@@ -11399,8 +11392,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, j = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, j];
+            const I = M[2] || 0, B = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, B];
           },
           symbolOffset: [-8, "-50%"],
           // 左移第一个柱子
@@ -11425,8 +11418,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, j = Math.max(10, I / z * 150);
-            return [R.barWidth || 15, j];
+            const I = M[2] || 0, B = Math.max(10, I / z * 150);
+            return [R.barWidth || 15, B];
           },
           symbolOffset: [8, "-50%"],
           // 右移第二个柱子
@@ -11450,9 +11443,9 @@ 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, j = I.value[0], Y = I.value[1], V = null;
-          if (j && Y) {
-            let Q = [j, Y];
+          let I = M.data, B = I.value[0], Y = I.value[1], V = null;
+          if (B && Y) {
+            let Q = [B, Y];
             i && i.value && i.value.value && (V = i.value.value.getPixelFromCoordinate(Q));
           }
           t("barClick", I, V);
@@ -11471,7 +11464,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
     });
     O.appendTo(i.value.value);
     let N = function(I) {
-      let j = [];
+      let B = [];
       for (let Y = 0; Y < I.length; Y++) {
         let V = I[Y].latlng;
         if (V) {
@@ -11480,7 +11473,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           let tt = I[Y].bar_names || ["数据1"];
           Array.isArray(tt) || (tt = [tt]);
           let Ot = I[Y].bar_units || ["单位"];
-          Array.isArray(Ot) || (Ot = [Ot]), j.push({
+          Array.isArray(Ot) || (Ot = [Ot]), B.push({
             name: I[Y].city,
             value: V,
             bar_count: I[Y].bar_count || 1,
@@ -11491,12 +11484,12 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           });
         }
       }
-      return j;
+      return B;
     };
-    const F = N(C).reduce((I, j) => I.concat(j.bar_data), []), z = Math.max(...F, 1), w = (I) => {
-      const j = I || 0;
+    const F = N(C).reduce((I, B) => I.concat(B.bar_data), []), z = Math.max(...F, 1), w = (I) => {
+      const B = I || 0;
       let Y = [];
-      return j < 300 ? Y = [
+      return B < 300 ? Y = [
         {
           offset: 0,
           color: "rgba(44, 104, 226, 1)"
@@ -11505,7 +11498,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           offset: 1,
           color: "rgba(44, 104, 226, 0.5)"
         }
-      ] : j < 1e3 ? Y = [
+      ] : B < 1e3 ? Y = [
         {
           offset: 0,
           color: "rgba(23, 221, 174, 1)"
@@ -11514,7 +11507,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           offset: 1,
           color: "rgba(44, 104, 226, 0.5)"
         }
-      ] : j < 2e3 ? Y = [
+      ] : B < 2e3 ? Y = [
         {
           offset: 0,
           color: "rgba(255, 213, 114, 1)"
@@ -11555,15 +11548,15 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       };
     }, _ = N(C).filter(
       (I) => I.bar_count === 1
-    ), B = N(C).filter(
+    ), j = N(C).filter(
       (I) => I.bar_count > 1
     ), G = _.map((I) => ({
       ...I,
       value: [I.value[0], I.value[1], I.bar_data[0]]
-    })), b = B.map((I) => ({
+    })), b = j.map((I) => ({
       ...I,
       value: [I.value[0], I.value[1], I.bar_data[0]]
-    })), Z = B.map((I) => ({
+    })), Z = j.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";
@@ -11574,14 +11567,14 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
         trigger: "item",
         formatter: function(I) {
           if (I.seriesName === "singleBar") {
-            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}`;
+            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}`;
           } else if (I.seriesName === "doubleBar1") {
-            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}`;
+            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}`;
           } else if (I.seriesName === "doubleBar2") {
-            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}`;
+            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}`;
           }
           return `${I.data.name}`;
         },
@@ -11602,7 +11595,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: G,
           symbolSize: function(I) {
-            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
+            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [0, "-50%"],
@@ -11622,7 +11615,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: b,
           symbolSize: function(I) {
-            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
+            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [-8, "-50%"],
@@ -11642,7 +11635,7 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
           coordinateSystem: "geo",
           data: Z,
           symbolSize: function(I) {
-            const j = I[2] || 0, Y = Math.max(10, j / z * 150);
+            const B = I[2] || 0, Y = Math.max(10, B / z * 150);
             return [R.barWidth || 15, Y];
           },
           symbolOffset: [8, "-50%"],
@@ -11661,12 +11654,12 @@ 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 j = I.data, Y = j.value[0], V = j.value[1], Q = null;
+          let B = I.data, Y = B.value[0], V = B.value[1], Q = null;
           if (Y && V) {
             let tt = [Y, V];
             i && i.value && i.value.value && (Q = i.value.value.getPixelFromCoordinate(tt));
           }
-          t("barClick", j, Q);
+          t("barClick", B, Q);
         }
       });
     }, 0)), O;
@@ -11686,11 +11679,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 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;
+      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;
     }, z = (w, _) => {
-      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;
+      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;
     };
     if (!Array.isArray(T) || T.length === 0)
       throw new Error("Invalid coordinates: must be a non-empty array");
@@ -11698,13 +11691,13 @@ function ns(i, r, t, e, n, o, a, s, l, u) {
       const [w, _] = T;
       if (N(w, _))
         return [w, _];
-      let B = F(w - 105, _ - 35), G = z(w - 105, _ - 35);
+      let j = 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);
-      B = B * 180 / (R * (1 - O) / (Z * P) * C), G = G * 180 / (R / P * Math.cos(b) * C);
-      const M = _ + B, I = w + G;
+      j = j * 180 / (R * (1 - O) / (Z * P) * C), G = G * 180 / (R / P * Math.cos(b) * C);
+      const M = _ + j, I = w + G;
       return [w * 2 - I, _ * 2 - M];
     } else {
       if (Array.isArray(T[0]))
@@ -11853,7 +11846,7 @@ function Pf(i) {
     });
     let _ = "1=1";
     x.devStatus !== void 0 && x.devStatus !== null && x.devStatus !== "" && (_ = `DEV_STATUS='${x.devStatus}'`);
-    const B = new Ar({
+    const j = new Ar({
       queryParameter: {
         name: "sde_point_toll_station@ceshi",
         attributeFilter: _,
@@ -11864,7 +11857,7 @@ function Pf(i) {
       datasetNames: ["ceshi:sde_point_toll_station"],
       returnContent: !0
     });
-    new Ir(s).getFeaturesBySQL(B).then(function(b) {
+    new Ir(s).getFeaturesBySQL(j).then(function(b) {
       new Ge().readFeatures(b.result.features, {
         dataProjection: "EPSG:4326",
         featureProjection: "EPSG:4326"
@@ -12070,10 +12063,10 @@ function Pf(i) {
         opacity: 1
       })
     }), z = {}, w = function(_) {
-      const B = _.get("features") ? _.get("features").length : 1;
-      if (B === 1)
+      const j = _.get("features") ? _.get("features").length : 1;
+      if (j === 1)
         return _.get("features")[0].getStyle();
-      let G = z[B];
+      let G = z[j];
       return G || (G = new rt({
         image: new ht({
           src: Qn.cameraNormal,
@@ -12082,7 +12075,7 @@ function Pf(i) {
           opacity: 1
         }),
         text: new Ne({
-          text: B.toString(),
+          text: j.toString(),
           fill: new Yt({
             color: "#ff0000"
           }),
@@ -12094,7 +12087,7 @@ function Pf(i) {
           offsetY: -35,
           offsetX: 15
         })
-      }), z[B] = G), G;
+      }), z[j] = G), G;
     };
     a.value = new qt({
       layerName: "cameraLayer",
@@ -12109,14 +12102,14 @@ function Pf(i) {
       },
       body: JSON.stringify({ devStatus: "" })
     }).then((_) => _.json()).then((_) => {
-      const B = [];
+      const j = [];
       _ && _.data && Array.isArray(_.data) && _.data.forEach((G) => {
         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"), B.push(b);
-      }), R.addFeatures(B), 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"), j.push(b);
+      }), R.addFeatures(j), i.value.addLayer(a.value), T(a.value);
     }).catch(function(_) {
       console.error("加载摄像机数据失败:", _), C(_);
     });
@@ -12257,14 +12250,14 @@ const Rf = { id: "popupContent" }, Lf = {
       e.tiandituKey
     ), w = H([]), {
       fwqLayer: _,
-      loadFWQLayer: B,
+      loadFWQLayer: j,
       removeFWQLayer: G,
       sfzLayer: b,
       loadSFZLayer: Z,
       removeSFZLayer: P,
       qbbLayer: M,
       loadQBBLayer: I,
-      removeQBBLayer: j,
+      removeQBBLayer: B,
       lgzxLayer: Y,
       loadLGZXLayer: V,
       removeLGZXLayer: Q,
@@ -12360,14 +12353,14 @@ const Rf = { id: "popupContent" }, Lf = {
       loadGaodeTrafficLayer: F,
       removeGaodeTrafficLayer: z,
       fwqLayer: _,
-      loadFWQLayer: B,
+      loadFWQLayer: j,
       removeFWQLayer: G,
       sfzLayer: b,
       loadSFZLayer: Z,
       removeSFZLayer: P,
       qbbLayer: M,
       loadQBBLayer: I,
-      removeQBBLayer: j,
+      removeQBBLayer: B,
       lgzxLayer: Y,
       loadLGZXLayer: V,
       removeLGZXLayer: Q,