gisviewer-vue3-arcgis 1.0.226 → 1.0.228

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

@@ -1,112 +1,67 @@
-import * as L from "@arcgis/core/core/reactiveUtils";
-import { Polygon as b } from "@arcgis/core/geometry";
-import { webMercatorToGeographic as w } from "@arcgis/core/geometry/support/webMercatorUtils";
-import y from "@arcgis/core/Graphic";
-import c from "@arcgis/core/layers/FeatureLayer";
-import C from "@arcgis/core/layers/GraphicsLayer";
-import E from "@turf/buffer";
-import D from "@turf/convex";
-import * as d from "@turf/helpers";
-import m from "concaveman";
-import F from "../../stores/index.mjs";
-import k from "./district-controller.mjs";
-import { districtDashLineLayerOptions as G, districtSolidLineLayerOptions as v, subDistrictLayerOptions as x, signalMarkerLayerOptions as S, signalPictureLayerOptions as I, signalClusterLayerOptions as M } from "./layer-symbol.mjs";
-class V {
-  constructor(e) {
-    this.detachmentLayerLoaded = !1, this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.popupEnabled = !0, this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
-    const t = F.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(t.mapConfig)), this.detachmentLayer = new C(), this.districtControllerDashLayer = new c(
-      G
-    ), this.districtControllerDashLayer.spatialReference = e.spatialReference, this.districtControllerSolidLayer = new c(
-      v
-    ), this.districtControllerSolidLayer.spatialReference = e.spatialReference, this.districtControllerSolidLayer.popupEnabled = this.popupEnabled, this.subDistrictControllerLayer = new c(
-      x
-    ), this.subDistrictControllerLayer.spatialReference = e.spatialReference, this.subDistrictControllerLayer.popupEnabled = this.popupEnabled, this.signalMarkerLayer = new c(
-      S
-    ), this.signalMarkerLayer.spatialReference = e.spatialReference, this.signalMarkerLayer.popupEnabled = this.popupEnabled, this.signalPictureLayer = new c(
-      I
-    ), this.signalPictureLayer.spatialReference = e.spatialReference, this.signalPictureLayer.popupEnabled = this.popupEnabled, this.signalClusterLayer = new c(
-      M
-    ), this.signalClusterLayer.spatialReference = e.spatialReference, this.signalClusterLayer.popupEnabled = this.popupEnabled, this.view.map.addMany([
-      this.detachmentLayer,
-      this.districtControllerSolidLayer,
-      this.districtControllerDashLayer,
-      this.signalMarkerLayer,
-      this.signalPictureLayer,
-      this.signalClusterLayer,
-      this.subDistrictControllerLayer
-    ]), this.clickHandler = this.view.on("click", this.viewHitTest.bind(this));
+import { Polygon as f } from "@arcgis/core/geometry";
+import { webMercatorToGeographic as m } from "@arcgis/core/geometry/support/webMercatorUtils";
+import u from "@arcgis/core/Graphic";
+import y from "@arcgis/core/layers/GraphicsLayer";
+import D from "@turf/buffer";
+import w from "@turf/convex";
+import * as c from "@turf/helpers";
+import R from "concaveman";
+import S from "../../stores/index.mjs";
+import G from "./district-controller.mjs";
+import C from "./renderer/district-renderer.mjs";
+import I from "./renderer/signal-renderer.mjs";
+import L from "./renderer/sub-district-renderer.mjs";
+class T {
+  constructor(t) {
+    this.detachmentLayerLoaded = !1, this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.popupEnabled = !0, this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.view = t, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
+    const e = S.useAppDataStore;
+    this.mapConfig = JSON.parse(JSON.stringify(e.mapConfig)), this.detachmentLayer = new y(), this.view.map.add(this.detachmentLayer), this.districtRenderer = new C(t, this.hasGpu), this.subDistrictRenderer = new L(t, this.hasGpu), this.signalRenderer = new I(t, this.hasGpu);
   }
   /**
    * 显示所有区控、子区、信号机
    * @param params
    * @returns
    */
-  async showSignalControlArea(e) {
-    this.detachmentLayerLoaded || await this.loadDetachmentLayer(), await this.clearSignalControlArea(), this.districtControllerDashLayer.visible = !1, this.districtControllerSolidLayer.visible = !1, this.subDistrictControllerLayer.visible = !1, this.signalMarkerLayer.visible = !1, this.signalPictureLayer.visible = !1, this.signalClusterLayer.visible = !0;
-    for (const t of e.areaList) {
-      const s = new k(
-        t,
-        e.style || ""
+  async showSignalControlArea(t) {
+    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 e = [], s = [];
+    for (const r of t.areaList) {
+      const a = new G(
+        r,
+        t.style || ""
       );
-      this.generateGraphic(s, !0, e.style);
+      e.push(a), s.push(...a.subDistricts);
     }
-    return await this.districtControllerDashLayer.applyEdits({
-      addFeatures: this.districtGraphics
-    }), await this.districtControllerSolidLayer.applyEdits({
-      addFeatures: this.districtGraphics
-    }), this.view.goTo(this.districtGraphics), this.districtGraphics = [], await this.subDistrictControllerLayer.applyEdits({
-      addFeatures: this.subDistrictGraphics
-    }), this.subDistrictGraphics = [], await this.signalMarkerLayer.applyEdits({
-      addFeatures: this.signalGraphics
-    }), await this.signalPictureLayer.applyEdits({
-      addFeatures: this.signalGraphics
-    }), await this.signalClusterLayer.applyEdits({
-      addFeatures: this.signalGraphics
-    }), this.signalGraphics = [], { status: 0, message: "ok" };
+    return this.districtRenderer.style = t.style || "", await this.districtRenderer.showDistricts(e), await this.subDistrictRenderer.showSubDistricts(s), await this.signalRenderer.showSignals(e), { status: 0, message: "ok" };
   }
   /**
    * 清空区控、子区、信号机
    * @returns
    */
   async clearSignalControlArea() {
-    this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0;
-    let e = await this.districtControllerDashLayer.queryFeatures();
-    return await this.districtControllerDashLayer.applyEdits({
-      deleteFeatures: e.features
-    }), this.districtControllerDashLayer.definitionExpression = "1=1", e = await this.districtControllerSolidLayer.queryFeatures(), await this.districtControllerSolidLayer.applyEdits({
-      deleteFeatures: e.features
-    }), this.districtControllerSolidLayer.definitionExpression = "1=1", e = await this.subDistrictControllerLayer.queryFeatures(), await this.subDistrictControllerLayer.applyEdits({
-      deleteFeatures: e.features
-    }), this.subDistrictControllerLayer.definitionExpression = "1=1", 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", { status: 0, message: "ok" };
+    return this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, await this.districtRenderer.clearDistricts(), await this.subDistrictRenderer.clearSubDistricts(), await this.signalRenderer.clearSignals(), { status: 0, message: "ok" };
   }
   /**
    * 设置区控、子区、信号机图层可见性
    * @param layerName
    * @param visible
    */
-  setLayerVisibility(e) {
-    switch (e.visible === !1 && this.view.closePopup(), e.id) {
+  setLayerVisibility(t) {
+    switch (t.visible === !1 && this.view.closePopup(), t.id) {
       case "district":
-        this.districtControllerDashLayer.visible = e.visible, this.districtControllerSolidLayer.visible = e.visible;
+        this.districtRenderer.setVisible(t.visible);
         break;
       case "subDistrict":
-        this.subDistrictControllerLayer.visible = e.visible;
+        this.subDistrictRenderer.setVisible(t.visible);
         break;
       case "signal":
-        this.signalMarkerLayer.visible = e.visible, this.signalPictureLayer.visible = e.visible;
+        this.signalRenderer.setPointVisible(t.visible);
         break;
       case "signalCluster":
-        this.signalClusterLayer.visible = e.visible;
+        this.signalRenderer.setClusterVisible(t.visible);
         break;
       case "shanghai_district":
-        this.detachmentLayer.visible = e.visible;
+        this.detachmentLayer.visible = t.visible;
         break;
     }
     return { status: 0, message: "ok" };
@@ -116,38 +71,14 @@ class V {
    * @param params
    * @returns
    */
-  async locateSignalControlArea(e) {
-    switch (e.type) {
-      case "district": {
-        const i = this.districtControllerDashLayer.createQuery();
-        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
-        const r = await this.districtControllerDashLayer.queryFeatures(
-          i
-        );
-        return r.features.length > 0 ? (await this.view.goTo(r.features, {
-          duration: this.hasGpu ? 1e3 : 0
-        }), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
-      }
+  async locateSignalControlArea(t) {
+    switch (t.type) {
+      case "district":
+        return await this.districtRenderer.locateDistrict(t.id);
       case "subDistrict":
-        const t = this.subDistrictControllerLayer.createQuery();
-        t.where = `id = '${e.id}'`, t.returnGeometry = !0, t.outFields = ["*"];
-        const s = await this.subDistrictControllerLayer.queryFeatures(
-          t
-        );
-        return s.features.length > 0 ? (await this.view.goTo(s.features, {
-          duration: this.hasGpu ? 1e3 : 0
-        }), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
-      case "signal": {
-        const i = this.signalMarkerLayer.createQuery();
-        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
-        const r = await this.signalMarkerLayer.queryFeatures(i);
-        return r.features.length > 0 ? (await this.view.goTo(
-          { target: r.features[0], scale: e.scale || 1e3 },
-          {
-            duration: this.hasGpu ? 1e3 : 0
-          }
-        ), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
-      }
+        return await this.subDistrictRenderer.locateSubDistrict(t.id);
+      case "signal":
+        return await this.signalRenderer.locateSignal(t.id);
       default:
         return { status: 1, message: "未知类型" };
     }
@@ -157,45 +88,22 @@ class V {
    * @param params
    * @returns
    */
-  async highlightSignalControlArea(e) {
-    var t;
-    switch ((t = this.view.popup) != null && t.visible && this.view.popup.close(), e.type) {
-      case "district": {
-        const s = this.districtControllerDashLayer.definitionExpression;
-        this.districtControllerDashLayer.definitionExpression = `id = '${e.id}'`;
-        const i = await this.districtControllerDashLayer.queryFeatures();
-        return i.features.length > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${e.id}'`, this.subDistrictControllerLayer.definitionExpression = `parentId = '${e.id}'`, this.signalMarkerLayer.definitionExpression = `districtId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `districtId = '${e.id}'`, this.signalClusterLayer.definitionExpression = `districtId = '${e.id}'`, await this.view.goTo(i.features, {
-          duration: this.hasGpu ? 1e3 : 0
-        }), { status: 0, message: "ok" }) : (this.districtControllerDashLayer.definitionExpression = s, { status: 1, message: "未找到区控" });
-      }
+  async highlightSignalControlArea(t) {
+    switch (this.view.closePopup(), t.type) {
+      case "district":
+        return await this.districtRenderer.highlightDistrict(t.id) ? (this.subDistrictRenderer.filter("district", t.id), this.signalRenderer.filter("district", t.id), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       case "subDistrict": {
-        const s = this.subDistrictControllerLayer.definitionExpression;
-        this.subDistrictControllerLayer.definitionExpression = `id = '${e.id}'`;
-        const i = await this.subDistrictControllerLayer.queryFeatures();
-        if (i.features.length > 0) {
-          this.signalMarkerLayer.definitionExpression = `subDistrictId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `subDistrictId = '${e.id}'`, this.signalClusterLayer.definitionExpression = `subDistrictId = '${e.id}'`;
-          const o = i.features[0].attributes.parentId;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${o}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${o}'`, await this.view.goTo(i.features, {
-            duration: this.hasGpu ? 1e3 : 0
-          }), { status: 0, message: "ok" };
-        } else
-          return this.subDistrictControllerLayer.definitionExpression = s, { status: 1, message: "未找到子区" };
+        const { count: e, parentId: s } = await this.subDistrictRenderer.highlightSubDistrict(t.id);
+        return e > 0 ? (this.districtRenderer.filter(s), this.signalRenderer.filter("subDistrict", t.id), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
       }
       case "signal": {
-        const s = this.signalMarkerLayer.definitionExpression;
-        this.signalMarkerLayer.definitionExpression = `id = '${e.id}'`;
-        const i = await this.signalMarkerLayer.queryFeatures();
-        if (i.features.length > 0) {
-          this.signalPictureLayer.definitionExpression = `id = '${e.id}'`, this.signalClusterLayer.definitionExpression = `id = '${e.id}'`;
-          const r = i.features[0], { districtId: o, subDistrictId: h } = r.attributes;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${o}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${o}'`, this.subDistrictControllerLayer.definitionExpression = `id = '${h}'`, await this.view.goTo(
-            { target: i.features, scale: e.scale || 1e3 },
-            {
-              duration: this.hasGpu ? 1e3 : 0
-            }
-          ), { status: 0, message: "ok" };
-        } else
-          return this.signalMarkerLayer.definitionExpression = s, { status: 1, message: "未找到信号机" };
+        const { districtId: e, subDistrictId: s, count: r } = await this.signalRenderer.highlightSignal(t.id);
+        return r > 0 ? (this.districtRenderer.filter(e), this.subDistrictRenderer.filter("subDistrict", s), await this.view.goTo(
+          { target: this.signalGraphics, scale: t.scale || 1e3 },
+          {
+            duration: this.hasGpu ? 1e3 : 0
+          }
+        ), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
       }
       default:
         return { status: 1, message: "未知类型" };
@@ -206,11 +114,7 @@ class V {
    * @returns
    */
   async resetHighlight() {
-    this.districtControllerDashLayer.definitionExpression = "1=1", this.districtControllerSolidLayer.definitionExpression = "1=1", this.subDistrictControllerLayer.definitionExpression = "1=1", this.signalMarkerLayer.definitionExpression = "1=1", this.signalClusterLayer.definitionExpression = "1=1", this.signalPictureLayer.definitionExpression = "1=1";
-    const e = await this.districtControllerDashLayer.queryFeatures();
-    return this.view.goTo(e.features, {
-      duration: this.hasGpu ? 1e3 : 0
-    }), { status: 0, message: "ok" };
+    return this.districtRenderer.resetFilter(), this.subDistrictRenderer.resetFilter(), this.signalRenderer.resetFilter(), { status: 0, message: "ok" };
   }
   /**
    * 生成区控、子区和信号机graphic
@@ -218,237 +122,276 @@ class V {
    * @param isDistrict 是否是区控
    * @returns
    */
-  generateGraphic(e, t, s) {
-    const i = e.getAllSignalCoordinates();
-    let r = null;
-    if (i.length >= 2)
-      if (i.length === 2)
-        r = d.lineString(i);
+  generateGraphic(t, e, s) {
+    const r = t.getAllSignalCoordinates();
+    let a = null;
+    if (r.length >= 2)
+      if (r.length === 2)
+        a = c.lineString(r);
       else {
-        if (t) {
-          const n = d.featureCollection(
-            i.map((a) => d.point(a))
+        if (e) {
+          const i = c.featureCollection(
+            r.map((o) => c.point(o))
           );
-          r = D(n);
+          a = w(i);
         } else {
-          const n = m(i, 0.5);
-          n.length >= 4 && (r = d.polygon([n]));
+          const i = R(r, 0.5);
+          i.length >= 4 && (a = c.polygon([i]));
         }
-        r || (r = d.lineString(i));
+        a || (a = c.lineString(r));
       }
-    else if (i.length === 1)
-      r = d.point(i[0]);
+    else if (r.length === 1)
+      a = c.point(r[0]);
     else
       return;
-    const o = E(
-      r.geometry,
+    const n = D(
+      a.geometry,
       // 区控面积更大，需要更大的缓冲半径
-      t ? 200 : 30,
+      e ? 200 : 30,
       {
         units: "meters"
       }
-    ), h = new y({
+    ), l = new u({
       geometry: {
         type: "polyline",
-        paths: o.geometry.coordinates
+        paths: n.geometry.coordinates
       },
       attributes: {
-        ObjectID: t ? this.districtControllerOid++ : this.subDistrictControllerOid++,
-        id: e.id,
-        name: e.name,
-        subDistrictCount: e.subDistrictCount,
-        signalCount: e.signalCount,
-        parentId: e.parentId,
-        parentName: e.parentName,
+        ObjectID: e ? this.districtControllerOid++ : this.subDistrictControllerOid++,
+        id: t.id,
+        name: t.name,
+        subDistrictCount: t.subDistrictCount,
+        signalCount: t.signalCount,
+        parentId: t.parentId,
+        parentName: t.parentName,
         selected: s,
-        type: t ? "district" : "subDistrict"
+        type: e ? "district" : "subDistrict"
       }
     });
-    t ? this.districtGraphics.push(h) : this.subDistrictGraphics.push(h);
-    for (const n of e.subDistricts)
-      this.generateGraphic(n, !1, s);
-    e.signals.forEach((n) => {
-      const a = new y({
+    e ? this.districtGraphics.push(l) : this.subDistrictGraphics.push(l);
+    for (const i of t.subDistricts)
+      this.generateGraphic(i, !1, s);
+    t.signals.forEach((i) => {
+      const o = new u({
         geometry: {
           type: "point",
-          x: n.longitude,
-          y: n.latitude
+          x: i.longitude,
+          y: i.latitude
         },
         attributes: {
           ObjectID: this.signalOid++,
-          id: n.id,
-          name: n.name,
-          signalId: n.signalId,
-          nodeId: n.nodeId,
-          isKey: n.isKey,
-          districtId: t ? e.id : e.parentId,
-          districtName: t ? e.name : e.parentName,
-          subDistrictId: t ? "" : e.id,
-          subDistrictName: t ? "" : e.name,
+          id: i.id,
+          name: i.name,
+          signalId: i.signalId,
+          nodeId: i.nodeId,
+          isKey: i.isKey,
+          districtId: e ? t.id : t.parentId,
+          districtName: e ? t.name : t.parentName,
+          subDistrictId: e ? "" : t.id,
+          subDistrictName: e ? "" : t.name,
           type: "signal",
           selected: !0
         }
       });
-      this.signalGraphics.push(a);
+      this.signalGraphics.push(o);
     });
   }
-  async viewHitTest(e) {
-    var n;
-    const s = (n = (await this.view.hitTest(e, {
-      include: [
-        this.districtControllerSolidLayer,
-        this.subDistrictControllerLayer,
-        this.signalMarkerLayer,
-        this.signalPictureLayer,
-        this.signalClusterLayer
-      ]
-    })).results) == null ? void 0 : n.filter(
-      (a) => a.type === "graphic"
-    );
-    if (s.length === 0)
-      return;
-    const i = s[0].graphic;
-    let r = null;
-    i.geometry.type === "point" ? r = i.geometry : i.geometry.type === "polyline" ? r = i.geometry.extent.center : i.geometry.type === "polygon" && (r = i.geometry.centroid), r !== null && await this.view.goTo(r, { duration: 1e3 });
-    const o = i.getAttribute("type"), h = i.getAttribute("id");
-    switch (o) {
-      case "district": {
-        let a = await this.districtControllerSolidLayer.queryFeatures();
-        a.features.forEach((l) => {
-          l.attributes.selected = l.attributes.id === h;
-        }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: a.features
-        }), a = await this.districtControllerDashLayer.queryFeatures(), a.features.forEach((l) => {
-          l.attributes.selected = l.attributes.id === h;
-        }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: a.features
-        });
-        break;
-      }
-      case "subDistrict": {
-        let a = await this.subDistrictControllerLayer.queryFeatures();
-        a.features.forEach((u) => {
-          u.attributes.selected = u.attributes.id === h;
-        }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: a.features
-        }), a = await this.signalMarkerLayer.queryFeatures(), a.features.forEach((u) => {
-          u.attributes.selected = u.attributes.subDistrictId === h;
-        });
-        let l = await this.signalMarkerLayer.applyEdits({
-          updateFeatures: a.features
-        });
-        console.log(l), a = await this.signalPictureLayer.queryFeatures(), a.features.forEach((u) => {
-          u.attributes.selected = u.attributes.subDistrictId === h;
-        }), l = await this.signalPictureLayer.applyEdits({
-          updateFeatures: a.features
-        }), console.log(l);
-        break;
-      }
-    }
-    L.when(
-      () => this.view.popup.visible === !1,
-      async () => {
-        await this.resetSelectedSymbol(o);
-      },
-      {
-        once: !0
-      }
-    );
-  }
+  // private async viewHitTest(event: __esri.ViewClickEvent) {
+  //   // 捕捉点击事件
+  //   const response = await this.view.hitTest(event, {
+  //     include: [
+  //       // this.districtControllerSolidLayer,
+  //       this.subDistrictControllerLayer,
+  //       this.signalMarkerLayer,
+  //       this.signalPictureLayer,
+  //       this.signalClusterLayer
+  //     ]
+  //   });
+  //   const graphicHits = response.results?.filter(
+  //     (hitResult) => hitResult.type === 'graphic'
+  //   );
+  //   if (graphicHits.length === 0) {
+  //     return;
+  //   }
+  //   const hitGraphic = (graphicHits[0] as __esri.GraphicHit).graphic;
+  //   let centerPoint: __esri.Point | null = null;
+  //   if (hitGraphic.geometry.type === 'point') {
+  //     centerPoint = hitGraphic.geometry as __esri.Point;
+  //   } else if (hitGraphic.geometry.type === 'polyline') {
+  //     centerPoint = hitGraphic.geometry.extent.center;
+  //   } else if (hitGraphic.geometry.type === 'polygon') {
+  //     centerPoint = (hitGraphic.geometry as __esri.Polygon).centroid;
+  //   }
+  //   if (centerPoint !== null)
+  //     await this.view.goTo(centerPoint, { duration: 1000 });
+  //   // 未选中的同级graphic置灰
+  //   const clickedType = hitGraphic.getAttribute('type');
+  //   const clickedId = hitGraphic.getAttribute('id');
+  //   switch (clickedType) {
+  //     case 'district': {
+  //       let result = await this.districtControllerSolidLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = feature.attributes.id === clickedId;
+  //       });
+  //       await this.districtControllerSolidLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       result = await this.districtControllerDashLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = feature.attributes.id === clickedId;
+  //       });
+  //       await this.districtControllerDashLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       break;
+  //     }
+  //     case 'subDistrict': {
+  //       let result = await this.subDistrictControllerLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = feature.attributes.id === clickedId;
+  //       });
+  //       await this.subDistrictControllerLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       // 其他子区的信号机置灰
+  //       result = await this.signalMarkerLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected =
+  //           feature.attributes.subDistrictId === clickedId;
+  //       });
+  //       let editResult = await this.signalMarkerLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       result = await this.signalPictureLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected =
+  //           feature.attributes.subDistrictId === clickedId;
+  //       });
+  //       editResult = await this.signalPictureLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       break;
+  //     }
+  //   }
+  //   reactiveUtils.when(
+  //     () => this.view.popup.visible === false,
+  //     async () => {
+  //       await this.resetSelectedSymbol(clickedType);
+  //     },
+  //     {
+  //       once: true
+  //     }
+  //   );
+  // }
   /**
    * 重置所有graphic的置灰状态
    */
-  async resetSelectedSymbol(e) {
-    switch (e) {
-      case "district": {
-        let t = await this.districtControllerSolidLayer.queryFeatures();
-        t.features.forEach((s) => {
-          s.attributes.selected = !0;
-        }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: t.features
-        }), t = await this.districtControllerDashLayer.queryFeatures(), t.features.forEach((s) => {
-          s.attributes.selected = !0;
-        }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: t.features
-        });
-        break;
-      }
-      case "subDistrict": {
-        let t = await this.subDistrictControllerLayer.queryFeatures();
-        t.features.forEach((s) => {
-          s.attributes.selected = !0;
-        }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: t.features
-        }), t = await this.signalMarkerLayer.queryFeatures(), t.features.forEach((s) => {
-          s.attributes.selected = !0;
-        }), await this.signalMarkerLayer.applyEdits({
-          updateFeatures: t.features
-        }), t = await this.signalPictureLayer.queryFeatures(), t.features.forEach((s) => {
-          s.attributes.selected = !0;
-        }), await this.signalPictureLayer.applyEdits({
-          updateFeatures: t.features
-        });
-        break;
-      }
-    }
-  }
+  // private async resetSelectedSymbol(type: string) {
+  //   switch (type) {
+  //     case 'district': {
+  //       let result = await this.districtControllerSolidLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = true;
+  //       });
+  //       await this.districtControllerSolidLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       result = await this.districtControllerDashLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = true;
+  //       });
+  //       await this.districtControllerDashLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       break;
+  //     }
+  //     case 'subDistrict': {
+  //       let result = await this.subDistrictControllerLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = true;
+  //       });
+  //       await this.subDistrictControllerLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       result = await this.signalMarkerLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = true;
+  //       });
+  //       await this.signalMarkerLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       result = await this.signalPictureLayer.queryFeatures();
+  //       result.features.forEach((feature) => {
+  //         feature.attributes.selected = true;
+  //       });
+  //       await this.signalPictureLayer.applyEdits({
+  //         updateFeatures: result.features
+  //       });
+  //       break;
+  //     }
+  //   }
+  // }
   /**
    * 加载支队图层
    * 现场环境用url创建FeatureLayer有各种问题，
-   * 改为图层到处未json，用json创建Graphic，再将Graphic添加到FeatureLayer
+   * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
    */
   async loadDetachmentLayer() {
-    const e = this.mapConfig.baseLayers;
-    if (!e)
-      return;
-    const t = e.find(
-      (n) => n.options.id === "shanghai_district"
-    );
+    const t = this.mapConfig.baseLayers;
     if (!t)
       return;
-    const i = await (await fetch(
-      "/GisViewerAssets/ShangHai/Layers/district.json"
-    )).json(), r = [], { renderer: o, labelingInfo: h } = t.options;
-    i.features.forEach((n) => {
-      const a = n.attributes.ZD_NAME;
-      if (a !== "高架支队") {
-        let l = new b({
-          rings: n.geometry.rings
-        });
-        l = w(l);
-        const u = new y({
-          geometry: l,
-          attributes: n.attributes
-        });
-        if (o) {
-          if (o.type === "simple")
-            u.symbol = o.symbol;
-          else if (o.type === "unique-value") {
-            const p = u.getAttribute("OBJECTID"), g = o.uniqueValueInfos.find(
-              (f) => f.value == p
-            );
-            u.symbol = g ? g.symbol : o.defaultSymbol;
-          }
-        } else
-          u.symbol = {
-            type: "simple-fill",
-            color: [227, 237, 255, 0.4],
-            outline: {
-              color: [255, 195, 153],
-              width: 2
+    const e = t.find(
+      (s) => s.options.id === "shanghai_district"
+    );
+    if (e)
+      try {
+        const r = await (await fetch(
+          "/GisViewerAssets/ShangHai/Layers/district.json"
+        )).json(), a = [], { renderer: n, labelingInfo: l } = e.options;
+        r.features.forEach((i) => {
+          const o = i.attributes.ZD_NAME;
+          if (o !== "高架支队") {
+            let d = new f({
+              rings: i.geometry.rings
+            });
+            d = m(d);
+            const h = new u({
+              geometry: d,
+              attributes: i.attributes
+            });
+            if (n) {
+              if (n.type === "simple")
+                h.symbol = n.symbol;
+              else if (n.type === "unique-value") {
+                const g = h.getAttribute("OBJECTID"), b = n.uniqueValueInfos.find(
+                  (p) => p.value == g
+                );
+                h.symbol = b ? b.symbol : n.defaultSymbol;
+              }
+            } else
+              h.symbol = {
+                type: "simple-fill",
+                color: [227, 237, 255, 0.4],
+                outline: {
+                  color: [255, 195, 153],
+                  width: 2
+                }
+              };
+            if (a.push(h), l && o !== "边防港航支队" && o !== "机场支队") {
+              const g = new u({
+                geometry: d.centroid,
+                symbol: { ...l.symbol, text: o }
+              });
+              a.push(g);
             }
-          };
-        if (r.push(u), h && a !== "边防港航支队" && a !== "机场支队") {
-          const p = new y({
-            geometry: l.centroid,
-            symbol: { ...h.symbol, text: a }
-          });
-          r.push(p);
-        }
+          }
+        }), this.detachmentLayer.addMany(a), this.detachmentLayerLoaded = !0;
+      } catch (s) {
+        console.error("加载支队图层失败:", s);
+        return;
       }
-    }), this.detachmentLayer.addMany(r), this.detachmentLayerLoaded = !0;
   }
 }
 export {
-  V as default
+  T as default
 };