gisviewer-vue3-arcgis 1.0.202 → 1.0.204

package/es/src/gis-map/utils/signal-control-area-controller/{index.mjs → 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
 };

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

@@ -0,0 +1,68 @@
+import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignalControlAreaParams } from '../../../types';
+export default class SignalControlAreaController1 {
+    private view;
+    private hasGpu;
+    private openDriveServer;
+    /** 区控虚线图层 */
+    private districtControllerDashLayer;
+    /** 区控虚线图层，区控由透明实线+不透明虚线组成 */
+    private districtControllerSolidLayer;
+    /** 子区图层 */
+    private subDistrictControllerLayer;
+    /** 信号机图层 */
+    private signalMarkerLayer;
+    private signalPictureLayer;
+    private districtControllerOid;
+    private subDistrictControllerOid;
+    private signalOid;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    /** 暂存等待绘制的子区graphic */
+    private subDistrictGraphics;
+    /**
+     * 显示所有区控、子区、信号机
+     * @param params
+     * @returns
+     */
+    showSignalControlArea(params: IShowSignalControlAreaParams): Promise<IResult>;
+    /**
+     * 清空区控、子区、信号机
+     * @returns
+     */
+    clearSignalControlArea(): Promise<IResult>;
+    /**
+     * 设置区控、子区、信号机图层可见性
+     * @param layerName
+     * @param visible
+     */
+    setLayerVisibility(params: ILayerVisibleParams): IResult;
+    /**
+     * 定位区控、子区、信号机
+     * @param params
+     * @returns
+     */
+    locateSignalControlArea(params: IFindSignalControlAreaParams): Promise<IResult>;
+    /**
+     * 高亮指定的区控、子区、信号机，其他隐藏
+     * @param params
+     * @returns
+     */
+    highlightSignalControlArea(params: IFindSignalControlAreaParams): Promise<{
+        status: number;
+        message: string;
+    }>;
+    /**
+     * 重置高亮，恢复全图视角
+     * @returns
+     */
+    resetHighlight(): Promise<{
+        status: number;
+        message: string;
+    }>;
+    /**
+     * 绘制区控、子区和信号机
+     * @param districtController
+     * @param isDistrict 是否是区控
+     * @returns
+     */
+    private drawArea;
+}