gisviewer-vue3-arcgis 1.0.202 → 1.0.204

package/es/index.d.ts

@@ -1,6 +1,6 @@
 import { App } from 'vue';
-export * from './src/index';
 import MapUtils from './src/gis-map/utils';
+export * from './src/index';
 export { MapUtils };
 declare const _default: {
     install: (app: App, options: any) => void;

package/es/index.mjs

@@ -1,16 +1,17 @@
-import * as o from "./src/index.mjs";
-import { default as f } from "./src/gis-map/utils/index.mjs";
+import "core-js/stable/array/at";
+import { default as l } from "./src/gis-map/utils/index.mjs";
+import * as s from "./src/index.mjs";
 import { GisMap as c } from "./src/gis-map/index.mjs";
-const r = {
-  install: (s, e) => {
-    for (const i in o)
-      s.use(o[i]);
-    const { gisviewerAssetsRoot: t } = e;
-    s.config.globalProperties.$gisviewerAssetsRoot = t || "";
+const a = {
+  install: (o, t) => {
+    for (const i in s)
+      o.use(s[i]);
+    const { gisviewerAssetsRoot: e } = t;
+    o.config.globalProperties.$gisviewerAssetsRoot = e || "";
   }
 };
 export {
   c as GisMap,
-  f as MapUtils,
-  r as default
+  l as MapUtils,
+  a as default
 };

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

@@ -1,6 +1,6 @@
 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, IShowGreenWaveBandParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import { IEditSignalControlAreaParams, IFindSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowGreenWaveBandParams, 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';
@@ -8,7 +8,8 @@ import OpenDriveRenderer from './utils/open-drive-renderer';
 import Overlay from './utils/overlay';
 import QueueLength from './utils/queue-length';
 import RoadConfigTool from './utils/road-config-tool';
-import SignalControlAreaController from './utils/signal-control-area-controller';
+import EditSignalArea from './utils/signal-control-area-controller/edit-area';
+import ShowSignalArea from './utils/signal-control-area-controller/show-area';
 import TrafficFlow from './utils/traffic-flow';
 declare const _sfc_main: import("vue").DefineComponent<{
     config: {
@@ -29,7 +30,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
     overlay: Overlay;
     queueLength: QueueLength;
     openDriveRenderer: OpenDriveRenderer;
-    signalControlAreaController: SignalControlAreaController;
+    editSignalAreaController: EditSignalArea;
+    showSignalAreaController: ShowSignalArea;
     greenWaveBandController: GreenWaveBandController;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
@@ -117,15 +119,21 @@ declare const _sfc_main: import("vue").DefineComponent<{
         status: number;
         message: string;
     }>;
-    showSignalControlArea: (params: IShowSignalControlAreaParams) => import("../types").IResult;
-    clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: {
-        id: string;
-    }) => Promise<import("../types").IResult>;
-    highlightSignalControlArea: (params: {
-        id: string;
-    }) => Promise<import("../types").IResult>;
-    resetHighlightSignalControlArea: () => import("../types").IResult;
+    showSignalControlArea: (params: IShowSignalControlAreaParams) => Promise<import("../types").IResult>;
+    clearSignalControlArea: () => Promise<import("../types").IResult>;
+    setSignalControlAreaVisibility: (params: ILayerVisibleParams) => import("../types").IResult;
+    locateSignalControlArea: (params: IFindSignalControlAreaParams) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: IFindSignalControlAreaParams) => Promise<{
+        status: number;
+        message: string;
+    }>;
+    resetHighlightSignalControlArea: () => Promise<{
+        status: number;
+        message: string;
+    }> | {
+        status: number;
+        message: string;
+    };
     showSubSignalControlArea: (params: any) => import("../types").IResult;
     editSubSignalControlArea: (params: IEditSignalControlAreaParams) => Promise<import("../types").IResult> | {
         status: number;
@@ -137,10 +145,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     selectSubSignalControlAreaCross: (id: string) => import("../types").IResult;
     unselectSubSignalControlAreaCross: (id: string) => import("../types").IResult;
-    changeSubSignalControlAreaBorderVisibility: (params: any) => void | {
+    changeSubSignalControlAreaBorderVisibility: (params: any) => {
         status: number;
         message: string;
-    };
+    } | undefined;
     addGreenWaveBand: (params: IEditSignalControlAreaParams) => void;
     stopAddGreenWaveBand: () => {
         status: number;

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

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

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

@@ -17,7 +17,8 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     overlay: import("./utils/overlay").default;
     queueLength: import("./utils/queue-length").default;
     openDriveRenderer: import("./utils/open-drive-renderer").default;
-    signalControlAreaController: import("./utils/signal-control-area-controller").default;
+    editSignalAreaController: import("./utils/signal-control-area-controller/edit-area").default;
+    showSignalAreaController: import("./utils/signal-control-area-controller/show-area").default;
     greenWaveBandController: import("./utils/green-wave-band-controller").default;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
@@ -105,15 +106,21 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         status: number;
         message: string;
     }>;
-    showSignalControlArea: (params: import("../types").IShowSignalControlAreaParams) => import("../types").IResult;
-    clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: {
-        id: string;
-    }) => Promise<import("../types").IResult>;
-    highlightSignalControlArea: (params: {
-        id: string;
-    }) => Promise<import("../types").IResult>;
-    resetHighlightSignalControlArea: () => import("../types").IResult;
+    showSignalControlArea: (params: import("../types").IShowSignalControlAreaParams) => Promise<import("../types").IResult>;
+    clearSignalControlArea: () => Promise<import("../types").IResult>;
+    setSignalControlAreaVisibility: (params: import("../types").ILayerVisibleParams) => import("../types").IResult;
+    locateSignalControlArea: (params: import("../types").IFindSignalControlAreaParams) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: import("../types").IFindSignalControlAreaParams) => Promise<{
+        status: number;
+        message: string;
+    }>;
+    resetHighlightSignalControlArea: () => Promise<{
+        status: number;
+        message: string;
+    }> | {
+        status: number;
+        message: string;
+    };
     showSubSignalControlArea: (params: any) => import("../types").IResult;
     editSubSignalControlArea: (params: import("../types").IEditSignalControlAreaParams) => Promise<import("../types").IResult> | {
         status: number;
@@ -125,10 +132,10 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     };
     selectSubSignalControlAreaCross: (id: string) => import("../types").IResult;
     unselectSubSignalControlAreaCross: (id: string) => import("../types").IResult;
-    changeSubSignalControlAreaBorderVisibility: (params: any) => void | {
+    changeSubSignalControlAreaBorderVisibility: (params: any) => {
         status: number;
         message: string;
-    };
+    } | undefined;
     addGreenWaveBand: (params: import("../types").IEditSignalControlAreaParams) => void;
     stopAddGreenWaveBand: () => {
         status: number;

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

@@ -13,12 +13,16 @@ export default class DistrictController {
     name: string;
     parentId: string;
     parentName: string;
-    crosses: ICross[];
+    signals: ICross[];
     subDistricts: DistrictController[];
     areaColor: number[];
-    crossCount: number;
+    signalCount: number;
     subDistrictCount: number;
     constructor(params: any, style: string);
-    getAllCrossCoordinates(): number[][];
+    /**
+     * 获取区控/子区下的所有信号机
+     * @returns
+     */
+    getAllSignalCoordinates(): number[][];
 }
 export {};

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

@@ -1,32 +1,36 @@
-import r from "../common-utils.mjs";
+import o from "../common-utils.mjs";
 class e {
-  constructor(t, i) {
-    this.parentName = "", this.crosses = [], this.subDistricts = [], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.name, this.name = t.areaDesc, this.parentId = t.parentId, this.areaColor = i === "alarm" ? [255, 0, 0] : [61, 139, 249];
-    for (const s of t.children)
-      if (s.children) {
-        const o = new e(s, i);
-        o.id = s.id, o.name = `SS ${s.name}`, o.parentName = this.name, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
-      } else if (r.isCoordinateValid(s)) {
-        const o = {
-          id: s.id,
-          name: s.name,
-          parentId: s.parentId,
-          latitude: Number(s.latitude),
-          longitude: Number(s.longitude),
-          signalId: s.id,
-          nodeId: s.nodeId,
-          isKey: s.isKey === 1
+  constructor(i, n) {
+    this.parentName = "", this.signals = [], this.subDistricts = [], this.signalCount = 0, this.subDistrictCount = 0, this.id = i.name, this.name = i.areaDesc, this.parentId = i.parentId, this.areaColor = n === "alarm" ? [255, 0, 0] : [61, 139, 249];
+    for (const t of i.children)
+      if (t.children) {
+        const s = new e(t, n);
+        s.id = t.id, s.name = `SS ${t.name}`, s.parentId = this.id, s.parentName = this.name, this.subDistricts.push(s), this.subDistrictCount++, this.signalCount += s.signalCount;
+      } else if (o.isCoordinateValid(t)) {
+        const s = {
+          id: t.id,
+          name: t.name,
+          parentId: t.parentId,
+          latitude: Number(t.latitude),
+          longitude: Number(t.longitude),
+          signalId: t.signalId,
+          nodeId: t.id,
+          isKey: t.isKey === 1
         };
-        this.crosses.push(o), this.crossCount++;
+        this.signals.push(s), this.signalCount++;
       }
   }
-  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;
+  /**
+   * 获取区控/子区下的所有信号机
+   * @returns
+   */
+  getAllSignalCoordinates() {
+    const i = [];
+    for (const n of this.signals)
+      i.push([n.longitude, n.latitude]);
+    for (const n of this.subDistricts)
+      i.push(...n.getAllSignalCoordinates());
+    return i;
   }
 }
 export {

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

@@ -1,30 +1,19 @@
-import { IEditSignalControlAreaParams, IResult, IShowSignalControlAreaParams } from '../../../types';
+import { IEditSignalControlAreaParams, IResult } from '../../../types';
 export default class SignalControlAreaController {
     private view;
     private districtControllerLayer;
     private subDistrictControllerLayer;
     private crossLayer;
-    private highlightLayer;
-    private scaleWatcher?;
     private viewClickWatcher?;
     private readonly crossScale;
     private hasGpu;
     private openDriveServer;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
-     * 显示信控区控与子区
+     * 显示单个子区
      * @param params
      * @returns
      */
-    showSignalControlArea(params: IShowSignalControlAreaParams): IResult;
-    clearSignalControlArea(): IResult;
-    locateSignalControlArea(params: {
-        id: string;
-    }): Promise<IResult>;
-    highlightSignalControlArea(params: {
-        id: string;
-    }): Promise<IResult>;
-    resetHighlight(): IResult;
     showSubSignalControlArea(params: any): IResult;
     /**
      * 点击路口时
@@ -57,7 +46,6 @@ export default class SignalControlAreaController {
      * @param id
      */
     unselectSubSignalControlAreaCross(id: string): IResult;
-    changeSubSignalControlAreaBorderVisibility(visible: boolean): void;
     /**
      * 在区控\子区\路口图层中查找对应的graphic
      * @param id