gisviewer-vue3-arcgis 1.0.194 → 1.0.196

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

@@ -142,6 +142,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
         message: string;
     };
     addGreenWaveBand: (params: IEditSignalControlAreaParams) => void;
+    stopAddGreenWaveBand: () => {
+        status: number;
+        message: string;
+    } | undefined;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{

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

@@ -1,17 +1,17 @@
-import { defineComponent as Qe, ref as A, reactive as je, onMounted as We, getCurrentInstance as Ge, onUnmounted as Ze, computed as $e, openBlock as h, createElementBlock as k, createElementVNode as p, withDirectives as qe, vShow as Ke, Fragment as Ue, renderList as Je, createBlock as Re } from "vue";
-import D, { registerStore as Xe } from "./stores/index.mjs";
+import { defineComponent as Ge, ref as b, reactive as Qe, onMounted as je, getCurrentInstance as Ze, onUnmounted as $e, computed as qe, openBlock as h, createElementBlock as k, createElementVNode as p, withDirectives as Ke, vShow as Ue, Fragment as Je, renderList as Re, createBlock as Xe } from "vue";
+import D, { registerStore as Ye } from "./stores/index.mjs";
 import "./style/index.css";
-import Ye from "./utils/green-wave-band-controller/index.mjs";
-import Fe from "./utils/holo-flow/index.mjs";
-import et from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
-import tt from "./utils/map-initializer.mjs";
+import Fe from "./utils/green-wave-band-controller/index.mjs";
+import et from "./utils/holo-flow/index.mjs";
+import tt from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
+import at from "./utils/map-initializer.mjs";
 import L from "./utils/open-drive-renderer/index.mjs";
 import T from "./utils/overlay.mjs";
-import at from "./utils/queue-length.mjs";
+import nt from "./utils/queue-length.mjs";
 import I from "./utils/road-config-tool/index.mjs";
 import B from "./utils/signal-control-area-controller/index.mjs";
-import nt from "./utils/traffic-flow.mjs";
-const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom: "80px", left: "10px", "z-index": "9999" } }, vt = /* @__PURE__ */ Qe({
+import rt from "./utils/traffic-flow.mjs";
+const st = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom: "80px", left: "10px", "z-index": "9999" } }, wt = /* @__PURE__ */ Ge({
   __name: "gis-map",
   props: {
     config: {},
@@ -19,51 +19,51 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
   },
   emits: ["mapLoaded", "markerClick", "mapClick"],
   setup(M, { expose: _, emit: x }) {
-    const d = A(null);
-    let s, l, c, o, n, r, g, t, a, S;
-    const f = A(!1);
-    Xe();
-    const H = D.useAppDataStore, O = je([]);
-    We(async () => {
-      if (!d.value)
+    const S = b(null);
+    let o, l, c, s, n, r, g, t, a, d;
+    const f = b(!1);
+    Ye();
+    const H = D.useAppDataStore, O = Qe([]);
+    je(async () => {
+      if (!S.value)
         return;
       document.addEventListener("keydown", (m) => {
         m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
-      const e = Ge(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(b.config)).json();
-      i.assetsRoot = b.assetsRoot || u, H.mapConfig = i, l = new tt(), s = await l.initialize({
-        container: d.value,
+      const e = Ze(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(A.config)).json();
+      i.assetsRoot = A.assetsRoot || u, H.mapConfig = i, l = new at(), o = await l.initialize({
+        container: S.value,
         mapConfig: i,
-        markerClickCallback: (m, v, w, Ee) => {
-          y("markerClick", m, v, w, Ee);
+        markerClickCallback: (m, y, w, Ee) => {
+          v("markerClick", m, y, w, Ee);
         },
-        mapClickCallback: (m, v, w) => {
-          y("mapClick", m, v, w);
+        mapClickCallback: (m, y, w) => {
+          v("mapClick", m, y, w);
         }
-      }), n = new Fe(s, O), await n.init(), y("mapLoaded");
-    }), Ze(() => {
-      a == null || a.clearSignalControlArea(), t == null || t.clearOpenDrive(), n.clearHoloTrace(), n.clearHoloSignal(), o == null || o.disconnectTrafficFlow();
+      }), n = new et(o, O), await n.init(), v("mapLoaded");
+    }), $e(() => {
+      a == null || a.clearSignalControlArea(), t == null || t.clearOpenDrive(), n.clearHoloTrace(), n.clearHoloSignal(), s == null || s.disconnectTrafficFlow();
     });
-    const V = $e(() => s), P = () => {
+    const V = qe(() => o), P = () => {
       const e = D.useAppDataStore;
       e.saveTrackLog = !0;
     }, N = () => {
       n.downloadTrackLog();
     }, z = () => {
       C("vehicleId");
-    }, E = () => {
+    }, W = () => {
       C("plateNumber");
-    }, Q = async (e) => await l.setMapCenter(e), j = async (e) => await l.setMapCamera(e), W = async (e) => await l.lookAt(e), G = (e) => l.setLayerVisibility(e), Z = (e, u) => l.requestCoordinateTransform(e, u), $ = (e) => {
+    }, E = async (e) => await l.setMapCenter(e), G = async (e) => await l.setMapCamera(e), Q = async (e) => await l.lookAt(e), j = (e) => l.setLayerVisibility(e), Z = (e, u) => l.requestCoordinateTransform(e, u), $ = (e) => {
       l.cancelCoordinateTransform(e);
     }, q = (e) => {
       l.setMapZoomRange(e);
-    }, K = (e) => (c || (c = new I(s)), c.showLaneNumber(e)), U = () => {
+    }, K = (e) => (c || (c = new I(o)), c.showLaneNumber(e)), U = () => {
       c == null || c.clearLaneNumber();
-    }, J = async (e) => (c || (c = new I(s)), await c.initializeSearch(e)), R = async () => c == null ? void 0 : c.calCrossIndicatorArea(), X = async () => {
+    }, J = async (e) => (c || (c = new I(o)), await c.initializeSearch(e)), R = async () => c == null ? void 0 : c.calCrossIndicatorArea(), X = async () => {
     }, Y = async (e, u) => {
-      o || (o = new nt(s)), o.connectTrafficFlow(e, u);
+      s || (s = new rt(o)), s.connectTrafficFlow(e, u);
     }, F = () => {
-      o == null || o.disconnectTrafficFlow();
+      s == null || s.disconnectTrafficFlow();
     }, ee = async (e) => {
       n.handleVehicleTraceData(e);
     }, te = () => {
@@ -74,23 +74,23 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
       await n.handleSignalData(e);
     }, re = () => {
       n.clearHoloSignal();
-    }, oe = (e) => {
-      o == null || o.toggleTrafficInfo(e), n == null || n.toggleTrafficInfo(e);
     }, se = (e) => {
+      s == null || s.toggleTrafficInfo(e), n == null || n.toggleTrafficInfo(e);
+    }, oe = (e) => {
       n == null || n.togglePause(e);
     }, ie = (e) => {
-      o == null || o.toggleTrafficObject(e), n == null || n.toggleTrafficObject(e);
+      s == null || s.toggleTrafficObject(e), n == null || n.toggleTrafficObject(e);
     }, C = (e) => {
       n == null || n.updatePanelContent(e);
-    }, ce = async (e) => (r || (r = new T(s)), r.addOverlays(e)), le = (e) => (r || (r = new T(s)), r.addMask(e)), ue = () => {
+    }, ce = async (e) => (r || (r = new T(o)), r.addOverlays(e)), le = (e) => (r || (r = new T(o)), r.addMask(e)), ue = () => {
       r == null || r.removeMask();
     }, me = (e) => r == null ? void 0 : r.removeOverlaysByType(e), ge = (e) => r == null ? void 0 : r.removeOverlaysById(e), pe = () => r == null ? void 0 : r.removeAllOverlays(), de = () => {
       r == null || r.showAllOverlays();
     }, Se = (e) => {
-      g || (g = new at(s)), g.updateQueueLength(e);
+      g || (g = new nt(o)), g.updateQueueLength(e);
     }, fe = () => {
       g == null || g.removeQueueLength();
-    }, Ce = async (e, u) => (t || (t = new L(s)), await t.showOpenDriveFromServer(e, u)), ye = async (e) => (t || (t = new L(s)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ve = async () => await (t == null ? void 0 : t.clearOpenDrive()), we = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
+    }, Ce = async (e, u) => (t || (t = new L(o)), await t.showOpenDriveFromServer(e, u)), ve = async (e) => (t || (t = new L(o)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ye = async () => await (t == null ? void 0 : t.clearOpenDrive()), we = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
     }, he = async (e) => t ? t.selectSumo(e) : {
@@ -99,10 +99,10 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
     }, Oe = async (e) => t ? t.unselectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, be = async (e) => t ? await t.geometrySearch(e) : {
+    }, Ae = async (e) => t ? await t.geometrySearch(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ae = async (e) => t ? await t.getSumoInfo(e) : {
+    }, be = async (e) => t ? await t.getSumoInfo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
     }, ke = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
@@ -111,17 +111,21 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
     }, De = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Le = (e) => (a || (a = new B(s)), a.showSignalControlArea(e)), Te = () => {
+    }, Le = (e) => (a || (a = new B(o)), a.showSignalControlArea(e)), Te = () => {
       a == null || a.clearSignalControlArea();
-    }, Ie = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Be = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new B(s)), a.showSubSignalControlArea(e)), xe = (e) => a ? a.editSubSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, He = () => a ? a.stopEditSubSignalControlArea() : { status: -1, message: "未加载信号控制区" }, Ve = (e) => a ? a.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Pe = (e) => a ? a.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Ne = (e) => a ? a.changeSubSignalControlAreaBorderVisibility(
+    }, Ie = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Be = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new B(o)), a.showSubSignalControlArea(e)), xe = (e) => a ? a.editSubSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, He = () => a ? a.stopEditSubSignalControlArea() : { status: -1, message: "未加载信号控制区" }, Ve = (e) => a ? a.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Pe = (e) => a ? a.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Ne = (e) => a ? a.changeSubSignalControlAreaBorderVisibility(
       e
-    ) : { status: -1, message: "未加载信号控制区" }, ze = (e) => (S || (S = new Ye(s)), S.addGreenWaveBand(e)), b = M, y = x;
+    ) : { status: -1, message: "未加载信号控制区" }, ze = (e) => (d || (d = new Fe(o)), d.addGreenWaveBand(e)), We = () => {
+      if (!d)
+        return { status: -1, message: "未加载绿波带" };
+      d.stopAddGreenWaveBand();
+    }, A = M, v = x;
     return _({
       mapViewer: V,
-      setLayerVisibility: G,
-      setMapCenter: Q,
-      lookAt: W,
-      setMapCamera: j,
+      setLayerVisibility: j,
+      setMapCenter: E,
+      lookAt: Q,
+      setMapCamera: G,
       setMapZoomRange: q,
       requestCoordinateTransform: Z,
       cancelCoordinateTransform: $,
@@ -144,20 +148,20 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
       handleHoloSignalData: ne,
       clearHoloSignal: re,
       setInterpolate: ae,
-      toggleTrafficInfo: oe,
+      toggleTrafficInfo: se,
       toggleTrafficObject: ie,
       toggleVehicleInfo: C,
-      togglePause: se,
+      togglePause: oe,
       updateQueueLength: Se,
       removeQueueLength: fe,
       showOpenDriveFromServer: Ce,
-      showOpenDriveFromFile: ye,
-      clearOpenDrive: ve,
-      geometrySearchInOpenDrive: be,
+      showOpenDriveFromFile: ve,
+      clearOpenDrive: ye,
+      geometrySearchInOpenDrive: Ae,
       findSumoInOpenDrive: we,
       selectSumoInOpenDrive: he,
       unselectSumoInOpenDrive: Oe,
-      getSumoInfo: Ae,
+      getSumoInfo: be,
       splitOpenDriveLane: ke,
       clearSplitOpenDriveLane: De,
       showSignalControlArea: Le,
@@ -171,14 +175,15 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
       selectSubSignalControlAreaCross: Ve,
       unselectSubSignalControlAreaCross: Pe,
       changeSubSignalControlAreaBorderVisibility: Ne,
-      addGreenWaveBand: ze
-    }), (e, u) => (h(), k("div", rt, [
+      addGreenWaveBand: ze,
+      stopAddGreenWaveBand: We
+    }), (e, u) => (h(), k("div", st, [
       p("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
-        ref: d
+        ref: S
       }, [
-        qe(p("div", ot, [
+        Ke(p("div", ot, [
           p("button", {
             style: { "margin-right": "10px" },
             onClick: P
@@ -191,12 +196,12 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
             style: { "margin-right": "10px" },
             onClick: z
           }, " 显示车辆id "),
-          p("button", { onClick: E }, "显示车辆号牌")
+          p("button", { onClick: W }, "显示车辆号牌")
         ], 512), [
-          [Ke, f.value]
+          [Ue, f.value]
         ])
       ], 512),
-      (h(!0), k(Ue, null, Je(O, (i, m) => (h(), Re(et, {
+      (h(!0), k(Je, null, Re(O, (i, m) => (h(), Xe(tt, {
         key: m,
         "display-mode": i.displayMode,
         "road-id": i.crossId,
@@ -212,5 +217,5 @@ const rt = { class: "gis-viewer" }, ot = { style: { position: "absolute", bottom
   }
 });
 export {
-  vt as default
+  wt as default
 };

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

@@ -130,6 +130,10 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         message: string;
     };
     addGreenWaveBand: (params: import("../types").IEditSignalControlAreaParams) => void;
+    stopAddGreenWaveBand: () => {
+        status: number;
+        message: string;
+    } | undefined;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{

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

@@ -1,23 +1,37 @@
 import { IEditSignalControlAreaParams } from '../../../types';
 export default class GreenWaveBandController {
     private view;
-    private unSelectedNodesLayer;
+    private allNodesLayer;
+    private roadsectLayer;
     private viewClickWatcher?;
     private openDriveServer;
     private selectedNodeIds;
+    private addCrossCallback;
+    private removeCrossCallback;
+    private removeAllCrossCallback;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 新增绿波带
-     * @param prams
+     * @param params
      */
-    addGreenWaveBand(prams: IEditSignalControlAreaParams): void;
+    addGreenWaveBand(params: IEditSignalControlAreaParams): void;
     stopAddGreenWaveBand(): void;
+    /**
+     * 显示所有路口，进入待选状态
+     * @param nodeAttributes
+     */
     private showAllNodes;
+    /**
+     * 点击待选/已选路口
+     * @param event
+     * @returns
+     */
     private handleViewClick;
     /**
      * 显示下游节点
      * @param nodeId
      */
     private showDownstreamNodes;
-    private getSymbol;
+    private getLineSymbol;
+    private getNodeSymbol;
 }

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

@@ -1,73 +1,200 @@
-import l from "@arcgis/core/Graphic";
+import h from "@arcgis/core/Graphic";
 import n from "@arcgis/core/layers/GraphicsLayer";
-import d from "axios";
-class p {
+import y from "axios";
+class C {
   constructor(e) {
-    this.selectedNodeIds = [], this.view = e, this.unSelectedNodesLayer = new n({
-      id: "unSelectedNodesLayer"
-    }), this.view.map.addMany([this.unSelectedNodesLayer]);
+    this.selectedNodeIds = [], 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);
   }
   /**
    * 新增绿波带
-   * @param prams
+   * @param params
    */
   addGreenWaveBand(e) {
-    this.selectedNodeIds = [], this.openDriveServer = e.odrServer, this.showAllNodes(e.crossesInArea), this.viewClickWatcher || (this.viewClickWatcher = this.view.on("click", (t) => {
-      this.handleViewClick(t);
+    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);
     }));
   }
   stopAddGreenWaveBand() {
     var e;
-    (e = this.viewClickWatcher) == null || e.remove(), this.viewClickWatcher = void 0;
+    (e = this.viewClickWatcher) == null || e.remove(), this.viewClickWatcher = void 0, this.allNodesLayer.removeAll(), this.selectedNodeIds = [], this.roadsectLayer.removeAll();
   }
+  /**
+   * 显示所有路口，进入待选状态
+   * @param nodeAttributes
+   */
   showAllNodes(e) {
-    const t = [];
-    e.forEach((s) => {
-      t.push(
-        new l({
+    const i = [];
+    e.forEach((a) => {
+      i.push(
+        new h({
           geometry: {
             type: "point",
-            x: s.longitude,
-            y: s.latitude
+            x: a.longitude,
+            y: a.latitude
           },
-          symbol: this.getSymbol(!1),
-          attributes: { ...s, selected: !1 }
+          symbol: this.getNodeSymbol(!1),
+          attributes: { ...a, selected: !1 }
         })
       );
-    }), this.unSelectedNodesLayer.addMany(t);
+    }), this.allNodesLayer.addMany(i);
   }
+  /**
+   * 点击待选/已选路口
+   * @param event
+   * @returns
+   */
   async handleViewClick(e) {
-    var a;
-    const s = (a = (await this.view.hitTest(e, {
-      include: [this.unSelectedNodesLayer]
-    })).results) == null ? void 0 : a.filter(
-      (o) => o.type === "graphic"
+    var d;
+    const a = (d = (await this.view.hitTest(e, {
+      include: [this.allNodesLayer]
+    })).results) == null ? void 0 : d.filter(
+      (s) => s.type === "graphic"
     );
-    if (s.length === 0)
+    if (a.length === 0)
       return;
-    const i = s[0].graphic, r = i.getAttribute("id");
-    i.setAttribute("selected", !0), i.symbol = this.getSymbol(!0), this.selectedNodeIds.push(r), console.log(this.selectedNodeIds), this.unSelectedNodesLayer.graphics.forEach((o) => {
-      this.selectedNodeIds.length === 0 ? o !== i && (o.visible = !1) : o.getAttribute("selected") === !1 && (o.visible = !1);
-    }), await this.showDownstreamNodes(r);
+    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;
+        }), this.roadsectLayer.removeAll();
+      else {
+        for (let t = s; t < this.selectedNodeIds.length; t++) {
+          this.removeCrossCallback && this.removeCrossCallback({
+            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--);
+          }
+        }
+        this.selectedNodeIds = this.selectedNodeIds.slice(0, s), this.allNodesLayer.graphics.forEach((t) => {
+          const l = this.selectedNodeIds.includes(
+            t.getAttribute("id")
+          );
+          t.setAttribute("selected", l), t.symbol = this.getNodeSymbol(l), t.visible = l;
+        }), await this.showDownstreamNodes(r);
+      }
+    } 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");
+      });
+      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--);
+      }
+      await this.showDownstreamNodes(r);
+    }
   }
   /**
    * 显示下游节点
    * @param nodeId
    */
   async showDownstreamNodes(e) {
-    const t = await d.get(
+    this.view.container.style.cursor = "progress";
+    const i = await y.get(
       `http://${this.openDriveServer}/api/computable/getDownstreamNodes`,
       { params: { nodeId: e } }
     );
-    if (t.status !== 200 || t.data.status !== 0)
+    if (i.status !== 200 || i.data.status !== 0) {
+      this.view.container.style.cursor = "default";
       return;
-    console.log(t.data.result), t.data.result.forEach((i) => {
-      this.unSelectedNodesLayer.graphics.forEach((r) => {
-        r.getAttribute("nodeId") === i.id && r.getAttribute("selected") === !1 && (r.visible = !0);
+    }
+    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({
+            geometry: {
+              type: "polyline",
+              paths: [o.coordinates]
+            },
+            symbol: this.getLineSymbol(!1),
+            attributes: { ...o, selected: !1 }
+          });
+          this.roadsectLayer.add(d);
+        }
       });
-    });
+    }), this.view.container.style.cursor = "default";
+  }
+  getLineSymbol(e) {
+    return e ? {
+      type: "cim",
+      data: {
+        type: "CIMSymbolReference",
+        symbol: {
+          type: "CIMLineSymbol",
+          symbolLayers: [
+            {
+              type: "CIMVectorMarker",
+              enable: !0,
+              size: 4,
+              markerPlacement: {
+                type: "CIMMarkerPlacementAlongLineSameSize",
+                endings: "WithMarkers",
+                placementTemplate: [40],
+                angleToLine: !0
+              },
+              frame: {
+                xmin: -5,
+                ymin: -5,
+                xmax: 5,
+                ymax: 5
+              },
+              markerGraphics: [
+                {
+                  type: "CIMMarkerGraphic",
+                  geometry: {
+                    paths: [
+                      [
+                        [4, -4],
+                        [12, 0],
+                        [4, 4]
+                      ],
+                      [
+                        [-4, 4],
+                        [-12, 0],
+                        [-4, -4]
+                      ]
+                    ]
+                  },
+                  symbol: {
+                    type: "CIMLineSymbol",
+                    symbolLayers: [
+                      {
+                        type: "CIMSolidStroke",
+                        enable: !0,
+                        width: 1.5,
+                        color: [255, 255, 255, 255]
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              type: "CIMSolidStroke",
+              enable: !0,
+              width: 4,
+              color: [55, 125, 34, 255]
+            }
+          ]
+        }
+      }
+    } : {
+      type: "simple-line",
+      color: "gray",
+      width: 2
+    };
   }
-  getSymbol(e) {
+  getNodeSymbol(e) {
     return {
       type: "cim",
       data: {
@@ -157,5 +284,5 @@ class p {
   }
 }
 export {
-  p as default
+  C as default
 };

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

@@ -280,6 +280,7 @@ export interface INode {
     latitude: number;
     name: string;
     signalId?: string;
+    coordinates?: number[][];
 }
 export interface IEditSignalControlAreaParams {
     crossesInArea: INode[];
@@ -290,5 +291,6 @@ export interface IEditSignalControlAreaParams {
     removeCrossCallback: (params: {
         id: string;
     }) => void;
+    removeAllCrossCallback?: () => void;
     odrServer: string;
 }

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

@@ -142,6 +142,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
         message: string;
     };
     addGreenWaveBand: (params: IEditSignalControlAreaParams) => void;
+    stopAddGreenWaveBand: () => {
+        status: number;
+        message: string;
+    } | undefined;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{

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

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

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

@@ -130,6 +130,10 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         message: string;
     };
     addGreenWaveBand: (params: import("../types").IEditSignalControlAreaParams) => void;
+    stopAddGreenWaveBand: () => {
+        status: number;
+        message: string;
+    } | undefined;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{

package/lib/src/gis-map/utils/green-wave-band-controller/index.d.ts

@@ -1,23 +1,37 @@
 import { IEditSignalControlAreaParams } from '../../../types';
 export default class GreenWaveBandController {
     private view;
-    private unSelectedNodesLayer;
+    private allNodesLayer;
+    private roadsectLayer;
     private viewClickWatcher?;
     private openDriveServer;
     private selectedNodeIds;
+    private addCrossCallback;
+    private removeCrossCallback;
+    private removeAllCrossCallback;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 新增绿波带
-     * @param prams
+     * @param params
      */
-    addGreenWaveBand(prams: IEditSignalControlAreaParams): void;
+    addGreenWaveBand(params: IEditSignalControlAreaParams): void;
     stopAddGreenWaveBand(): void;
+    /**
+     * 显示所有路口，进入待选状态
+     * @param nodeAttributes
+     */
     private showAllNodes;
+    /**
+     * 点击待选/已选路口
+     * @param event
+     * @returns
+     */
     private handleViewClick;
     /**
      * 显示下游节点
      * @param nodeId
      */
     private showDownstreamNodes;
-    private getSymbol;
+    private getLineSymbol;
+    private getNodeSymbol;
 }

package/lib/src/gis-map/utils/green-wave-band-controller/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const l=require("@arcgis/core/Graphic"),n=require("@arcgis/core/layers/GraphicsLayer"),c=require("axios");class d{constructor(e){this.selectedNodeIds=[],this.view=e,this.unSelectedNodesLayer=new n({id:"unSelectedNodesLayer"}),this.view.map.addMany([this.unSelectedNodesLayer])}addGreenWaveBand(e){this.selectedNodeIds=[],this.openDriveServer=e.odrServer,this.showAllNodes(e.crossesInArea),this.viewClickWatcher||(this.viewClickWatcher=this.view.on("click",t=>{this.handleViewClick(t)}))}stopAddGreenWaveBand(){var e;(e=this.viewClickWatcher)==null||e.remove(),this.viewClickWatcher=void 0}showAllNodes(e){const t=[];e.forEach(s=>{t.push(new l({geometry:{type:"point",x:s.longitude,y:s.latitude},symbol:this.getSymbol(!1),attributes:{...s,selected:!1}}))}),this.unSelectedNodesLayer.addMany(t)}async handleViewClick(e){var a;const s=(a=(await this.view.hitTest(e,{include:[this.unSelectedNodesLayer]})).results)==null?void 0:a.filter(o=>o.type==="graphic");if(s.length===0)return;const i=s[0].graphic,r=i.getAttribute("id");i.setAttribute("selected",!0),i.symbol=this.getSymbol(!0),this.selectedNodeIds.push(r),console.log(this.selectedNodeIds),this.unSelectedNodesLayer.graphics.forEach(o=>{this.selectedNodeIds.length===0?o!==i&&(o.visible=!1):o.getAttribute("selected")===!1&&(o.visible=!1)}),await this.showDownstreamNodes(r)}async showDownstreamNodes(e){const t=await c.get(`http://${this.openDriveServer}/api/computable/getDownstreamNodes`,{params:{nodeId:e}});if(t.status!==200||t.data.status!==0)return;console.log(t.data.result),t.data.result.forEach(i=>{this.unSelectedNodesLayer.graphics.forEach(r=>{r.getAttribute("nodeId")===i.id&&r.getAttribute("selected")===!1&&(r.visible=!0)})})}getSymbol(e){return{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:30,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:20,haloSize:2,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:25,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}}}exports.default=d;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("@arcgis/core/Graphic"),h=require("@arcgis/core/layers/GraphicsLayer"),y=require("axios");class m{constructor(e){this.selectedNodeIds=[],this.view=e,this.roadsectLayer=new h({id:"roadsectLayer"}),this.view.map.add(this.roadsectLayer),this.allNodesLayer=new h({id:"allNodesLayer"}),this.view.map.add(this.allNodesLayer)}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)}))}stopAddGreenWaveBand(){var e;(e=this.viewClickWatcher)==null||e.remove(),this.viewClickWatcher=void 0,this.allNodesLayer.removeAll(),this.selectedNodeIds=[],this.roadsectLayer.removeAll()}showAllNodes(e){const i=[];e.forEach(a=>{i.push(new n({geometry:{type:"point",x:a.longitude,y:a.latitude},symbol:this.getNodeSymbol(!1),attributes:{...a,selected:!1}}))}),this.allNodesLayer.addMany(i)}async handleViewClick(e){var d;const a=(d=(await this.view.hitTest(e,{include:[this.allNodesLayer]})).results)==null?void 0:d.filter(s=>s.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}),this.roadsectLayer.removeAll();else{for(let t=s;t<this.selectedNodeIds.length;t++){this.removeCrossCallback&&this.removeCrossCallback({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--)}}this.selectedNodeIds=this.selectedNodeIds.slice(0,s),this.allNodesLayer.graphics.forEach(t=>{const l=this.selectedNodeIds.includes(t.getAttribute("id"));t.setAttribute("selected",l),t.symbol=this.getNodeSymbol(l),t.visible=l}),await this.showDownstreamNodes(r)}}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")});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--)}await this.showDownstreamNodes(r)}}async showDownstreamNodes(e){this.view.container.style.cursor="progress";const i=await y.get(`http://${this.openDriveServer}/api/computable/getDownstreamNodes`,{params:{nodeId:e}});if(i.status!==200||i.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 n({geometry:{type:"polyline",paths:[o.coordinates]},symbol:this.getLineSymbol(!1),attributes:{...o,selected:!1}});this.roadsectLayer.add(d)}})}),this.view.container.style.cursor="default"}getLineSymbol(e){return e?{type:"cim",data:{type:"CIMSymbolReference",symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMVectorMarker",enable:!0,size:4,markerPlacement:{type:"CIMMarkerPlacementAlongLineSameSize",endings:"WithMarkers",placementTemplate:[40],angleToLine:!0},frame:{xmin:-5,ymin:-5,xmax:5,ymax:5},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{paths:[[[4,-4],[12,0],[4,4]],[[-4,4],[-12,0],[-4,-4]]]},symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMSolidStroke",enable:!0,width:1.5,color:[255,255,255,255]}]}}]},{type:"CIMSolidStroke",enable:!0,width:4,color:[55,125,34,255]}]}}}:{type:"simple-line",color:"gray",width:2}}getNodeSymbol(e){return{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:30,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:20,haloSize:2,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:25,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}}}exports.default=m;

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

@@ -280,6 +280,7 @@ export interface INode {
     latitude: number;
     name: string;
     signalId?: string;
+    coordinates?: number[][];
 }
 export interface IEditSignalControlAreaParams {
     crossesInArea: INode[];
@@ -290,5 +291,6 @@ export interface IEditSignalControlAreaParams {
     removeCrossCallback: (params: {
         id: string;
     }) => void;
+    removeAllCrossCallback?: () => void;
     odrServer: string;
 }

package/package.json

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