gisviewer-vue3-arcgis 1.0.235 → 1.0.237

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

@@ -2,17 +2,17 @@ import { Polygon as f } from "@arcgis/core/geometry";
 import { webMercatorToGeographic as y } from "@arcgis/core/geometry/support/webMercatorUtils";
 import g from "@arcgis/core/Graphic";
 import m from "@arcgis/core/layers/GraphicsLayer";
-import p from "papaparse";
 import R from "../../stores/index.mjs";
-import D from "./district-controller.mjs";
-import w from "./district-renderer.mjs";
-import L from "./signal-renderer.mjs";
+import w from "./district-controller.mjs";
+import D from "./district-renderer.mjs";
+import p from "./signal-renderer.mjs";
 import C from "./sub-district-renderer.mjs";
-class P {
+class N {
+  // private roadLines!: IRoadLine[];
   constructor(e) {
-    this.detachmentLayerLoaded = !1, this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
+    this.detachmentLayerLoaded = !1, this.view = e;
     const t = R.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(t.mapConfig)), this.detachmentLayer = new m(), this.view.map.add(this.detachmentLayer), this.districtRenderer = new w(e, this.hasGpu), this.subDistrictRenderer = new C(e, this.hasGpu), this.signalRenderer = new L(e, this.hasGpu);
+    this.mapConfig = JSON.parse(JSON.stringify(t.mapConfig)), this.detachmentLayer = new m(), this.view.map.add(this.detachmentLayer), this.districtRenderer = new D(e), this.subDistrictRenderer = new C(e), this.signalRenderer = new p(e);
   }
   /**
    * 显示所有区控、子区、信号机
@@ -20,16 +20,16 @@ class P {
    * @returns
    */
   async showSignalControlArea(e) {
-    this.detachmentLayerLoaded || await this.loadDetachmentLayer(), this.roadLines || (await this.loadRoadLine(), this.subDistrictRenderer.roadLines = this.roadLines), await this.clearSignalControlArea(), this.districtRenderer.setVisible(!1), this.subDistrictRenderer.setVisible(!1), this.signalRenderer.setClusterVisible(!1), this.signalRenderer.setPointVisible(!1);
-    const t = [], s = [];
-    for (const a of e.areaList) {
-      const i = new D(
-        a,
+    this.detachmentLayerLoaded || await this.loadDetachmentLayer(), await this.clearSignalControlArea(), this.districtRenderer.setVisible(!1), this.subDistrictRenderer.setVisible(!1), this.signalRenderer.setClusterVisible(!1), this.signalRenderer.setPointVisible(!1);
+    const t = [], i = [];
+    for (const n of e.areaList) {
+      const s = new w(
+        n,
         e.style || ""
       );
-      t.push(i), s.push(...i.subDistricts);
+      t.push(s), i.push(...s.subDistricts);
     }
-    return this.districtRenderer.style = e.style || "", await this.districtRenderer.showDistricts(t), await this.subDistrictRenderer.showSubDistricts(s), await this.signalRenderer.showSignals(t), { status: 0, message: "ok" };
+    return this.districtRenderer.style = e.style || "", await this.districtRenderer.showDistricts(t), await this.subDistrictRenderer.showSubDistricts(i), await this.signalRenderer.showSignals(t), { status: 0, message: "ok" };
   }
   /**
    * 清空区控、子区、信号机
@@ -88,14 +88,14 @@ class P {
   async highlightSignalControlArea(e) {
     switch (this.view.closePopup(), e.type) {
       case "district":
-        return await this.districtRenderer.highlightDistrict(e.id) ? (this.subDistrictRenderer.filter("district", e.id), this.signalRenderer.filter("district", e.id), this.roadLines && this.roadLines.length > 0 && await this.subDistrictRenderer.showRoads(e.id), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
+        return await this.districtRenderer.highlightDistrict(e.id) ? (this.subDistrictRenderer.filter(e), this.signalRenderer.filter(e), await this.subDistrictRenderer.showRoads(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       case "subDistrict": {
-        const { count: t, parentId: s } = await this.subDistrictRenderer.highlightSubDistrict(e.id);
-        return t > 0 ? (this.districtRenderer.filter(s), this.signalRenderer.filter("subDistrict", e.id), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
+        const { count: t, parentId: i } = await this.subDistrictRenderer.highlightSubDistrict(e.id);
+        return t > 0 ? (this.districtRenderer.filter(i), this.signalRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
       }
       case "signal": {
-        const { districtId: t, subDistrictId: s, count: a } = await this.signalRenderer.highlightSignal(e.id);
-        return a > 0 ? (this.districtRenderer.filter(t), this.subDistrictRenderer.filter("subDistrict", s), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
+        const { districtId: t, subDistrictId: i, count: n } = await this.signalRenderer.highlightSignal(e.id);
+        return n > 0 ? (this.districtRenderer.filter(t), this.subDistrictRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
       }
       default:
         return { status: 1, message: "未知类型" };
@@ -108,39 +108,6 @@ class P {
   async resetHighlight() {
     return this.districtRenderer.resetFilter(), this.subDistrictRenderer.resetFilter(), this.signalRenderer.resetFilter(), { status: 0, message: "ok" };
   }
-  /**
-   * 获取道路线
-   * @returns
-   */
-  async loadRoadLine() {
-    var t;
-    const e = (t = this.mapConfig.signalControlArea) == null ? void 0 : t.roadLayerUrl;
-    if (!e) {
-      console.warn("未配置道路线图层URL");
-      return;
-    }
-    try {
-      const a = await (await fetch(`/GisViewerAssets/${e}`)).text();
-      p.parse(a, {
-        header: !0,
-        skipEmptyLines: !0,
-        complete: (i) => {
-          const { data: r } = i;
-          this.roadLines = r.map((n) => ({
-            id: n.ROADSECT_ID,
-            fromNode: n.FROM_NODE_ID,
-            toNode: n.TO_NODE_ID,
-            coordinates: JSON.parse(n.GEOM).coordinates
-          }));
-        },
-        error: (i) => {
-          console.error("道路线CSV解析失败:", i);
-        }
-      });
-    } catch (s) {
-      console.error("读取道路线CSV失败:", s);
-    }
-  }
   /**
    * 加载支队图层
    * 现场环境用url创建FeatureLayer有各种问题，
@@ -151,35 +118,35 @@ class P {
     if (!e)
       return;
     const t = e.find(
-      (s) => s.options.id === "shanghai_district"
+      (i) => i.options.id === "shanghai_district"
     );
     if (t)
       try {
-        const a = await (await fetch(
+        const n = await (await fetch(
           "/GisViewerAssets/ShangHai/Layers/district.json"
-        )).json(), i = [], { renderer: r, labelingInfo: n } = t.options;
-        a.features.forEach((d) => {
-          const c = d.attributes.ZD_NAME;
-          if (c !== "高架支队") {
+        )).json(), s = [], { renderer: r, labelingInfo: d } = t.options;
+        n.features.forEach((c) => {
+          const o = c.attributes.ZD_NAME;
+          if (o !== "高架支队") {
             let l = new f({
-              rings: d.geometry.rings
+              rings: c.geometry.rings
             });
             l = y(l);
-            const o = new g({
+            const a = new g({
               geometry: l,
-              attributes: d.attributes
+              attributes: c.attributes
             });
             if (r) {
               if (r.type === "simple")
-                o.symbol = r.symbol;
+                a.symbol = r.symbol;
               else if (r.type === "unique-value") {
-                const h = o.getAttribute("OBJECTID"), u = r.uniqueValueInfos.find(
+                const h = a.getAttribute("OBJECTID"), u = r.uniqueValueInfos.find(
                   (b) => b.value == h
                 );
-                o.symbol = u ? u.symbol : r.defaultSymbol;
+                a.symbol = u ? u.symbol : r.defaultSymbol;
               }
             } else
-              o.symbol = {
+              a.symbol = {
                 type: "simple-fill",
                 color: [227, 237, 255, 0.4],
                 outline: {
@@ -187,21 +154,21 @@ class P {
                   width: 2
                 }
               };
-            if (i.push(o), n && c !== "边防港航支队" && c !== "机场支队") {
+            if (s.push(a), d && o !== "边防港航支队" && o !== "机场支队") {
               const h = new g({
                 geometry: l.centroid,
-                symbol: { ...n.symbol, text: c }
+                symbol: { ...d.symbol, text: o }
               });
-              i.push(h);
+              s.push(h);
             }
           }
-        }), this.detachmentLayer.addMany(i), this.detachmentLayerLoaded = !0;
-      } catch (s) {
-        console.error("加载支队图层失败:", s);
+        }), this.detachmentLayer.addMany(s), this.detachmentLayerLoaded = !0;
+      } catch (i) {
+        console.error("加载支队图层失败:", i);
         return;
       }
   }
 }
 export {
-  P as default
+  N as default
 };

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

@@ -1,12 +1,11 @@
-import { IResult } from '../../../types';
+import { IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
 export default class CrossRenderer {
     private view;
-    private hasGpu;
     private signalMarkerLayer;
     private signalPictureLayer;
     private signalClusterLayer;
-    constructor(view: __esri.MapView | __esri.SceneView, hasGpu: boolean);
+    constructor(view: __esri.MapView | __esri.SceneView);
     showSignals(controllers: DistrictController[]): Promise<void>;
     clearSignals(): Promise<void>;
     setPointVisible(visible: boolean): Promise<void>;
@@ -17,6 +16,6 @@ export default class CrossRenderer {
         subDistrictId: string;
         count: number;
     }>;
-    filter(type: string, id: string): void;
+    filter(params: IFindSignalControlAreaParams): void;
     resetFilter(): void;
 }

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

@@ -1,14 +1,15 @@
-import d from "@arcgis/core/Graphic";
-import u from "@arcgis/core/layers/FeatureLayer";
-import { signalMarkerLayerOptions as y, signalPictureLayerOptions as c, signalClusterLayerOptions as o } from "./layer-symbol.mjs";
-class f {
-  constructor(e, a) {
-    this.view = e, this.hasGpu = a, this.signalMarkerLayer = new u(
+import u from "@arcgis/core/Graphic";
+import d from "@arcgis/core/layers/FeatureLayer";
+import o from "../common-utils.mjs";
+import { signalMarkerLayerOptions as y, signalPictureLayerOptions as c, signalClusterLayerOptions as p } from "./layer-symbol.mjs";
+class E {
+  constructor(e) {
+    this.view = e, this.signalMarkerLayer = new d(
       y
-    ), this.signalMarkerLayer.spatialReference = e.spatialReference, this.signalMarkerLayer.popupEnabled = !0, this.signalPictureLayer = new u(
+    ), this.signalMarkerLayer.spatialReference = e.spatialReference, this.signalMarkerLayer.popupEnabled = !0, this.signalPictureLayer = new d(
       c
-    ), this.signalPictureLayer.spatialReference = e.spatialReference, this.signalPictureLayer.popupEnabled = !0, this.signalClusterLayer = new u(
-      o
+    ), this.signalPictureLayer.spatialReference = e.spatialReference, this.signalPictureLayer.popupEnabled = !0, this.signalClusterLayer = new d(
+      p
     ), this.signalClusterLayer.spatialReference = e.spatialReference, this.signalClusterLayer.popupEnabled = !0, this.view.map.addMany([
       this.signalMarkerLayer,
       this.signalPictureLayer,
@@ -17,24 +18,24 @@ class f {
   }
   async showSignals(e) {
     await this.clearSignals();
-    let a = 0;
-    const s = [];
-    e.forEach((r) => {
-      r.signals.forEach((i) => {
-        const t = new d({
+    let r = 0;
+    const a = [];
+    e.forEach((s) => {
+      s.signals.forEach((i) => {
+        const t = new u({
           geometry: {
             type: "point",
             longitude: i.longitude,
             latitude: i.latitude
           },
           attributes: {
-            ObjectID: a++,
+            ObjectID: r++,
             id: i.id,
             name: i.name,
             signalId: i.signalId,
             nodeId: i.nodeId || i.id,
-            districtId: r.id,
-            districtName: r.name,
+            districtId: s.id,
+            districtName: s.name,
             subDistrictId: "",
             subDistrictName: "",
             isKey: i.isKey,
@@ -42,23 +43,23 @@ class f {
             selected: !0
           }
         });
-        s.push(t);
-      }), r.subDistricts.forEach((i) => {
+        a.push(t);
+      }), s.subDistricts.forEach((i) => {
         i.signals.forEach((t) => {
-          const n = new d({
+          const n = new u({
             geometry: {
               type: "point",
               longitude: t.longitude,
               latitude: t.latitude
             },
             attributes: {
-              ObjectID: a++,
+              ObjectID: r++,
               id: t.id,
               name: t.name,
               signalId: t.signalId,
               nodeId: t.nodeId || t.id,
-              districtId: r.id,
-              districtName: r.name,
+              districtId: s.id,
+              districtName: s.name,
               subDistrictId: i.id,
               subDistrictName: i.name,
               isKey: t.isKey,
@@ -66,15 +67,15 @@ class f {
               selected: !0
             }
           });
-          s.push(n);
+          a.push(n);
         });
       });
     }), await this.signalMarkerLayer.applyEdits({
-      addFeatures: s
+      addFeatures: a
     }), await this.signalPictureLayer.applyEdits({
-      addFeatures: s
+      addFeatures: a
     }), await this.signalClusterLayer.applyEdits({
-      addFeatures: s
+      addFeatures: a
     });
   }
   async clearSignals() {
@@ -97,21 +98,19 @@ class f {
     return { status: 0, message: "ok" };
   }
   async highlightSignal(e) {
-    let a = "", s = "";
-    const r = this.signalMarkerLayer.definitionExpression;
+    let r = "", a = "";
+    const s = this.signalMarkerLayer.definitionExpression;
     this.signalMarkerLayer.definitionExpression = `signalId = '${e}'`;
     const i = await this.signalMarkerLayer.queryFeatures(), t = i.features.length;
     if (t > 0) {
       const n = i.features[0].attributes.districtId || "", l = i.features[0].attributes.subDistrictId || "";
-      return await this.view.goTo(i.features, {
-        duration: this.hasGpu ? 1e3 : 0
-      }), { districtId: n, subDistrictId: l, count: t };
+      return await o.viewGoto(this.view, i.features), { districtId: n, subDistrictId: l, count: t };
     } else
-      this.signalMarkerLayer.definitionExpression = r;
-    return { districtId: a, subDistrictId: s, count: t };
+      this.signalMarkerLayer.definitionExpression = s;
+    return { districtId: r, subDistrictId: a, count: t };
   }
-  filter(e, a) {
-    const s = `${e === "district" ? "districtId" : "subDistrictId"} = '${a}'`;
+  filter(e) {
+    const { id: r, type: a } = e, s = `${a === "district" ? "districtId" : "subDistrictId"} = '${r}'`;
     this.signalClusterLayer.definitionExpression = s, this.signalMarkerLayer.definitionExpression = s, this.signalPictureLayer.definitionExpression = s;
   }
   resetFilter() {
@@ -120,5 +119,5 @@ class f {
   }
 }
 export {
-  f as default
+  E as default
 };

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

@@ -1,15 +1,18 @@
-import { IResult, IRoadLine } from '../../../types';
+import { IDistrictRoad, IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
 export default class SubDistrictRenderer {
     private view;
-    private hasGpu;
     private clickHandler;
     private subDistrictPointLayer;
     private subDistrictLineLayer;
-    roadLines: IRoadLine[];
-    constructor(view: __esri.MapView | __esri.SceneView, hasGpu: boolean);
+    roadConnections: IDistrictRoad[];
+    constructor(view: __esri.MapView | __esri.SceneView);
     showSubDistricts(controllers: DistrictController[]): Promise<void>;
-    showRoads(districtId: string): Promise<void>;
+    /**
+     * 显示区控下的所有子区，用道路线表示
+     * @param id 区控ID
+     */
+    showRoads(params: IFindSignalControlAreaParams): Promise<void>;
     clearSubDistricts(): Promise<void>;
     setVisible(visible: boolean): void;
     /**
@@ -31,12 +34,16 @@ export default class SubDistrictRenderer {
      * @param type 类型，district 或 subDistrict
      * @param id
      */
-    filter(type: string, id: string): void;
+    filter(param: IFindSignalControlAreaParams): void;
     /**
      * 重置过滤器，显示所有子区
      */
     resetFilter(): void;
     private currentPointRenderer;
     private currentLineRenderer;
+    /**
+     * 监听地图点击事件，进行子区高亮
+     * @param event
+     */
     private viewHitTest;
 }