gisviewer-vue3-arcgis 1.0.196 → 1.0.198

package/es/src/gis-map/utils/green-wave-band-controller/index.mjs

@@ -1,46 +1,81 @@
-import h from "@arcgis/core/Graphic";
+import * as y from "@arcgis/core/core/reactiveUtils.js";
+import { Polyline as m } from "@arcgis/core/geometry";
+import c from "@arcgis/core/Graphic";
 import n from "@arcgis/core/layers/GraphicsLayer";
-import y from "axios";
-class C {
+import b from "axios";
+class w {
   constructor(e) {
-    this.selectedNodeIds = [], this.view = e, this.roadsectLayer = new n({
+    this.selectedNodeIds = [], this.nodeScale = 5e3, this.hasGpu = !1, this.hasGpu = localStorage.getItem("gpu") !== "Unknown", this.view = e, this.roadsectLayer = new n({
       id: "roadsectLayer"
     }), this.view.map.add(this.roadsectLayer), this.allNodesLayer = new n({
       id: "allNodesLayer"
-    }), this.view.map.add(this.allNodesLayer);
+    }), this.view.map.add(this.allNodesLayer), this.bandLayer = new n({
+      id: "bandLayer"
+    }), this.view.map.add(this.bandLayer);
   }
   /**
    * 新增绿波带
    * @param params
    */
   addGreenWaveBand(e) {
-    this.addCrossCallback = e.addCrossCallback, this.removeCrossCallback = e.removeCrossCallback, e.removeAllCrossCallback && (this.removeAllCrossCallback = e.removeAllCrossCallback), this.selectedNodeIds = [], this.openDriveServer = e.odrServer, this.showAllNodes(e.crossesInArea), this.viewClickWatcher || (this.viewClickWatcher = this.view.on("click", (i) => {
-      this.handleViewClick(i);
+    this.addNodeCallback = e.addCrossCallback, this.removeNodeCallback = e.removeCrossCallback, e.removeAllCrossCallback && (this.removeAllNodeCallback = e.removeAllCrossCallback), this.selectedNodeIds = [], this.openDriveServer = e.odrServer, this.showAllNodes(e.crossesInArea), this.viewClickWatcher || (this.viewClickWatcher = this.view.on("click", (o) => {
+      this.handleViewClick(o);
     }));
   }
   stopAddGreenWaveBand() {
     var e;
-    (e = this.viewClickWatcher) == null || e.remove(), this.viewClickWatcher = void 0, this.allNodesLayer.removeAll(), this.selectedNodeIds = [], this.roadsectLayer.removeAll();
+    (e = this.viewClickWatcher) == null || e.remove(), this.viewClickWatcher = void 0, this.allNodesLayer.removeAll(), this.selectedNodeIds = [], this.roadsectLayer.removeAll(), this.bandLayer.removeAll();
+  }
+  async showGreenWaveBand(e) {
+    this.scaleWatcher || (this.scaleWatcher = y.watch(
+      () => this.view.scale,
+      (s, i) => {
+        s > this.nodeScale && i <= this.nodeScale ? this.bandLayer.graphics.forEach((l) => {
+          l.geometry.type === "point" && (l.symbol = this.getShowNodeSymbol("marker"));
+        }) : s <= this.nodeScale && i > this.nodeScale && this.bandLayer.graphics.forEach((l) => {
+          l.geometry.type === "point" && (l.symbol = this.getShowNodeSymbol("picture"));
+        });
+      }
+    ));
+    const o = new m({
+      paths: [e.coordinates]
+    }), a = new c({
+      geometry: o,
+      symbol: this.getLineSymbol(!0),
+      attributes: { bandId: e.bandId }
+    });
+    this.roadsectLayer.add(a), await this.view.goTo(a), e.nodeList.forEach((s) => {
+      const i = new c({
+        geometry: {
+          type: "point",
+          x: s.longitude,
+          y: s.latitude
+        },
+        symbol: this.getShowNodeSymbol("picture"),
+        attributes: s
+      });
+      this.bandLayer.add(i);
+    });
   }
   /**
    * 显示所有路口，进入待选状态
    * @param nodeAttributes
    */
   showAllNodes(e) {
-    const i = [];
+    const o = [];
     e.forEach((a) => {
-      i.push(
-        new h({
+      o.push(
+        new c({
           geometry: {
             type: "point",
             x: a.longitude,
             y: a.latitude
           },
-          symbol: this.getNodeSymbol(!1),
+          symbol: this.getEditableNodeSymbol(!1),
           attributes: { ...a, selected: !1 }
         })
       );
-    }), this.allNodesLayer.addMany(i);
+    }), this.allNodesLayer.addMany(o);
   }
   /**
    * 点击待选/已选路口
@@ -48,50 +83,51 @@ class C {
    * @returns
    */
   async handleViewClick(e) {
-    var d;
-    const a = (d = (await this.view.hitTest(e, {
+    var l;
+    const a = (l = (await this.view.hitTest(e, {
       include: [this.allNodesLayer]
-    })).results) == null ? void 0 : d.filter(
-      (s) => s.type === "graphic"
+    })).results) == null ? void 0 : l.filter(
+      (d) => d.type === "graphic"
     );
     if (a.length === 0)
       return;
-    const o = a[0].graphic, r = o.getAttribute("id");
-    if (this.selectedNodeIds.includes(r)) {
-      const s = this.selectedNodeIds.indexOf(r) + 1;
-      if (s === 1)
-        this.removeAllCrossCallback && this.removeAllCrossCallback(), this.selectedNodeIds = [], this.allNodesLayer.graphics.forEach((t) => {
-          t.setAttribute("selected", !1), t.symbol = this.getNodeSymbol(!1), t.visible = !0;
+    const s = a[0].graphic, i = s.getAttribute("id");
+    if (this.selectedNodeIds.includes(i)) {
+      const d = this.selectedNodeIds.indexOf(i) + 1;
+      if (d === 1)
+        this.removeAllNodeCallback && this.removeAllNodeCallback(), this.selectedNodeIds = [], this.allNodesLayer.graphics.forEach((t) => {
+          t.setAttribute("selected", !1), t.symbol = this.getEditableNodeSymbol(!1), t.visible = !0;
         }), this.roadsectLayer.removeAll();
       else {
-        for (let t = s; t < this.selectedNodeIds.length; t++) {
-          this.removeCrossCallback && this.removeCrossCallback({
+        for (let t = d; t < this.selectedNodeIds.length; t++) {
+          this.removeNodeCallback && this.removeNodeCallback({
             id: this.selectedNodeIds[t]
           });
-          for (let l = 0; l < this.roadsectLayer.graphics.length; l++) {
-            const c = this.roadsectLayer.graphics.getItemAt(l);
-            (c.getAttribute("id") === this.selectedNodeIds[t] || !c.getAttribute("selected")) && (this.roadsectLayer.remove(c), l--);
+          for (let r = 0; r < this.roadsectLayer.graphics.length; r++) {
+            const h = this.roadsectLayer.graphics.getItemAt(r);
+            (h.getAttribute("id") === this.selectedNodeIds[t] || !h.getAttribute("selected")) && (this.roadsectLayer.remove(h), r--);
           }
         }
-        this.selectedNodeIds = this.selectedNodeIds.slice(0, s), this.allNodesLayer.graphics.forEach((t) => {
-          const l = this.selectedNodeIds.includes(
+        this.selectedNodeIds = this.selectedNodeIds.slice(0, d), this.allNodesLayer.graphics.forEach((t) => {
+          const r = this.selectedNodeIds.includes(
             t.getAttribute("id")
           );
-          t.setAttribute("selected", l), t.symbol = this.getNodeSymbol(l), t.visible = l;
-        }), await this.showDownstreamNodes(r);
+          t.setAttribute("selected", r), t.symbol = this.getEditableNodeSymbol(r), t.visible = r;
+        }), await this.showDownstreamNodes(i);
       }
     } else {
-      o.setAttribute("selected", !0), this.addCrossCallback && this.addCrossCallback({
-        id: r,
-        name: o.getAttribute("name")
-      }), o.symbol = this.getNodeSymbol(!0), this.selectedNodeIds.push(r), this.allNodesLayer.graphics.forEach((s) => {
-        s.visible = s.getAttribute("selected");
+      s.setAttribute("selected", !0), s.symbol = this.getEditableNodeSymbol(!0), this.selectedNodeIds.push(i), this.allNodesLayer.graphics.forEach((t) => {
+        t.visible = t.getAttribute("selected");
       });
-      for (let s = 0; s < this.roadsectLayer.graphics.length; s++) {
-        const t = this.roadsectLayer.graphics.getItemAt(s);
-        t.getAttribute("id") === r ? (t.symbol = this.getLineSymbol(!0), t.setAttribute("selected", !0)) : t.getAttribute("selected") || (this.roadsectLayer.remove(t), s--);
+      let d = [];
+      for (let t = 0; t < this.roadsectLayer.graphics.length; t++) {
+        const r = this.roadsectLayer.graphics.getItemAt(t);
+        r.getAttribute("id") === i ? (r.symbol = this.getLineSymbol(!0), r.setAttribute("selected", !0), d = r.geometry.paths[0]) : r.getAttribute("selected") || (this.roadsectLayer.remove(r), t--);
       }
-      await this.showDownstreamNodes(r);
+      this.addNodeCallback && this.addNodeCallback({
+        ...s.attributes,
+        roadsect: d
+      }), await this.showDownstreamNodes(i);
     }
   }
   /**
@@ -100,26 +136,26 @@ class C {
    */
   async showDownstreamNodes(e) {
     this.view.container.style.cursor = "progress";
-    const i = await y.get(
+    const o = await b.get(
       `http://${this.openDriveServer}/api/computable/getDownstreamNodes`,
       { params: { nodeId: e } }
     );
-    if (i.status !== 200 || i.data.status !== 0) {
+    if (o.status !== 200 || o.data.status !== 0) {
       this.view.container.style.cursor = "default";
       return;
     }
-    i.data.result.forEach((o) => {
-      this.allNodesLayer.graphics.forEach((r) => {
-        if (r.getAttribute("nodeId") === o.id && r.getAttribute("selected") === !1 && (r.visible = !0, o.coordinates)) {
-          const d = new h({
+    o.data.result.forEach((s) => {
+      this.allNodesLayer.graphics.forEach((i) => {
+        if (i.getAttribute("nodeId") === s.id && i.getAttribute("selected") === !1 && (i.visible = !0, s.coordinates)) {
+          const l = new c({
             geometry: {
               type: "polyline",
-              paths: [o.coordinates]
+              paths: [s.coordinates]
             },
             symbol: this.getLineSymbol(!1),
-            attributes: { ...o, selected: !1 }
+            attributes: { ...s, selected: !1 }
           });
-          this.roadsectLayer.add(d);
+          this.roadsectLayer.add(l);
         }
       });
     }), this.view.container.style.cursor = "default";
@@ -194,7 +230,25 @@ class C {
       width: 2
     };
   }
-  getNodeSymbol(e) {
+  getShowNodeSymbol(e) {
+    return e === "marker" ? {
+      type: "simple-marker",
+      style: "circle",
+      color: [61, 139, 249],
+      size: 8,
+      outline: {
+        color: "white",
+        width: 1
+      }
+    } : this.getEditableNodeSymbol(!0);
+  }
+  /**
+   * 编辑状态时的路口符号
+   * 全部用cim符号，是否选中用不同的图标
+   * @param selected 是否选中
+   * @returns
+   */
+  getEditableNodeSymbol(e) {
     return {
       type: "cim",
       data: {
@@ -284,5 +338,5 @@ class C {
   }
 }
 export {
-  C as default
+  w as default
 };

package/es/src/gis-map/utils/holo-flow/trace-renderer-layer.d.ts

@@ -8,10 +8,6 @@ export default class TraceRendererLayer implements ITraceRendererInterface {
     private appDataStore;
     private logTable;
     constructor(view: __esri.MapView);
-    private getRendererText;
-    private em;
-    private el;
-    private getGpuText;
     getLog(): (string | number)[][];
     init(): Promise<void>;
     private needInterpolate;

package/es/src/gis-map/utils/holo-flow/trace-renderer-layer.mjs

@@ -1,10 +1,10 @@
 import p from "@arcgis/core/Graphic";
-import g from "@arcgis/core/layers/GraphicsLayer";
-import { toRaw as m } from "vue";
-import u from "../../stores/index.mjs";
+import m from "@arcgis/core/layers/GraphicsLayer";
+import { toRaw as g } from "vue";
+import y from "../../stores/index.mjs";
 class v {
   constructor(i) {
-    this.hasGpu = !1, this.appDataStore = u.useAppDataStore, this.logTable = [
+    this.hasGpu = !1, this.appDataStore = y.useAppDataStore, this.logTable = [
       [
         "uuid",
         "ptcId",
@@ -30,53 +30,11 @@ class v {
         "step",
         "receiveTimestamp"
       ]
-    ], this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i, this.mapConfig = m(this.appDataStore.mapConfig), this.vehicleLayer = new g({
+    ], this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i, this.mapConfig = g(this.appDataStore.mapConfig), this.vehicleLayer = new m({
       id: "vehicleLayer"
     }), this.view.map.add(this.vehicleLayer);
-    const t = this.getRendererText(), e = this.getGpuText(t);
-    this.hasGpu = e !== "Unknown", this.hasGpu && (this.rafSignal = requestAnimationFrame(() => this.render())), console.log("rendererText: ", t), console.log("gpuText: ", e);
-  }
-  getRendererText() {
-    try {
-      const i = document.createElement("canvas"), t = i.getContext("webgl") || i.getContext("experimental-webgl");
-      if (!t)
-        return "Unknown";
-      const e = t.getExtension("WEBGL_debug_renderer_info");
-      return e && t.getParameter(e.UNMASKED_RENDERER_WEBGL) || "Unknown";
-    } catch {
-      return "Unknown";
-    }
-  }
-  em(i) {
-    const t = [], e = i.split("");
-    for (let s = 0; s < e.length; s++)
-      if (e[s] === "(")
-        t.push(s);
-      else if (e[s] === ")") {
-        const r = t.pop();
-        r !== void 0 && (e.splice(r, s - r + 1), s = r - 1);
-      }
-    return e.join("");
-  }
-  el(i) {
-    return this.em(i).replace(/\/PCIe\/SSE2/g, "").replace(/\s+/g, " ").trim();
-  }
-  getGpuText(i) {
-    try {
-      if (/, or similar$/.test(i) || /SwiftShader/.test(i))
-        return "Unknown";
-      if (/^ANGLE/.test(i)) {
-        const t = i.match(/\((.+)\)$/);
-        if (t) {
-          const e = t[1], s = e.split(/,\s*/g);
-          let r = s[1];
-          return /^ANGLE Metal Renderer: /.test(r) && (r = i.split(": ")[1].split(",")[0]), s.length === 1 && (r = s[0].split(" ").slice(1).join(" ")), /Direct3D/.test(r) && (r = r.split("Direct3D")[0].trim()), r;
-        }
-      }
-    } catch {
-      return "Unknown";
-    }
-    return this.el(i);
+    const t = localStorage.getItem("gpu");
+    this.hasGpu = t !== "Unknown";
   }
   getLog() {
     return this.logTable;
@@ -90,11 +48,11 @@ class v {
         return;
       }
       const e = i.map((s) => {
-        const { vehicleId: r, heading: o, localTimestamp: h } = s, n = Number(s.x), l = Number(s.y), a = new p({
+        const { vehicleId: r, heading: o, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y), a = new p({
           geometry: {
             type: "point",
-            x: n,
-            y: l
+            x: l,
+            y: n
           },
           attributes: {
             ...s,
@@ -103,7 +61,7 @@ class v {
           symbol: this.hasGpu ? this.createCIMSymbol(s) : this.createMarkerSymbol()
         });
         return this.hasGpu && (a.visible = !1, this.historyPositionMap.set(r, [
-          { pos: [n, l, 0], heading: o, time: h }
+          { pos: [l, n, 0], heading: o, time: h }
         ]), this.vehicleObjectMap.set(r, {
           graphic: a,
           data: s,
@@ -122,7 +80,7 @@ class v {
       }
       const e = [];
       i.forEach((s) => {
-        const { vehicleId: r, heading: o, localTimestamp: h } = s, n = Number(s.x), l = Number(s.y);
+        const { vehicleId: r, heading: o, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y);
         if (this.hasGpu) {
           const a = this.vehicleObjectMap.get(r);
           a ? (a.data = s, a.graphic.attributes = {
@@ -131,7 +89,7 @@ class v {
           }, this.historyPositionMap.get(
             r
           ).push({
-            pos: [n, l, 0],
+            pos: [l, n, 0],
             heading: o,
             time: h
           })) : e.push(s);
@@ -141,8 +99,8 @@ class v {
           );
           a ? a.geometry = {
             type: "point",
-            x: n,
-            y: l
+            x: l,
+            y: n
           } : e.push(s);
         }
       }), this.addVehicles(e), t();
@@ -213,12 +171,12 @@ class v {
           y: t[0].pos[1]
         };
     else {
-      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * o, n = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * o, l = t[0].heading + (t[1].heading - t[0].heading) * o;
+      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * o, l = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * o, n = t[0].heading + (t[1].heading - t[0].heading) * o;
       e.graphic.geometry = {
         type: "point",
         x: h,
-        y: n
-      }, e.data.heading = l, e.graphic.symbol = this.hasGpu ? this.createCIMSymbol(e.data) : this.createMarkerSymbol();
+        y: l
+      }, e.data.heading = n, e.graphic.symbol = this.hasGpu ? this.createCIMSymbol(e.data) : this.createMarkerSymbol();
     }
   }
   /**

package/es/src/gis-map/utils/signal-control-area-controller/district-controller.mjs

@@ -1,11 +1,11 @@
 import r from "../common-utils.mjs";
 class e {
   constructor(t, i) {
-    this.parentName = "", this.crosses = [], this.subDistricts = [], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.id, this.name = t.name, this.parentId = t.parentId, this.areaColor = i === "alarm" ? [255, 0, 0] : [61, 139, 249];
+    this.parentName = "", this.crosses = [], this.subDistricts = [], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.name, this.name = t.areaDesc, this.parentId = t.parentId, this.areaColor = i === "alarm" ? [255, 0, 0] : [61, 139, 249];
     for (const s of t.children)
       if (s.children) {
         const o = new e(s, i);
-        o.parentName = this.name, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
+        o.id = s.id, o.name = `SS ${s.name}`, o.parentName = this.name, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
       } else if (r.isCoordinateValid(s)) {
         const o = {
           id: s.id,

package/es/src/gis-map/utils/signal-control-area-controller/index.d.ts

@@ -8,6 +8,7 @@ export default class SignalControlAreaController {
     private scaleWatcher?;
     private viewClickWatcher?;
     private readonly crossScale;
+    private hasGpu;
     private openDriveServer;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**

package/es/src/gis-map/utils/signal-control-area-controller/index.mjs

@@ -1,17 +1,17 @@
-import * as d from "@arcgis/core/core/reactiveUtils.js";
+import * as p from "@arcgis/core/core/reactiveUtils.js";
 import n from "@arcgis/core/Graphic";
 import y from "@arcgis/core/layers/GraphicsLayer";
-import p from "@turf/buffer";
-import u from "@turf/convex";
+import d from "@turf/buffer";
+import g from "@turf/convex";
 import * as a from "@turf/helpers";
 import b from "axios";
 import f from "concaveman";
 import C from "../../stores/index.mjs";
 import v from "./district-controller.mjs";
-class N {
+class G {
   constructor(e) {
     var i;
-    this.crossScale = 5e3, this.crossIdsInDistrict = [], this.view = e;
+    this.crossScale = 5e3, this.hasGpu = !1, this.crossIdsInDistrict = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
     const r = C.useAppDataStore.mapConfig;
     this.openDriveServer = (i = r.openDriveServer) == null ? void 0 : i.url, this.districtControllerLayer = new y({
       id: "districtControllerLayer"
@@ -48,7 +48,7 @@ class N {
       );
       this.drawArea(r, !0);
     }
-    return this.scaleWatcher = d.watch(
+    return this.scaleWatcher = p.watch(
       () => this.view.scale,
       (t, r) => {
         t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((i) => {
@@ -81,10 +81,17 @@ class N {
   }
   async locateSignalControlArea(e) {
     const t = this.findAreaGraphic(e.id);
-    return t ? (t.attributes.type === "cross" ? await this.view.goTo({
-      target: t.geometry,
-      scale: 1500
-    }) : await this.view.goTo(t.geometry), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
+    return t ? (t.attributes.type === "cross" ? await this.view.goTo(
+      {
+        target: t.geometry,
+        scale: 1500
+      },
+      {
+        duration: this.hasGpu ? 1e3 : 0
+      }
+    ) : await this.view.goTo(t.geometry, {
+      duration: this.hasGpu ? 1e3 : 0
+    }), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
   }
   async highlightSignalControlArea(e) {
     if (!e.id || e.id === "")
@@ -98,21 +105,35 @@ class N {
     ).toArray().map((s) => s.clone()), i = this.crossLayer.graphics.filter(
       (s) => s.getAttribute("id") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
     ).toArray().map((s) => s.clone());
-    if (t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), this.highlightLayer.graphics.length === 0)
+    if (r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), this.highlightLayer.graphics.length === 0)
       return { status: 1, message: "未找到" };
     if (t.length > 0)
-      await this.view.goTo(t);
+      await this.view.goTo(t, {
+        duration: this.hasGpu ? 1e3 : 0
+      });
     else if (r.length > 0) {
       const s = r[0].geometry.centroid;
-      await this.view.goTo({
-        target: s,
-        scale: this.crossScale - 500
-      });
+      await this.view.goTo(
+        {
+          target: s,
+          scale: this.crossScale - 500
+        },
+        {
+          duration: this.hasGpu ? 1e3 : 0
+        }
+      );
     } else
-      i.length > 1 ? await this.view.goTo(i) : await this.view.goTo({
-        target: i[0].geometry,
-        scale: 1500
-      });
+      i.length > 1 ? await this.view.goTo(i, {
+        duration: this.hasGpu ? 1e3 : 0
+      }) : await this.view.goTo(
+        {
+          target: i[0].geometry,
+          scale: 1500
+        },
+        {
+          duration: this.hasGpu ? 1e3 : 0
+        }
+      );
     return { status: 0, message: "ok" };
   }
   resetHighlight() {
@@ -132,7 +153,9 @@ class N {
         attributes: s
       });
     });
-    return this.crossLayer.addMany(r), this.view.goTo(r), { status: 0, message: "ok" };
+    return this.crossLayer.addMany(r), this.view.goTo(r, {
+      duration: this.hasGpu ? 1e3 : 0
+    }), { status: 0, message: "ok" };
   }
   /**
    * 点击路口时
@@ -151,10 +174,7 @@ class N {
     const i = r[0].graphic;
     i.getAttribute("selected") ? i.getAttribute("signalId") && (this.removeCrossCallback && this.removeCrossCallback({ id: i.getAttribute("id") }), i.setAttribute("selected", !1), i.symbol = this.getCrossSymbolInSubDistrict(
       i.attributes
-    )) : (i.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback({
-      id: i.getAttribute("id"),
-      name: i.getAttribute("name")
-    }), i.setAttribute("selected", !0), i.symbol = this.getCrossSymbolInSubDistrict(
+    )) : (i.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback(i.attributes), i.setAttribute("selected", !0), i.symbol = this.getCrossSymbolInSubDistrict(
       i.attributes
     )), await this.showNearbyCrosses(i.getAttribute("id")));
   }
@@ -180,10 +200,10 @@ class N {
             continue;
           }
           if (this.crossLayer.graphics.some(
-            (c) => c.getAttribute("id") === o
+            (h) => h.getAttribute("id") === o
           ))
             continue;
-          const g = new n({
+          const u = new n({
             geometry: {
               type: "point",
               x: s.lon,
@@ -197,7 +217,7 @@ class N {
               selected: !1
             }
           });
-          i.push(g);
+          i.push(u);
         }
         return this.crossLayer.addMany(i), { status: 0, message: "ok" };
       } else
@@ -216,7 +236,7 @@ class N {
         e.crossesInArea.map(
           (s) => a.point([s.longitude, s.latitude])
         )
-      ), r = u(t);
+      ), r = g(t);
       r && (this.districtControllerLayer.removeAll(), this.districtControllerLayer.add(
         new n({
           geometry: {
@@ -305,17 +325,17 @@ class N {
         s = a.lineString(r);
       else {
         if (t) {
-          const h = a.featureCollection(
+          const c = a.featureCollection(
             r.map((m) => a.point(m))
           );
-          s = u(h);
+          s = g(c);
         } else {
-          const h = f(r, 0.5);
-          h.length >= 4 && (s = a.polygon([h]));
+          const c = f(r, 0.5);
+          c.length >= 4 && (s = a.polygon([c]));
         }
         s || (s = a.lineString(r));
       }
-      const o = p(
+      const o = d(
         s.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
@@ -347,7 +367,7 @@ class N {
           label: "路口数量"
         }
       ];
-      const g = {
+      const u = {
         type: "signalControlArea",
         id: e.id,
         name: e.name,
@@ -355,7 +375,7 @@ class N {
         parentName: e.parentName,
         crossCount: e.crossCount,
         subDistrictCount: e.subDistrictCount
-      }, c = new n({
+      }, h = new n({
         geometry: {
           type: "polygon",
           rings: o.geometry.coordinates
@@ -370,9 +390,9 @@ class N {
             style: t ? "long-dash" : "solid"
           }
         },
-        attributes: g,
+        attributes: u,
         popupTemplate: {
-          title: `${t ? "区控" : "子区"}  ${e.name}`,
+          title: `${e.name}`,
           content: [
             {
               type: "fields",
@@ -381,7 +401,7 @@ class N {
           ]
         }
       });
-      t ? this.districtControllerLayer.add(c) : this.subDistrictControllerLayer.add(c);
+      t ? this.districtControllerLayer.add(h) : this.subDistrictControllerLayer.add(h);
     }
     for (const s of e.subDistricts)
       this.drawArea(s, !1);
@@ -648,5 +668,5 @@ class N {
   }
 }
 export {
-  N as default
+  G as default
 };

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

@@ -284,13 +284,15 @@ export interface INode {
 }
 export interface IEditSignalControlAreaParams {
     crossesInArea: INode[];
-    addCrossCallback: (params: {
-        id: string;
-        name: string;
-    }) => void;
+    addCrossCallback: (params: INode) => void;
     removeCrossCallback: (params: {
         id: string;
     }) => void;
     removeAllCrossCallback?: () => void;
     odrServer: string;
 }
+export interface IShowGreenWaveBandParams {
+    bandId: string;
+    coordinates: number[][];
+    nodeList: INode[];
+}