gisviewer-vue3-arcgis 1.0.252 → 1.0.253

package/es/src/gis-map/gis-map.vue.d.ts

@@ -116,6 +116,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: IOverlayParam) => Promise<import("../types").IResult>;
     addClusterPoints: (params: IClusterPointParams) => Promise<void>;
+    removeAllClusterPoints: () => void;
     addMask: (params: IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

package/es/src/gis-map/gis-map.vue.mjs

@@ -1,22 +1,22 @@
-import { defineComponent as it, ref as P, reactive as ct, onMounted as lt, getCurrentInstance as ut, onUnmounted as mt, computed as pt, openBlock as T, createElementBlock as _, createElementVNode as f, withDirectives as dt, vShow as gt, Fragment as ft, renderList as yt, createBlock as Ct } from "vue";
+import { defineComponent as ct, ref as z, reactive as lt, onMounted as ut, getCurrentInstance as mt, onUnmounted as pt, computed as dt, openBlock as T, createElementBlock as _, createElementVNode as y, withDirectives as gt, vShow as ft, Fragment as yt, renderList as Ct, createBlock as vt } from "vue";
 import x, { registerStore as St } from "./stores/index.mjs";
 import "./style/index.css";
-import vt from "./utils/dbscan-cluster/index.mjs";
-import wt from "./utils/detect-gpu.mjs";
-import ht from "./utils/edpass-device-controller.mjs";
+import wt from "./utils/dbscan-cluster/index.mjs";
+import ht from "./utils/detect-gpu.mjs";
+import bt from "./utils/edpass-device-controller.mjs";
 import G from "./utils/green-wave-band-controller/index.mjs";
-import bt from "./utils/holo-flow/index.mjs";
-import Ot from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
-import At from "./utils/map-initializer.mjs";
+import Ot from "./utils/holo-flow/index.mjs";
+import At from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
+import kt from "./utils/map-initializer.mjs";
 import H from "./utils/open-drive-renderer/index.mjs";
 import E from "./utils/overlay.mjs";
-import kt from "./utils/police-jurisdiction.mjs";
-import Dt from "./utils/queue-length.mjs";
+import Dt from "./utils/police-jurisdiction.mjs";
+import Lt from "./utils/queue-length.mjs";
 import N from "./utils/road-config-tool/index.mjs";
-import Lt from "./utils/signal-control-area/edit-area.mjs";
-import Tt from "./utils/signal-control-area/show-area.mjs";
-import It from "./utils/traffic-flow.mjs";
-const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom: "80px", left: "10px", "z-index": "9999" } }, Ft = /* @__PURE__ */ it({
+import Tt from "./utils/signal-control-area/edit-area.mjs";
+import It from "./utils/signal-control-area/show-area.mjs";
+import Mt from "./utils/traffic-flow.mjs";
+const Bt = { class: "gis-viewer" }, Pt = { style: { position: "absolute", bottom: "80px", left: "10px", "z-index": "9999" } }, Rt = /* @__PURE__ */ ct({
   __name: "gis-map",
   props: {
     config: {},
@@ -24,47 +24,47 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
   },
   emits: ["mapLoaded", "markerClick", "mapClick", "update:zoom"],
   setup(W, { expose: Z, emit: Q }) {
-    const w = P(null);
-    let n, p, c, o, a, r, g, t, l, s, d, y, h, b;
-    const O = P(!1);
+    const h = z(null);
+    let n, p, c, o, a, r, g, t, l, s, d, C, b, f;
+    const O = z(!1);
     St();
-    const I = x.useAppDataStore, M = ct([]), B = (e) => Math.log2(591657527591555e-6 / e);
-    let C = null, V = null;
+    const I = x.useAppDataStore, M = lt([]), B = (e) => Math.log2(591657527591555e-6 / e);
+    let v = null, P = null;
     const A = (e) => {
       if (!Number.isFinite(e))
         return;
       const u = Math.round(e);
-      u !== V && (V = u, S("update:zoom", u));
+      u !== P && (P = u, S("update:zoom", u));
     };
-    wt(), lt(async () => {
-      if (!w.value)
+    ht(), ut(async () => {
+      if (!h.value)
         return;
       document.addEventListener("keydown", (m) => {
         m.ctrlKey && m.key === "i" && (O.value = !O.value);
       });
-      const e = ut(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(z.config)).json();
-      i.assetsRoot = z.assetsRoot || u, I.mapConfig = i, p = new At(), I.mapInitializer = p, n = await p.initialize({
-        container: w.value,
+      const e = mt(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(V.config)).json();
+      i.assetsRoot = V.assetsRoot || u, I.mapConfig = i, p = new kt(), I.mapInitializer = p, n = await p.initialize({
+        container: h.value,
         mapConfig: i,
-        markerClickCallback: (m, D, L, ot) => {
-          S("markerClick", m, D, L, ot);
+        markerClickCallback: (m, D, L, it) => {
+          S("markerClick", m, D, L, it);
         },
         mapClickCallback: (m, D, L) => {
           S("mapClick", m, D, L);
         }
       });
-      const v = n.zoom ?? (n.scale ? B(n.scale) : void 0);
-      typeof v == "number" && A(v);
-      const st = n.zoom !== void 0 ? n.watch("zoom", (m) => {
+      const w = n.zoom ?? (n.scale ? B(n.scale) : void 0);
+      typeof w == "number" && A(w);
+      const ot = n.zoom !== void 0 ? n.watch("zoom", (m) => {
         A(m);
       }) : n.watch("scale", (m) => {
         typeof m == "number" && m > 0 && A(B(m));
       });
-      C = () => st.remove(), a = new bt(n, M), await a.init(), S("mapLoaded");
-    }), mt(() => {
-      s == null || s.clearSignalControlArea(), t == null || t.clearOpenDrive(), a.clearHoloTrace(), a.clearHoloSignal(), o == null || o.disconnectTrafficFlow(), C == null || C(), C = null;
+      v = () => ot.remove(), a = new Ot(n, M), await a.init(), S("mapLoaded");
+    }), pt(() => {
+      s == null || s.clearSignalControlArea(), t == null || t.clearOpenDrive(), a.clearHoloTrace(), a.clearHoloSignal(), o == null || o.disconnectTrafficFlow(), v == null || v(), v = null;
     });
-    const j = pt(() => n), J = () => {
+    const j = dt(() => n), J = () => {
       const e = x.useAppDataStore;
       e.saveTrackLog = !0;
     }, U = () => {
@@ -81,7 +81,7 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
       c == null || c.clearLaneNumber();
     }, se = async (e) => (c || (c = new N(n)), await c.initializeSearch(e)), oe = async () => c == null ? void 0 : c.calCrossIndicatorArea(), ie = async () => {
     }, ce = async (e, u) => {
-      o || (o = new It(n)), o.connectTrafficFlow(e, u);
+      o || (o = new Mt(n)), o.connectTrafficFlow(e, u);
     }, le = () => {
       o == null || o.disconnectTrafficFlow();
     }, ue = async (e) => {
@@ -100,56 +100,58 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
       a.clearHoloSignal();
     }, Ce = (e) => {
       o == null || o.toggleTrafficInfo(e), a == null || a.toggleTrafficInfo(e);
-    }, Se = (e) => {
-      a == null || a.togglePause(e);
     }, ve = (e) => {
+      a == null || a.togglePause(e);
+    }, Se = (e) => {
       o == null || o.toggleTrafficObject(e), a == null || a.toggleTrafficObject(e);
     }, k = (e) => {
       a == null || a.updatePanelContent(e);
-    }, we = async (e) => (r || (r = new E(n)), r.addOverlays(e)), he = async (e) => (b || (b = new vt(n)), b.addClusterPoints(e)), be = (e) => (r || (r = new E(n)), r.addMask(e)), Oe = () => {
+    }, we = async (e) => (r || (r = new E(n)), r.addOverlays(e)), he = async (e) => (f || (f = new wt(n)), f.addClusterPoints(e)), be = () => {
+      f == null || f.removeAllClusterPoints();
+    }, Oe = (e) => (r || (r = new E(n)), r.addMask(e)), Ae = () => {
       r == null || r.removeMask();
-    }, Ae = (e) => r == null ? void 0 : r.removeOverlaysByType(e), ke = (e) => r == null ? void 0 : r.removeOverlaysById(e), De = () => r == null ? void 0 : r.removeAllOverlays(), Le = () => {
+    }, ke = (e) => r == null ? void 0 : r.removeOverlaysByType(e), De = (e) => r == null ? void 0 : r.removeOverlaysById(e), Le = () => r == null ? void 0 : r.removeAllOverlays(), Te = () => {
       r == null || r.showAllOverlays();
-    }, Te = (e) => {
-      g || (g = new Dt(n)), g.updateQueueLength(e);
-    }, Ie = () => {
+    }, Ie = (e) => {
+      g || (g = new Lt(n)), g.updateQueueLength(e);
+    }, Me = () => {
       g == null || g.removeQueueLength();
-    }, Me = async (e, u) => (t || (t = new H(n)), await t.showOpenDriveFromServer(e, u)), Be = async (e) => (t || (t = new H(n)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), Ve = (e) => t ? t.setOpendriveVisibility(e) : {
+    }, Be = async (e, u) => (t || (t = new H(n)), await t.showOpenDriveFromServer(e, u)), Pe = async (e) => (t || (t = new H(n)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), Ve = (e) => t ? t.setOpendriveVisibility(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, ze = async () => await (t == null ? void 0 : t.clearOpenDrive()), Pe = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
+    }, ze = async () => await (t == null ? void 0 : t.clearOpenDrive()), _e = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, _e = async (e) => t ? t.selectSumo(e) : {
+    }, xe = async (e) => t ? t.selectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, xe = async (e) => t ? t.unselectSumo(e) : {
+    }, Ge = async (e) => t ? t.unselectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ge = async (e) => t ? await t.geometrySearch(e) : {
+    }, He = async (e) => t ? await t.geometrySearch(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, He = async (e) => t ? await t.getSumoInfo(e) : {
+    }, Ee = async (e) => t ? await t.getSumoInfo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ee = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
+    }, Ne = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ne = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
+    }, We = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, We = async (e) => (s || (s = new Tt(n)), await s.showSignalControlArea(e)), Ze = async () => await (s == null ? void 0 : s.clearSignalControlArea()), Qe = (e) => s == null ? void 0 : s.setLayerVisibility(e), je = async (e) => s ? await (s == null ? void 0 : s.locateSignalControlArea(e)) : { status: -1, message: "未加载信号控制区" }, Je = async (e) => s ? await s.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ue = () => s ? s.resetHighlight() : { status: -1, message: "未加载信号控制区" }, $e = (e) => (l || (l = new Lt(n)), l.showSubSignalControlArea(e)), qe = (e) => l ? l.editSubSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ke = () => l ? l.stopEditSubSignalControlArea() : { status: -1, message: "未加载信号控制区" }, Fe = (e) => l ? l.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Re = (e) => l ? l.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Xe = (e) => {
+    }, Ze = async (e) => (s || (s = new It(n)), await s.showSignalControlArea(e)), Qe = async () => await (s == null ? void 0 : s.clearSignalControlArea()), je = (e) => s == null ? void 0 : s.setLayerVisibility(e), Je = async (e) => s ? await (s == null ? void 0 : s.locateSignalControlArea(e)) : { status: -1, message: "未加载信号控制区" }, Ue = async (e) => s ? await s.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, $e = () => s ? s.resetHighlight() : { status: -1, message: "未加载信号控制区" }, qe = (e) => (l || (l = new Tt(n)), l.showSubSignalControlArea(e)), Ke = (e) => l ? l.editSubSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Fe = () => l ? l.stopEditSubSignalControlArea() : { status: -1, message: "未加载信号控制区" }, Re = (e) => l ? l.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Xe = (e) => l ? l.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Ye = (e) => {
       if (!l)
         return { status: -1, message: "未加载信号控制区" };
-    }, Ye = (e) => (d || (d = new G(n)), d.addGreenWaveBand(e)), et = () => {
+    }, et = (e) => (d || (d = new G(n)), d.addGreenWaveBand(e)), tt = () => {
       if (!d)
         return { status: -1, message: "未加载绿波带" };
       d.stopAddGreenWaveBand();
-    }, tt = async (e) => (d || (d = new G(n)), await d.showGreenWaveBand(e)), nt = async (e) => (y || (y = new kt(n)), await y.showJurisdiction(e)), at = () => {
-      if (!y)
+    }, nt = async (e) => (d || (d = new G(n)), await d.showGreenWaveBand(e)), at = async (e) => (C || (C = new Dt(n)), await C.showJurisdiction(e)), rt = () => {
+      if (!C)
         return { status: -1, message: "未加载警务管辖区" };
-      y.clearJurisdiction();
-    }, rt = async (e) => (h || (h = new ht(n)), await h.setEdpassLayerVisibility(e)), z = W, S = Q;
+      C.clearJurisdiction();
+    }, st = async (e) => (b || (b = new bt(n)), await b.setEdpassLayerVisibility(e)), V = W, S = Q;
     return Z({
       mapViewer: j,
       setLayerVisibility: Y,
@@ -162,12 +164,13 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
       cancelCoordinateTransform: te,
       addOverlays: we,
       addClusterPoints: he,
-      addMask: be,
-      removeMask: Oe,
-      showAllOverlays: Le,
-      removeOverlaysByType: Ae,
-      removeOverlaysById: ke,
-      removeAllOverlays: De,
+      removeAllClusterPoints: be,
+      addMask: Oe,
+      removeMask: Ae,
+      showAllOverlays: Te,
+      removeOverlaysByType: ke,
+      removeOverlaysById: De,
+      removeAllOverlays: Le,
       showLaneNumber: ae,
       clearLaneNumber: re,
       initializeAreaTool: se,
@@ -183,66 +186,66 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
       clearHoloSignal: ye,
       setInterpolate: pe,
       toggleTrafficInfo: Ce,
-      toggleTrafficObject: ve,
+      toggleTrafficObject: Se,
       toggleVehicleInfo: k,
-      togglePause: Se,
-      updateQueueLength: Te,
-      removeQueueLength: Ie,
-      showOpenDriveFromServer: Me,
-      showOpenDriveFromFile: Be,
+      togglePause: ve,
+      updateQueueLength: Ie,
+      removeQueueLength: Me,
+      showOpenDriveFromServer: Be,
+      showOpenDriveFromFile: Pe,
       clearOpenDrive: ze,
       setOpendriveVisibility: Ve,
-      geometrySearchInOpenDrive: Ge,
-      findSumoInOpenDrive: Pe,
-      selectSumoInOpenDrive: _e,
-      unselectSumoInOpenDrive: xe,
-      getSumoInfo: He,
-      splitOpenDriveLane: Ee,
-      clearSplitOpenDriveLane: Ne,
-      showSignalControlArea: We,
-      clearSignalControlArea: Ze,
-      setSignalControlAreaVisibility: Qe,
-      locateSignalControlArea: je,
-      highlightSignalControlArea: Je,
-      resetHighlightSignalControlArea: Ue,
-      showSubSignalControlArea: $e,
-      editSubSignalControlArea: qe,
-      stopEditSubSignalControlArea: Ke,
-      selectSubSignalControlAreaCross: Fe,
-      unselectSubSignalControlAreaCross: Re,
-      changeSubSignalControlAreaBorderVisibility: Xe,
-      addGreenWaveBand: Ye,
-      stopAddGreenWaveBand: et,
-      showGreenWaveBand: tt,
-      showPoliceArea: nt,
-      clearPoliceArea: at,
-      setEdpassLayerVisibility: rt
-    }), (e, u) => (T(), _("div", Mt, [
-      f("div", {
+      geometrySearchInOpenDrive: He,
+      findSumoInOpenDrive: _e,
+      selectSumoInOpenDrive: xe,
+      unselectSumoInOpenDrive: Ge,
+      getSumoInfo: Ee,
+      splitOpenDriveLane: Ne,
+      clearSplitOpenDriveLane: We,
+      showSignalControlArea: Ze,
+      clearSignalControlArea: Qe,
+      setSignalControlAreaVisibility: je,
+      locateSignalControlArea: Je,
+      highlightSignalControlArea: Ue,
+      resetHighlightSignalControlArea: $e,
+      showSubSignalControlArea: qe,
+      editSubSignalControlArea: Ke,
+      stopEditSubSignalControlArea: Fe,
+      selectSubSignalControlAreaCross: Re,
+      unselectSubSignalControlAreaCross: Xe,
+      changeSubSignalControlAreaBorderVisibility: Ye,
+      addGreenWaveBand: et,
+      stopAddGreenWaveBand: tt,
+      showGreenWaveBand: nt,
+      showPoliceArea: at,
+      clearPoliceArea: rt,
+      setEdpassLayerVisibility: st
+    }), (e, u) => (T(), _("div", Bt, [
+      y("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
-        ref: w
+        ref: h
       }, [
-        dt(f("div", Bt, [
-          f("button", {
+        gt(y("div", Pt, [
+          y("button", {
             style: { "margin-right": "10px" },
             onClick: J
           }, " 开始记录 "),
-          f("button", {
+          y("button", {
             style: { "margin-right": "10px" },
             onClick: U
           }, " 下载日志 "),
-          f("button", {
+          y("button", {
             style: { "margin-right": "10px" },
             onClick: $
           }, " 显示车辆id "),
-          f("button", { onClick: q }, "显示车辆号牌")
+          y("button", { onClick: q }, "显示车辆号牌")
         ], 512), [
-          [gt, O.value]
+          [ft, O.value]
         ])
       ], 512),
-      (T(!0), _(ft, null, yt(M, (i, v) => (T(), Ct(Ot, {
-        key: v,
+      (T(!0), _(yt, null, Ct(M, (i, w) => (T(), vt(At, {
+        key: w,
         "display-mode": i.displayMode,
         flash: i.flash,
         "road-id": i.crossId,
@@ -258,5 +261,5 @@ const Mt = { class: "gis-viewer" }, Bt = { style: { position: "absolute", bottom
   }
 });
 export {
-  Ft as default
+  Rt as default
 };

package/es/src/gis-map/index.d.ts

@@ -100,6 +100,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: import("../types").IOverlayParam) => Promise<import("../types").IResult>;
     addClusterPoints: (params: import("../types").IClusterPointParams) => Promise<void>;
+    removeAllClusterPoints: () => void;
     addMask: (params: import("../types").IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

package/es/src/gis-map/utils/dbscan-cluster/index.d.ts

@@ -18,6 +18,7 @@ export default class DbscanCluster {
      * @param params
      */
     addClusterPoints(params: IClusterPointParams): void;
+    removeAllClusterPoints(): void;
     private showClusters;
     /**
      * 获取邻居点

package/es/src/gis-map/utils/dbscan-cluster/index.mjs

@@ -1,5 +1,5 @@
 import * as f from "@arcgis/core/core/reactiveUtils";
-import { Point as a } from "@arcgis/core/geometry";
+import { Point as u } from "@arcgis/core/geometry";
 import m from "@arcgis/core/Graphic";
 import b from "@arcgis/core/layers/GraphicsLayer";
 class M {
@@ -12,7 +12,7 @@ class M {
   locationToScreen() {
     this.locations.forEach((e) => {
       const s = this.view.toScreen(
-        new a({ x: e.x, y: e.y })
+        new u({ x: e.x, y: e.y })
       );
       e.properties.screenX = s.x, e.properties.screenY = s.y;
     });
@@ -22,8 +22,8 @@ class M {
    * @param params
    */
   addClusterPoints(e) {
-    var o;
-    this.locations = e.points, this.clusterMarkUrl = ((o = e.clusterSymbol) == null ? void 0 : o.url) || "/GisViewerAssets/Images/cross/gis_xhj_blue.png", e.points.forEach((r) => {
+    var i;
+    this.locations = e.points, this.clusterMarkUrl = ((i = e.clusterSymbol) == null ? void 0 : i.url) || "/GisViewerAssets/Images/cross/gis_xhj_blue.png", e.points.forEach((r) => {
       r.symbol || (r.symbol = e.pointSymbol || {
         type: "simple-marker",
         style: "circle",
@@ -43,16 +43,20 @@ class M {
     const s = this.doPixelCluster(e.points, 120, 3);
     console.timeEnd("cluster"), this.showClusters(s);
   }
+  removeAllClusterPoints() {
+    var e;
+    (e = this.zoomWatchHandle) == null || e.remove(), this.zoomWatchHandle = null, this.clusterLayer.removeAll();
+  }
   showClusters(e) {
-    let s = Number.MIN_VALUE, o = Number.MAX_VALUE;
+    let s = Number.MIN_VALUE, i = Number.MAX_VALUE;
     e.forEach((r) => {
-      r.count > 1 && (o = Math.min(o, r.count), s = Math.max(s, r.count));
+      r.count > 1 && (i = Math.min(i, r.count), s = Math.max(s, r.count));
     }), e.forEach((r) => {
       if (r.id !== -1) {
-        let t = o === s ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (r.count - o) / (s - o) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
+        let t = i === s ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (r.count - i) / (s - i) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
         t *= 0.75;
-        const i = new m({
-          geometry: new a({ x: r.center.x, y: r.center.y }),
+        const o = new m({
+          geometry: new u({ x: r.center.x, y: r.center.y }),
           attributes: {
             count: r.count
           },
@@ -164,15 +168,15 @@ class M {
             }
           }
         });
-        this.clusterLayer.add(i);
+        this.clusterLayer.add(o);
       } else
         r.items.forEach((t) => {
-          const i = new m({
-            geometry: new a({ x: t.x, y: t.y }),
+          const o = new m({
+            geometry: new u({ x: t.x, y: t.y }),
             attributes: t.properties,
             symbol: t.symbol
           });
-          this.clusterLayer.add(i);
+          this.clusterLayer.add(o);
         });
     });
   }
@@ -183,9 +187,9 @@ class M {
    * @param eps
    * @returns
    */
-  getNeighbors(e, s, o) {
+  getNeighbors(e, s, i) {
     const r = e[s];
-    return e.filter((t) => t.id === r.id || t.visited ? !1 : this.getDistance(r, t) <= o);
+    return e.filter((t) => t.id === r.id || t.visited ? !1 : this.getDistance(r, t) <= i);
   }
   /**
    * 两点间的像素距离
@@ -204,13 +208,13 @@ class M {
    * @returns
    */
   createClusters(e) {
-    const s = {}, o = [];
+    const s = {}, i = [];
     for (let t = 0; t < e.length; t++) {
-      const i = e[t];
-      i.clusterId === void 0 || i.clusterId === -1 ? o.push(i) : (s[i.clusterId] || (s[i.clusterId] = []), s[i.clusterId].push(i));
+      const o = e[t];
+      o.clusterId === void 0 || o.clusterId === -1 ? i.push(o) : (s[o.clusterId] || (s[o.clusterId] = []), s[o.clusterId].push(o));
     }
-    const r = Object.keys(s).map((t, i) => {
-      const l = s[Number(t)], n = l.length, h = l.reduce((c, u) => c + u.x, 0), y = l.reduce((c, u) => c + u.y, 0), p = h / n, d = y / n;
+    const r = Object.keys(s).map((t, o) => {
+      const l = s[Number(t)], n = l.length, h = l.reduce((c, a) => c + a.x, 0), y = l.reduce((c, a) => c + a.y, 0), p = h / n, d = y / n;
       return {
         id: Number(t),
         items: l,
@@ -221,10 +225,10 @@ class M {
         }
       };
     });
-    return o.length > 0 && r.push({
+    return i.length > 0 && r.push({
       id: -1,
-      items: o,
-      count: o.length,
+      items: i,
+      count: i.length,
       center: null
     }), r;
   }
@@ -235,18 +239,18 @@ class M {
    * @param minPoints
    * @returns
    */
-  doPixelCluster(e, s, o) {
+  doPixelCluster(e, s, i) {
     let r = 0;
     e.forEach((t) => t.visited = !1);
     for (let t = 0; t < e.length; t++) {
-      const i = e[t];
-      if (i.visited)
+      const o = e[t];
+      if (o.visited)
         continue;
-      i.visited = !0;
+      o.visited = !0;
       const l = this.getNeighbors(e, t, s);
-      l.length < o ? i.clusterId = -1 : (l.forEach((n) => {
+      l.length < i ? o.clusterId = -1 : (l.forEach((n) => {
         n.visited = !0, n.clusterId = r;
-      }), i.clusterId = r, r++);
+      }), o.clusterId = r, r++);
     }
     return this.createClusters(e);
   }

package/es/src/types/index.d.ts

@@ -96,8 +96,8 @@ export interface IPointSymbol {
     type: string;
     style?: string;
     url?: string;
-    width?: number;
-    height?: number;
+    width?: number | string;
+    height?: number | string;
     xoffset?: number;
     yoffset?: number;
     horizontalOrigin?: string;

package/lib/src/gis-map/gis-map.vue.d.ts

@@ -116,6 +116,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: IOverlayParam) => Promise<import("../types").IResult>;
     addClusterPoints: (params: IClusterPointParams) => Promise<void>;
+    removeAllClusterPoints: () => void;
     addMask: (params: IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

package/lib/src/gis-map/gis-map.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),T=require("./stores/index.js");require("./style/index.css");const rt=require("./utils/dbscan-cluster/index.js"),st=require("./utils/detect-gpu.js"),ot=require("./utils/edpass-device-controller.js"),M=require("./utils/green-wave-band-controller/index.js"),it=require("./utils/holo-flow/index.js"),ct=require("./utils/holo-flow/signal-countdown-panel.vue.js"),lt=require("./utils/map-initializer.js"),x=require("./utils/open-drive-renderer/index.js"),z=require("./utils/overlay.js"),ut=require("./utils/police-jurisdiction.js"),dt=require("./utils/queue-length.js"),E=require("./utils/road-config-tool/index.js"),mt=require("./utils/signal-control-area/edit-area.js"),pt=require("./utils/signal-control-area/show-area.js"),gt=require("./utils/traffic-flow.js"),ft={class:"gis-viewer"},yt={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},vt=r.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick","update:zoom"],setup(P,{expose:N,emit:H}){const C=r.ref(null);let n,p,l,i,a,s,f,t,u,o,g,y,h,b;const O=r.ref(!1);T.registerStore();const q=T.default.useAppDataStore,V=r.reactive([]),_=e=>Math.log2(591657527591555e-6/e);let v=null,B=null;const k=e=>{if(!Number.isFinite(e))return;const d=Math.round(e);d!==B&&(B=d,S("update:zoom",d))};st.default(),r.onMounted(async()=>{if(!C.value)return;document.addEventListener("keydown",m=>{m.ctrlKey&&m.key==="i"&&(O.value=!O.value)});const e=r.getCurrentInstance(),{$gisviewerAssetsRoot:d}=e.appContext.config.globalProperties,c=await(await fetch(I.config)).json();c.assetsRoot=I.assetsRoot||d,q.mapConfig=c,p=new lt.default,q.mapInitializer=p,n=await p.initialize({container:C.value,mapConfig:c,markerClickCallback:(m,L,D,at)=>{S("markerClick",m,L,D,at)},mapClickCallback:(m,L,D)=>{S("mapClick",m,L,D)}});const w=n.zoom??(n.scale?_(n.scale):void 0);typeof w=="number"&&k(w);const nt=n.zoom!==void 0?n.watch("zoom",m=>{k(m)}):n.watch("scale",m=>{typeof m=="number"&&m>0&&k(_(m))});v=()=>nt.remove(),a=new it.default(n,V),await a.init(),S("mapLoaded")}),r.onUnmounted(()=>{o==null||o.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),i==null||i.disconnectTrafficFlow(),v==null||v(),v=null});const G=r.computed(()=>n),Z=()=>{const e=T.default.useAppDataStore;e.saveTrackLog=!0},W=()=>{a.downloadTrackLog()},j=()=>{A("vehicleId")},J=()=>{A("plateNumber")},Q=async e=>await p.setMapCenter(e),U=async e=>await p.setMapCamera(e),K=e=>p.setMapZoom(e),F=async e=>await p.lookAt(e),X=e=>p.setLayerVisibility(e),Y=(e,d)=>p.requestCoordinateTransform(e,d),R=e=>{p.cancelCoordinateTransform(e)},$=e=>{p.setMapZoomRange(e)},ee=e=>(l||(l=new E.default(n)),l.showLaneNumber(e)),te=()=>{l==null||l.clearLaneNumber()},ne=async e=>(l||(l=new E.default(n)),await l.initializeSearch(e)),ae=async()=>l==null?void 0:l.calCrossIndicatorArea(),re=async()=>{},se=async(e,d)=>{i||(i=new gt.default(n)),i.connectTrafficFlow(e,d)},oe=()=>{i==null||i.disconnectTrafficFlow()},ie=async e=>{a.handleVehicleTraceData(e)},ce=()=>{a.clearHoloTrace()},le=e=>{a.setInterpolate(e)},ue=async e=>{await a.handleSignalData(e)},de=async e=>{await a.initializeLampGroup(e)},me=e=>{a.handleUniSignalData(e)},pe=()=>{a.clearHoloSignal()},ge=e=>{i==null||i.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},fe=e=>{a==null||a.togglePause(e)},ye=e=>{i==null||i.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},A=e=>{a==null||a.updatePanelContent(e)},ve=async e=>(s||(s=new z.default(n)),s.addOverlays(e)),Se=async e=>(b||(b=new rt.default(n)),b.addClusterPoints(e)),we=e=>(s||(s=new z.default(n)),s.addMask(e)),Ce=()=>{s==null||s.removeMask()},he=e=>s==null?void 0:s.removeOverlaysByType(e),be=e=>s==null?void 0:s.removeOverlaysById(e),Oe=()=>s==null?void 0:s.removeAllOverlays(),ke=()=>{s==null||s.showAllOverlays()},Ae=e=>{f||(f=new dt.default(n)),f.updateQueueLength(e)},Le=()=>{f==null||f.removeQueueLength()},De=async(e,d)=>(t||(t=new x.default(n)),await t.showOpenDriveFromServer(e,d)),Te=async e=>(t||(t=new x.default(n)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),qe=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},Ve=async()=>await(t==null?void 0:t.clearOpenDrive()),_e=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},Be=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Ie=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Me=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},xe=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},ze=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},Ee=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},Pe=async e=>(o||(o=new pt.default(n)),await o.showSignalControlArea(e)),Ne=async()=>await(o==null?void 0:o.clearSignalControlArea()),He=e=>o==null?void 0:o.setLayerVisibility(e),Ge=async e=>o?await(o==null?void 0:o.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},Ze=async e=>o?await o.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},We=()=>o?o.resetHighlight():{status:-1,message:"未加载信号控制区"},je=e=>(u||(u=new mt.default(n)),u.showSubSignalControlArea(e)),Je=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Qe=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},Ue=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ke=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Fe=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},Xe=e=>(g||(g=new M.default(n)),g.addGreenWaveBand(e)),Ye=()=>{if(!g)return{status:-1,message:"未加载绿波带"};g.stopAddGreenWaveBand()},Re=async e=>(g||(g=new M.default(n)),await g.showGreenWaveBand(e)),$e=async e=>(y||(y=new ut.default(n)),await y.showJurisdiction(e)),et=()=>{if(!y)return{status:-1,message:"未加载警务管辖区"};y.clearJurisdiction()},tt=async e=>(h||(h=new ot.default(n)),await h.setEdpassLayerVisibility(e)),I=P,S=H;return N({mapViewer:G,setLayerVisibility:X,setMapCenter:Q,lookAt:F,setMapCamera:U,setMapZoom:K,setMapZoomRange:$,requestCoordinateTransform:Y,cancelCoordinateTransform:R,addOverlays:ve,addClusterPoints:Se,addMask:we,removeMask:Ce,showAllOverlays:ke,removeOverlaysByType:he,removeOverlaysById:be,removeAllOverlays:Oe,showLaneNumber:ee,clearLaneNumber:te,initializeAreaTool:ne,calCrossIndicatorArea:ae,calRoadIndicatorArea:re,connectCarFlow:se,disconnectCarFlow:oe,handleHoloVehicleTraceData:ie,clearHoloTrace:ce,initializeLampGroup:de,handleUniSignalData:me,handleHoloSignalData:ue,clearHoloSignal:pe,setInterpolate:le,toggleTrafficInfo:ge,toggleTrafficObject:ye,toggleVehicleInfo:A,togglePause:fe,updateQueueLength:Ae,removeQueueLength:Le,showOpenDriveFromServer:De,showOpenDriveFromFile:Te,clearOpenDrive:Ve,setOpendriveVisibility:qe,geometrySearchInOpenDrive:Me,findSumoInOpenDrive:_e,selectSumoInOpenDrive:Be,unselectSumoInOpenDrive:Ie,getSumoInfo:xe,splitOpenDriveLane:ze,clearSplitOpenDriveLane:Ee,showSignalControlArea:Pe,clearSignalControlArea:Ne,setSignalControlAreaVisibility:He,locateSignalControlArea:Ge,highlightSignalControlArea:Ze,resetHighlightSignalControlArea:We,showSubSignalControlArea:je,editSubSignalControlArea:Je,stopEditSubSignalControlArea:Qe,selectSubSignalControlAreaCross:Ue,unselectSubSignalControlAreaCross:Ke,changeSubSignalControlAreaBorderVisibility:Fe,addGreenWaveBand:Xe,stopAddGreenWaveBand:Ye,showGreenWaveBand:Re,showPoliceArea:$e,clearPoliceArea:et,setEdpassLayerVisibility:tt}),(e,d)=>(r.openBlock(),r.createElementBlock("div",ft,[r.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:C},[r.withDirectives(r.createElementVNode("div",yt,[r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:Z}," 开始记录 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:W}," 下载日志 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:j}," 显示车辆id "),r.createElementVNode("button",{onClick:J},"显示车辆号牌")],512),[[r.vShow,O.value]])],512),(r.openBlock(!0),r.createElementBlock(r.Fragment,null,r.renderList(V,(c,w)=>(r.openBlock(),r.createBlock(ct.default,{key:w,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=vt;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),T=require("./stores/index.js");require("./style/index.css");const st=require("./utils/dbscan-cluster/index.js"),ot=require("./utils/detect-gpu.js"),it=require("./utils/edpass-device-controller.js"),M=require("./utils/green-wave-band-controller/index.js"),ct=require("./utils/holo-flow/index.js"),lt=require("./utils/holo-flow/signal-countdown-panel.vue.js"),ut=require("./utils/map-initializer.js"),x=require("./utils/open-drive-renderer/index.js"),P=require("./utils/overlay.js"),dt=require("./utils/police-jurisdiction.js"),mt=require("./utils/queue-length.js"),z=require("./utils/road-config-tool/index.js"),pt=require("./utils/signal-control-area/edit-area.js"),gt=require("./utils/signal-control-area/show-area.js"),ft=require("./utils/traffic-flow.js"),yt={class:"gis-viewer"},vt={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},St=r.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick","update:zoom"],setup(E,{expose:N,emit:H}){const h=r.ref(null);let n,p,l,i,a,s,f,t,u,o,g,v,b,y;const O=r.ref(!1);T.registerStore();const q=T.default.useAppDataStore,V=r.reactive([]),_=e=>Math.log2(591657527591555e-6/e);let S=null,B=null;const A=e=>{if(!Number.isFinite(e))return;const d=Math.round(e);d!==B&&(B=d,w("update:zoom",d))};ot.default(),r.onMounted(async()=>{if(!h.value)return;document.addEventListener("keydown",m=>{m.ctrlKey&&m.key==="i"&&(O.value=!O.value)});const e=r.getCurrentInstance(),{$gisviewerAssetsRoot:d}=e.appContext.config.globalProperties,c=await(await fetch(I.config)).json();c.assetsRoot=I.assetsRoot||d,q.mapConfig=c,p=new ut.default,q.mapInitializer=p,n=await p.initialize({container:h.value,mapConfig:c,markerClickCallback:(m,L,D,rt)=>{w("markerClick",m,L,D,rt)},mapClickCallback:(m,L,D)=>{w("mapClick",m,L,D)}});const C=n.zoom??(n.scale?_(n.scale):void 0);typeof C=="number"&&A(C);const at=n.zoom!==void 0?n.watch("zoom",m=>{A(m)}):n.watch("scale",m=>{typeof m=="number"&&m>0&&A(_(m))});S=()=>at.remove(),a=new ct.default(n,V),await a.init(),w("mapLoaded")}),r.onUnmounted(()=>{o==null||o.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),i==null||i.disconnectTrafficFlow(),S==null||S(),S=null});const G=r.computed(()=>n),Z=()=>{const e=T.default.useAppDataStore;e.saveTrackLog=!0},W=()=>{a.downloadTrackLog()},j=()=>{k("vehicleId")},J=()=>{k("plateNumber")},Q=async e=>await p.setMapCenter(e),U=async e=>await p.setMapCamera(e),K=e=>p.setMapZoom(e),F=async e=>await p.lookAt(e),X=e=>p.setLayerVisibility(e),Y=(e,d)=>p.requestCoordinateTransform(e,d),R=e=>{p.cancelCoordinateTransform(e)},$=e=>{p.setMapZoomRange(e)},ee=e=>(l||(l=new z.default(n)),l.showLaneNumber(e)),te=()=>{l==null||l.clearLaneNumber()},ne=async e=>(l||(l=new z.default(n)),await l.initializeSearch(e)),ae=async()=>l==null?void 0:l.calCrossIndicatorArea(),re=async()=>{},se=async(e,d)=>{i||(i=new ft.default(n)),i.connectTrafficFlow(e,d)},oe=()=>{i==null||i.disconnectTrafficFlow()},ie=async e=>{a.handleVehicleTraceData(e)},ce=()=>{a.clearHoloTrace()},le=e=>{a.setInterpolate(e)},ue=async e=>{await a.handleSignalData(e)},de=async e=>{await a.initializeLampGroup(e)},me=e=>{a.handleUniSignalData(e)},pe=()=>{a.clearHoloSignal()},ge=e=>{i==null||i.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},fe=e=>{a==null||a.togglePause(e)},ye=e=>{i==null||i.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},k=e=>{a==null||a.updatePanelContent(e)},ve=async e=>(s||(s=new P.default(n)),s.addOverlays(e)),Se=async e=>(y||(y=new st.default(n)),y.addClusterPoints(e)),we=()=>{y==null||y.removeAllClusterPoints()},Ce=e=>(s||(s=new P.default(n)),s.addMask(e)),he=()=>{s==null||s.removeMask()},be=e=>s==null?void 0:s.removeOverlaysByType(e),Oe=e=>s==null?void 0:s.removeOverlaysById(e),Ae=()=>s==null?void 0:s.removeAllOverlays(),ke=()=>{s==null||s.showAllOverlays()},Le=e=>{f||(f=new mt.default(n)),f.updateQueueLength(e)},De=()=>{f==null||f.removeQueueLength()},Te=async(e,d)=>(t||(t=new x.default(n)),await t.showOpenDriveFromServer(e,d)),qe=async e=>(t||(t=new x.default(n)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),Ve=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},_e=async()=>await(t==null?void 0:t.clearOpenDrive()),Be=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},Ie=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Me=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},xe=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},Pe=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},ze=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},Ee=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},Ne=async e=>(o||(o=new gt.default(n)),await o.showSignalControlArea(e)),He=async()=>await(o==null?void 0:o.clearSignalControlArea()),Ge=e=>o==null?void 0:o.setLayerVisibility(e),Ze=async e=>o?await(o==null?void 0:o.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},We=async e=>o?await o.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},je=()=>o?o.resetHighlight():{status:-1,message:"未加载信号控制区"},Je=e=>(u||(u=new pt.default(n)),u.showSubSignalControlArea(e)),Qe=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Ue=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},Ke=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Fe=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Xe=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},Ye=e=>(g||(g=new M.default(n)),g.addGreenWaveBand(e)),Re=()=>{if(!g)return{status:-1,message:"未加载绿波带"};g.stopAddGreenWaveBand()},$e=async e=>(g||(g=new M.default(n)),await g.showGreenWaveBand(e)),et=async e=>(v||(v=new dt.default(n)),await v.showJurisdiction(e)),tt=()=>{if(!v)return{status:-1,message:"未加载警务管辖区"};v.clearJurisdiction()},nt=async e=>(b||(b=new it.default(n)),await b.setEdpassLayerVisibility(e)),I=E,w=H;return N({mapViewer:G,setLayerVisibility:X,setMapCenter:Q,lookAt:F,setMapCamera:U,setMapZoom:K,setMapZoomRange:$,requestCoordinateTransform:Y,cancelCoordinateTransform:R,addOverlays:ve,addClusterPoints:Se,removeAllClusterPoints:we,addMask:Ce,removeMask:he,showAllOverlays:ke,removeOverlaysByType:be,removeOverlaysById:Oe,removeAllOverlays:Ae,showLaneNumber:ee,clearLaneNumber:te,initializeAreaTool:ne,calCrossIndicatorArea:ae,calRoadIndicatorArea:re,connectCarFlow:se,disconnectCarFlow:oe,handleHoloVehicleTraceData:ie,clearHoloTrace:ce,initializeLampGroup:de,handleUniSignalData:me,handleHoloSignalData:ue,clearHoloSignal:pe,setInterpolate:le,toggleTrafficInfo:ge,toggleTrafficObject:ye,toggleVehicleInfo:k,togglePause:fe,updateQueueLength:Le,removeQueueLength:De,showOpenDriveFromServer:Te,showOpenDriveFromFile:qe,clearOpenDrive:_e,setOpendriveVisibility:Ve,geometrySearchInOpenDrive:xe,findSumoInOpenDrive:Be,selectSumoInOpenDrive:Ie,unselectSumoInOpenDrive:Me,getSumoInfo:Pe,splitOpenDriveLane:ze,clearSplitOpenDriveLane:Ee,showSignalControlArea:Ne,clearSignalControlArea:He,setSignalControlAreaVisibility:Ge,locateSignalControlArea:Ze,highlightSignalControlArea:We,resetHighlightSignalControlArea:je,showSubSignalControlArea:Je,editSubSignalControlArea:Qe,stopEditSubSignalControlArea:Ue,selectSubSignalControlAreaCross:Ke,unselectSubSignalControlAreaCross:Fe,changeSubSignalControlAreaBorderVisibility:Xe,addGreenWaveBand:Ye,stopAddGreenWaveBand:Re,showGreenWaveBand:$e,showPoliceArea:et,clearPoliceArea:tt,setEdpassLayerVisibility:nt}),(e,d)=>(r.openBlock(),r.createElementBlock("div",yt,[r.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:h},[r.withDirectives(r.createElementVNode("div",vt,[r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:Z}," 开始记录 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:W}," 下载日志 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:j}," 显示车辆id "),r.createElementVNode("button",{onClick:J},"显示车辆号牌")],512),[[r.vShow,O.value]])],512),(r.openBlock(!0),r.createElementBlock(r.Fragment,null,r.renderList(V,(c,C)=>(r.openBlock(),r.createBlock(lt.default,{key:C,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=St;

package/lib/src/gis-map/index.d.ts

@@ -100,6 +100,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: import("../types").IOverlayParam) => Promise<import("../types").IResult>;
     addClusterPoints: (params: import("../types").IClusterPointParams) => Promise<void>;
+    removeAllClusterPoints: () => void;
     addMask: (params: import("../types").IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

package/lib/src/gis-map/utils/dbscan-cluster/index.d.ts

@@ -18,6 +18,7 @@ export default class DbscanCluster {
      * @param params
      */
     addClusterPoints(params: IClusterPointParams): void;
+    removeAllClusterPoints(): void;
     private showClusters;
     /**
      * 获取邻居点

package/lib/src/gis-map/utils/dbscan-cluster/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils"),m=require("@arcgis/core/geometry"),h=require("@arcgis/core/Graphic"),S=require("@arcgis/core/layers/GraphicsLayer");function g(l){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const t in l)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(l,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>l[t]})}}return e.default=l,Object.freeze(e)}const C=g(b);class x{constructor(e){this.maxClusterSymbolSize=50,this.minClusterSymbolSize=25,this.zoomWatchHandle=null,this.locations=[],this.clusterMarkUrl="",this.currentZoom=0,this.view=e,this.currentZoom=e.zoom,this.clusterLayer=new S,this.view.map.add(this.clusterLayer)}locationToScreen(){this.locations.forEach(e=>{const t=this.view.toScreen(new m.Point({x:e.x,y:e.y}));e.properties.screenX=t.x,e.properties.screenY=t.y})}addClusterPoints(e){var i;this.locations=e.points,this.clusterMarkUrl=((i=e.clusterSymbol)==null?void 0:i.url)||"/GisViewerAssets/Images/cross/gis_xhj_blue.png",e.points.forEach(s=>{s.symbol||(s.symbol=e.pointSymbol||{type:"simple-marker",style:"circle",color:"#3388ff",size:8,outline:{color:"#ffffff",width:1}})}),this.zoomWatchHandle||(this.zoomWatchHandle=C.watch(()=>this.view.zoom,()=>{Math.abs(this.currentZoom-this.view.zoom)>=1&&(this.currentZoom=this.view.zoom,this.locationToScreen(),this.clusterLayer.removeAll(),this.addClusterPoints(e))})),this.locationToScreen(),console.time("cluster");const t=this.doPixelCluster(e.points,120,3);console.timeEnd("cluster"),this.showClusters(t)}showClusters(e){let t=Number.MIN_VALUE,i=Number.MAX_VALUE;e.forEach(s=>{s.count>1&&(i=Math.min(i,s.count),t=Math.max(t,s.count))}),e.forEach(s=>{if(s.id!==-1){let r=i===t?(this.maxClusterSymbolSize+this.minClusterSymbolSize)/2:this.minClusterSymbolSize+(s.count-i)/(t-i)*(this.maxClusterSymbolSize-this.minClusterSymbolSize);r*=.75;const o=new h({geometry:new m.Point({x:s.center.x,y:s.center.y}),attributes:{count:s.count},symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.count",returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:r,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{rings:[[[-15,40],[15,40],[15,20],[-15,20],[-15,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}},{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:r,rotateClockwise:!0,textureFilter:"Picture",url:this.clusterMarkUrl}]}}}});this.clusterLayer.add(o)}else s.items.forEach(r=>{const o=new h({geometry:new m.Point({x:r.x,y:r.y}),attributes:r.properties,symbol:r.symbol});this.clusterLayer.add(o)})})}getNeighbors(e,t,i){const s=e[t];return e.filter(r=>r.id===s.id||r.visited?!1:this.getDistance(s,r)<=i)}getDistance(e,t){return Math.sqrt(Math.pow(e.properties.screenX-t.properties.screenX,2)+Math.pow(e.properties.screenY-t.properties.screenY,2))}createClusters(e){const t={},i=[];for(let r=0;r<e.length;r++){const o=e[r];o.clusterId===void 0||o.clusterId===-1?i.push(o):(t[o.clusterId]||(t[o.clusterId]=[]),t[o.clusterId].push(o))}const s=Object.keys(t).map((r,o)=>{const n=t[Number(r)],c=n.length,y=n.reduce((u,a)=>u+a.x,0),d=n.reduce((u,a)=>u+a.y,0),p=y/c,f=d/c;return{id:Number(r),items:n,count:c,center:{x:p,y:f}}});return i.length>0&&s.push({id:-1,items:i,count:i.length,center:null}),s}doPixelCluster(e,t,i){let s=0;e.forEach(r=>r.visited=!1);for(let r=0;r<e.length;r++){const o=e[r];if(o.visited)continue;o.visited=!0;const n=this.getNeighbors(e,r,t);n.length<i?o.clusterId=-1:(n.forEach(c=>{c.visited=!0,c.clusterId=s}),o.clusterId=s,s++)}return this.createClusters(e)}}exports.default=x;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils"),m=require("@arcgis/core/geometry"),h=require("@arcgis/core/Graphic"),S=require("@arcgis/core/layers/GraphicsLayer");function C(n){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const t in n)if(t!=="default"){const o=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(e,t,o.get?o:{enumerable:!0,get:()=>n[t]})}}return e.default=n,Object.freeze(e)}const g=C(b);class x{constructor(e){this.maxClusterSymbolSize=50,this.minClusterSymbolSize=25,this.zoomWatchHandle=null,this.locations=[],this.clusterMarkUrl="",this.currentZoom=0,this.view=e,this.currentZoom=e.zoom,this.clusterLayer=new S,this.view.map.add(this.clusterLayer)}locationToScreen(){this.locations.forEach(e=>{const t=this.view.toScreen(new m.Point({x:e.x,y:e.y}));e.properties.screenX=t.x,e.properties.screenY=t.y})}addClusterPoints(e){var o;this.locations=e.points,this.clusterMarkUrl=((o=e.clusterSymbol)==null?void 0:o.url)||"/GisViewerAssets/Images/cross/gis_xhj_blue.png",e.points.forEach(s=>{s.symbol||(s.symbol=e.pointSymbol||{type:"simple-marker",style:"circle",color:"#3388ff",size:8,outline:{color:"#ffffff",width:1}})}),this.zoomWatchHandle||(this.zoomWatchHandle=g.watch(()=>this.view.zoom,()=>{Math.abs(this.currentZoom-this.view.zoom)>=1&&(this.currentZoom=this.view.zoom,this.locationToScreen(),this.clusterLayer.removeAll(),this.addClusterPoints(e))})),this.locationToScreen(),console.time("cluster");const t=this.doPixelCluster(e.points,120,3);console.timeEnd("cluster"),this.showClusters(t)}removeAllClusterPoints(){var e;(e=this.zoomWatchHandle)==null||e.remove(),this.zoomWatchHandle=null,this.clusterLayer.removeAll()}showClusters(e){let t=Number.MIN_VALUE,o=Number.MAX_VALUE;e.forEach(s=>{s.count>1&&(o=Math.min(o,s.count),t=Math.max(t,s.count))}),e.forEach(s=>{if(s.id!==-1){let r=o===t?(this.maxClusterSymbolSize+this.minClusterSymbolSize)/2:this.minClusterSymbolSize+(s.count-o)/(t-o)*(this.maxClusterSymbolSize-this.minClusterSymbolSize);r*=.75;const i=new h({geometry:new m.Point({x:s.center.x,y:s.center.y}),attributes:{count:s.count},symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.count",returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:r,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{rings:[[[-15,40],[15,40],[15,20],[-15,20],[-15,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}},{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:r,rotateClockwise:!0,textureFilter:"Picture",url:this.clusterMarkUrl}]}}}});this.clusterLayer.add(i)}else s.items.forEach(r=>{const i=new h({geometry:new m.Point({x:r.x,y:r.y}),attributes:r.properties,symbol:r.symbol});this.clusterLayer.add(i)})})}getNeighbors(e,t,o){const s=e[t];return e.filter(r=>r.id===s.id||r.visited?!1:this.getDistance(s,r)<=o)}getDistance(e,t){return Math.sqrt(Math.pow(e.properties.screenX-t.properties.screenX,2)+Math.pow(e.properties.screenY-t.properties.screenY,2))}createClusters(e){const t={},o=[];for(let r=0;r<e.length;r++){const i=e[r];i.clusterId===void 0||i.clusterId===-1?o.push(i):(t[i.clusterId]||(t[i.clusterId]=[]),t[i.clusterId].push(i))}const s=Object.keys(t).map((r,i)=>{const l=t[Number(r)],c=l.length,y=l.reduce((u,a)=>u+a.x,0),d=l.reduce((u,a)=>u+a.y,0),p=y/c,f=d/c;return{id:Number(r),items:l,count:c,center:{x:p,y:f}}});return o.length>0&&s.push({id:-1,items:o,count:o.length,center:null}),s}doPixelCluster(e,t,o){let s=0;e.forEach(r=>r.visited=!1);for(let r=0;r<e.length;r++){const i=e[r];if(i.visited)continue;i.visited=!0;const l=this.getNeighbors(e,r,t);l.length<o?i.clusterId=-1:(l.forEach(c=>{c.visited=!0,c.clusterId=s}),i.clusterId=s,s++)}return this.createClusters(e)}}exports.default=x;

package/lib/src/types/index.d.ts

@@ -96,8 +96,8 @@ export interface IPointSymbol {
     type: string;
     style?: string;
     url?: string;
-    width?: number;
-    height?: number;
+    width?: number | string;
+    height?: number | string;
     xoffset?: number;
     yoffset?: number;
     horizontalOrigin?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.252",
+  "version": "1.0.253",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [