gisviewer-vue3-arcgis 1.0.184 → 1.0.185

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

@@ -128,7 +128,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
+    editSubSignalControlArea: (crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

@@ -19,7 +19,7 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
   emits: ["mapLoaded", "markerClick", "mapClick"],
   setup(M, { expose: _, emit: x }) {
     const d = k(null);
-    let o, u, c, s, n, r, p, t, a;
+    let i, u, c, s, n, r, p, t, a;
     const f = k(!1);
     Ge();
     const H = b.useAppDataStore, v = Ne([]);
@@ -29,21 +29,21 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       document.addEventListener("keydown", (m) => {
         m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
-      const e = Qe(), { $gisviewerAssetsRoot: l } = e.appContext.config.globalProperties, i = await (await fetch(O.config)).json();
-      i.assetsRoot = O.assetsRoot || l, H.mapConfig = i, u = new We(), o = await u.initialize({
+      const e = Qe(), { $gisviewerAssetsRoot: l } = e.appContext.config.globalProperties, o = await (await fetch(O.config)).json();
+      o.assetsRoot = O.assetsRoot || l, H.mapConfig = o, u = new We(), i = await u.initialize({
         container: d.value,
-        mapConfig: i,
+        mapConfig: o,
         markerClickCallback: (m, w, h, Ve) => {
           y("markerClick", m, w, h, Ve);
         },
         mapClickCallback: (m, w, h) => {
           y("mapClick", m, w, h);
         }
-      }), n = new Je(o, v), await n.init(), y("mapLoaded");
+      }), n = new Je(i, v), await n.init(), y("mapLoaded");
     }), je(() => {
       a == null || a.clearSignalControlArea(), t == null || t.clearOpenDrive(), n.clearHoloTrace(), n.clearHoloSignal(), s == null || s.disconnectTrafficFlow();
     });
-    const P = Ee(() => o), V = () => {
+    const P = Ee(() => i), V = () => {
       const e = b.useAppDataStore;
       e.saveTrackLog = !0;
     }, B = () => {
@@ -56,11 +56,11 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       u.cancelCoordinateTransform(e);
     }, K = (e) => {
       u.setMapZoomRange(e);
-    }, U = (e) => (c || (c = new T(o)), c.showLaneNumber(e)), G = () => {
+    }, U = (e) => (c || (c = new T(i)), c.showLaneNumber(e)), G = () => {
       c == null || c.clearLaneNumber();
-    }, J = async (e) => (c || (c = new T(o)), await c.initializeSearch(e)), R = async () => c == null ? void 0 : c.calCrossIndicatorArea(), W = async () => {
+    }, J = async (e) => (c || (c = new T(i)), await c.initializeSearch(e)), R = async () => c == null ? void 0 : c.calCrossIndicatorArea(), W = async () => {
     }, X = async (e, l) => {
-      s || (s = new Ye(o)), s.connectTrafficFlow(e, l);
+      s || (s = new Ye(i)), s.connectTrafficFlow(e, l);
     }, Y = () => {
       s == null || s.disconnectTrafficFlow();
     }, F = async (e) => {
@@ -81,15 +81,15 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       s == null || s.toggleTrafficObject(e), n == null || n.toggleTrafficObject(e);
     }, S = (e) => {
       n == null || n.updatePanelContent(e);
-    }, ie = async (e) => (r || (r = new L(o)), r.addOverlays(e)), ce = (e) => (r || (r = new L(o)), r.addMask(e)), le = () => {
+    }, ie = async (e) => (r || (r = new L(i)), r.addOverlays(e)), ce = (e) => (r || (r = new L(i)), r.addMask(e)), le = () => {
       r == null || r.removeMask();
     }, ue = (e) => r == null ? void 0 : r.removeOverlaysByType(e), me = (e) => r == null ? void 0 : r.removeOverlaysById(e), pe = () => r == null ? void 0 : r.removeAllOverlays(), ge = () => {
       r == null || r.showAllOverlays();
     }, de = (e) => {
-      p || (p = new Xe(o)), p.updateQueueLength(e);
+      p || (p = new Xe(i)), p.updateQueueLength(e);
     }, fe = () => {
       p == null || p.removeQueueLength();
-    }, Se = async (e, l) => (t || (t = new D(o)), await t.showOpenDriveFromServer(e, l)), ye = async (e) => (t || (t = new D(o)), 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)) : {
+    }, Se = async (e, l) => (t || (t = new D(i)), await t.showOpenDriveFromServer(e, l)), ye = async (e) => (t || (t = new D(i)), 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地图"
     }, Ce = async (e) => t ? t.selectSumo(e) : {
@@ -110,11 +110,12 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
     }, be = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, De = (e) => (a || (a = new I(o)), a.showSignalControlArea(e)), Le = () => {
+    }, De = (e) => (a || (a = new I(i)), a.showSignalControlArea(e)), Le = () => {
       a == null || a.clearSignalControlArea();
-    }, Te = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ie = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new I(o)), a.showSubSignalControlArea(e)), xe = (e, l) => a ? a.editSubSignalArea(
+    }, Te = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ie = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new I(i)), a.showSubSignalControlArea(e)), xe = (e, l, o) => a ? a.editSubSignalArea(
       e,
-      l
+      l,
+      o
     ) : { status: -1, message: "未加载信号控制区" }, He = (e) => a ? a.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Pe = (e) => a ? a.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, O = M, y = x;
     return _({
       mapViewer: P,
@@ -193,17 +194,17 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
           [$e, f.value]
         ])
       ], 512),
-      (C(!0), A(qe, null, Ke(v, (i, m) => (C(), Ue(Re, {
+      (C(!0), A(qe, null, Ke(v, (o, m) => (C(), Ue(Re, {
         key: m,
-        "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
+        "display-mode": o.displayMode,
+        "road-id": o.crossId,
+        "cross-id": o.roadId,
+        "map-point": o.mapPoint,
+        "stop-line": o.stopLine,
+        position: o.position,
+        rotation: o.rotation,
+        scale: o.scale,
+        "lamp-status": o.lampStatus
       }, null, 8, ["display-mode", "road-id", "cross-id", "map-point", "stop-line", "position", "rotation", "scale", "lamp-status"]))), 128))
     ]));
   }

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

@@ -117,7 +117,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
+    editSubSignalControlArea: (crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

@@ -34,6 +34,7 @@ export default class SignalControlAreaController {
      * @returns
      */
     private handleViewClick;
+    private crossIdsInDistrict;
     /**
      * 显示周边的路口
      * @param crossIds
@@ -46,7 +47,7 @@ export default class SignalControlAreaController {
      * 编辑子区的路口
      * @returns
      */
-    editSubSignalArea(addCrossCallback: (params: {
+    editSubSignalArea(crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

@@ -1,19 +1,19 @@
 import * as g from "@arcgis/core/core/reactiveUtils.js";
-import c from "@arcgis/core/Graphic";
+import h from "@arcgis/core/Graphic";
 import y from "@arcgis/core/layers/GraphicsLayer";
 import p from "@turf/buffer";
 import b from "@turf/convex";
-import * as n from "@turf/helpers";
+import * as l from "@turf/helpers";
 import d from "axios";
 import f from "concaveman";
 import C from "../../stores/index.mjs";
 import v from "./district-controller.mjs";
 class N {
   constructor(e) {
-    var s;
-    this.crossScale = 5e3, this.view = e;
+    var i;
+    this.crossScale = 5e3, this.crossIdsInDistrict = [], this.view = e;
     const r = C.useAppDataStore.mapConfig;
-    this.openDriveServer = (s = r.openDriveServer) == null ? void 0 : s.url, this.districtControllerLayer = new y({
+    this.openDriveServer = (i = r.openDriveServer) == null ? void 0 : i.url, this.districtControllerLayer = new y({
       id: "districtControllerLayer"
     }), this.subDistrictControllerLayer = new y({
       id: "subDistrictControllerLayer",
@@ -51,24 +51,24 @@ class N {
     return this.scaleWatcher = g.watch(
       () => this.view.scale,
       (t, r) => {
-        t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((s) => {
-          s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((i) => {
+          i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "marker"
           );
-        }), this.highlightLayer.graphics.forEach((s) => {
-          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        }), 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((s) => {
-          s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        })) : t <= this.crossScale && r > this.crossScale && (this.crossLayer.graphics.forEach((i) => {
+          i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "picture"
           );
-        }), this.highlightLayer.graphics.forEach((s) => {
-          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        }), this.highlightLayer.graphics.forEach((i) => {
+          i.getAttribute("type") === "cross" && (i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "picture"
           ));
         }));
@@ -90,27 +90,27 @@ class N {
     if (!e.id || e.id === "")
       return { status: 1, message: "请输入id" };
     this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !1;
-    const t = this.districtControllerLayer.graphics.filter((i) => i.getAttribute("id") === e.id).toArray().map((i) => {
-      const a = i.clone();
+    const t = this.districtControllerLayer.graphics.filter((s) => s.getAttribute("id") === e.id).toArray().map((s) => {
+      const a = s.clone();
       return a.symbol.style = "none", a;
     }), r = this.subDistrictControllerLayer.graphics.filter(
-      (i) => i.getAttribute("id") === e.id || i.getAttribute("parentId") === e.id
-    ).toArray().map((i) => i.clone()), s = this.crossLayer.graphics.filter(
-      (i) => i.getAttribute("id") === e.id || i.getAttribute("districtId") === e.id || i.getAttribute("subDistrictId") === e.id
-    ).toArray().map((i) => i.clone());
-    if (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)
+      (s) => s.getAttribute("id") === e.id || s.getAttribute("parentId") === e.id
+    ).toArray().map((s) => s.clone()), i = this.crossLayer.graphics.filter(
+      (s) => s.getAttribute("id") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
+    ).toArray().map((s) => s.clone());
+    if (t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), this.highlightLayer.graphics.length === 0)
       return { status: 1, message: "未找到" };
     if (t.length > 0)
       await this.view.goTo(t);
     else if (r.length > 0) {
-      const i = r[0].geometry.centroid;
+      const s = r[0].geometry.centroid;
       await this.view.goTo({
-        target: i,
+        target: s,
         scale: this.crossScale - 500
       });
     } else
-      s.length > 1 ? await this.view.goTo(s) : await this.view.goTo({
-        target: s[0].geometry,
+      i.length > 1 ? await this.view.goTo(i) : await this.view.goTo({
+        target: i[0].geometry,
         scale: 1500
       });
     return { status: 0, message: "ok" };
@@ -120,16 +120,16 @@ class N {
   }
   showSubSignalControlArea(e) {
     this.crossLayer.removeAll(), this.crossLayer.visible = !0;
-    const r = e.children.map((s) => {
-      const i = { ...s, selected: !0 };
-      return new c({
+    const r = e.children.map((i) => {
+      const s = { ...i, selected: !0 };
+      return new h({
         geometry: {
           type: "point",
-          x: s.longitude,
-          y: s.latitude
+          x: i.longitude,
+          y: i.latitude
         },
-        symbol: this.getCrossSymbolInSubDistrict(i),
-        attributes: i
+        symbol: this.getCrossSymbolInSubDistrict(s),
+        attributes: s
       });
     });
     return this.crossLayer.addMany(r), this.view.goTo(r), { status: 0, message: "ok" };
@@ -140,23 +140,23 @@ class N {
    * @returns
    */
   async handleViewClick(e) {
-    var i;
-    const r = (i = (await this.view.hitTest(e, {
+    var s;
+    const r = (s = (await this.view.hitTest(e, {
       include: [this.crossLayer]
-    })).results) == null ? void 0 : i.filter(
+    })).results) == null ? void 0 : s.filter(
       (a) => a.type === "graphic"
     );
     if (r.length === 0)
       return;
-    const s = r[0].graphic;
-    s.getAttribute("selected") ? s.getAttribute("signalId") && (this.removeCrossCallback && this.removeCrossCallback({ id: s.getAttribute("id") }), s.setAttribute("selected", !1), s.symbol = this.getCrossSymbolInSubDistrict(
-      s.attributes
-    )) : (s.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback({
-      id: s.getAttribute("id"),
-      name: s.getAttribute("name")
-    }), s.setAttribute("selected", !0), s.symbol = this.getCrossSymbolInSubDistrict(
-      s.attributes
-    )), await this.showNearbyCrosses(s.getAttribute("id")));
+    const i = r[0].graphic;
+    i.getAttribute("selected") ? i.getAttribute("signalId") && (this.removeCrossCallback && this.removeCrossCallback({ id: i.getAttribute("id") }), i.setAttribute("selected", !1), i.symbol = this.getCrossSymbolInSubDistrict(
+      i.attributes
+    )) : (i.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback({
+      id: i.getAttribute("id"),
+      name: i.getAttribute("name")
+    }), i.setAttribute("selected", !0), i.symbol = this.getCrossSymbolInSubDistrict(
+      i.attributes
+    )), await this.showNearbyCrosses(i.getAttribute("id")));
   }
   /**
    * 显示周边的路口
@@ -170,31 +170,30 @@ class N {
     );
     if (t.status === 200)
       if (t.data.status === 0) {
-        const r = t.data.result, s = [];
-        return r.forEach(
-          (i) => {
-            const { junctionId: a } = i;
-            if (!this.crossLayer.graphics.some(
-              (l) => l.getAttribute("id") === a
-            )) {
-              const l = new c({
-                geometry: {
-                  type: "point",
-                  x: i.lon,
-                  y: i.lat
-                },
-                symbol: this.getCrossSymbolInSubDistrict(i),
-                attributes: {
-                  id: i.junctionId,
-                  name: i.name,
-                  signalId: i.signalId,
-                  selected: !1
-                }
-              });
-              s.push(l);
+        const r = t.data.result, i = [];
+        for (const s of r) {
+          const { junctionId: a } = s;
+          if (s.signalId && !this.crossIdsInDistrict.includes(a) || this.crossLayer.graphics.some(
+            (n) => n.getAttribute("id") === a
+          ))
+            continue;
+          const m = new h({
+            geometry: {
+              type: "point",
+              x: s.lon,
+              y: s.lat
+            },
+            symbol: this.getCrossSymbolInSubDistrict(s),
+            attributes: {
+              id: a,
+              name: s.name,
+              signalId: s.signalId,
+              selected: !1
             }
-          }
-        ), this.crossLayer.addMany(s), { status: 0, message: "ok" };
+          });
+          i.push(m);
+        }
+        return this.crossLayer.addMany(i), { status: 0, message: "ok" };
       } else
         return { status: -1, message: t.data.message };
     else
@@ -204,13 +203,13 @@ class N {
    * 编辑子区的路口
    * @returns
    */
-  async editSubSignalArea(e, t) {
+  async editSubSignalArea(e, t, r) {
     if (this.openDriveServer) {
-      this.addCrossCallback = e, this.removeCrossCallback = t, this.clickWatcher || (this.clickWatcher = this.view.on("click", async (s) => {
+      this.crossIdsInDistrict = e, this.addCrossCallback = t, this.removeCrossCallback = r, this.clickWatcher || (this.clickWatcher = this.view.on("click", async (s) => {
         await this.handleViewClick(s);
       }));
-      const r = this.crossLayer.graphics.toArray().map((s) => s.getAttribute("id")).join(",");
-      return await this.showNearbyCrosses(r);
+      const i = this.crossLayer.graphics.toArray().map((s) => s.getAttribute("id")).join(",");
+      return await this.showNearbyCrosses(i);
     } else
       return { status: 1, message: "未配置OpenDriveServer" };
   }
@@ -260,23 +259,23 @@ class N {
   drawArea(e, t) {
     const r = e.getAllCrossCoordinates();
     if (r.length >= 2) {
-      let i = null;
+      let s = null;
       if (r.length === 2)
-        i = n.lineString(r);
+        s = l.lineString(r);
       else {
         if (t) {
-          const h = n.featureCollection(
-            r.map((u) => n.point(u))
+          const c = l.featureCollection(
+            r.map((u) => l.point(u))
           );
-          i = b(h);
+          s = b(c);
         } else {
-          const h = f(r, 0.5);
-          h.length >= 4 && (i = n.polygon([h]));
+          const c = f(r, 0.5);
+          c.length >= 4 && (s = l.polygon([c]));
         }
-        i || (i = n.lineString(r));
+        s || (s = l.lineString(r));
       }
       const a = p(
-        i.geometry,
+        s.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
         {
@@ -307,7 +306,7 @@ class N {
           label: "路口数量"
         }
       ];
-      const l = {
+      const m = {
         type: "signalControlArea",
         id: e.id,
         name: e.name,
@@ -315,7 +314,7 @@ class N {
         parentName: e.parentName,
         crossCount: e.crossCount,
         subDistrictCount: e.subDistrictCount
-      }, m = new c({
+      }, n = new h({
         geometry: {
           type: "polygon",
           rings: a.geometry.coordinates
@@ -330,7 +329,7 @@ class N {
             style: t ? "long-dash" : "solid"
           }
         },
-        attributes: l,
+        attributes: m,
         popupTemplate: {
           title: `${t ? "区控" : "子区"}  ${e.name}`,
           content: [
@@ -341,33 +340,33 @@ class N {
           ]
         }
       });
-      t ? this.districtControllerLayer.add(m) : this.subDistrictControllerLayer.add(m);
+      t ? this.districtControllerLayer.add(n) : this.subDistrictControllerLayer.add(n);
     }
-    for (const i of e.subDistricts)
-      this.drawArea(i, !1);
-    const s = [];
-    e.crosses.forEach((i) => {
+    for (const s of e.subDistricts)
+      this.drawArea(s, !1);
+    const i = [];
+    e.crosses.forEach((s) => {
       const a = {
         type: "cross",
-        id: i.id,
-        name: i.name,
+        id: s.id,
+        name: s.name,
         color: e.areaColor,
-        signalId: i.signalId,
+        signalId: s.signalId,
         districtId: t ? e.id : e.parentId,
         districtName: t ? e.name : e.parentName,
         subDistrictId: t ? "" : e.id,
         subDistrictName: t ? "" : e.name,
-        isKey: i.isKey
-      }, o = new c({
+        isKey: s.isKey
+      }, o = new h({
         geometry: {
           type: "point",
-          x: i.longitude,
-          y: i.latitude
+          x: s.longitude,
+          y: s.latitude
         },
         symbol: this.getCrossGraphicSymbol(a, "marker"),
         attributes: a,
         popupTemplate: {
-          title: i.name,
+          title: s.name,
           content: [
             {
               type: "fields",
@@ -393,8 +392,8 @@ class N {
           ]
         }
       });
-      s.push(o);
-    }), this.crossLayer.addMany(s);
+      i.push(o);
+    }), this.crossLayer.addMany(i);
   }
   /**
    * 显示子区时路口的样式
@@ -500,7 +499,7 @@ class N {
    * @returns
    */
   getCrossGraphicSymbol(e, t) {
-    const { isKey: r, color: s } = e;
+    const { isKey: r, color: i } = e;
     if (t === "marker")
       return r ? {
         type: "picture-marker",
@@ -510,7 +509,7 @@ class N {
       } : {
         type: "simple-marker",
         style: "circle",
-        color: s,
+        color: i,
         size: 8,
         outline: {
           color: "white",

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

@@ -128,7 +128,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
+    editSubSignalControlArea: (crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

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

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

@@ -117,7 +117,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
+    editSubSignalControlArea: (crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

@@ -34,6 +34,7 @@ export default class SignalControlAreaController {
      * @returns
      */
     private handleViewClick;
+    private crossIdsInDistrict;
     /**
      * 显示周边的路口
      * @param crossIds
@@ -46,7 +47,7 @@ export default class SignalControlAreaController {
      * 编辑子区的路口
      * @returns
      */
-    editSubSignalArea(addCrossCallback: (params: {
+    editSubSignalArea(crossIdsInDistrict: string[], addCrossCallback: (params: {
         id: string;
         name: string;
     }) => void, removeCrossCallback: (params: {

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

package/package.json

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