gisviewer-vue3-arcgis 1.0.236 → 1.0.237

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

@@ -1,3 +1,4 @@
+import { IDistrictRoad } from 'packages/components/src/types';
 interface ICross {
     id: string;
     name: string;
@@ -18,6 +19,7 @@ export default class DistrictController {
     areaColor: [number, number, number];
     signalCount: number;
     subDistrictCount: number;
+    roadConnections: IDistrictRoad[];
     constructor(params: any, style: string);
     /**
      * 获取区控/子区下的所有信号机

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

@@ -1,12 +1,28 @@
-import e from "../common-utils.mjs";
-class r {
-  constructor(s, o) {
-    this.parentName = "", this.signals = [], this.subDistricts = [], this.areaColor = this.getDarkNonGrayColor(), this.signalCount = 0, this.subDistrictCount = 0, this.id = s.name, this.name = s.areaDesc, this.parentId = s.parentId, o === "alarm" && (this.areaColor = [255, 0, 0]);
-    for (const t of s.children)
+import h from "pako";
+import c from "../common-utils.mjs";
+class e {
+  constructor(o, s) {
+    this.parentName = "", this.signals = [], this.subDistricts = [], this.areaColor = this.getDarkNonGrayColor(), this.signalCount = 0, this.subDistrictCount = 0, this.roadConnections = [], this.id = o.name, this.name = o.areaDesc, this.parentId = o.parentId, s === "alarm" && (this.areaColor = [255, 0, 0]);
+    for (const t of o.children)
       if (t.children) {
-        const i = new r(t, o);
-        i.id = t.id, i.name = `SS ${t.name}`, i.parentId = this.id, i.parentName = this.name, i.areaColor = this.getDarkNonGrayColor(t.id), this.subDistricts.push(i), this.subDistrictCount++, this.signalCount += i.signalCount;
-      } else if (e.isCoordinateValid(t)) {
+        const i = new e(t, s);
+        if (i.id = t.id, i.name = `SS ${t.name}`, i.parentId = this.id, i.parentName = this.name, i.areaColor = this.getDarkNonGrayColor(t.id), this.subDistricts.push(i), this.subDistrictCount++, this.signalCount += i.signalCount, t.mapConnectList)
+          try {
+            const a = t.mapConnectList, n = new Uint8Array(
+              window.atob(a).split("").map((r) => r.charCodeAt(0))
+            ), l = h.inflate(n, { to: "string" }), d = JSON.parse(l);
+            i.roadConnections.push(
+              ...d.map((r) => ({
+                id: r.roadsectId,
+                coordinates: JSON.parse(r.geomData).coordinates,
+                districtId: i.parentId,
+                subDistrictId: i.id
+              }))
+            ), console.log(i.roadConnections);
+          } catch (a) {
+            console.error("解压子区路段连接信息失败:", a);
+          }
+      } else if (c.isCoordinateValid(t)) {
         const i = {
           id: t.id,
           name: t.name,
@@ -25,29 +41,29 @@ class r {
    * @returns
    */
   getAllSignalCoordinates() {
-    const s = [];
-    for (const o of this.signals)
-      s.push([o.longitude, o.latitude]);
-    for (const o of this.subDistricts)
-      s.push(...o.getAllSignalCoordinates());
-    return s;
+    const o = [];
+    for (const s of this.signals)
+      o.push([s.longitude, s.latitude]);
+    for (const s of this.subDistricts)
+      o.push(...s.getAllSignalCoordinates());
+    return o;
   }
-  getDarkNonGrayColor(s) {
-    let o, t, i;
-    if (s) {
-      const a = this.cyrb53(s);
-      o = ((a & 16711680) >> 16) % 200, t = ((a & 65280) >> 8) % 200, i = (a & 255) % 200;
+  getDarkNonGrayColor(o) {
+    let s, t, i;
+    if (o) {
+      const a = this.cyrb53(o);
+      s = ((a & 16711680) >> 16) % 200, t = ((a & 65280) >> 8) % 200, i = (a & 255) % 200;
     } else
-      o = Math.floor(Math.random() * 256), t = Math.floor(Math.random() * 256), i = Math.floor(Math.random() * 256);
-    return [o, t, i];
+      s = Math.floor(Math.random() * 256), t = Math.floor(Math.random() * 256), i = Math.floor(Math.random() * 256);
+    return [s, t, i];
   }
-  cyrb53(s, o = 0) {
-    let t = 3735928559 ^ o, i = 1103547991 ^ o;
-    for (let a = 0, n; a < s.length; a++)
-      n = s.charCodeAt(a), t = Math.imul(t ^ n, 2654435761), i = Math.imul(i ^ n, 1597334677);
+  cyrb53(o, s = 0) {
+    let t = 3735928559 ^ s, i = 1103547991 ^ s;
+    for (let a = 0, n; a < o.length; a++)
+      n = o.charCodeAt(a), t = Math.imul(t ^ n, 2654435761), i = Math.imul(i ^ n, 1597334677);
     return t = Math.imul(t ^ t >>> 16, 2246822507), t ^= Math.imul(i ^ i >>> 13, 3266489909), i = Math.imul(i ^ i >>> 16, 2246822507), i ^= Math.imul(t ^ t >>> 13, 3266489909), 4294967296 * (2097151 & i) + (t >>> 0);
   }
 }
 export {
-  r as default
+  e as default
 };

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

@@ -375,14 +375,10 @@ const e = {
       {
         value: "true,true",
         symbol: {
-          type: "simple-marker",
-          style: "circle",
-          color: [254, 172, 22, 0.8],
-          size: 8,
-          outline: {
-            color: "white",
-            width: 0
-          }
+          type: "picture-marker",
+          url: "/GisViewerAssets/Images/icon_star.png",
+          width: "20px",
+          height: "20px"
         }
       },
       {
@@ -424,31 +420,31 @@ const e = {
           }
         }
       }
-    ],
-    visualVariables: [
-      {
-        type: "size",
-        valueExpression: "$view.scale",
-        stops: [
-          {
-            size: 8,
-            value: 9000.954822000003
-          },
-          {
-            size: 6,
-            value: 18055.954822000003
-          },
-          {
-            size: 3,
-            value: 144447.638572
-          },
-          {
-            size: 2,
-            value: 1155581108577e-6
-          }
-        ]
-      }
     ]
+    // visualVariables: [
+    //   {
+    //     type: 'size',
+    //     valueExpression: '$view.scale',
+    //     stops: [
+    //       {
+    //         size: 8,
+    //         value: 9000.954822000003
+    //       },
+    //       {
+    //         size: 6,
+    //         value: 18055.954822000003
+    //       },
+    //       {
+    //         size: 3,
+    //         value: 144447.638572
+    //       },
+    //       {
+    //         size: 2,
+    //         value: 1155581.108577
+    //       }
+    //     ]
+    //   }
+    // ]
   }
 }, s = {
   id: "signalLayer",
@@ -762,7 +758,7 @@ const e = {
       }
     ]
   }
-}, a = {
+}, n = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -980,7 +976,7 @@ const e = {
 export {
   e as districtDashLineLayerOptions,
   t as districtSolidLineLayerOptions,
-  a as signalClusterLayerOptions,
+  n as signalClusterLayerOptions,
   l as signalMarkerLayerOptions,
   s as signalPictureLayerOptions,
   r as subDistrictLineLayerOptions,

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

@@ -1,7 +1,6 @@
 import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignalControlAreaParams } from '../../../types';
 export default class SignalControlAreaController1 {
     private view;
-    private hasGpu;
     /** 支队图层 */
     private detachmentLayer;
     private detachmentLayerLoaded;
@@ -9,7 +8,6 @@ export default class SignalControlAreaController1 {
     private subDistrictRenderer;
     private signalRenderer;
     private mapConfig;
-    private roadLines;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 显示所有区控、子区、信号机
@@ -51,11 +49,6 @@ export default class SignalControlAreaController1 {
         status: number;
         message: string;
     }>;
-    /**
-     * 获取道路线
-     * @returns
-     */
-    private loadRoadLine;
     /**
      * 加载支队图层
      * 现场环境用url创建FeatureLayer有各种问题，

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 R from "papaparse";
-import D from "../../stores/index.mjs";
-import p from "./district-controller.mjs";
-import w from "./district-renderer.mjs";
-import L from "./signal-renderer.mjs";
+import R from "../../stores/index.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 = !1;
-    const t = D.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.subDistrictRenderer = new C(e), this.signalRenderer = new L(e);
+    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 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 p(
-        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();
-      R.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,4 +1,4 @@
-import { IResult } from '../../../types';
+import { IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
 export default class CrossRenderer {
     private view;
@@ -16,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,14 @@
-import d from "@arcgis/core/Graphic";
-import u from "@arcgis/core/layers/FeatureLayer";
+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 u(
+    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(
+    ), 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,
@@ -19,10 +19,10 @@ class E {
   async showSignals(e) {
     await this.clearSignals();
     let r = 0;
-    const s = [];
-    e.forEach((a) => {
-      a.signals.forEach((i) => {
-        const t = new d({
+    const a = [];
+    e.forEach((s) => {
+      s.signals.forEach((i) => {
+        const t = new u({
           geometry: {
             type: "point",
             longitude: i.longitude,
@@ -34,8 +34,8 @@ class E {
             name: i.name,
             signalId: i.signalId,
             nodeId: i.nodeId || i.id,
-            districtId: a.id,
-            districtName: a.name,
+            districtId: s.id,
+            districtName: s.name,
             subDistrictId: "",
             subDistrictName: "",
             isKey: i.isKey,
@@ -43,10 +43,10 @@ class E {
             selected: !0
           }
         });
-        s.push(t);
-      }), a.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,
@@ -58,8 +58,8 @@ class E {
               name: t.name,
               signalId: t.signalId,
               nodeId: t.nodeId || t.id,
-              districtId: a.id,
-              districtName: a.name,
+              districtId: s.id,
+              districtName: s.name,
               subDistrictId: i.id,
               subDistrictName: i.name,
               isKey: t.isKey,
@@ -67,15 +67,15 @@ class E {
               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() {
@@ -98,19 +98,19 @@ class E {
     return { status: 0, message: "ok" };
   }
   async highlightSignal(e) {
-    let r = "", s = "";
-    const a = 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 o.viewGoto(this.view, i.features), { districtId: n, subDistrictId: l, count: t };
     } else
-      this.signalMarkerLayer.definitionExpression = a;
-    return { districtId: r, subDistrictId: s, count: t };
+      this.signalMarkerLayer.definitionExpression = s;
+    return { districtId: r, subDistrictId: a, count: t };
   }
-  filter(e, r) {
-    const s = `${e === "district" ? "districtId" : "subDistrictId"} = '${r}'`;
+  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() {

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

@@ -1,14 +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 clickHandler;
     private subDistrictPointLayer;
     private subDistrictLineLayer;
-    roadLines: IRoadLine[];
+    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;
     /**
@@ -30,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;
 }

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

@@ -1,13 +1,13 @@
-import v from "@arcgis/core/Graphic";
-import w from "@arcgis/core/layers/FeatureLayer";
-import g from "../common-utils.mjs";
-import { subDistrictPointLayerOptions as I, subDistrictLineLayerOptions as P } from "./layer-symbol.mjs";
-class S {
+import f from "@arcgis/core/Graphic";
+import m from "@arcgis/core/layers/FeatureLayer";
+import v from "../common-utils.mjs";
+import { subDistrictPointLayerOptions as I, subDistrictLineLayerOptions as z } from "./layer-symbol.mjs";
+class C {
   constructor(e) {
-    this.view = e, this.subDistrictPointLayer = new w(
+    this.roadConnections = [], this.view = e, this.subDistrictPointLayer = new m(
       I
-    ), this.subDistrictPointLayer.spatialReference = e.spatialReference, this.subDistrictPointLayer.popupEnabled = !0, this.subDistrictLineLayer = new w(
-      P
+    ), this.subDistrictPointLayer.spatialReference = e.spatialReference, this.subDistrictPointLayer.popupEnabled = !0, this.subDistrictLineLayer = new m(
+      z
     ), this.subDistrictLineLayer.spatialReference = e.spatialReference, this.subDistrictLineLayer.popupEnabled = !0, this.view.map.addMany([
       this.subDistrictLineLayer,
       this.subDistrictPointLayer
@@ -18,13 +18,13 @@ class S {
     let s = 0;
     const t = [], r = [];
     e.forEach((i) => {
-      r.push({
+      i.roadConnections.length > 0 && this.roadConnections.push(...i.roadConnections), r.push({
         value: i.id,
         label: i.name,
         symbol: {
           type: "simple-marker",
           style: "circle",
-          color: [0, 0, 0, 0],
+          color: [...i.areaColor, 0.8],
           size: "8px",
           outline: {
             color: [...i.areaColor],
@@ -32,7 +32,7 @@ class S {
           }
         }
       }), i.signals.forEach((a) => {
-        const n = new v({
+        const n = new f({
           geometry: {
             type: "point",
             longitude: a.longitude,
@@ -99,80 +99,69 @@ class S {
       addFeatures: t
     });
   }
+  /**
+   * 显示区控下的所有子区，用道路线表示
+   * @param id 区控ID
+   */
   async showRoads(e) {
-    const s = this.subDistrictPointLayer.createQuery();
-    s.where = `districtId = '${e}'`;
-    const t = await this.subDistrictPointLayer.queryFeatures(
-      s
-    ), r = /* @__PURE__ */ new Map();
-    t.features.forEach((n) => {
-      var o;
+    const { type: s, id: t } = e, r = this.subDistrictPointLayer.createQuery(), i = s === "district" ? "districtId" : "subDistrictId";
+    r.where = `${i} = '${t}'`;
+    const a = await this.subDistrictPointLayer.queryFeatures(
+      r
+    ), n = /* @__PURE__ */ new Map();
+    a.features.forEach((u) => {
+      var y;
       const {
-        subDistrictId: c,
-        color: l,
-        id: b,
-        districtName: h,
-        subDistrictName: u,
-        signalCount: y
-      } = n.attributes;
-      r.has(c) || r.set(c, {
-        color: l,
+        subDistrictId: o,
+        color: c,
+        id: d,
+        districtName: p,
+        subDistrictName: L,
+        signalCount: b
+      } = u.attributes;
+      n.has(o) || n.set(o, {
+        color: c,
         signalIds: [],
-        districtName: h,
-        subDistrictName: u,
-        signalCount: y
-      }), (o = r.get(c)) == null || o.signalIds.push(b);
+        districtName: p,
+        subDistrictName: L,
+        signalCount: b
+      }), (y = n.get(o)) == null || y.signalIds.push(d);
     });
-    const i = [], a = [];
-    for (const n of r) {
-      let c = 0;
-      const l = n[0];
-      i.push({
-        value: l,
+    const h = [], D = [];
+    for (const u of n) {
+      let o = 0;
+      const c = u[0];
+      h.push({
+        value: c,
         symbol: {
           type: "simple-line",
-          color: n[1].color.split(",").map(Number),
+          color: u[1].color.split(",").map(Number),
           width: 2,
           style: "solid"
         }
       });
-      const { districtName: b, subDistrictName: h, signalIds: u, signalCount: y } = n[1];
-      if (!(u.length < 2))
-        for (let o = 0; o < u.length; o++)
-          for (let d = 0; d < u.length; d++) {
-            if (o === d)
-              continue;
-            const f = u[o], L = u[d];
-            if (a.some((p) => {
-              const m = p.attributes;
-              return m && m.fromNode === L && m.toNode === f;
-            }))
-              continue;
-            const D = this.roadLines.find(
-              (p) => p.fromNode === f && p.toNode === L
-            );
-            if (!D)
-              continue;
-            const z = new v({
-              geometry: {
-                type: "polyline",
-                paths: [D.coordinates]
-              },
-              attributes: {
-                ObjectID: c++,
-                id: D.id,
-                districtId: e,
-                subDistrictId: l,
-                subDistrictName: h,
-                districtName: b,
-                signalCount: y,
-                fromNode: f,
-                toNode: L,
-                color: n[1].color
-              }
-            });
-            a.push(z);
+      const { districtName: d, subDistrictName: p, signalIds: L, signalCount: b } = u[1];
+      this.roadConnections.filter(
+        (l) => l.subDistrictId === c
+      ).forEach((l) => {
+        const w = new f({
+          geometry: {
+            type: "polyline",
+            paths: l.coordinates
+          },
+          attributes: {
+            ObjectID: o++,
+            id: l.id,
+            districtId: l.districtId,
+            subDistrictId: c,
+            subDistrictName: p,
+            districtName: d,
+            signalCount: b,
+            color: u[1].color
           }
+        });
+        D.push(w);
+      });
     }
     this.subDistrictLineLayer.renderer = {
       type: "unique-value",
@@ -184,7 +173,7 @@ class S {
         style: "solid"
       },
       defaultLabel: "其他子区",
-      uniqueValueInfos: i,
+      uniqueValueInfos: h,
       visualVariables: [
         {
           type: "size",
@@ -214,7 +203,7 @@ class S {
         }
       ]
     }, this.currentLineRenderer = this.subDistrictLineLayer.renderer.clone(), await this.subDistrictLineLayer.applyEdits({
-      addFeatures: a
+      addFeatures: D
     });
   }
   async clearSubDistricts() {
@@ -239,7 +228,7 @@ class S {
     const s = this.subDistrictPointLayer.createQuery();
     s.where = `subDistrictId = '${e}'`, s.returnGeometry = !0;
     const t = await this.subDistrictPointLayer.queryFeatures(s);
-    return t.features.length > 0 ? (await g.viewGoto(this.view, t.features), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
+    return t.features.length > 0 ? (await v.viewGoto(this.view, t.features), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
   }
   /**
    * 高亮子区, 其他子区隐藏
@@ -251,16 +240,16 @@ class S {
     const t = this.subDistrictPointLayer.definitionExpression;
     this.subDistrictPointLayer.definitionExpression = `subDistrictId = '${e}'`;
     const r = await this.subDistrictPointLayer.queryFeatures(), i = r.features.length;
-    return i > 0 ? (this.subDistrictLineLayer.definitionExpression = `subDistrictId = '${e}'`, s = r.features[0].attributes.districtId, await g.viewGoto(this.view, r.features)) : this.subDistrictPointLayer.definitionExpression = t, { count: i, parentId: s };
+    return i > 0 ? (this.subDistrictLineLayer.definitionExpression = `subDistrictId = '${e}'`, s = r.features[0].attributes.districtId, await v.viewGoto(this.view, r.features)) : this.subDistrictPointLayer.definitionExpression = t, { count: i, parentId: s };
   }
   /**
    * 按照区控、子区id显示子区
    * @param type 类型，district 或 subDistrict
    * @param id
    */
-  filter(e, s) {
-    const t = `${e === "district" ? "districtId" : "subDistrictId"} = '${s}'`;
-    this.subDistrictPointLayer.definitionExpression = t, this.subDistrictLineLayer.definitionExpression = t;
+  filter(e) {
+    const { type: s, id: t } = e, r = `${s === "district" ? "districtId" : "subDistrictId"} = '${t}'`;
+    this.subDistrictPointLayer.definitionExpression = r, this.subDistrictLineLayer.definitionExpression = r;
   }
   /**
    * 重置过滤器，显示所有子区
@@ -268,6 +257,10 @@ class S {
   resetFilter() {
     this.subDistrictPointLayer.definitionExpression = "1=1", this.subDistrictLineLayer.definitionExpression = "1=1";
   }
+  /**
+   * 监听地图点击事件，进行子区高亮
+   * @param event
+   */
   async viewHitTest(e) {
     var r;
     const t = (r = (await this.view.hitTest(e, {
@@ -276,9 +269,9 @@ class S {
       (i) => i.type === "graphic"
     );
     if (t.length === 0)
-      this.subDistrictPointLayer.renderer = this.currentPointRenderer, this.subDistrictLineLayer.renderer = this.currentLineRenderer;
+      console.time("resetRenderer"), this.subDistrictPointLayer.renderer = this.currentPointRenderer, this.subDistrictLineLayer.renderer = this.currentLineRenderer;
     else {
-      const i = t[0].graphic;
+      const i = t[0].graphic, a = i.attributes.color.split(",").map(Number);
       this.subDistrictPointLayer.renderer = {
         type: "unique-value",
         field: "subDistrictId",
@@ -299,10 +292,10 @@ class S {
             symbol: {
               type: "simple-marker",
               style: "circle",
-              color: [0, 0, 0, 0],
+              color: [...a, 0.8],
               size: "8px",
               outline: {
-                color: i.attributes.color.split(",").map(Number),
+                color: a,
                 width: 4
               }
             }
@@ -390,5 +383,5 @@ class S {
   }
 }
 export {
-  S as default
+  C as default
 };

package/es/src/types/index.d.ts

@@ -275,6 +275,12 @@ export interface IShowSignalControlAreaParams {
     areaList: any[];
     style?: string;
 }
+export interface IDistrictRoad {
+    id: string;
+    coordinates: number[][];
+    districtId: string;
+    subDistrictId: string;
+}
 export interface IFindSignalControlAreaParams {
     type: string;
     id: string;

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

@@ -1,3 +1,4 @@
+import { IDistrictRoad } from 'packages/components/src/types';
 interface ICross {
     id: string;
     name: string;
@@ -18,6 +19,7 @@ export default class DistrictController {
     areaColor: [number, number, number];
     signalCount: number;
     subDistrictCount: number;
+    roadConnections: IDistrictRoad[];
     constructor(params: any, style: string);
     /**
      * 获取区控/子区下的所有信号机

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("../common-utils.js");class n{constructor(s,e){this.parentName="",this.signals=[],this.subDistricts=[],this.areaColor=this.getDarkNonGrayColor(),this.signalCount=0,this.subDistrictCount=0,this.id=s.name,this.name=s.areaDesc,this.parentId=s.parentId,e==="alarm"&&(this.areaColor=[255,0,0]);for(const t of s.children)if(t.children){const i=new n(t,e);i.id=t.id,i.name=`SS ${t.name}`,i.parentId=this.id,i.parentName=this.name,i.areaColor=this.getDarkNonGrayColor(t.id),this.subDistricts.push(i),this.subDistrictCount++,this.signalCount+=i.signalCount}else if(r.default.isCoordinateValid(t)){const i={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,nodeId:t.nodeId,isKey:t.isKey===1};this.signals.push(i),this.signalCount++}}getAllSignalCoordinates(){const s=[];for(const e of this.signals)s.push([e.longitude,e.latitude]);for(const e of this.subDistricts)s.push(...e.getAllSignalCoordinates());return s}getDarkNonGrayColor(s){let e,t,i;if(s){const o=this.cyrb53(s);e=((o&16711680)>>16)%200,t=((o&65280)>>8)%200,i=(o&255)%200}else e=Math.floor(Math.random()*256),t=Math.floor(Math.random()*256),i=Math.floor(Math.random()*256);return[e,t,i]}cyrb53(s,e=0){let t=3735928559^e,i=1103547991^e;for(let o=0,a;o<s.length;o++)a=s.charCodeAt(o),t=Math.imul(t^a,2654435761),i=Math.imul(i^a,1597334677);return t=Math.imul(t^t>>>16,2246822507),t^=Math.imul(i^i>>>13,3266489909),i=Math.imul(i^i>>>16,2246822507),i^=Math.imul(t^t>>>13,3266489909),4294967296*(2097151&i)+(t>>>0)}}exports.default=n;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("pako"),c=require("../common-utils.js");class r{constructor(o,s){this.parentName="",this.signals=[],this.subDistricts=[],this.areaColor=this.getDarkNonGrayColor(),this.signalCount=0,this.subDistrictCount=0,this.roadConnections=[],this.id=o.name,this.name=o.areaDesc,this.parentId=o.parentId,s==="alarm"&&(this.areaColor=[255,0,0]);for(const t of o.children)if(t.children){const i=new r(t,s);if(i.id=t.id,i.name=`SS ${t.name}`,i.parentId=this.id,i.parentName=this.name,i.areaColor=this.getDarkNonGrayColor(t.id),this.subDistricts.push(i),this.subDistrictCount++,this.signalCount+=i.signalCount,t.mapConnectList)try{const a=t.mapConnectList,n=new Uint8Array(window.atob(a).split("").map(e=>e.charCodeAt(0))),l=h.inflate(n,{to:"string"}),d=JSON.parse(l);i.roadConnections.push(...d.map(e=>({id:e.roadsectId,coordinates:JSON.parse(e.geomData).coordinates,districtId:i.parentId,subDistrictId:i.id}))),console.log(i.roadConnections)}catch(a){console.error("解压子区路段连接信息失败:",a)}}else if(c.default.isCoordinateValid(t)){const i={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,nodeId:t.nodeId,isKey:t.isKey===1};this.signals.push(i),this.signalCount++}}getAllSignalCoordinates(){const o=[];for(const s of this.signals)o.push([s.longitude,s.latitude]);for(const s of this.subDistricts)o.push(...s.getAllSignalCoordinates());return o}getDarkNonGrayColor(o){let s,t,i;if(o){const a=this.cyrb53(o);s=((a&16711680)>>16)%200,t=((a&65280)>>8)%200,i=(a&255)%200}else s=Math.floor(Math.random()*256),t=Math.floor(Math.random()*256),i=Math.floor(Math.random()*256);return[s,t,i]}cyrb53(o,s=0){let t=3735928559^s,i=1103547991^s;for(let a=0,n;a<o.length;a++)n=o.charCodeAt(a),t=Math.imul(t^n,2654435761),i=Math.imul(i^n,1597334677);return t=Math.imul(t^t>>>16,2246822507),t^=Math.imul(i^i>>>13,3266489909),i=Math.imul(i^i>>>16,2246822507),i^=Math.imul(t^t>>>13,3266489909),4294967296*(2097151&i)+(t>>>0)}}exports.default=r;

package/lib/src/gis-map/utils/signal-control-area/layer-symbol.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e={id:"districtController",source:[],objectIdField:"ObjectID",geometryType:"polyline",outFields:["*"],fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"},{name:"selected",type:"string"}],renderer:{type:"unique-value",field:"selected",defaultSymbol:{type:"simple-line",style:"long-dash",color:[111,100,255],width:2},uniqueValueInfos:[{value:"false",symbol:{type:"simple-line",style:"long-dash",color:[180,180,180],width:1}}]}},t={id:"districtController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"subDistrictCount",label:"子区数量"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"unique-value",field:"selected",defaultSymbol:{type:"simple-line",style:"solid",color:[111,100,255,.4],width:2},uniqueValueInfos:[{value:"false",symbol:{type:"simple-line",style:"solid",color:[180,180,180,.4],width:1}}]}},i={id:"subDistrictPointController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"signalCount",type:"integer"},{name:"selected",type:"string"},{name:"type",type:"string"},{name:"color",type:"string"}],popupTemplate:{title:"{subDistrictName} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"districtName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]}},r={id:"subDistrictLineController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"signalCount",type:"integer"},{name:"fromNode",type:"string"},{name:"toNode",type:"string"},{name:"color",type:"string"}],popupTemplate:{title:"{subDistrictName} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"districtName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]}},l={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",field2:"selected",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:0}},uniqueValueInfos:[{value:"true,true",symbol:{type:"simple-marker",style:"circle",color:[254,172,22,.8],size:8,outline:{color:"white",width:0}}},{value:"false,true",symbol:{type:"simple-marker",style:"circle",color:[5,116,255,.8],size:8,outline:{color:"white",width:0}}},{value:"true,false",symbol:{type:"simple-marker",style:"circle",color:[180,180,180,.8],size:8,outline:{color:"white",width:0}}},{value:"false,false",symbol:{type:"simple-marker",style:"circle",color:[180,180,180,.8],size:8,outline:{color:"white",width:0}}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:8,value:9000.954822000003},{size:6,value:18055.954822000003},{size:3,value:144447.638572},{size:2,value:1155581108577e-6}]}]}},s={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",minScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",field2:"selected",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true,true",symbol:{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:30,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:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png"}]}}}},{value:"false,true",symbol:{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: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:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}},{value:"true,false",symbol:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_gjxk_gray.png",width:20,height:20}},{value:"false,false",symbol:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_xhj_gray.png",width:20,height:20}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:28,value:2250},{size:24,value:4500}]}]}},a={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],featureReduction:{type:"cluster",clusterRadius:"120px",clusterMaxSize:"50px",clusterMinSize:"30px",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.cluster_count",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:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""},{type:"CIMMarkerGraphic",geometry:{rings:[[[-15,40],[15,40],[15,20],[-15,20],[-15,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:40,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}},popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"simple",symbol:{type:"simple-marker",style:"circle",color:[5,116,255],size:8,outline:{color:"white",width:1}}}};exports.districtDashLineLayerOptions=e;exports.districtSolidLineLayerOptions=t;exports.signalClusterLayerOptions=a;exports.signalMarkerLayerOptions=l;exports.signalPictureLayerOptions=s;exports.subDistrictLineLayerOptions=r;exports.subDistrictPointLayerOptions=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e={id:"districtController",source:[],objectIdField:"ObjectID",geometryType:"polyline",outFields:["*"],fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"},{name:"selected",type:"string"}],renderer:{type:"unique-value",field:"selected",defaultSymbol:{type:"simple-line",style:"long-dash",color:[111,100,255],width:2},uniqueValueInfos:[{value:"false",symbol:{type:"simple-line",style:"long-dash",color:[180,180,180],width:1}}]}},t={id:"districtController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"subDistrictCount",label:"子区数量"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"unique-value",field:"selected",defaultSymbol:{type:"simple-line",style:"solid",color:[111,100,255,.4],width:2},uniqueValueInfos:[{value:"false",symbol:{type:"simple-line",style:"solid",color:[180,180,180,.4],width:1}}]}},i={id:"subDistrictPointController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"signalCount",type:"integer"},{name:"selected",type:"string"},{name:"type",type:"string"},{name:"color",type:"string"}],popupTemplate:{title:"{subDistrictName} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"districtName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]}},r={id:"subDistrictLineController",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"signalCount",type:"integer"},{name:"fromNode",type:"string"},{name:"toNode",type:"string"},{name:"color",type:"string"}],popupTemplate:{title:"{subDistrictName} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"districtName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]}},s={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",field2:"selected",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:0}},uniqueValueInfos:[{value:"true,true",symbol:{type:"picture-marker",url:"/GisViewerAssets/Images/icon_star.png",width:"20px",height:"20px"}},{value:"false,true",symbol:{type:"simple-marker",style:"circle",color:[5,116,255,.8],size:8,outline:{color:"white",width:0}}},{value:"true,false",symbol:{type:"simple-marker",style:"circle",color:[180,180,180,.8],size:8,outline:{color:"white",width:0}}},{value:"false,false",symbol:{type:"simple-marker",style:"circle",color:[180,180,180,.8],size:8,outline:{color:"white",width:0}}}]}},l={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",minScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",field2:"selected",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true,true",symbol:{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:30,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:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png"}]}}}},{value:"false,true",symbol:{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: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:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}},{value:"true,false",symbol:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_gjxk_gray.png",width:20,height:20}},{value:"false,false",symbol:{type:"picture-marker",url:"/GisViewerAssets/Images/cross/gis_xhj_gray.png",width:20,height:20}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:28,value:2250},{size:24,value:4500}]}]}},n={id:"signalLayer",source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"},{name:"type",type:"string"},{name:"type",type:"string"},{name:"selected",type:"string"}],featureReduction:{type:"cluster",clusterRadius:"120px",clusterMaxSize:"50px",clusterMinSize:"30px",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.cluster_count",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:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""},{type:"CIMMarkerGraphic",geometry:{rings:[[[-15,40],[15,40],[15,20],[-15,20],[-15,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:40,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}},popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"simple",symbol:{type:"simple-marker",style:"circle",color:[5,116,255],size:8,outline:{color:"white",width:1}}}};exports.districtDashLineLayerOptions=e;exports.districtSolidLineLayerOptions=t;exports.signalClusterLayerOptions=n;exports.signalMarkerLayerOptions=s;exports.signalPictureLayerOptions=l;exports.subDistrictLineLayerOptions=r;exports.subDistrictPointLayerOptions=i;

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

@@ -1,7 +1,6 @@
 import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignalControlAreaParams } from '../../../types';
 export default class SignalControlAreaController1 {
     private view;
-    private hasGpu;
     /** 支队图层 */
     private detachmentLayer;
     private detachmentLayerLoaded;
@@ -9,7 +8,6 @@ export default class SignalControlAreaController1 {
     private subDistrictRenderer;
     private signalRenderer;
     private mapConfig;
-    private roadLines;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 显示所有区控、子区、信号机
@@ -51,11 +49,6 @@ export default class SignalControlAreaController1 {
         status: number;
         message: string;
     }>;
-    /**
-     * 获取道路线
-     * @returns
-     */
-    private loadRoadLine;
     /**
      * 加载支队图层
      * 现场环境用url创建FeatureLayer有各种问题，

package/lib/src/gis-map/utils/signal-control-area/show-area.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("@arcgis/core/geometry"),y=require("@arcgis/core/geometry/support/webMercatorUtils"),g=require("@arcgis/core/Graphic"),R=require("@arcgis/core/layers/GraphicsLayer"),D=require("papaparse"),w=require("../../stores/index.js"),m=require("./district-controller.js"),p=require("./district-renderer.js"),L=require("./signal-renderer.js"),C=require("./sub-district-renderer.js");class S{constructor(e){this.detachmentLayerLoaded=!1,this.view=e,this.hasGpu=!1;const t=w.default.useAppDataStore;this.mapConfig=JSON.parse(JSON.stringify(t.mapConfig)),this.detachmentLayer=new R,this.view.map.add(this.detachmentLayer),this.districtRenderer=new p.default(e),this.subDistrictRenderer=new C.default(e),this.signalRenderer=new L.default(e)}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 n of e.areaList){const i=new m.default(n,e.style||"");t.push(i),s.push(...i.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"}}async clearSignalControlArea(){return await this.districtRenderer.clearDistricts(),await this.subDistrictRenderer.clearSubDistricts(),await this.signalRenderer.clearSignals(),{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtRenderer.setVisible(e.visible);break;case"subDistrict":this.subDistrictRenderer.setVisible(e.visible);break;case"signal":this.signalRenderer.setPointVisible(e.visible);break;case"signalCluster":this.signalRenderer.setClusterVisible(e.visible);break;case"shanghai_district":this.detachmentLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":return await this.districtRenderer.locateDistrict(e.id);case"subDistrict":return await this.subDistrictRenderer.locateSubDistrict(e.id);case"signal":return await this.signalRenderer.locateSignal(e.id);default:return{status:1,message:"未知类型"}}}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:"未找到区控"};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:"未找到子区"}}case"signal":{const{districtId:t,subDistrictId:s,count:n}=await this.signalRenderer.highlightSignal(e.id);return n>0?(this.districtRenderer.filter(t),this.subDistrictRenderer.filter("subDistrict",s),{status:0,message:"ok"}):{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async resetHighlight(){return this.districtRenderer.resetFilter(),this.subDistrictRenderer.resetFilter(),this.signalRenderer.resetFilter(),{status:0,message:"ok"}}async loadRoadLine(){var t;const e=(t=this.mapConfig.signalControlArea)==null?void 0:t.roadLayerUrl;if(!e){console.warn("未配置道路线图层URL");return}try{const n=await(await fetch(`/GisViewerAssets/${e}`)).text();D.parse(n,{header:!0,skipEmptyLines:!0,complete:i=>{const{data:r}=i;this.roadLines=r.map(a=>({id:a.ROADSECT_ID,fromNode:a.FROM_NODE_ID,toNode:a.TO_NODE_ID,coordinates:JSON.parse(a.GEOM).coordinates}))},error:i=>{console.error("道路线CSV解析失败:",i)}})}catch(s){console.error("读取道路线CSV失败:",s)}}async loadDetachmentLayer(){const e=this.mapConfig.baseLayers;if(!e)return;const t=e.find(s=>s.options.id==="shanghai_district");if(t)try{const n=await(await fetch("/GisViewerAssets/ShangHai/Layers/district.json")).json(),i=[],{renderer:r,labelingInfo:a}=t.options;n.features.forEach(d=>{const c=d.attributes.ZD_NAME;if(c!=="高架支队"){let l=new f.Polygon({rings:d.geometry.rings});l=y.webMercatorToGeographic(l);const o=new g({geometry:l,attributes:d.attributes});if(r){if(r.type==="simple")o.symbol=r.symbol;else if(r.type==="unique-value"){const h=o.getAttribute("OBJECTID"),u=r.uniqueValueInfos.find(b=>b.value==h);o.symbol=u?u.symbol:r.defaultSymbol}}else o.symbol={type:"simple-fill",color:[227,237,255,.4],outline:{color:[255,195,153],width:2}};if(i.push(o),a&&c!=="边防港航支队"&&c!=="机场支队"){const h=new g({geometry:l.centroid,symbol:{...a.symbol,text:c}});i.push(h)}}}),this.detachmentLayer.addMany(i),this.detachmentLayerLoaded=!0}catch(s){console.error("加载支队图层失败:",s);return}}}exports.default=S;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("@arcgis/core/geometry"),y=require("@arcgis/core/geometry/support/webMercatorUtils"),g=require("@arcgis/core/Graphic"),w=require("@arcgis/core/layers/GraphicsLayer"),R=require("../../stores/index.js"),D=require("./district-controller.js"),m=require("./district-renderer.js"),S=require("./signal-renderer.js"),C=require("./sub-district-renderer.js");class p{constructor(e){this.detachmentLayerLoaded=!1,this.view=e;const t=R.default.useAppDataStore;this.mapConfig=JSON.parse(JSON.stringify(t.mapConfig)),this.detachmentLayer=new w,this.view.map.add(this.detachmentLayer),this.districtRenderer=new m.default(e),this.subDistrictRenderer=new C.default(e),this.signalRenderer=new S.default(e)}async showSignalControlArea(e){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=[],s=[];for(const n of e.areaList){const i=new D.default(n,e.style||"");t.push(i),s.push(...i.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"}}async clearSignalControlArea(){return await this.districtRenderer.clearDistricts(),await this.subDistrictRenderer.clearSubDistricts(),await this.signalRenderer.clearSignals(),{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtRenderer.setVisible(e.visible);break;case"subDistrict":this.subDistrictRenderer.setVisible(e.visible);break;case"signal":this.signalRenderer.setPointVisible(e.visible);break;case"signalCluster":this.signalRenderer.setClusterVisible(e.visible);break;case"shanghai_district":this.detachmentLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":return await this.districtRenderer.locateDistrict(e.id);case"subDistrict":return await this.subDistrictRenderer.locateSubDistrict(e.id);case"signal":return await this.signalRenderer.locateSignal(e.id);default:return{status:1,message:"未知类型"}}}async highlightSignalControlArea(e){switch(this.view.closePopup(),e.type){case"district":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(e),{status:0,message:"ok"}):{status:1,message:"未找到子区"}}case"signal":{const{districtId:t,subDistrictId:s,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:"未知类型"}}}async resetHighlight(){return this.districtRenderer.resetFilter(),this.subDistrictRenderer.resetFilter(),this.signalRenderer.resetFilter(),{status:0,message:"ok"}}async loadDetachmentLayer(){const e=this.mapConfig.baseLayers;if(!e)return;const t=e.find(s=>s.options.id==="shanghai_district");if(t)try{const n=await(await fetch("/GisViewerAssets/ShangHai/Layers/district.json")).json(),i=[],{renderer:r,labelingInfo:u}=t.options;n.features.forEach(o=>{const l=o.attributes.ZD_NAME;if(l!=="高架支队"){let c=new f.Polygon({rings:o.geometry.rings});c=y.webMercatorToGeographic(c);const a=new g({geometry:c,attributes:o.attributes});if(r){if(r.type==="simple")a.symbol=r.symbol;else if(r.type==="unique-value"){const d=a.getAttribute("OBJECTID"),h=r.uniqueValueInfos.find(b=>b.value==d);a.symbol=h?h.symbol:r.defaultSymbol}}else a.symbol={type:"simple-fill",color:[227,237,255,.4],outline:{color:[255,195,153],width:2}};if(i.push(a),u&&l!=="边防港航支队"&&l!=="机场支队"){const d=new g({geometry:c.centroid,symbol:{...u.symbol,text:l}});i.push(d)}}}),this.detachmentLayer.addMany(i),this.detachmentLayerLoaded=!0}catch(s){console.error("加载支队图层失败:",s);return}}}exports.default=p;

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

@@ -1,4 +1,4 @@
-import { IResult } from '../../../types';
+import { IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
 export default class CrossRenderer {
     private view;
@@ -16,6 +16,6 @@ export default class CrossRenderer {
         subDistrictId: string;
         count: number;
     }>;
-    filter(type: string, id: string): void;
+    filter(params: IFindSignalControlAreaParams): void;
     resetFilter(): void;
 }

package/lib/src/gis-map/utils/signal-control-area/signal-renderer.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("@arcgis/core/Graphic"),u=require("@arcgis/core/layers/FeatureLayer"),o=require("../common-utils.js"),l=require("./layer-symbol.js");class y{constructor(e){this.view=e,this.signalMarkerLayer=new u(l.signalMarkerLayerOptions),this.signalMarkerLayer.spatialReference=e.spatialReference,this.signalMarkerLayer.popupEnabled=!0,this.signalPictureLayer=new u(l.signalPictureLayerOptions),this.signalPictureLayer.spatialReference=e.spatialReference,this.signalPictureLayer.popupEnabled=!0,this.signalClusterLayer=new u(l.signalClusterLayerOptions),this.signalClusterLayer.spatialReference=e.spatialReference,this.signalClusterLayer.popupEnabled=!0,this.view.map.addMany([this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer])}async showSignals(e){await this.clearSignals();let r=0;const s=[];e.forEach(a=>{a.signals.forEach(i=>{const t=new d({geometry:{type:"point",longitude:i.longitude,latitude:i.latitude},attributes:{ObjectID:r++,id:i.id,name:i.name,signalId:i.signalId,nodeId:i.nodeId||i.id,districtId:a.id,districtName:a.name,subDistrictId:"",subDistrictName:"",isKey:i.isKey,type:"signal",selected:!0}});s.push(t)}),a.subDistricts.forEach(i=>{i.signals.forEach(t=>{const n=new d({geometry:{type:"point",longitude:t.longitude,latitude:t.latitude},attributes:{ObjectID:r++,id:t.id,name:t.name,signalId:t.signalId,nodeId:t.nodeId||t.id,districtId:a.id,districtName:a.name,subDistrictId:i.id,subDistrictName:i.name,isKey:t.isKey,type:"signal",selected:!0}});s.push(n)})})}),await this.signalMarkerLayer.applyEdits({addFeatures:s}),await this.signalPictureLayer.applyEdits({addFeatures:s}),await this.signalClusterLayer.applyEdits({addFeatures:s})}async clearSignals(){let e=await this.signalMarkerLayer.queryFeatures();await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),this.signalMarkerLayer.definitionExpression="1=1",e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),this.signalPictureLayer.definitionExpression="1=1",e=await this.signalClusterLayer.queryFeatures(),await this.signalClusterLayer.applyEdits({deleteFeatures:e.features}),this.signalClusterLayer.definitionExpression="1=1"}async setPointVisible(e){this.signalMarkerLayer.visible=e,this.signalPictureLayer.visible=e}setClusterVisible(e){this.signalClusterLayer.visible=e}async locateSignal(e){return{status:0,message:"ok"}}async highlightSignal(e){let r="",s="";const a=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||"",c=i.features[0].attributes.subDistrictId||"";return await o.default.viewGoto(this.view,i.features),{districtId:n,subDistrictId:c,count:t}}else this.signalMarkerLayer.definitionExpression=a;return{districtId:r,subDistrictId:s,count:t}}filter(e,r){const s=`${e==="district"?"districtId":"subDistrictId"} = '${r}'`;this.signalClusterLayer.definitionExpression=s,this.signalMarkerLayer.definitionExpression=s,this.signalPictureLayer.definitionExpression=s}resetFilter(){const e="1=1";this.signalClusterLayer.definitionExpression=e,this.signalMarkerLayer.definitionExpression=e,this.signalPictureLayer.definitionExpression=e}}exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("@arcgis/core/Graphic"),u=require("@arcgis/core/layers/FeatureLayer"),o=require("../common-utils.js"),l=require("./layer-symbol.js");class y{constructor(e){this.view=e,this.signalMarkerLayer=new u(l.signalMarkerLayerOptions),this.signalMarkerLayer.spatialReference=e.spatialReference,this.signalMarkerLayer.popupEnabled=!0,this.signalPictureLayer=new u(l.signalPictureLayerOptions),this.signalPictureLayer.spatialReference=e.spatialReference,this.signalPictureLayer.popupEnabled=!0,this.signalClusterLayer=new u(l.signalClusterLayerOptions),this.signalClusterLayer.spatialReference=e.spatialReference,this.signalClusterLayer.popupEnabled=!0,this.view.map.addMany([this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer])}async showSignals(e){await this.clearSignals();let r=0;const a=[];e.forEach(s=>{s.signals.forEach(i=>{const t=new d({geometry:{type:"point",longitude:i.longitude,latitude:i.latitude},attributes:{ObjectID:r++,id:i.id,name:i.name,signalId:i.signalId,nodeId:i.nodeId||i.id,districtId:s.id,districtName:s.name,subDistrictId:"",subDistrictName:"",isKey:i.isKey,type:"signal",selected:!0}});a.push(t)}),s.subDistricts.forEach(i=>{i.signals.forEach(t=>{const n=new d({geometry:{type:"point",longitude:t.longitude,latitude:t.latitude},attributes:{ObjectID:r++,id:t.id,name:t.name,signalId:t.signalId,nodeId:t.nodeId||t.id,districtId:s.id,districtName:s.name,subDistrictId:i.id,subDistrictName:i.name,isKey:t.isKey,type:"signal",selected:!0}});a.push(n)})})}),await this.signalMarkerLayer.applyEdits({addFeatures:a}),await this.signalPictureLayer.applyEdits({addFeatures:a}),await this.signalClusterLayer.applyEdits({addFeatures:a})}async clearSignals(){let e=await this.signalMarkerLayer.queryFeatures();await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),this.signalMarkerLayer.definitionExpression="1=1",e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),this.signalPictureLayer.definitionExpression="1=1",e=await this.signalClusterLayer.queryFeatures(),await this.signalClusterLayer.applyEdits({deleteFeatures:e.features}),this.signalClusterLayer.definitionExpression="1=1"}async setPointVisible(e){this.signalMarkerLayer.visible=e,this.signalPictureLayer.visible=e}setClusterVisible(e){this.signalClusterLayer.visible=e}async locateSignal(e){return{status:0,message:"ok"}}async highlightSignal(e){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||"",c=i.features[0].attributes.subDistrictId||"";return await o.default.viewGoto(this.view,i.features),{districtId:n,subDistrictId:c,count:t}}else this.signalMarkerLayer.definitionExpression=s;return{districtId:r,subDistrictId:a,count:t}}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(){const e="1=1";this.signalClusterLayer.definitionExpression=e,this.signalMarkerLayer.definitionExpression=e,this.signalPictureLayer.definitionExpression=e}}exports.default=y;

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

@@ -1,14 +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 clickHandler;
     private subDistrictPointLayer;
     private subDistrictLineLayer;
-    roadLines: IRoadLine[];
+    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;
     /**
@@ -30,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;
 }

package/lib/src/gis-map/utils/signal-control-area/sub-district-renderer.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const m=require("@arcgis/core/Graphic"),w=require("@arcgis/core/layers/FeatureLayer"),g=require("../common-utils.js"),P=require("./layer-symbol.js");class I{constructor(e){this.view=e,this.subDistrictPointLayer=new w(P.subDistrictPointLayerOptions),this.subDistrictPointLayer.spatialReference=e.spatialReference,this.subDistrictPointLayer.popupEnabled=!0,this.subDistrictLineLayer=new w(P.subDistrictLineLayerOptions),this.subDistrictLineLayer.spatialReference=e.spatialReference,this.subDistrictLineLayer.popupEnabled=!0,this.view.map.addMany([this.subDistrictLineLayer,this.subDistrictPointLayer])}async showSubDistricts(e){await this.clearSubDistricts(),this.clickHandler=this.view.on("click",this.viewHitTest.bind(this));let s=0;const t=[],r=[];e.forEach(i=>{r.push({value:i.id,label:i.name,symbol:{type:"simple-marker",style:"circle",color:[0,0,0,0],size:"8px",outline:{color:[...i.areaColor],width:4}}}),i.signals.forEach(a=>{const u=new m({geometry:{type:"point",longitude:a.longitude,latitude:a.latitude},attributes:{ObjectID:s++,id:a.nodeId,name:a.name,subDistrictId:i.id,subDistrictName:i.name,districtId:i.parentId,districtName:i.parentName,signalCount:i.signalCount,color:i.areaColor.join(","),type:"subDistrict"}});t.push(u)})}),this.subDistrictPointLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-marker",color:[180,180,180,.5],size:"8px",outline:{color:"white",width:1}},defaultLabel:"其他子区",uniqueValueInfos:r,visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:24,value:2500},{size:20,value:5e3},{size:8,value:18055.954822000003},{size:4,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.currentPointRenderer=this.subDistrictPointLayer.renderer.clone(),await this.subDistrictPointLayer.applyEdits({addFeatures:t})}async showRoads(e){const s=this.subDistrictPointLayer.createQuery();s.where=`districtId = '${e}'`;const t=await this.subDistrictPointLayer.queryFeatures(s),r=new Map;t.features.forEach(u=>{var o;const{subDistrictId:l,color:c,id:y,districtName:p,subDistrictName:n,signalCount:h}=u.attributes;r.has(l)||r.set(l,{color:c,signalIds:[],districtName:p,subDistrictName:n,signalCount:h}),(o=r.get(l))==null||o.signalIds.push(y)});const i=[],a=[];for(const u of r){let l=0;const c=u[0];i.push({value:c,symbol:{type:"simple-line",color:u[1].color.split(",").map(Number),width:2,style:"solid"}});const{districtName:y,subDistrictName:p,signalIds:n,signalCount:h}=u[1];if(!(n.length<2))for(let o=0;o<n.length;o++)for(let d=0;d<n.length;d++){if(o===d)continue;const L=n[o],f=n[d];if(a.some(b=>{const v=b.attributes;return v&&v.fromNode===f&&v.toNode===L}))continue;const D=this.roadLines.find(b=>b.fromNode===L&&b.toNode===f);if(!D)continue;const z=new m({geometry:{type:"polyline",paths:[D.coordinates]},attributes:{ObjectID:l++,id:D.id,districtId:e,subDistrictId:c,subDistrictName:p,districtName:y,signalCount:h,fromNode:L,toNode:f,color:u[1].color}});a.push(z)}}this.subDistrictLineLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-line",color:[180,180,180,.5],width:2,style:"solid"},defaultLabel:"其他子区",uniqueValueInfos:i,visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:6,value:2500},{size:5,value:5e3},{size:4,value:18055.954822000003},{size:3,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.currentLineRenderer=this.subDistrictLineLayer.renderer.clone(),await this.subDistrictLineLayer.applyEdits({addFeatures:a})}async clearSubDistricts(){var t;const e=await this.subDistrictPointLayer.queryFeatures();e.features.length>0&&await this.subDistrictPointLayer.applyEdits({deleteFeatures:e.features}),this.subDistrictPointLayer.definitionExpression="1=1";const s=await this.subDistrictLineLayer.queryFeatures();s.features.length>0&&await this.subDistrictLineLayer.applyEdits({deleteFeatures:s.features}),this.subDistrictLineLayer.definitionExpression="1=1",(t=this.clickHandler)==null||t.remove()}setVisible(e){this.subDistrictPointLayer.visible=e,this.subDistrictLineLayer.visible=e}async locateSubDistrict(e){const s=this.subDistrictPointLayer.createQuery();s.where=`subDistrictId = '${e}'`,s.returnGeometry=!0;const t=await this.subDistrictPointLayer.queryFeatures(s);return t.features.length>0?(await g.default.viewGoto(this.view,t.features),{status:0,message:"ok"}):{status:1,message:"未找到子区"}}async highlightSubDistrict(e){let s="";const t=this.subDistrictPointLayer.definitionExpression;this.subDistrictPointLayer.definitionExpression=`subDistrictId = '${e}'`;const r=await this.subDistrictPointLayer.queryFeatures(),i=r.features.length;return i>0?(this.subDistrictLineLayer.definitionExpression=`subDistrictId = '${e}'`,s=r.features[0].attributes.districtId,await g.default.viewGoto(this.view,r.features)):this.subDistrictPointLayer.definitionExpression=t,{count:i,parentId:s}}filter(e,s){const t=`${e==="district"?"districtId":"subDistrictId"} = '${s}'`;this.subDistrictPointLayer.definitionExpression=t,this.subDistrictLineLayer.definitionExpression=t}resetFilter(){this.subDistrictPointLayer.definitionExpression="1=1",this.subDistrictLineLayer.definitionExpression="1=1"}async viewHitTest(e){var r;const t=(r=(await this.view.hitTest(e,{include:[this.subDistrictPointLayer,this.subDistrictLineLayer]})).results)==null?void 0:r.filter(i=>i.type==="graphic");if(t.length===0)this.subDistrictPointLayer.renderer=this.currentPointRenderer,this.subDistrictLineLayer.renderer=this.currentLineRenderer;else{const i=t[0].graphic;this.subDistrictPointLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-marker",style:"circle",color:[0,0,0,0],size:"8px",outline:{color:[180,180,180,.5],width:4}},defaultLabel:"其他子区",uniqueValueInfos:[{value:i.attributes.subDistrictId,symbol:{type:"simple-marker",style:"circle",color:[0,0,0,0],size:"8px",outline:{color:i.attributes.color.split(",").map(Number),width:4}}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:24,value:2500},{size:20,value:5e3},{size:8,value:18055.954822000003},{size:4,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.subDistrictLineLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-line",style:"solid",color:[180,180,180,.5],width:"8px"},defaultLabel:"其他子区",uniqueValueInfos:[{value:i.attributes.subDistrictId,symbol:{type:"simple-line",style:"solid",color:i.attributes.color.split(",").map(Number),width:"8px"}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:6,value:2500},{size:5,value:5e3},{size:4,value:18055.954822000003},{size:3,value:144447.638572},{size:2,value:1155581108577e-6}]}]}}}}exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("@arcgis/core/Graphic"),v=require("@arcgis/core/layers/FeatureLayer"),m=require("../common-utils.js"),w=require("./layer-symbol.js");class g{constructor(i){this.roadConnections=[],this.view=i,this.subDistrictPointLayer=new v(w.subDistrictPointLayerOptions),this.subDistrictPointLayer.spatialReference=i.spatialReference,this.subDistrictPointLayer.popupEnabled=!0,this.subDistrictLineLayer=new v(w.subDistrictLineLayerOptions),this.subDistrictLineLayer.spatialReference=i.spatialReference,this.subDistrictLineLayer.popupEnabled=!0,this.view.map.addMany([this.subDistrictLineLayer,this.subDistrictPointLayer])}async showSubDistricts(i){await this.clearSubDistricts(),this.clickHandler=this.view.on("click",this.viewHitTest.bind(this));let s=0;const t=[],r=[];i.forEach(e=>{e.roadConnections.length>0&&this.roadConnections.push(...e.roadConnections),r.push({value:e.id,label:e.name,symbol:{type:"simple-marker",style:"circle",color:[...e.areaColor,.8],size:"8px",outline:{color:[...e.areaColor],width:4}}}),e.signals.forEach(a=>{const u=new f({geometry:{type:"point",longitude:a.longitude,latitude:a.latitude},attributes:{ObjectID:s++,id:a.nodeId,name:a.name,subDistrictId:e.id,subDistrictName:e.name,districtId:e.parentId,districtName:e.parentName,signalCount:e.signalCount,color:e.areaColor.join(","),type:"subDistrict"}});t.push(u)})}),this.subDistrictPointLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-marker",color:[180,180,180,.5],size:"8px",outline:{color:"white",width:1}},defaultLabel:"其他子区",uniqueValueInfos:r,visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:24,value:2500},{size:20,value:5e3},{size:8,value:18055.954822000003},{size:4,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.currentPointRenderer=this.subDistrictPointLayer.renderer.clone(),await this.subDistrictPointLayer.applyEdits({addFeatures:t})}async showRoads(i){const{type:s,id:t}=i,r=this.subDistrictPointLayer.createQuery(),e=s==="district"?"districtId":"subDistrictId";r.where=`${e} = '${t}'`;const a=await this.subDistrictPointLayer.queryFeatures(r),u=new Map;a.features.forEach(n=>{var y;const{subDistrictId:o,color:c,id:d,districtName:b,subDistrictName:L,signalCount:p}=n.attributes;u.has(o)||u.set(o,{color:c,signalIds:[],districtName:b,subDistrictName:L,signalCount:p}),(y=u.get(o))==null||y.signalIds.push(d)});const h=[],D=[];for(const n of u){let o=0;const c=n[0];h.push({value:c,symbol:{type:"simple-line",color:n[1].color.split(",").map(Number),width:2,style:"solid"}});const{districtName:d,subDistrictName:b,signalIds:L,signalCount:p}=n[1];this.roadConnections.filter(l=>l.subDistrictId===c).forEach(l=>{const I=new f({geometry:{type:"polyline",paths:l.coordinates},attributes:{ObjectID:o++,id:l.id,districtId:l.districtId,subDistrictId:c,subDistrictName:b,districtName:d,signalCount:p,color:n[1].color}});D.push(I)})}this.subDistrictLineLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-line",color:[180,180,180,.5],width:2,style:"solid"},defaultLabel:"其他子区",uniqueValueInfos:h,visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:6,value:2500},{size:5,value:5e3},{size:4,value:18055.954822000003},{size:3,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.currentLineRenderer=this.subDistrictLineLayer.renderer.clone(),await this.subDistrictLineLayer.applyEdits({addFeatures:D})}async clearSubDistricts(){var t;const i=await this.subDistrictPointLayer.queryFeatures();i.features.length>0&&await this.subDistrictPointLayer.applyEdits({deleteFeatures:i.features}),this.subDistrictPointLayer.definitionExpression="1=1";const s=await this.subDistrictLineLayer.queryFeatures();s.features.length>0&&await this.subDistrictLineLayer.applyEdits({deleteFeatures:s.features}),this.subDistrictLineLayer.definitionExpression="1=1",(t=this.clickHandler)==null||t.remove()}setVisible(i){this.subDistrictPointLayer.visible=i,this.subDistrictLineLayer.visible=i}async locateSubDistrict(i){const s=this.subDistrictPointLayer.createQuery();s.where=`subDistrictId = '${i}'`,s.returnGeometry=!0;const t=await this.subDistrictPointLayer.queryFeatures(s);return t.features.length>0?(await m.default.viewGoto(this.view,t.features),{status:0,message:"ok"}):{status:1,message:"未找到子区"}}async highlightSubDistrict(i){let s="";const t=this.subDistrictPointLayer.definitionExpression;this.subDistrictPointLayer.definitionExpression=`subDistrictId = '${i}'`;const r=await this.subDistrictPointLayer.queryFeatures(),e=r.features.length;return e>0?(this.subDistrictLineLayer.definitionExpression=`subDistrictId = '${i}'`,s=r.features[0].attributes.districtId,await m.default.viewGoto(this.view,r.features)):this.subDistrictPointLayer.definitionExpression=t,{count:e,parentId:s}}filter(i){const{type:s,id:t}=i,r=`${s==="district"?"districtId":"subDistrictId"} = '${t}'`;this.subDistrictPointLayer.definitionExpression=r,this.subDistrictLineLayer.definitionExpression=r}resetFilter(){this.subDistrictPointLayer.definitionExpression="1=1",this.subDistrictLineLayer.definitionExpression="1=1"}async viewHitTest(i){var r;const t=(r=(await this.view.hitTest(i,{include:[this.subDistrictPointLayer,this.subDistrictLineLayer]})).results)==null?void 0:r.filter(e=>e.type==="graphic");if(t.length===0)console.time("resetRenderer"),this.subDistrictPointLayer.renderer=this.currentPointRenderer,this.subDistrictLineLayer.renderer=this.currentLineRenderer;else{const e=t[0].graphic,a=e.attributes.color.split(",").map(Number);this.subDistrictPointLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-marker",style:"circle",color:[0,0,0,0],size:"8px",outline:{color:[180,180,180,.5],width:4}},defaultLabel:"其他子区",uniqueValueInfos:[{value:e.attributes.subDistrictId,symbol:{type:"simple-marker",style:"circle",color:[...a,.8],size:"8px",outline:{color:a,width:4}}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:24,value:2500},{size:20,value:5e3},{size:8,value:18055.954822000003},{size:4,value:144447.638572},{size:2,value:1155581108577e-6}]}]},this.subDistrictLineLayer.renderer={type:"unique-value",field:"subDistrictId",defaultSymbol:{type:"simple-line",style:"solid",color:[180,180,180,.5],width:"8px"},defaultLabel:"其他子区",uniqueValueInfos:[{value:e.attributes.subDistrictId,symbol:{type:"simple-line",style:"solid",color:e.attributes.color.split(",").map(Number),width:"8px"}}],visualVariables:[{type:"size",valueExpression:"$view.scale",stops:[{size:6,value:2500},{size:5,value:5e3},{size:4,value:18055.954822000003},{size:3,value:144447.638572},{size:2,value:1155581108577e-6}]}]}}}}exports.default=g;

package/lib/src/types/index.d.ts

@@ -275,6 +275,12 @@ export interface IShowSignalControlAreaParams {
     areaList: any[];
     style?: string;
 }
+export interface IDistrictRoad {
+    id: string;
+    coordinates: number[][];
+    districtId: string;
+    subDistrictId: string;
+}
 export interface IFindSignalControlAreaParams {
     type: string;
     id: string;

package/package.json

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