gisviewer-vue3-arcgis 1.0.201 → 1.0.203

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

@@ -0,0 +1,224 @@
+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 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 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 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: 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" && (y.value = !y.value);
+      });
+      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, w, h, je) => {
+          v("markerClick", g, w, h, je);
+        },
+        mapClickCallback: (g, w, h) => {
+          v("mapClick", g, w, h);
+        }
+      }), 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 = Je(() => s), P = () => {
+      const e = D.useAppDataStore;
+      e.saveTrackLog = !0;
+    }, W = () => {
+      a.downloadTrackLog();
+    }, N = () => {
+      C("vehicleId");
+    }, z = () => {
+      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) => {
+      u.setMapZoomRange(e);
+    }, U = (e) => (c || (c = new M(s)), c.showLaneNumber(e)), J = () => {
+      c == null || c.clearLaneNumber();
+    }, 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);
+    }, ae = () => {
+      a.clearHoloTrace();
+    }, ne = (e) => {
+      a.setInterpolate(e);
+    }, re = async (e) => {
+      await a.handleSignalData(e);
+    }, se = () => {
+      a.clearHoloSignal();
+    }, oe = (e) => {
+      o == null || o.toggleTrafficInfo(e), a == null || a.toggleTrafficInfo(e);
+    }, ie = (e) => {
+      a == null || a.togglePause(e);
+    }, ce = (e) => {
+      o == null || o.toggleTrafficObject(e), a == null || a.toggleTrafficObject(e);
+    }, C = (e) => {
+      a == null || a.updatePanelContent(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地图"
+    }, be = async (e) => t ? t.unselectSumo(e) : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, Ae = async (e) => t ? await t.geometrySearch(e) : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, ke = async (e) => t ? await t.getSumoInfo(e) : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, Le = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, De = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, 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: "未加载绿波带" };
+      m.stopAddGreenWaveBand();
+    }, Qe = async (e) => (m || (m = new T(s)), await m.showGreenWaveBand(e)), A = _, v = V;
+    return x({
+      mapViewer: G,
+      setLayerVisibility: Z,
+      setMapCenter: E,
+      lookAt: j,
+      setMapCamera: Q,
+      setMapZoomRange: K,
+      requestCoordinateTransform: $,
+      cancelCoordinateTransform: q,
+      addOverlays: le,
+      addMask: ue,
+      removeMask: me,
+      showAllOverlays: fe,
+      removeOverlaysByType: pe,
+      removeOverlaysById: ge,
+      removeAllOverlays: de,
+      showLaneNumber: U,
+      clearLaneNumber: J,
+      initializeAreaTool: R,
+      calCrossIndicatorArea: X,
+      calRoadIndicatorArea: Y,
+      connectCarFlow: F,
+      disconnectCarFlow: ee,
+      handleHoloVehicleTraceData: te,
+      clearHoloTrace: ae,
+      handleHoloSignalData: re,
+      clearHoloSignal: se,
+      setInterpolate: ne,
+      toggleTrafficInfo: oe,
+      toggleTrafficObject: ce,
+      toggleVehicleInfo: C,
+      togglePause: ie,
+      updateQueueLength: Se,
+      removeQueueLength: ye,
+      showOpenDriveFromServer: Ce,
+      showOpenDriveFromFile: ve,
+      clearOpenDrive: we,
+      geometrySearchInOpenDrive: Ae,
+      findSumoInOpenDrive: he,
+      selectSumoInOpenDrive: Oe,
+      unselectSumoInOpenDrive: be,
+      getSumoInfo: ke,
+      splitOpenDriveLane: Le,
+      clearSplitOpenDriveLane: De,
+      showSignalControlArea: Te,
+      clearSignalControlArea: Ie,
+      setSignalControlAreaVisibility: Be,
+      locateSignalControlArea: Me,
+      highlightSignalControlArea: _e,
+      resetHighlightSignalControlArea: xe,
+      showSubSignalControlArea: Ve,
+      editSubSignalControlArea: He,
+      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
+      }, [
+        Re(f("div", mt, [
+          f("button", {
+            style: { "margin-right": "10px" },
+            onClick: P
+          }, " 开始记录 "),
+          f("button", {
+            style: { "margin-right": "10px" },
+            onClick: W
+          }, " 下载日志 "),
+          f("button", {
+            style: { "margin-right": "10px" },
+            onClick: N
+          }, " 显示车辆id "),
+          f("button", { onClick: z }, "显示车辆号牌")
+        ], 512), [
+          [Xe, y.value]
+        ])
+      ], 512),
+      (O(!0), L(Ye, null, Fe(b, (i, g) => (O(), et(rt, {
+        key: g,
+        "display-mode": i.displayMode,
+        "road-id": i.crossId,
+        "cross-id": i.roadId,
+        "map-point": i.mapPoint,
+        "stop-line": i.stopLine,
+        position: i.position,
+        rotation: i.rotation,
+        scale: i.scale,
+        "lamp-status": i.lampStatus
+      }, null, 8, ["display-mode", "road-id", "cross-id", "map-point", "stop-line", "position", "rotation", "scale", "lamp-status"]))), 128))
+    ]));
+  }
+});
+export {
+  Dt as default
+};

package/es/{src → packages/components/src}/gis-map/utils/holo-flow/trace-renderer-layer.mjs

@@ -34,7 +34,7 @@ class v {
       id: "vehicleLayer"
     }), this.view.map.add(this.vehicleLayer);
     const t = localStorage.getItem("gpu");
-    this.hasGpu = t !== "Unknown";
+    this.hasGpu = t !== "Unknown", this.hasGpu && (this.rafSignal = requestAnimationFrame(() => this.render()));
   }
   getLog() {
     return this.logTable;
@@ -48,7 +48,7 @@ class v {
         return;
       }
       const e = i.map((s) => {
-        const { vehicleId: r, heading: o, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y), a = new p({
+        const { vehicleId: o, heading: r, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y), a = new p({
           geometry: {
             type: "point",
             x: l,
@@ -60,9 +60,9 @@ class v {
           },
           symbol: this.hasGpu ? this.createCIMSymbol(s) : this.createMarkerSymbol()
         });
-        return this.hasGpu && (a.visible = !1, this.historyPositionMap.set(r, [
-          { pos: [l, n, 0], heading: o, time: h }
-        ]), this.vehicleObjectMap.set(r, {
+        return this.hasGpu && (a.visible = !1, this.historyPositionMap.set(o, [
+          { pos: [l, n, 0], heading: r, time: h }
+        ]), this.vehicleObjectMap.set(o, {
           graphic: a,
           data: s,
           waitForDelete: !1,
@@ -80,17 +80,17 @@ class v {
       }
       const e = [];
       i.forEach((s) => {
-        const { vehicleId: r, heading: o, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y);
+        const { vehicleId: o, heading: r, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y);
         if (this.hasGpu) {
-          const a = this.vehicleObjectMap.get(r);
+          const a = this.vehicleObjectMap.get(o);
           a ? (a.data = s, a.graphic.attributes = {
             ...s,
             type: "trackVehicle"
           }, this.historyPositionMap.get(
-            r
+            o
           ).push({
             pos: [l, n, 0],
-            heading: o,
+            heading: r,
             time: h
           })) : e.push(s);
         } else {
@@ -156,11 +156,11 @@ class v {
     if (!t || !e || !e.isMoving && t.length <= 2)
       return;
     e.isMoving = !0, (e.graphic.getAttribute("roadLayer") || "1") === "1" ? e.graphic.visible = this.showGroundVehicle : e.graphic.visible = this.showElevatedVehicle, e.segmentStartTime || (e.segmentStartTime = Date.now(), e.segmentTotalTime = t[1].time - t[0].time);
-    const r = Date.now() - e.segmentStartTime, o = Math.min(
+    const o = Date.now() - e.segmentStartTime, r = Math.min(
       1,
-      r / e.segmentTotalTime
+      o / e.segmentTotalTime
     );
-    if (o === 1)
+    if (r === 1)
       if (t.shift(), t.length === 1) {
         e.waitForDelete ? (this.vehicleLayer.remove(e.graphic), this.vehicleObjectMap.delete(i), this.historyPositionMap.delete(i)) : (e.segmentStartTime = void 0, e.segmentTotalTime = void 0, e.graphic.visible = !1, e.isMoving = !1);
         return;
@@ -171,7 +171,7 @@ class v {
           y: t[0].pos[1]
         };
     else {
-      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * o, l = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * o, n = t[0].heading + (t[1].heading - t[0].heading) * o;
+      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * r, l = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * r, n = t[0].heading + (t[1].heading - t[0].heading) * r;
       e.graphic.geometry = {
         type: "point",
         x: h,

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

@@ -0,0 +1,38 @@
+import o from "../common-utils.mjs";
+class e {
+  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.signals.push(s), this.signalCount++;
+      }
+  }
+  /**
+   * 获取区控/子区下的所有信号机
+   * @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 {
+  e as default
+};

package/es/{src/gis-map/utils/signal-control-area-controller/index.mjs → packages/components/src/gis-map/utils/signal-control-area-controller/edit-area.mjs}

@@ -1,144 +1,33 @@
-import * as p 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 g from "@turf/convex";
+import u from "@arcgis/core/layers/GraphicsLayer";
+import g from "@turf/buffer";
+import p 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 G {
+import h from "axios";
+import b from "concaveman";
+import f from "../../stores/index.mjs";
+class L {
   constructor(e) {
     var i;
     this.crossScale = 5e3, this.hasGpu = !1, this.crossIdsInDistrict = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
-    const r = C.useAppDataStore.mapConfig;
-    this.openDriveServer = (i = r.openDriveServer) == null ? void 0 : i.url, this.districtControllerLayer = new y({
+    const r = f.useAppDataStore.mapConfig;
+    this.openDriveServer = (i = r.openDriveServer) == null ? void 0 : i.url, this.districtControllerLayer = new u({
       id: "districtControllerLayer"
-    }), this.subDistrictControllerLayer = new y({
-      id: "subDistrictControllerLayer",
-      visible: !1
-      // maxScale: 0,
-      // minScale: 144447
-    }), this.crossLayer = new y({
-      id: "crossLayer",
-      visible: !1
-      // maxScale: 0,
-      // minScale: 36112
-    }), this.highlightLayer = new y({
-      id: "highlightLayer"
+    }), this.subDistrictControllerLayer = new u({
+      id: "subDistrictControllerLayer"
+    }), this.crossLayer = new u({
+      id: "crossLayer"
     }), this.view.map.addMany([
       this.districtControllerLayer,
       this.subDistrictControllerLayer,
-      this.crossLayer,
-      this.highlightLayer
+      this.crossLayer
     ]);
   }
   /**
-   * 显示信控区控与子区
+   * 显示单个子区
    * @param params
    * @returns
    */
-  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 v(
-        t,
-        e.style || ""
-      );
-      this.drawArea(r, !0);
-    }
-    return this.scaleWatcher = p.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
-      },
-      {
-        duration: this.hasGpu ? 1e3 : 0
-      }
-    ) : await this.view.goTo(t.geometry, {
-      duration: this.hasGpu ? 1e3 : 0
-    }), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
-  }
-  async highlightSignalControlArea(e) {
-    if (!e.id || e.id === "")
-      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("nodeId") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
-    ).toArray().map((s) => s.clone());
-    if (r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), this.highlightLayer.graphics.length === 0)
-      return { status: 1, message: "未找到" };
-    if (t.length > 0)
-      await this.view.goTo(t, {
-        duration: this.hasGpu ? 1e3 : 0
-      });
-    else if (r.length > 0) {
-      const s = r[0].geometry.centroid;
-      await this.view.goTo(
-        {
-          target: s,
-          scale: this.crossScale - 500
-        },
-        {
-          duration: this.hasGpu ? 1e3 : 0
-        }
-      );
-    } else
-      i.length > 1 ? await this.view.goTo(i, {
-        duration: this.hasGpu ? 1e3 : 0
-      }) : await this.view.goTo(
-        {
-          target: i[0].geometry,
-          scale: 1500
-        },
-        {
-          duration: this.hasGpu ? 1e3 : 0
-        }
-      );
-    return { status: 0, message: "ok" };
-  }
-  resetHighlight() {
-    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) => {
@@ -184,7 +73,7 @@ class G {
    * @returns
    */
   async showNearbyCrosses(e) {
-    const t = await b.get(
+    const t = await h.get(
       `http://${this.openDriveServer}/api/computable/getRelatedNodesForNode`,
       { params: { nodeIds: e } }
     );
@@ -200,10 +89,10 @@ class G {
             continue;
           }
           if (this.crossLayer.graphics.some(
-            (h) => h.getAttribute("id") === o
+            (c) => c.getAttribute("id") === o
           ))
             continue;
-          const u = new n({
+          const m = new n({
             geometry: {
               type: "point",
               x: s.lon,
@@ -217,7 +106,7 @@ class G {
               selected: !1
             }
           });
-          i.push(u);
+          i.push(m);
         }
         return this.crossLayer.addMany(i), { status: 0, message: "ok" };
       } else
@@ -236,7 +125,7 @@ class G {
         e.crossesInArea.map(
           (s) => a.point([s.longitude, s.latitude])
         )
-      ), r = g(t);
+      ), r = p(t);
       r && (this.districtControllerLayer.removeAll(), this.districtControllerLayer.add(
         new n({
           geometry: {
@@ -293,11 +182,6 @@ class G {
         ), { status: 0, message: "ok" };
     }), { status: 0, message: "未找到" };
   }
-  changeSubSignalControlAreaBorderVisibility(e) {
-    this.highlightLayer.graphics.forEach((t) => {
-      t.getAttribute("type") === "signalControlArea" && (t.visible = e);
-    });
-  }
   /**
    * 在区控\子区\路口图层中查找对应的graphic
    * @param id
@@ -318,24 +202,24 @@ class G {
    * @returns
    */
   drawArea(e, t) {
-    const r = e.getAllCrossCoordinates();
+    const r = e.getAllSignalCoordinates();
     if (r.length >= 2) {
       let s = null;
       if (r.length === 2)
         s = a.lineString(r);
       else {
         if (t) {
-          const c = a.featureCollection(
-            r.map((m) => a.point(m))
+          const y = a.featureCollection(
+            r.map((d) => a.point(d))
           );
-          s = g(c);
+          s = p(y);
         } else {
-          const c = f(r, 0.5);
-          c.length >= 4 && (s = a.polygon([c]));
+          const y = b(r, 0.5);
+          y.length >= 4 && (s = a.polygon([y]));
         }
         s || (s = a.lineString(r));
       }
-      const o = d(
+      const o = g(
         s.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
@@ -367,15 +251,15 @@ class G {
           label: "路口数量"
         }
       ];
-      const u = {
+      const m = {
         type: "signalControlArea",
         id: e.id,
         name: e.name,
         parentId: e.parentId,
         parentName: e.parentName,
-        crossCount: e.crossCount,
+        crossCount: e.signalCount,
         subDistrictCount: e.subDistrictCount
-      }, h = new n({
+      }, c = new n({
         geometry: {
           type: "polygon",
           rings: o.geometry.coordinates
@@ -383,14 +267,14 @@ class G {
         symbol: {
           type: "simple-fill",
           style: "none",
-          color: [...e.areaColor, 0.3],
+          // color: [...districtController.areaColor, 0.3],
           outline: {
-            color: e.areaColor,
+            color: t ? [111, 100, 255] : [5, 196, 104],
             width: 3,
             style: t ? "long-dash" : "solid"
           }
         },
-        attributes: u,
+        attributes: m,
         popupTemplate: {
           title: `${e.name}`,
           content: [
@@ -401,17 +285,16 @@ class G {
           ]
         }
       });
-      t ? this.districtControllerLayer.add(h) : this.subDistrictControllerLayer.add(h);
+      t ? this.districtControllerLayer.add(c) : this.subDistrictControllerLayer.add(c);
     }
     for (const s of e.subDistricts)
       this.drawArea(s, !1);
     const i = [];
-    e.crosses.forEach((s) => {
+    e.signals.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,
@@ -561,18 +444,13 @@ class G {
    * @returns
    */
   getCrossGraphicSymbol(e, t) {
-    const { isKey: r, color: i } = e;
+    const r = e.isKey;
     if (t === "marker")
-      return r ? {
-        type: "picture-marker",
-        url: "/GisViewerAssets/Images/cross/gis_gjxklk_orange.png",
-        width: "30px",
-        height: "30px"
-      } : {
+      return {
         type: "simple-marker",
         style: "circle",
-        color: i,
-        size: 8,
+        color: r ? [254, 172, 22] : [5, 116, 255],
+        size: r ? 12 : 8,
         outline: {
           color: "white",
           width: 1
@@ -668,5 +546,5 @@ class G {
   }
 }
 export {
-  G as default
+  L as default
 };