gisviewer-vue3-arcgis 1.0.193 → 1.0.194

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

@@ -1,6 +1,7 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
 import { IEditSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import GreenWaveBandController from './utils/green-wave-band-controller';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
 import OpenDriveRenderer from './utils/open-drive-renderer';
@@ -29,6 +30,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     queueLength: QueueLength;
     openDriveRenderer: OpenDriveRenderer;
     signalControlAreaController: SignalControlAreaController;
+    greenWaveBandController: GreenWaveBandController;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -139,6 +141,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         status: number;
         message: string;
     };
+    addGreenWaveBand: (params: IEditSignalControlAreaParams) => void;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{

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

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

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

@@ -18,6 +18,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     queueLength: import("./utils/queue-length").default;
     openDriveRenderer: import("./utils/open-drive-renderer").default;
     signalControlAreaController: import("./utils/signal-control-area-controller").default;
+    greenWaveBandController: import("./utils/green-wave-band-controller").default;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -128,6 +129,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         status: number;
         message: string;
     };
+    addGreenWaveBand: (params: import("../types").IEditSignalControlAreaParams) => void;
     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

@@ -0,0 +1,23 @@
+import { IEditSignalControlAreaParams } from '../../../types';
+export default class GreenWaveBandController {
+    private view;
+    private unSelectedNodesLayer;
+    private viewClickWatcher?;
+    private openDriveServer;
+    private selectedNodeIds;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    /**
+     * 新增绿波带
+     * @param prams
+     */
+    addGreenWaveBand(prams: IEditSignalControlAreaParams): void;
+    stopAddGreenWaveBand(): void;
+    private showAllNodes;
+    private handleViewClick;
+    /**
+     * 显示下游节点
+     * @param nodeId
+     */
+    private showDownstreamNodes;
+    private getSymbol;
+}

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

@@ -0,0 +1,161 @@
+import l from "@arcgis/core/Graphic";
+import n from "@arcgis/core/layers/GraphicsLayer";
+import d from "axios";
+class p {
+  constructor(e) {
+    this.selectedNodeIds = [], this.view = e, this.unSelectedNodesLayer = new n({
+      id: "unSelectedNodesLayer"
+    }), this.view.map.addMany([this.unSelectedNodesLayer]);
+  }
+  /**
+   * 新增绿波带
+   * @param prams
+   */
+  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);
+  }
+  /**
+   * 显示下游节点
+   * @param nodeId
+   */
+  async showDownstreamNodes(e) {
+    const t = await d.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: [
+          {
+            // 将textGraphic的TextString替换为graphic.attributes.name
+            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`
+            }
+          ]
+        }
+      }
+    };
+  }
+}
+export {
+  p as default
+};

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

@@ -5,6 +5,7 @@ interface ICross {
     latitude: number;
     longitude: number;
     signalId: string;
+    nodeId: string;
     isKey: boolean;
 }
 export default class DistrictController {

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

@@ -1,19 +1,20 @@
-import e from "../common-utils.mjs";
-class r {
+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];
     for (const s of t.children)
       if (s.children) {
-        const o = new r(s, i);
+        const o = new e(s, i);
         o.parentName = this.name, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
-      } else if (e.isCoordinateValid(s)) {
+      } else if (r.isCoordinateValid(s)) {
         const o = {
           id: s.id,
           name: s.name,
           parentId: s.parentId,
           latitude: Number(s.latitude),
           longitude: Number(s.longitude),
-          signalId: s.signalId,
+          signalId: s.id,
+          nodeId: s.nodeId,
           isKey: s.isKey === 1
         };
         this.crosses.push(o), this.crossCount++;
@@ -29,5 +30,5 @@ class r {
   }
 }
 export {
-  r as default
+  e as default
 };

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

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

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

@@ -1,14 +1,14 @@
-import * as p from "@arcgis/core/core/reactiveUtils.js";
+import * as d from "@arcgis/core/core/reactiveUtils.js";
 import n from "@arcgis/core/Graphic";
 import y from "@arcgis/core/layers/GraphicsLayer";
-import d from "@turf/buffer";
+import p from "@turf/buffer";
 import u 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 P {
+class N {
   constructor(e) {
     var i;
     this.crossScale = 5e3, this.crossIdsInDistrict = [], this.view = e;
@@ -48,7 +48,7 @@ class P {
       );
       this.drawArea(r, !0);
     }
-    return this.scaleWatcher = p.watch(
+    return this.scaleWatcher = d.watch(
       () => this.view.scale,
       (t, r) => {
         t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((i) => {
@@ -77,7 +77,7 @@ class P {
   }
   clearSignalControlArea() {
     var e, t;
-    return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.scaleWatcher) == null || e.remove(), this.scaleWatcher = void 0, (t = this.clickWatcher) == null || t.remove(), this.clickWatcher = void 0, this.view.closePopup(), { status: 0, message: "ok" };
+    return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.scaleWatcher) == null || e.remove(), this.scaleWatcher = void 0, (t = this.viewClickWatcher) == null || t.remove(), this.viewClickWatcher = void 0, this.view.closePopup(), { status: 0, message: "ok" };
   }
   async locateSignalControlArea(e) {
     const t = this.findAreaGraphic(e.id);
@@ -165,14 +165,14 @@ class P {
    */
   async showNearbyCrosses(e) {
     const t = await b.get(
-      `http://${this.openDriveServer}/api/computable/getRelatedJunctionsForJunction`,
-      { params: { junctionIds: e } }
+      `http://${this.openDriveServer}/api/computable/getRelatedNodesForNode`,
+      { params: { nodeIds: e } }
     );
     if (t.status === 200)
       if (t.data.status === 0) {
         const r = t.data.result, i = [];
         for (const s of r) {
-          const o = s.junctionId;
+          const o = s.nodeId;
           if (o.startsWith("-"))
             continue;
           if (s.signalId && !this.crossIdsInDistrict.includes(o)) {
@@ -213,7 +213,9 @@ class P {
     if (e.odrServer) {
       this.openDriveServer = e.odrServer, this.crossIdsInDistrict = e.crossesInArea.map((s) => s.id);
       const t = a.featureCollection(
-        e.crossesInArea.map((s) => a.point([s.x, s.y]))
+        e.crossesInArea.map(
+          (s) => a.point([s.longitude, s.latitude])
+        )
       ), r = u(t);
       r && (this.districtControllerLayer.removeAll(), this.districtControllerLayer.add(
         new n({
@@ -231,7 +233,7 @@ class P {
             }
           }
         })
-      )), this.addCrossCallback = e.addCrossCallback, this.removeCrossCallback = e.removeCrossCallback, this.clickWatcher || (this.clickWatcher = this.view.on("click", async (s) => {
+      )), this.addCrossCallback = e.addCrossCallback, this.removeCrossCallback = e.removeCrossCallback, this.viewClickWatcher || (this.viewClickWatcher = this.view.on("click", async (s) => {
         await this.handleViewClick(s);
       }));
       const i = this.crossLayer.graphics.toArray().map((s) => s.getAttribute("id")).join(",");
@@ -241,7 +243,7 @@ class P {
   }
   stopEditSubSignalControlArea() {
     var t;
-    (t = this.clickWatcher) == null || t.remove(), this.clickWatcher = void 0;
+    (t = this.viewClickWatcher) == null || t.remove(), this.viewClickWatcher = void 0;
     const e = this.crossLayer.graphics.filter(
       (r) => r.getAttribute("signalId") === "" || !r.getAttribute("signalId") || !r.getAttribute("selected")
     );
@@ -313,7 +315,7 @@ class P {
         }
         s || (s = a.lineString(r));
       }
-      const o = d(
+      const o = p(
         s.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
@@ -391,6 +393,7 @@ class P {
         name: s.name,
         color: e.areaColor,
         signalId: s.signalId,
+        nodeId: s.nodeId,
         districtId: t ? e.id : e.parentId,
         districtName: t ? e.name : e.parentName,
         subDistrictId: t ? "" : e.id,
@@ -418,13 +421,13 @@ class P {
                   fieldName: "subDistrictName",
                   label: "子区名称"
                 },
-                {
-                  fieldName: "id",
-                  label: "路口编号"
-                },
                 {
                   fieldName: "signalId",
                   label: "信号机编号"
+                },
+                {
+                  fieldName: "nodeId",
+                  label: "路口编号"
                 }
               ]
             }
@@ -645,5 +648,5 @@ class P {
   }
 }
 export {
-  P as default
+  N as default
 };

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

@@ -274,12 +274,15 @@ export interface IShowSignalControlAreaParams {
     areaList: any[];
     style?: string;
 }
+export interface INode {
+    id: string;
+    longitude: number;
+    latitude: number;
+    name: string;
+    signalId?: string;
+}
 export interface IEditSignalControlAreaParams {
-    crossesInArea: {
-        id: string;
-        x: number;
-        y: number;
-    }[];
+    crossesInArea: INode[];
     addCrossCallback: (params: {
         id: string;
         name: string;

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

@@ -1,6 +1,7 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
 import { IEditSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import GreenWaveBandController from './utils/green-wave-band-controller';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
 import OpenDriveRenderer from './utils/open-drive-renderer';
@@ -29,6 +30,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     queueLength: QueueLength;
     openDriveRenderer: OpenDriveRenderer;
     signalControlAreaController: SignalControlAreaController;
+    greenWaveBandController: GreenWaveBandController;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -139,6 +141,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         status: number;
         message: string;
     };
+    addGreenWaveBand: (params: IEditSignalControlAreaParams) => void;
     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 n=require("vue"),C=require("./stores/index.js");require("./style/index.css");const Be=require("./utils/holo-flow/index.js"),Ne=require("./utils/holo-flow/signal-countdown-panel.vue.js"),Ee=require("./utils/map-initializer.js"),k=require("./utils/open-drive-renderer/index.js"),O=require("./utils/overlay.js"),He=require("./utils/queue-length.js"),A=require("./utils/road-config-tool/index.js"),L=require("./utils/signal-control-area-controller/index.js"),Pe=require("./utils/traffic-flow.js"),ze={class:"gis-viewer"},je={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},Qe=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick"],setup(D,{expose:T,emit:_}){const p=n.ref(null);let i,u,l,o,r,s,m,t,a;const S=n.ref(!1);C.registerStore();const I=C.default.useAppDataStore,h=n.reactive([]);n.onMounted(async()=>{if(!p.value)return;document.addEventListener("keydown",d=>{d.ctrlKey&&d.key==="i"&&(S.value=!S.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:g}=e.appContext.config.globalProperties,c=await(await fetch(b.config)).json();c.assetsRoot=b.assetsRoot||g,I.mapConfig=c,u=new Ee.default,i=await u.initialize({container:p.value,mapConfig:c,markerClickCallback:(d,v,w,Me)=>{y("markerClick",d,v,w,Me)},mapClickCallback:(d,v,w)=>{y("mapClick",d,v,w)}}),r=new Be.default(i,h),await r.init(),y("mapLoaded")}),n.onUnmounted(()=>{a==null||a.clearSignalControlArea(),t==null||t.clearOpenDrive(),r.clearHoloTrace(),r.clearHoloSignal(),o==null||o.disconnectTrafficFlow()});const x=n.computed(()=>i),V=()=>{const e=C.default.useAppDataStore;e.saveTrackLog=!0},q=()=>{r.downloadTrackLog()},M=()=>{f("vehicleId")},B=()=>{f("plateNumber")},N=async e=>await u.setMapCenter(e),E=async e=>await u.setMapCamera(e),H=async e=>await u.lookAt(e),P=e=>u.setLayerVisibility(e),z=(e,g)=>u.requestCoordinateTransform(e,g),j=e=>{u.cancelCoordinateTransform(e)},Q=e=>{u.setMapZoomRange(e)},Z=e=>(l||(l=new A.default(i)),l.showLaneNumber(e)),K=()=>{l==null||l.clearLaneNumber()},U=async e=>(l||(l=new A.default(i)),await l.initializeSearch(e)),G=async()=>l==null?void 0:l.calCrossIndicatorArea(),J=async()=>{},W=async(e,g)=>{o||(o=new Pe.default(i)),o.connectTrafficFlow(e,g)},X=()=>{o==null||o.disconnectTrafficFlow()},Y=async e=>{r.handleVehicleTraceData(e)},F=()=>{r.clearHoloTrace()},R=e=>{r.setInterpolate(e)},$=async e=>{await r.handleSignalData(e)},ee=()=>{r.clearHoloSignal()},te=e=>{o==null||o.toggleTrafficInfo(e),r==null||r.toggleTrafficInfo(e)},ae=e=>{r==null||r.togglePause(e)},ne=e=>{o==null||o.toggleTrafficObject(e),r==null||r.toggleTrafficObject(e)},f=e=>{r==null||r.updatePanelContent(e)},re=async e=>(s||(s=new O.default(i)),s.addOverlays(e)),se=e=>(s||(s=new O.default(i)),s.addMask(e)),oe=()=>{s==null||s.removeMask()},ie=e=>s==null?void 0:s.removeOverlaysByType(e),ce=e=>s==null?void 0:s.removeOverlaysById(e),le=()=>s==null?void 0:s.removeAllOverlays(),ue=()=>{s==null||s.showAllOverlays()},ge=e=>{m||(m=new He.default(i)),m.updateQueueLength(e)},de=()=>{m==null||m.removeQueueLength()},me=async(e,g)=>(t||(t=new k.default(i)),await t.showOpenDriveFromServer(e,g)),pe=async e=>(t||(t=new k.default(i)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),Se=async()=>await(t==null?void 0:t.clearOpenDrive()),fe=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地图"},ve=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},we=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},Ce=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},he=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},be=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},ke=e=>(a||(a=new L.default(i)),a.showSignalControlArea(e)),Oe=()=>{a==null||a.clearSignalControlArea()},Ae=async e=>a?await a.locateSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Le=async e=>a?await a.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},De=()=>a?a.resetHighlight():{status:-1,message:"未加载信号控制区"},Te=e=>(a||(a=new L.default(i)),a.showSubSignalControlArea(e)),_e=e=>a?a.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Ie=()=>a?a.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},xe=e=>a?a.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ve=e=>a?a.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},qe=e=>a?a.changeSubSignalControlAreaBorderVisibility(e):{status:-1,message:"未加载信号控制区"},b=D,y=_;return T({mapViewer:x,setLayerVisibility:P,setMapCenter:N,lookAt:H,setMapCamera:E,setMapZoomRange:Q,requestCoordinateTransform:z,cancelCoordinateTransform:j,addOverlays:re,addMask:se,removeMask:oe,showAllOverlays:ue,removeOverlaysByType:ie,removeOverlaysById:ce,removeAllOverlays:le,showLaneNumber:Z,clearLaneNumber:K,initializeAreaTool:U,calCrossIndicatorArea:G,calRoadIndicatorArea:J,connectCarFlow:W,disconnectCarFlow:X,handleHoloVehicleTraceData:Y,clearHoloTrace:F,handleHoloSignalData:$,clearHoloSignal:ee,setInterpolate:R,toggleTrafficInfo:te,toggleTrafficObject:ne,toggleVehicleInfo:f,togglePause:ae,updateQueueLength:ge,removeQueueLength:de,showOpenDriveFromServer:me,showOpenDriveFromFile:pe,clearOpenDrive:Se,geometrySearchInOpenDrive:we,findSumoInOpenDrive:fe,selectSumoInOpenDrive:ye,unselectSumoInOpenDrive:ve,getSumoInfo:Ce,splitOpenDriveLane:he,clearSplitOpenDriveLane:be,showSignalControlArea:ke,clearSignalControlArea:Oe,locateSignalControlArea:Ae,highlightSignalControlArea:Le,resetHighlightSignalControlArea:De,showSubSignalControlArea:Te,editSubSignalControlArea:_e,stopEditSubSignalControlArea:Ie,selectSubSignalControlAreaCross:xe,unselectSubSignalControlAreaCross:Ve,changeSubSignalControlAreaBorderVisibility:qe}),(e,g)=>(n.openBlock(),n.createElementBlock("div",ze,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:p},[n.withDirectives(n.createElementVNode("div",je,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:V}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:q}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:M}," 显示车辆id "),n.createElementVNode("button",{onClick:B},"显示车辆号牌")],512),[[n.vShow,S.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(h,(c,d)=>(n.openBlock(),n.createBlock(Ne.default,{key:d,"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=Qe;
+"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;

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

@@ -18,6 +18,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     queueLength: import("./utils/queue-length").default;
     openDriveRenderer: import("./utils/open-drive-renderer").default;
     signalControlAreaController: import("./utils/signal-control-area-controller").default;
+    greenWaveBandController: import("./utils/green-wave-band-controller").default;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -128,6 +129,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         status: number;
         message: string;
     };
+    addGreenWaveBand: (params: import("../types").IEditSignalControlAreaParams) => void;
     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

@@ -0,0 +1,23 @@
+import { IEditSignalControlAreaParams } from '../../../types';
+export default class GreenWaveBandController {
+    private view;
+    private unSelectedNodesLayer;
+    private viewClickWatcher?;
+    private openDriveServer;
+    private selectedNodeIds;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    /**
+     * 新增绿波带
+     * @param prams
+     */
+    addGreenWaveBand(prams: IEditSignalControlAreaParams): void;
+    stopAddGreenWaveBand(): void;
+    private showAllNodes;
+    private handleViewClick;
+    /**
+     * 显示下游节点
+     * @param nodeId
+     */
+    private showDownstreamNodes;
+    private getSymbol;
+}

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

@@ -0,0 +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;

package/lib/src/gis-map/utils/signal-control-area-controller/district-controller.d.ts

@@ -5,6 +5,7 @@ interface ICross {
     latitude: number;
     longitude: number;
     signalId: string;
+    nodeId: string;
     isKey: boolean;
 }
 export default class DistrictController {

package/lib/src/gis-map/utils/signal-control-area-controller/district-controller.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("../common-utils.js");class o{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];for(const s of t.children)if(s.children){const e=new o(s,i);e.parentName=this.name,this.subDistricts.push(e),this.subDistrictCount++,this.crossCount+=e.crossCount}else if(r.default.isCoordinateValid(s)){const e={id:s.id,name:s.name,parentId:s.parentId,latitude:Number(s.latitude),longitude:Number(s.longitude),signalId:s.signalId,isKey:s.isKey===1};this.crosses.push(e),this.crossCount++}}getAllCrossCoordinates(){const t=[];for(const i of this.crosses)t.push([i.longitude,i.latitude]);for(const i of this.subDistricts)t.push(...i.getAllCrossCoordinates());return t}}exports.default=o;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("../common-utils.js");class o{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];for(const s of t.children)if(s.children){const e=new o(s,i);e.parentName=this.name,this.subDistricts.push(e),this.subDistrictCount++,this.crossCount+=e.crossCount}else if(r.default.isCoordinateValid(s)){const e={id:s.id,name:s.name,parentId:s.parentId,latitude:Number(s.latitude),longitude:Number(s.longitude),signalId:s.id,nodeId:s.nodeId,isKey:s.isKey===1};this.crosses.push(e),this.crossCount++}}getAllCrossCoordinates(){const t=[];for(const i of this.crosses)t.push([i.longitude,i.latitude]);for(const i of this.subDistricts)t.push(...i.getAllCrossCoordinates());return t}}exports.default=o;

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

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

package/lib/src/gis-map/utils/signal-control-area-controller/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("@arcgis/core/core/reactiveUtils.js"),c=require("@arcgis/core/Graphic"),y=require("@arcgis/core/layers/GraphicsLayer"),f=require("@turf/buffer"),m=require("@turf/convex"),C=require("@turf/helpers"),v=require("axios"),S=require("concaveman"),A=require("../../stores/index.js"),I=require("./district-controller.js");function d(l){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const t in l)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(l,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>l[t]})}}return e.default=l,Object.freeze(e)}const L=d(p),a=d(C);class w{constructor(e){var i;this.crossScale=5e3,this.crossIdsInDistrict=[],this.view=e;const r=A.default.useAppDataStore.mapConfig;this.openDriveServer=(i=r.openDriveServer)==null?void 0:i.url,this.districtControllerLayer=new y({id:"districtControllerLayer"}),this.subDistrictControllerLayer=new y({id:"subDistrictControllerLayer",visible:!1}),this.crossLayer=new y({id:"crossLayer",visible:!1}),this.highlightLayer=new y({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}showSignalControlArea(e){this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1,this.districtControllerLayer.visible=!0;for(const t of e.areaList){const r=new I.default(t,e.style||"");this.drawArea(r,!0)}return this.scaleWatcher=L.watch(()=>this.view.scale,(t,r)=>{t>this.crossScale&&r<=this.crossScale?(this.crossLayer.graphics.forEach(i=>{i.symbol=this.getCrossGraphicSymbol(i.attributes,"marker")}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol=this.getCrossGraphicSymbol(i.attributes,"marker"))})):t<=this.crossScale&&r>this.crossScale&&(this.crossLayer.graphics.forEach(i=>{i.symbol=this.getCrossGraphicSymbol(i.attributes,"picture")}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol=this.getCrossGraphicSymbol(i.attributes,"picture"))}))}),{status:0,message:"ok"}}clearSignalControlArea(){var e,t;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.scaleWatcher)==null||e.remove(),this.scaleWatcher=void 0,(t=this.clickWatcher)==null||t.remove(),this.clickWatcher=void 0,this.view.closePopup(),{status:0,message:"ok"}}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:"未找到"}}async highlightSignalControlArea(e){if(!e.id||e.id==="")return{status:1,message:"请输入id"};this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id).toArray().map(s=>{const o=s.clone();return o.symbol.style="none",o}),r=this.subDistrictControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id||s.getAttribute("parentId")===e.id).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)return{status:1,message:"未找到"};if(t.length>0)await this.view.goTo(t);else if(r.length>0){const s=r[0].geometry.centroid;await this.view.goTo({target:s,scale:this.crossScale-500})}else i.length>1?await this.view.goTo(i):await this.view.goTo({target:i[0].geometry,scale:1500});return{status:0,message:"ok"}}resetHighlight(){return this.highlightLayer.removeAll(),this.view.closePopup(),this.districtControllerLayer.visible=!0,{status:0,message:"ok"}}showSubSignalControlArea(e){this.crossLayer.removeAll(),this.crossLayer.visible=!0;const r=e.children.map(i=>{const s={...i,selected:!0};return new c({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:this.getCrossSymbolInSubDistrict(s),attributes:s})});return this.crossLayer.addMany(r),this.view.goTo(r),{status:0,message:"ok"}}async handleViewClick(e){var s;const r=(s=(await this.view.hitTest(e,{include:[this.crossLayer]})).results)==null?void 0:s.filter(o=>o.type==="graphic");if(r.length===0)return;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.attributes)),await this.showNearbyCrosses(i.getAttribute("id")))}async showNearbyCrosses(e){const t=await v.get(`http://${this.openDriveServer}/api/computable/getRelatedJunctionsForJunction`,{params:{junctionIds:e}});if(t.status===200)if(t.data.status===0){const r=t.data.result,i=[];for(const s of r){const o=s.junctionId;if(o.startsWith("-"))continue;if(s.signalId&&!this.crossIdsInDistrict.includes(o)){console.log("不是此区控内的路口",o);continue}if(this.crossLayer.graphics.some(h=>h.getAttribute("id")===o))continue;const g=new c({geometry:{type:"point",x:s.lon,y:s.lat},symbol:this.getCrossSymbolInSubDistrict(s),attributes:{id:o,name:s.name,signalId:s.signalId,selected:!1}});i.push(g)}return this.crossLayer.addMany(i),{status:0,message:"ok"}}else return{status:-1,message:t.data.message};else return{status:-1,message:"请求失败"}}async editSubSignalControlArea(e){if(e.odrServer){this.openDriveServer=e.odrServer,this.crossIdsInDistrict=e.crossesInArea.map(s=>s.id);const t=a.featureCollection(e.crossesInArea.map(s=>a.point([s.x,s.y]))),r=m(t);r&&(this.districtControllerLayer.removeAll(),this.districtControllerLayer.add(new c({geometry:{type:"polygon",rings:r.geometry.coordinates},symbol:{type:"simple-fill",style:"none",outline:{color:[61,139,249],width:3,style:"long-dash"}}}))),this.addCrossCallback=e.addCrossCallback,this.removeCrossCallback=e.removeCrossCallback,this.clickWatcher||(this.clickWatcher=this.view.on("click",async s=>{await this.handleViewClick(s)}));const i=this.crossLayer.graphics.toArray().map(s=>s.getAttribute("id")).join(",");return await this.showNearbyCrosses(i)}else return{status:1,message:"未配置OpenDriveServer"}}stopEditSubSignalControlArea(){var t;(t=this.clickWatcher)==null||t.remove(),this.clickWatcher=void 0;const e=this.crossLayer.graphics.filter(r=>r.getAttribute("signalId")===""||!r.getAttribute("signalId")||!r.getAttribute("selected"));this.crossLayer.removeMany(e.toArray())}selectSubSignalControlAreaCross(e){return this.crossLayer.graphics.forEach(t=>{if(t.getAttribute("id")===e&&!t.getAttribute("selected"))return t.setAttribute("selected",!0),t.symbol=this.getCrossSymbolInSubDistrict(t.attributes),{status:0,message:"ok"}}),{status:0,message:"未找到"}}unselectSubSignalControlAreaCross(e){return this.crossLayer.graphics.forEach(t=>{if(t.getAttribute("id")===e&&t.getAttribute("selected"))return t.setAttribute("selected",!1),t.symbol=this.getCrossSymbolInSubDistrict(t.attributes),{status:0,message:"ok"}}),{status:0,message:"未找到"}}changeSubSignalControlAreaBorderVisibility(e){this.highlightLayer.graphics.forEach(t=>{t.getAttribute("type")==="signalControlArea"&&(t.visible=e)})}findAreaGraphic(e){let t=this.districtControllerLayer.graphics.find(r=>r.attributes.id===e);return t||(t=this.subDistrictControllerLayer.graphics.find(r=>r.attributes.id===e)),t||(t=this.crossLayer.graphics.find(r=>r.attributes.id===e)),t}drawArea(e,t){const r=e.getAllCrossCoordinates();if(r.length>=2){let s=null;if(r.length===2)s=a.lineString(r);else{if(t){const u=a.featureCollection(r.map(b=>a.point(b)));s=m(u)}else{const u=S(r,.5);u.length>=4&&(s=a.polygon([u]))}s||(s=a.lineString(r))}const o=f(s.geometry,t?200:30,{units:"meters"});let n;t?n=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:n=[{fieldName:"parentName",label:"所属区控"},{fieldName:"crossCount",label:"路口数量"}];const g={type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},h=new c({geometry:{type:"polygon",rings:o.geometry.coordinates},symbol:{type:"simple-fill",style:"none",color:[...e.areaColor,.3],outline:{color:e.areaColor,width:3,style:t?"long-dash":"solid"}},attributes:g,popupTemplate:{title:`${t?"区控":"子区"}  ${e.name}`,content:[{type:"fields",fieldInfos:n}]}});t?this.districtControllerLayer.add(h):this.subDistrictControllerLayer.add(h)}for(const s of e.subDistricts)this.drawArea(s,!1);const i=[];e.crosses.forEach(s=>{const o={type:"cross",id:s.id,name:s.name,color:e.areaColor,signalId:s.signalId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,isKey:s.isKey},n=new c({geometry:{type:"point",x:s.longitude,y:s.latitude},symbol:this.getCrossGraphicSymbol(o,"marker"),attributes:o,popupTemplate:{title:s.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}});i.push(n)}),this.crossLayer.addMany(i)}getCrossSymbolInSubDistrict(e){return e.signalId&&e.signalId!==""?{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:32,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:1,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:30,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e.selected?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_lkcz.png",width:"20px",height:"20px"}}getCrossGraphicSymbol(e,t){const{isKey:r,color:i}=e;if(t==="marker")return r?{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png",width:"30px",height:"30px"}:{type:"simple-marker",style:"circle",color:i,size:8,outline:{color:"white",width:1}};if(t==="picture")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:32,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:r?30:15,haloSize:1,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:r?40:20,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${r?"gis_gjxklk_orange":"gis_xhj_blue"}.png`}]}}}}}exports.default=w;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("@arcgis/core/core/reactiveUtils.js"),c=require("@arcgis/core/Graphic"),y=require("@arcgis/core/layers/GraphicsLayer"),f=require("@turf/buffer"),d=require("@turf/convex"),C=require("@turf/helpers"),v=require("axios"),S=require("concaveman"),I=require("../../stores/index.js"),A=require("./district-controller.js");function m(l){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const t in l)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(l,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>l[t]})}}return e.default=l,Object.freeze(e)}const L=m(p),a=m(C);class w{constructor(e){var i;this.crossScale=5e3,this.crossIdsInDistrict=[],this.view=e;const r=I.default.useAppDataStore.mapConfig;this.openDriveServer=(i=r.openDriveServer)==null?void 0:i.url,this.districtControllerLayer=new y({id:"districtControllerLayer"}),this.subDistrictControllerLayer=new y({id:"subDistrictControllerLayer",visible:!1}),this.crossLayer=new y({id:"crossLayer",visible:!1}),this.highlightLayer=new y({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}showSignalControlArea(e){this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1,this.districtControllerLayer.visible=!0;for(const t of e.areaList){const r=new A.default(t,e.style||"");this.drawArea(r,!0)}return this.scaleWatcher=L.watch(()=>this.view.scale,(t,r)=>{t>this.crossScale&&r<=this.crossScale?(this.crossLayer.graphics.forEach(i=>{i.symbol=this.getCrossGraphicSymbol(i.attributes,"marker")}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol=this.getCrossGraphicSymbol(i.attributes,"marker"))})):t<=this.crossScale&&r>this.crossScale&&(this.crossLayer.graphics.forEach(i=>{i.symbol=this.getCrossGraphicSymbol(i.attributes,"picture")}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol=this.getCrossGraphicSymbol(i.attributes,"picture"))}))}),{status:0,message:"ok"}}clearSignalControlArea(){var e,t;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.scaleWatcher)==null||e.remove(),this.scaleWatcher=void 0,(t=this.viewClickWatcher)==null||t.remove(),this.viewClickWatcher=void 0,this.view.closePopup(),{status:0,message:"ok"}}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:"未找到"}}async highlightSignalControlArea(e){if(!e.id||e.id==="")return{status:1,message:"请输入id"};this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id).toArray().map(s=>{const o=s.clone();return o.symbol.style="none",o}),r=this.subDistrictControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id||s.getAttribute("parentId")===e.id).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)return{status:1,message:"未找到"};if(t.length>0)await this.view.goTo(t);else if(r.length>0){const s=r[0].geometry.centroid;await this.view.goTo({target:s,scale:this.crossScale-500})}else i.length>1?await this.view.goTo(i):await this.view.goTo({target:i[0].geometry,scale:1500});return{status:0,message:"ok"}}resetHighlight(){return this.highlightLayer.removeAll(),this.view.closePopup(),this.districtControllerLayer.visible=!0,{status:0,message:"ok"}}showSubSignalControlArea(e){this.crossLayer.removeAll(),this.crossLayer.visible=!0;const r=e.children.map(i=>{const s={...i,selected:!0};return new c({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:this.getCrossSymbolInSubDistrict(s),attributes:s})});return this.crossLayer.addMany(r),this.view.goTo(r),{status:0,message:"ok"}}async handleViewClick(e){var s;const r=(s=(await this.view.hitTest(e,{include:[this.crossLayer]})).results)==null?void 0:s.filter(o=>o.type==="graphic");if(r.length===0)return;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.attributes)),await this.showNearbyCrosses(i.getAttribute("id")))}async showNearbyCrosses(e){const t=await v.get(`http://${this.openDriveServer}/api/computable/getRelatedNodesForNode`,{params:{nodeIds:e}});if(t.status===200)if(t.data.status===0){const r=t.data.result,i=[];for(const s of r){const o=s.nodeId;if(o.startsWith("-"))continue;if(s.signalId&&!this.crossIdsInDistrict.includes(o)){console.log("不是此区控内的路口",o);continue}if(this.crossLayer.graphics.some(h=>h.getAttribute("id")===o))continue;const g=new c({geometry:{type:"point",x:s.lon,y:s.lat},symbol:this.getCrossSymbolInSubDistrict(s),attributes:{id:o,name:s.name,signalId:s.signalId,selected:!1}});i.push(g)}return this.crossLayer.addMany(i),{status:0,message:"ok"}}else return{status:-1,message:t.data.message};else return{status:-1,message:"请求失败"}}async editSubSignalControlArea(e){if(e.odrServer){this.openDriveServer=e.odrServer,this.crossIdsInDistrict=e.crossesInArea.map(s=>s.id);const t=a.featureCollection(e.crossesInArea.map(s=>a.point([s.longitude,s.latitude]))),r=d(t);r&&(this.districtControllerLayer.removeAll(),this.districtControllerLayer.add(new c({geometry:{type:"polygon",rings:r.geometry.coordinates},symbol:{type:"simple-fill",style:"none",outline:{color:[61,139,249],width:3,style:"long-dash"}}}))),this.addCrossCallback=e.addCrossCallback,this.removeCrossCallback=e.removeCrossCallback,this.viewClickWatcher||(this.viewClickWatcher=this.view.on("click",async s=>{await this.handleViewClick(s)}));const i=this.crossLayer.graphics.toArray().map(s=>s.getAttribute("id")).join(",");return await this.showNearbyCrosses(i)}else return{status:1,message:"未配置OpenDriveServer"}}stopEditSubSignalControlArea(){var t;(t=this.viewClickWatcher)==null||t.remove(),this.viewClickWatcher=void 0;const e=this.crossLayer.graphics.filter(r=>r.getAttribute("signalId")===""||!r.getAttribute("signalId")||!r.getAttribute("selected"));this.crossLayer.removeMany(e.toArray())}selectSubSignalControlAreaCross(e){return this.crossLayer.graphics.forEach(t=>{if(t.getAttribute("id")===e&&!t.getAttribute("selected"))return t.setAttribute("selected",!0),t.symbol=this.getCrossSymbolInSubDistrict(t.attributes),{status:0,message:"ok"}}),{status:0,message:"未找到"}}unselectSubSignalControlAreaCross(e){return this.crossLayer.graphics.forEach(t=>{if(t.getAttribute("id")===e&&t.getAttribute("selected"))return t.setAttribute("selected",!1),t.symbol=this.getCrossSymbolInSubDistrict(t.attributes),{status:0,message:"ok"}}),{status:0,message:"未找到"}}changeSubSignalControlAreaBorderVisibility(e){this.highlightLayer.graphics.forEach(t=>{t.getAttribute("type")==="signalControlArea"&&(t.visible=e)})}findAreaGraphic(e){let t=this.districtControllerLayer.graphics.find(r=>r.attributes.id===e);return t||(t=this.subDistrictControllerLayer.graphics.find(r=>r.attributes.id===e)),t||(t=this.crossLayer.graphics.find(r=>r.attributes.id===e)),t}drawArea(e,t){const r=e.getAllCrossCoordinates();if(r.length>=2){let s=null;if(r.length===2)s=a.lineString(r);else{if(t){const u=a.featureCollection(r.map(b=>a.point(b)));s=d(u)}else{const u=S(r,.5);u.length>=4&&(s=a.polygon([u]))}s||(s=a.lineString(r))}const o=f(s.geometry,t?200:30,{units:"meters"});let n;t?n=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:n=[{fieldName:"parentName",label:"所属区控"},{fieldName:"crossCount",label:"路口数量"}];const g={type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},h=new c({geometry:{type:"polygon",rings:o.geometry.coordinates},symbol:{type:"simple-fill",style:"none",color:[...e.areaColor,.3],outline:{color:e.areaColor,width:3,style:t?"long-dash":"solid"}},attributes:g,popupTemplate:{title:`${t?"区控":"子区"}  ${e.name}`,content:[{type:"fields",fieldInfos:n}]}});t?this.districtControllerLayer.add(h):this.subDistrictControllerLayer.add(h)}for(const s of e.subDistricts)this.drawArea(s,!1);const i=[];e.crosses.forEach(s=>{const o={type:"cross",id:s.id,name:s.name,color:e.areaColor,signalId:s.signalId,nodeId:s.nodeId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,isKey:s.isKey},n=new c({geometry:{type:"point",x:s.longitude,y:s.latitude},symbol:this.getCrossGraphicSymbol(o,"marker"),attributes:o,popupTemplate:{title:s.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]}});i.push(n)}),this.crossLayer.addMany(i)}getCrossSymbolInSubDistrict(e){return e.signalId&&e.signalId!==""?{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:32,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:1,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:30,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e.selected?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_lkcz.png",width:"20px",height:"20px"}}getCrossGraphicSymbol(e,t){const{isKey:r,color:i}=e;if(t==="marker")return r?{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png",width:"30px",height:"30px"}:{type:"simple-marker",style:"circle",color:i,size:8,outline:{color:"white",width:1}};if(t==="picture")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:32,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:r?30:15,haloSize:1,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:r?40:20,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${r?"gis_gjxklk_orange":"gis_xhj_blue"}.png`}]}}}}}exports.default=w;

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

@@ -274,12 +274,15 @@ export interface IShowSignalControlAreaParams {
     areaList: any[];
     style?: string;
 }
+export interface INode {
+    id: string;
+    longitude: number;
+    latitude: number;
+    name: string;
+    signalId?: string;
+}
 export interface IEditSignalControlAreaParams {
-    crossesInArea: {
-        id: string;
-        x: number;
-        y: number;
-    }[];
+    crossesInArea: INode[];
     addCrossCallback: (params: {
         id: string;
         name: string;

package/package.json

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