gisviewer-vue3-arcgis 1.0.130 → 1.0.131

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

@@ -79,7 +79,13 @@ declare const _sfc_main: import("vue").DefineComponent<{
     splitOpenDriveLane: (params: ISplitOpenDriveLaneParams) => Promise<import("../types").IResult>;
     showSignalControlArea: (params: any) => import("../types").IResult;
     clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: any) => import("../types").IResult;
+    locateSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    resetHighlightSignalControlArea: () => import("../types").IResult;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -1,91 +1,93 @@
-import { defineComponent as Ce, ref as h, onMounted as he, getCurrentInstance as Oe, computed as Se, openBlock as ke, createElementBlock as De, createElementVNode as p, withDirectives as Te, vShow as Ie } from "vue";
-import O, { registerStore as Le } from "./stores/index.mjs";
+import { defineComponent as Ce, ref as S, onMounted as Oe, getCurrentInstance as ke, onUnmounted as Te, computed as Ae, openBlock as De, createElementBlock as Ie, createElementVNode as p, withDirectives as Le, vShow as be } from "vue";
+import C, { registerStore as _e } from "./stores/index.mjs";
 import "./style/index.css";
-import Ae from "./utils/holo-flow/index.mjs";
-import be from "./utils/map-initializer.mjs";
-import S from "./utils/open-drive-renderer/index.mjs";
-import _e from "./utils/overlay.mjs";
-import xe from "./utils/queue-length.mjs";
+import He from "./utils/holo-flow/index.mjs";
+import xe from "./utils/map-initializer.mjs";
+import O from "./utils/open-drive-renderer/index.mjs";
+import Me from "./utils/overlay.mjs";
+import Ve from "./utils/queue-length.mjs";
 import k from "./utils/road-config-tool/index.mjs";
-import Me from "./utils/signal-control-area-controller/index.mjs";
-import Fe from "./utils/traffic-flow.mjs";
-const Ve = { class: "gis-viewer" }, Be = { style: { position: "absolute", bottom: "10px", left: "10px" } }, $e = /* @__PURE__ */ Ce({
+import Be from "./utils/signal-control-area-controller/index.mjs";
+import ze from "./utils/traffic-flow.mjs";
+const Ne = { class: "gis-viewer" }, Qe = { style: { position: "absolute", bottom: "10px", left: "10px" } }, Je = /* @__PURE__ */ Ce({
   __name: "gis-map",
   props: {
     config: {},
     assetsRoot: {}
   },
   emits: ["mapLoaded", "markerClick", "mapClick"],
-  setup(D, { expose: T, emit: I }) {
-    const g = h(null);
-    let s, i, a, o, r, n, m, t, c;
-    const f = h(!1);
-    he(async () => {
-      if (Le(), !g.value)
+  setup(T, { expose: A, emit: D }) {
+    const g = S(null);
+    let i, c, s, n, a, r, u, t, o;
+    const f = S(!1);
+    Oe(async () => {
+      if (_e(), !g.value)
         return;
-      document.addEventListener("keydown", (u) => {
-        u.ctrlKey && u.key === "i" && (f.value = !f.value);
+      document.addEventListener("keydown", (m) => {
+        m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
-      const e = Oe(), { $gisviewerAssetsRoot: l } = e.appContext.config.globalProperties, C = await (await fetch(y.config)).json();
-      C.assetsRoot = y.assetsRoot || l;
-      const de = O.useAppDataStore;
-      de.mapConfig = C, i = new be(), s = await i.initialize({
+      const e = ke(), { $gisviewerAssetsRoot: l } = e.appContext.config.globalProperties, h = await (await fetch(y.config)).json();
+      h.assetsRoot = y.assetsRoot || l;
+      const he = C.useAppDataStore;
+      he.mapConfig = h, c = new xe(), i = await c.initialize({
         container: g.value,
-        markerClickCallback: (u, v, d, ye) => {
-          w("markerClick", u, v, d, ye);
+        markerClickCallback: (m, d, v, Se) => {
+          w("markerClick", m, d, v, Se);
         },
-        mapClickCallback: (u, v, d) => {
-          w("mapClick", u, v, d);
+        mapClickCallback: (m, d, v) => {
+          w("mapClick", m, d, v);
         }
-      }), r = new Ae(s), await r.init(), w("mapLoaded");
+      }), a = new He(i), await a.init(), w("mapLoaded");
+    }), Te(() => {
+      o == null || o.clearSignalControlArea(), t == null || t.clearOpenDrive(), a == null || a.clearHoloTrace(), a == null || a.clearHoloSignal(), n == null || n.disconnectTrafficFlow();
     });
-    const L = Se(() => s), A = () => {
-      const e = O.useAppDataStore;
+    const I = Ae(() => i), L = () => {
+      const e = C.useAppDataStore;
       e.saveTrackLog = !0;
     }, b = () => {
-      r.downloadTrackLog();
-    }, _ = async (e) => await i.setMapCenter(e), x = async (e) => await i.setMapCamera(e), M = async (e) => await i.lookAt(e), F = (e) => i.setLayerVisibility(e), V = (e, l) => i.requestCoordinateTransform(e, l), B = (e) => {
-      i.cancelCoordinateTransform(e);
-    }, H = (e) => {
-      i.setMapZoomRange(e);
-    }, z = (e) => (a || (a = new k(s)), a.showLaneNumber(e)), N = () => {
-      a == null || a.clearLaneNumber();
-    }, Q = async (e) => (a || (a = new k(s)), await a.initializeSearch(e)), j = async () => a == null ? void 0 : a.calCrossIndicatorArea(), P = async () => {
-    }, R = async (e, l) => {
-      o || (o = new Fe(s)), o.connectTrafficFlow(e, l);
-    }, E = () => {
-      o == null || o.disconnectTrafficFlow();
+      a.downloadTrackLog();
+    }, _ = async (e) => await c.setMapCenter(e), H = async (e) => await c.setMapCamera(e), x = async (e) => await c.lookAt(e), M = (e) => c.setLayerVisibility(e), V = (e, l) => c.requestCoordinateTransform(e, l), B = (e) => {
+      c.cancelCoordinateTransform(e);
+    }, z = (e) => {
+      c.setMapZoomRange(e);
+    }, N = (e) => (s || (s = new k(i)), s.showLaneNumber(e)), Q = () => {
+      s == null || s.clearLaneNumber();
+    }, j = async (e) => (s || (s = new k(i)), await s.initializeSearch(e)), P = async () => s == null ? void 0 : s.calCrossIndicatorArea(), E = async () => {
+    }, F = async (e, l) => {
+      n || (n = new ze(i)), n.connectTrafficFlow(e, l);
+    }, R = () => {
+      n == null || n.disconnectTrafficFlow();
     }, Z = (e) => {
-      r.handleVehicleTraceData(e);
+      a.handleVehicleTraceData(e);
     }, q = () => {
-      r.clearHoloTrace();
+      a.clearHoloTrace();
     }, K = (e) => {
-      r.setInterpolate(e);
-    }, $ = async (e) => {
-      await r.handleSignalData(e);
-    }, G = () => {
-      r.clearHoloSignal();
+      a.setInterpolate(e);
+    }, U = async (e) => {
+      await a.handleSignalData(e);
+    }, $ = () => {
+      a.clearHoloSignal();
+    }, G = (e) => {
+      n == null || n.toggleTrafficInfo(e), a.toggleTrafficInfo(e);
     }, J = (e) => {
-      o == null || o.toggleTrafficInfo(e), r.toggleTrafficInfo(e);
-    }, U = (e) => {
-      r.togglePause(e);
+      a.togglePause(e);
     }, W = (e) => {
-      o == null || o.toggleTrafficObject(e), r.toggleTrafficObject(e);
+      n == null || n.toggleTrafficObject(e), a.toggleTrafficObject(e);
     }, X = (e) => {
-      r.updatePanelContent(e);
-    }, Y = async (e) => (n || (n = new _e(s)), n.addOverlays(e)), ee = (e) => n == null ? void 0 : n.removeOverlaysByType(e), te = (e) => n == null ? void 0 : n.removeOverlaysById(e), ne = () => n == null ? void 0 : n.removeAllOverlays(), ae = () => {
-      n == null || n.showAllOverlays();
-    }, oe = (e) => {
-      m || (m = new xe(s)), m.updateQueueLength(e);
-    }, re = () => {
-      m == null || m.removeQueueLength();
-    }, se = async (e, l) => (t || (t = new S(s)), await t.showOpenDriveFromServer(e, l)), ie = async (e) => (t || (t = new S(s)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ce = async () => await (t == null ? void 0 : t.clearOpenDrive()), le = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
+      a.updatePanelContent(e);
+    }, Y = async (e) => (r || (r = new Me(i)), r.addOverlays(e)), ee = (e) => r == null ? void 0 : r.removeOverlaysByType(e), te = (e) => r == null ? void 0 : r.removeOverlaysById(e), ae = () => r == null ? void 0 : r.removeAllOverlays(), ne = () => {
+      r == null || r.showAllOverlays();
+    }, re = (e) => {
+      u || (u = new Ve(i)), u.updateQueueLength(e);
+    }, oe = () => {
+      u == null || u.removeQueueLength();
+    }, se = async (e, l) => (t || (t = new O(i)), await t.showOpenDriveFromServer(e, l)), ie = async (e) => (t || (t = new O(i)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ce = async () => await (t == null ? void 0 : t.clearOpenDrive()), le = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, me = async (e) => t ? t.selectSumo(e) : {
+    }, ue = async (e) => t ? t.selectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, ue = async (e) => t ? t.unselectSumo(e) : {
+    }, me = async (e) => t ? t.unselectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
     }, pe = async (e) => t ? await t.getSumoInfo(e) : {
@@ -94,71 +96,73 @@ const Ve = { class: "gis-viewer" }, Be = { style: { position: "absolute", bottom
     }, ge = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, fe = (e) => (c || (c = new Me(s)), c.showSignalControlArea(e)), we = () => {
-      c == null || c.clearSignalControlArea();
-    }, ve = (e) => c ? c.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, y = D, w = I;
-    return T({
-      mapViewer: L,
-      setLayerVisibility: F,
+    }, fe = (e) => (o || (o = new Be(i)), o.showSignalControlArea(e)), we = () => {
+      o == null || o.clearSignalControlArea();
+    }, de = async (e) => o ? await o.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, ve = async (e) => o ? await o.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, ye = () => o ? o.resetHighlight() : { status: -1, message: "未加载信号控制区" }, y = T, w = D;
+    return A({
+      mapViewer: I,
+      setLayerVisibility: M,
       setMapCenter: _,
-      lookAt: M,
-      setMapCamera: x,
-      setMapZoomRange: H,
+      lookAt: x,
+      setMapCamera: H,
+      setMapZoomRange: z,
       requestCoordinateTransform: V,
       cancelCoordinateTransform: B,
       addOverlays: Y,
-      showAllOverlays: ae,
+      showAllOverlays: ne,
       removeOverlaysByType: ee,
       removeOverlaysById: te,
-      removeAllOverlays: ne,
-      showLaneNumber: z,
-      clearLaneNumber: N,
-      initializeAreaTool: Q,
-      calCrossIndicatorArea: j,
-      calRoadIndicatorArea: P,
-      connectCarFlow: R,
-      disconnectCarFlow: E,
+      removeAllOverlays: ae,
+      showLaneNumber: N,
+      clearLaneNumber: Q,
+      initializeAreaTool: j,
+      calCrossIndicatorArea: P,
+      calRoadIndicatorArea: E,
+      connectCarFlow: F,
+      disconnectCarFlow: R,
       handleHoloVehicleTraceData: Z,
       clearHoloTrace: q,
-      handleHoloSignalData: $,
-      clearHoloSignal: G,
+      handleHoloSignalData: U,
+      clearHoloSignal: $,
       setInterpolate: K,
-      toggleTrafficInfo: J,
+      toggleTrafficInfo: G,
       toggleTrafficObject: W,
       toggleVehicleInfo: X,
-      togglePause: U,
-      updateQueueLength: oe,
-      removeQueueLength: re,
+      togglePause: J,
+      updateQueueLength: re,
+      removeQueueLength: oe,
       showOpenDriveFromServer: se,
       showOpenDriveFromFile: ie,
       clearOpenDrive: ce,
       findSumoInOpenDrive: le,
-      selectSumoInOpenDrive: me,
-      unselectSumoInOpenDrive: ue,
+      selectSumoInOpenDrive: ue,
+      unselectSumoInOpenDrive: me,
       getSumoInfo: pe,
       splitOpenDriveLane: ge,
       showSignalControlArea: fe,
       clearSignalControlArea: we,
-      locateSignalControlArea: ve
-    }), (e, l) => (ke(), De("div", Ve, [
+      locateSignalControlArea: de,
+      highlightSignalControlArea: ve,
+      resetHighlightSignalControlArea: ye
+    }), (e, l) => (De(), Ie("div", Ne, [
       p("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
         ref: g
       }, [
-        Te(p("div", Be, [
+        Le(p("div", Qe, [
           p("button", {
             style: { "margin-right": "10px" },
-            onClick: A
+            onClick: L
           }, " 开始记录 "),
           p("button", { onClick: b }, "下载日志")
         ], 512), [
-          [Ie, f.value]
+          [be, f.value]
         ])
       ], 512)
     ]));
   }
 });
 export {
-  $e as default
+  Je as default
 };

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

@@ -68,7 +68,13 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     splitOpenDriveLane: (params: import("../types").ISplitOpenDriveLaneParams) => Promise<import("../types").IResult>;
     showSignalControlArea: (params: any) => import("../types").IResult;
     clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: any) => import("../types").IResult;
+    locateSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    resetHighlightSignalControlArea: () => import("../types").IResult;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/es/src/gis-map/utils/holo-flow/index.mjs

@@ -58,7 +58,8 @@ class n {
     this.signalHoloFlow || (this.signalHoloFlow = new a(this.view)), await this.signalHoloFlow.initializeLayer(), await this.signalHoloFlow.handleSignalData(e);
   }
   clearHoloSignal() {
-    this.signalHoloFlow.clearSignal();
+    var e;
+    (e = this.signalHoloFlow) == null || e.clearSignal();
   }
   setInterpolate(e) {
     this.traceHoloFlow.setInterpolate(e);

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

@@ -9,6 +9,7 @@ export default class DistrictController {
     id: string;
     name: string;
     parentId: string;
+    parentName: string;
     crosses: ICross[];
     subDistricts: DistrictController[];
     areaColor: number[];

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

@@ -1,6 +1,6 @@
 class r {
   constructor(t) {
-    this.crosses = [], this.subDistricts = [], this.areaColor = [
+    this.parentName = "", this.crosses = [], this.subDistricts = [], this.areaColor = [
       Math.floor(Math.random() * 255),
       Math.floor(Math.random() * 255),
       Math.floor(Math.random() * 255)
@@ -8,7 +8,7 @@ class r {
     for (const s of t.children)
       if (s.children) {
         const o = new r(s);
-        o.areaColor = this.areaColor, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
+        o.parentName = this.name, o.areaColor = this.areaColor, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
       } else {
         const o = {
           id: s.id,

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

@@ -4,13 +4,24 @@ export default class SignalControlAreaController {
     private districtControllerLayer;
     private subDistrictControllerLayer;
     private crossLayer;
+    private highlightLayer;
     private eventHandle?;
     constructor(view: __esri.MapView | __esri.SceneView);
     showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;
     locateSignalControlArea(params: {
         id: string;
-    }): IResult;
+    }): Promise<IResult>;
+    highlightSignalControlArea(params: {
+        id: string;
+    }): Promise<IResult>;
+    resetHighlight(): IResult;
+    /**
+     * 在区控\子区\路口图层中查找对应的graphic
+     * @param id
+     * @returns
+     */
+    private findAreaGraphic;
     /**
      * 绘制区控与子区
      * @param districtController

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

@@ -1,61 +1,86 @@
-import n from "@arcgis/core/Graphic";
-import s from "@arcgis/core/layers/GraphicsLayer";
-import p from "@turf/buffer";
-import f from "@turf/convex";
+import h from "@arcgis/core/Graphic";
+import a from "@arcgis/core/layers/GraphicsLayer";
+import y from "@turf/buffer";
+import g from "@turf/convex";
 import * as c from "@turf/helpers";
-import y from "./district-controller.mjs";
-class v {
+import m from "./district-controller.mjs";
+class C {
   constructor(e) {
     this.view = e, this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
-      actionBar: !1
-    }, this.districtControllerLayer = new s({
+      actionBar: !0
+    }, this.districtControllerLayer = new a({
       id: "districtControllerLayer",
       maxScale: 144447,
       minScale: 1155582
-    }), this.subDistrictControllerLayer = new s({
+    }), this.subDistrictControllerLayer = new a({
       id: "subDistrictControllerLayer",
       maxScale: 0,
       minScale: 144447
-    }), this.crossLayer = new s({
+    }), this.crossLayer = new a({
       id: "crossLayer",
       maxScale: 0,
-      minScale: 18056
+      minScale: 36112
+    }), this.highlightLayer = new a({
+      id: "highlightLayer"
     }), this.view.map.addMany([
-      this.crossLayer,
       this.districtControllerLayer,
-      this.subDistrictControllerLayer
+      this.subDistrictControllerLayer,
+      this.crossLayer,
+      this.highlightLayer
     ]);
   }
   showSignalControlArea(e) {
+    this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0;
     for (const t of e) {
-      const r = new y(t);
+      const r = new m(t);
       this.drawArea(r, !0);
     }
     return { status: 0, message: "ok" };
   }
   clearSignalControlArea() {
     var e;
-    return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), (e = this.eventHandle) == null || e.remove(), this.view.closePopup(), { status: 0, message: "ok" };
+    return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.eventHandle) == null || e.remove(), this.view.closePopup(), { status: 0, message: "ok" };
   }
-  locateSignalControlArea(e) {
-    let t = this.districtControllerLayer.graphics.find(
-      (r) => r.attributes.id === e.id
-    );
-    if (t || (t = this.subDistrictControllerLayer.graphics.find(
-      (r) => r.attributes.id === e.id
-    )), t || (t = this.crossLayer.graphics.find(
-      (r) => r.attributes.id === e.id
-    )), t) {
-      this.view.goTo(t.geometry);
+  async locateSignalControlArea(e) {
+    const t = this.findAreaGraphic(e.id);
+    if (t) {
+      await this.view.goTo(t.geometry);
       const r = t.geometry.type === "point" ? t.geometry : t.geometry.centroid;
       return this.view.popup.open({
         features: [t],
         location: r
       }), { status: 0, message: "ok" };
-    }
-    return { status: 1, message: "未找到" };
+    } else
+      return { status: 1, message: "未找到" };
+  }
+  async highlightSignalControlArea(e) {
+    this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !1, this.subDistrictControllerLayer.visible = !1, this.crossLayer.visible = !1;
+    const t = this.districtControllerLayer.graphics.filter((i) => i.getAttribute("id") === e.id).toArray(), r = this.subDistrictControllerLayer.graphics.filter(
+      (i) => i.getAttribute("id") === e.id || i.getAttribute("parentId") === e.id
+    ).toArray(), s = this.crossLayer.graphics.filter(
+      (i) => i.getAttribute("id") === e.id || i.getAttribute("districtId") === e.id || i.getAttribute("subDistrictId") === e.id
+    ).toArray();
+    return t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), s.length > 0 && this.highlightLayer.addMany(s), this.highlightLayer.graphics.length === 0 ? { status: 1, message: "未找到" } : (await this.view.goTo(
+      t.length > 0 ? t : r.length > 0 ? r : s
+    ), { status: 0, message: "ok" });
+  }
+  resetHighlight() {
+    return this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0, this.crossLayer.visible = !0, { status: 0, message: "ok" };
+  }
+  /**
+   * 在区控\子区\路口图层中查找对应的graphic
+   * @param id
+   * @returns
+   */
+  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;
   }
   /**
    * 绘制区控与子区
@@ -66,21 +91,21 @@ class v {
   drawArea(e, t) {
     const r = e.getAllCrossCoordinates();
     if (r.length > 2) {
-      const o = c.featureCollection(
+      const i = c.featureCollection(
         r.map((u) => c.point(u))
-      ), i = f(o);
-      if (!i)
+      ), l = g(i);
+      if (!l)
         return;
-      const d = p(
-        i.geometry,
+      const d = y(
+        l.geometry,
         // 区控面积更大，需要更大的缓冲半径
-        t ? 200 : 20,
+        t ? 200 : 30,
         {
           units: "meters"
         }
       );
-      let a;
-      t ? a = [
+      let o;
+      t ? o = [
         {
           fieldName: "id",
           label: "区控编号"
@@ -93,11 +118,15 @@ class v {
           fieldName: "subDistrictCount",
           label: "子区数量"
         }
-      ] : a = [
+      ] : o = [
         {
           fieldName: "parentId",
           label: "区控编号"
         },
+        {
+          fieldName: "parentName",
+          label: "区控名称"
+        },
         {
           fieldName: "id",
           label: "子区编号"
@@ -107,17 +136,18 @@ class v {
           label: "路口数量"
         }
       ];
-      const l = new n({
+      const n = new h({
         geometry: {
           type: "polygon",
           rings: d.geometry.coordinates
         },
         symbol: {
           type: "simple-fill",
-          color: [...e.areaColor, 0.5],
+          color: [...e.areaColor, t ? 0.6 : 0.8],
           outline: {
             color: e.areaColor,
-            width: 1
+            width: 2,
+            style: t ? "solid" : "long-dash"
           }
         },
         attributes: {
@@ -125,6 +155,7 @@ class v {
           id: e.id,
           name: e.name,
           parentId: e.parentId,
+          parentName: e.parentName,
           crossCount: e.crossCount,
           subDistrictCount: e.subDistrictCount
         },
@@ -133,35 +164,39 @@ class v {
           content: [
             {
               type: "fields",
-              fieldInfos: a
+              fieldInfos: o
             }
           ]
         }
       });
-      t ? this.districtControllerLayer.add(l) : this.subDistrictControllerLayer.add(l);
+      t ? this.districtControllerLayer.add(n) : this.subDistrictControllerLayer.add(n);
     }
-    for (const o of e.subDistricts)
-      this.drawArea(o, !1);
-    const m = e.crosses.map((o) => new n({
+    for (const i of e.subDistricts)
+      this.drawArea(i, !1);
+    const s = e.crosses.map((i) => new h({
       geometry: {
         type: "point",
-        x: o.longitude,
-        y: o.latitude
+        x: i.longitude,
+        y: i.latitude
       },
       symbol: {
         type: "simple-marker",
         color: e.areaColor,
-        size: 8
+        size: 8,
+        outline: {
+          color: "white",
+          width: 1
+        }
       },
       attributes: {
         type: "cross",
-        id: o.id,
-        name: o.name,
+        id: i.id,
+        name: i.name,
         districtId: t ? e.id : e.parentId,
         subDistrictId: t ? "" : e.id
       },
       popupTemplate: {
-        title: o.name,
+        title: i.name,
         content: [
           {
             type: "fields",
@@ -183,9 +218,9 @@ class v {
         ]
       }
     }));
-    this.crossLayer.addMany(m);
+    this.crossLayer.addMany(s);
   }
 }
 export {
-  v as default
+  C as default
 };

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

@@ -79,7 +79,13 @@ declare const _sfc_main: import("vue").DefineComponent<{
     splitOpenDriveLane: (params: ISplitOpenDriveLaneParams) => Promise<import("../types").IResult>;
     showSignalControlArea: (params: any) => import("../types").IResult;
     clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: any) => import("../types").IResult;
+    locateSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    resetHighlightSignalControlArea: () => import("../types").IResult;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

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

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

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

@@ -68,7 +68,13 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     splitOpenDriveLane: (params: import("../types").ISplitOpenDriveLaneParams) => Promise<import("../types").IResult>;
     showSignalControlArea: (params: any) => import("../types").IResult;
     clearSignalControlArea: () => void;
-    locateSignalControlArea: (params: any) => import("../types").IResult;
+    locateSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    highlightSignalControlArea: (params: {
+        id: string;
+    }) => Promise<import("../types").IResult>;
+    resetHighlightSignalControlArea: () => import("../types").IResult;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/lib/src/gis-map/utils/holo-flow/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("../../../types/index.js"),a=require("./signal-holo-flow.js"),o=require("./trace-holo-flow.js");class i{constructor(e){this.view=e}async init(){this.traceHoloFlow=new o.default(this.view),await this.traceHoloFlow.init()}handleVehicleTraceData(e){this.traceHoloFlow.handleVehicleTraceData(e)}toggleTrafficObject(e){switch(e.name.toLowerCase()){case"groundVehicle".toLowerCase():this.traceHoloFlow.toggleGroundVehicle(e.visible);break;case"elevatedVehicle".toLowerCase():this.traceHoloFlow.toggleElevatedVehicle(e.visible);break}}clearHoloTrace(){this.traceHoloFlow.clearTrace()}toggleTrafficInfo(e){this.traceHoloFlow.toggleTrafficInfo(e)}togglePause(e){this.traceHoloFlow.togglePause(e)}updatePanelContent(e){let l=t.EVehiclePlateState.None;switch(e){case"none":l=t.EVehiclePlateState.None;break;case"plateNumber":l=t.EVehiclePlateState.PlateNumber;break;case"vehicleId":l=t.EVehiclePlateState.Id;break;case"mix":l=t.EVehiclePlateState.Mix;break}this.traceHoloFlow.updatePanelContent(l)}async handleSignalData(e){this.signalHoloFlow||(this.signalHoloFlow=new a.default(this.view)),await this.signalHoloFlow.initializeLayer(),await this.signalHoloFlow.handleSignalData(e)}clearHoloSignal(){this.signalHoloFlow.clearSignal()}setInterpolate(e){this.traceHoloFlow.setInterpolate(e)}downloadTrackLog(){this.traceHoloFlow.downloadLog()}}exports.default=i;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("../../../types/index.js"),a=require("./signal-holo-flow.js"),o=require("./trace-holo-flow.js");class i{constructor(e){this.view=e}async init(){this.traceHoloFlow=new o.default(this.view),await this.traceHoloFlow.init()}handleVehicleTraceData(e){this.traceHoloFlow.handleVehicleTraceData(e)}toggleTrafficObject(e){switch(e.name.toLowerCase()){case"groundVehicle".toLowerCase():this.traceHoloFlow.toggleGroundVehicle(e.visible);break;case"elevatedVehicle".toLowerCase():this.traceHoloFlow.toggleElevatedVehicle(e.visible);break}}clearHoloTrace(){this.traceHoloFlow.clearTrace()}toggleTrafficInfo(e){this.traceHoloFlow.toggleTrafficInfo(e)}togglePause(e){this.traceHoloFlow.togglePause(e)}updatePanelContent(e){let l=t.EVehiclePlateState.None;switch(e){case"none":l=t.EVehiclePlateState.None;break;case"plateNumber":l=t.EVehiclePlateState.PlateNumber;break;case"vehicleId":l=t.EVehiclePlateState.Id;break;case"mix":l=t.EVehiclePlateState.Mix;break}this.traceHoloFlow.updatePanelContent(l)}async handleSignalData(e){this.signalHoloFlow||(this.signalHoloFlow=new a.default(this.view)),await this.signalHoloFlow.initializeLayer(),await this.signalHoloFlow.handleSignalData(e)}clearHoloSignal(){var e;(e=this.signalHoloFlow)==null||e.clearSignal()}setInterpolate(e){this.traceHoloFlow.setInterpolate(e)}downloadTrackLog(){this.traceHoloFlow.downloadLog()}}exports.default=i;

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

@@ -9,6 +9,7 @@ export default class DistrictController {
     id: string;
     name: string;
     parentId: string;
+    parentName: string;
     crosses: ICross[];
     subDistricts: DistrictController[];
     areaColor: number[];

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"}});class r{constructor(s){this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new r(t);o.areaColor=this.areaColor,this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else{const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude)};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=r;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});class e{constructor(s){this.parentName="",this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new e(t);o.parentName=this.name,o.areaColor=this.areaColor,this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else{const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude)};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=e;

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

@@ -4,13 +4,24 @@ export default class SignalControlAreaController {
     private districtControllerLayer;
     private subDistrictControllerLayer;
     private crossLayer;
+    private highlightLayer;
     private eventHandle?;
     constructor(view: __esri.MapView | __esri.SceneView);
     showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;
     locateSignalControlArea(params: {
         id: string;
-    }): IResult;
+    }): Promise<IResult>;
+    highlightSignalControlArea(params: {
+        id: string;
+    }): Promise<IResult>;
+    resetHighlight(): IResult;
+    /**
+     * 在区控\子区\路口图层中查找对应的graphic
+     * @param id
+     * @returns
+     */
+    private findAreaGraphic;
     /**
      * 绘制区控与子区
      * @param districtController

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 c=require("@arcgis/core/Graphic"),i=require("@arcgis/core/layers/GraphicsLayer"),m=require("@turf/buffer"),y=require("@turf/convex"),b=require("@turf/helpers"),g=require("./district-controller.js");function h(s){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(s){for(const t in s)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(s,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>s[t]})}}return e.default=s,Object.freeze(e)}const u=h(b);class C{constructor(e){this.view=e,this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!1},this.districtControllerLayer=new i({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new i({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new i({id:"crossLayer",maxScale:0,minScale:18056}),this.view.map.addMany([this.crossLayer,this.districtControllerLayer,this.subDistrictControllerLayer])}showSignalControlArea(e){for(const t of e){const r=new g.default(t);this.drawArea(r,!0)}return{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),(e=this.eventHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}locateSignalControlArea(e){let t=this.districtControllerLayer.graphics.find(r=>r.attributes.id===e.id);if(t||(t=this.subDistrictControllerLayer.graphics.find(r=>r.attributes.id===e.id)),t||(t=this.crossLayer.graphics.find(r=>r.attributes.id===e.id)),t){this.view.goTo(t.geometry);const r=t.geometry.type==="point"?t.geometry:t.geometry.centroid;return this.view.popup.open({features:[t],location:r}),{status:0,message:"ok"}}return{status:1,message:"未找到"}}drawArea(e,t){const r=e.getAllCrossCoordinates();if(r.length>2){const o=u.featureCollection(r.map(f=>u.point(f))),l=y(o);if(!l)return;const p=m(l.geometry,t?200:20,{units:"meters"});let a;t?a=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:a=[{fieldName:"parentId",label:"区控编号"},{fieldName:"id",label:"子区编号"},{fieldName:"crossCount",label:"路口数量"}];const n=new c({geometry:{type:"polygon",rings:p.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,.5],outline:{color:e.areaColor,width:1}},attributes:{type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},popupTemplate:{title:e.name,content:[{type:"fields",fieldInfos:a}]}});t?this.districtControllerLayer.add(n):this.subDistrictControllerLayer.add(n)}for(const o of e.subDistricts)this.drawArea(o,!1);const d=e.crosses.map(o=>new c({geometry:{type:"point",x:o.longitude,y:o.latitude},symbol:{type:"simple-marker",color:e.areaColor,size:8},attributes:{type:"cross",id:o.id,name:o.name,districtId:t?e.id:e.parentId,subDistrictId:t?"":e.id},popupTemplate:{title:o.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtId",label:"区控编号"},{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"id",label:"路口编号"}]}]}}));this.crossLayer.addMany(d)}}exports.default=C;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("@arcgis/core/Graphic"),l=require("@arcgis/core/layers/GraphicsLayer"),y=require("@turf/buffer"),f=require("@turf/convex"),p=require("@turf/helpers"),b=require("./district-controller.js");function m(s){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(s){for(const t in s)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(s,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>s[t]})}}return e.default=s,Object.freeze(e)}const u=m(p);class L{constructor(e){this.view=e,this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!0},this.districtControllerLayer=new l({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new l({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new l({id:"crossLayer",maxScale:0,minScale:36112}),this.highlightLayer=new l({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.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0;for(const t of e){const r=new b.default(t);this.drawArea(r,!0)}return{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.eventHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const t=this.findAreaGraphic(e.id);if(t){await this.view.goTo(t.geometry);const r=t.geometry.type==="point"?t.geometry:t.geometry.centroid;return this.view.popup.open({features:[t],location:r}),{status:0,message:"ok"}}else return{status:1,message:"未找到"}}async highlightSignalControlArea(e){this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id).toArray(),r=this.subDistrictControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("parentId")===e.id).toArray(),a=this.crossLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("districtId")===e.id||i.getAttribute("subDistrictId")===e.id).toArray();return t.length>0&&this.highlightLayer.addMany(t),r.length>0&&this.highlightLayer.addMany(r),a.length>0&&this.highlightLayer.addMany(a),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(await this.view.goTo(t.length>0?t:r.length>0?r:a),{status:0,message:"ok"})}resetHighlight(){return this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0,this.crossLayer.visible=!0,{status:0,message:"ok"}}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){const i=u.featureCollection(r.map(g=>u.point(g))),n=f(i);if(!n)return;const d=y(n.geometry,t?200:30,{units:"meters"});let o;t?o=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:o=[{fieldName:"parentId",label:"区控编号"},{fieldName:"parentName",label:"区控名称"},{fieldName:"id",label:"子区编号"},{fieldName:"crossCount",label:"路口数量"}];const h=new c({geometry:{type:"polygon",rings:d.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,t?.6:.8],outline:{color:e.areaColor,width:2,style:t?"solid":"long-dash"}},attributes:{type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},popupTemplate:{title:e.name,content:[{type:"fields",fieldInfos:o}]}});t?this.districtControllerLayer.add(h):this.subDistrictControllerLayer.add(h)}for(const i of e.subDistricts)this.drawArea(i,!1);const a=e.crosses.map(i=>new c({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:{type:"simple-marker",color:e.areaColor,size:8,outline:{color:"white",width:1}},attributes:{type:"cross",id:i.id,name:i.name,districtId:t?e.id:e.parentId,subDistrictId:t?"":e.id},popupTemplate:{title:i.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtId",label:"区控编号"},{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"id",label:"路口编号"}]}]}}));this.crossLayer.addMany(a)}}exports.default=L;

package/package.json

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