gisviewer-vue3-arcgis 1.0.236 → 1.0.238

package/es/src/gis-map/utils/map-initializer.mjs

@@ -1,24 +1,24 @@
 import C from "@arcgis/core/Basemap";
-import g from "@arcgis/core/config";
+import d from "@arcgis/core/config";
 import * as k from "@arcgis/core/core/reactiveUtils";
-import { Polygon as L, Polyline as W, Point as T } from "@arcgis/core/geometry";
+import { Multipoint as L, Polygon as W, Polyline as z, Point as T } from "@arcgis/core/geometry";
 import * as w from "@arcgis/core/geometry/support/webMercatorUtils";
-import z from "@arcgis/core/layers/FeatureLayer";
-import x from "@arcgis/core/layers/GeoJSONLayer";
-import I from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
-import R from "@arcgis/core/layers/MapImageLayer";
-import H from "@arcgis/core/layers/TileLayer";
-import G from "@arcgis/core/layers/WebTileLayer";
-import O from "@arcgis/core/Map";
-import S from "@arcgis/core/views/MapView";
-import B from "@arcgis/core/views/SceneView";
-import N from "@turf/destination";
-import * as E from "@turf/helpers";
-import A from "./custom-layer/custom-wmts-layer.mjs";
+import x from "@arcgis/core/layers/FeatureLayer";
+import I from "@arcgis/core/layers/GeoJSONLayer";
+import R from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
+import H from "@arcgis/core/layers/MapImageLayer";
+import G from "@arcgis/core/layers/TileLayer";
+import O from "@arcgis/core/layers/WebTileLayer";
+import S from "@arcgis/core/Map";
+import B from "@arcgis/core/views/MapView";
+import N from "@arcgis/core/views/SceneView";
+import E from "@turf/destination";
+import * as A from "@turf/helpers";
+import J from "./custom-layer/custom-wmts-layer.mjs";
 function P(h, e) {
   return h && (h.startsWith("http://") || h.startsWith("https://") ? h : e + h);
 }
-class ee {
+class te {
   constructor() {
     this.mapConfig = {}, this.watchHandleMap = /* @__PURE__ */ new Map(), this.handleIndex = 0, this.zoomWatchHandle = null;
   }
@@ -31,15 +31,15 @@ class ee {
     var p, u, b, y;
     this.mapConfig = e.mapConfig;
     const { container: i, markerClickCallback: o, mapClickCallback: r } = e;
-    g.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, g.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, g.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const s = new O();
-    if (((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new S({
+    d.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, d.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, d.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
+    const s = new S();
+    if (((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new B({
       map: s,
       container: i,
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
-    })) : this.view = new B({
+    })) : this.view = new N({
       map: s,
       container: i,
       environment: {
@@ -110,7 +110,7 @@ class ee {
       const c = P(t.url, this.mapConfig.assetsRoot);
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          const n = new G({
+          const n = new O({
             urlTemplate: c,
             ...t.options
           });
@@ -118,7 +118,7 @@ class ee {
           break;
         }
         case "tile": {
-          const n = new H({
+          const n = new G({
             url: c,
             ...t.options
           });
@@ -126,7 +126,7 @@ class ee {
           break;
         }
         case "customWMTS".toLowerCase(): {
-          const n = new A({
+          const n = new J({
             urlTemplate: c,
             ...t.options
           });
@@ -134,7 +134,7 @@ class ee {
           break;
         }
         case "mapImage".toLowerCase(): {
-          const n = new R({
+          const n = new H({
             url: c,
             ...t.options
           });
@@ -147,12 +147,12 @@ class ee {
           break;
         }
         case "feature": {
-          const n = new z({ url: c, ...t.options });
+          const n = new x({ url: c, ...t.options });
           s.add(n);
           break;
         }
         case "3dtiles": {
-          const n = new I({
+          const n = new R({
             url: c,
             ...t.options
           });
@@ -169,7 +169,7 @@ class ee {
       const t = this.mapConfig.hdLayers.map(
         (c) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new x({
+          new I({
             url: P(c.url, this.mapConfig.assetsRoot),
             ...c.options,
             title: c.options.id
@@ -179,7 +179,7 @@ class ee {
       s.addMany(t);
     }
     this.view.ui.remove("attribution"), await this.view.when();
-    const d = this.mapConfig.camera;
+    const g = this.mapConfig.camera;
     let l;
     if (this.view.type === "2d") {
       let t = this.view.center;
@@ -196,7 +196,7 @@ class ee {
         tilt: this.view.camera.tilt
       };
     }
-    return d ? d.home = l : this.mapConfig.camera = { home: l }, this.view;
+    return g ? g.home = l : this.mapConfig.camera = { home: l }, this.view;
   }
   setLayerVisibility(e) {
     const { id: i, visible: o } = e, r = this.view.map.findLayerById(i);
@@ -212,14 +212,17 @@ class ee {
     if (!this.view)
       return { status: -1, message: "未初始化" };
     if (e.center || e.target) {
-      switch ((i = e.target) == null ? void 0 : i.type) {
+      switch ((i = e.target) == null ? void 0 : i.type.toLowerCase()) {
         case "point":
           e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new W(e.target);
+          e.target = new z(e.target);
           break;
         case "polygon":
+          e.target = new W(e.target);
+          break;
+        case "multipoint":
           e.target = new L(e.target);
           break;
       }
@@ -248,8 +251,8 @@ class ee {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const r = Math.tan(i * Math.PI / 180) * e.height, s = N(
-        E.point(e.center),
+      const r = Math.tan(i * Math.PI / 180) * e.height, s = E(
+        A.point(e.center),
         r,
         o + 180,
         {
@@ -284,14 +287,14 @@ class ee {
    * */
   requestCoordinateTransform(e, i) {
     let o = 0;
-    const s = 1e3 / 30, d = k.watch(
+    const s = 1e3 / 30, g = k.watch(
       () => this.view.center,
       () => {
         const l = this.transformPoints(e), p = Date.now();
         p - o > s && (i(l), o = p);
       }
     );
-    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, d), { handle: this.handleIndex, points: this.transformPoints(e) };
+    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, g), { handle: this.handleIndex, points: this.transformPoints(e) };
   }
   transformPoints(e) {
     return e.map((i) => {
@@ -323,5 +326,5 @@ class ee {
   }
 }
 export {
-  ee as default
+  te as default
 };

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;
 }