gisviewer-vue3-arcgis 1.0.253 → 1.0.255

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

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

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

@@ -2,11 +2,10 @@ import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignal
 export default class SignalControlAreaController1 {
     private view;
     /** 支队图层 */
-    private detachmentLayer;
-    private detachmentLayerLoaded;
     private districtRenderer;
     private subDistrictRenderer;
     private signalRenderer;
+    private crossRenderer;
     private mapConfig;
     constructor(view: __esri.MapView | __esri.SceneView);
     /**
@@ -15,6 +14,8 @@ export default class SignalControlAreaController1 {
      * @returns
      */
     showSignalControlArea(params: IShowSignalControlAreaParams): Promise<IResult>;
+    showDistrict(params: IShowSignalControlAreaParams): Promise<void>;
+    showSubDistrict(params: IShowSignalControlAreaParams): Promise<void>;
     /**
      * 清空区控、子区、信号机
      * @returns
@@ -49,10 +50,4 @@ export default class SignalControlAreaController1 {
         status: number;
         message: string;
     }>;
-    /**
-     * 加载支队图层
-     * 现场环境用url创建FeatureLayer有各种问题，
-     * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
-     */
-    private loadDetachmentLayer;
 }

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

@@ -1,35 +1,56 @@
-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 "../../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 N {
+import a from "../../stores/index.mjs";
+import l from "./cross-renderer.mjs";
+import r from "./district-controller.mjs";
+import c from "./district-renderer.mjs";
+import o from "./signal-renderer.mjs";
+import d from "./sub-district-renderer.mjs";
+class f {
   // private roadLines!: IRoadLine[];
-  constructor(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);
+  constructor(t) {
+    this.view = t;
+    const i = a.useAppDataStore;
+    this.mapConfig = JSON.parse(JSON.stringify(i.mapConfig)), this.districtRenderer = new c(t), this.subDistrictRenderer = new d(t), this.signalRenderer = new o(t), this.crossRenderer = new l(t);
   }
   /**
    * 显示所有区控、子区、信号机
    * @param params
    * @returns
    */
-  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 w(
-        n,
-        e.style || ""
+  async showSignalControlArea(t) {
+    await this.clearSignalControlArea(), this.districtRenderer.setVisible(!1), this.subDistrictRenderer.setVisible(!1), this.signalRenderer.setClusterVisible(!1), this.signalRenderer.setPointVisible(!1);
+    const i = [], s = [];
+    for (const e of t.areaList) {
+      const n = new r(
+        e,
+        t.style || ""
       );
-      t.push(i), s.push(...i.subDistricts);
+      i.push(n), s.push(...n.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 = t.style || "", await this.districtRenderer.showDistricts(i), await this.subDistrictRenderer.showSubDistricts(s), await this.signalRenderer.showSignals(i), { status: 0, message: "ok" };
+  }
+  async showDistrict(t) {
+    this.setLayerVisibility({ id: "district", visible: !0 }), this.setLayerVisibility({ id: "subDistrict", visible: !0 });
+    const i = new r(
+      t.areaList,
+      t.style || ""
+    );
+    await this.districtRenderer.showDistricts([i]), await this.subDistrictRenderer.showSubDistricts(
+      i.subDistricts
+    ), await this.subDistrictRenderer.showRoads({
+      id: i.id,
+      type: "district"
+    });
+  }
+  async showSubDistrict(t) {
+    this.setLayerVisibility({ id: "subDistrict", visible: !0 });
+    const i = new r(
+      t.areaList,
+      t.style || ""
+    );
+    await this.subDistrictRenderer.showSubDistricts([i]), await this.subDistrictRenderer.showRoads({
+      id: i.id,
+      type: "subDistrict"
+    });
   }
   /**
    * 清空区控、子区、信号机
@@ -43,22 +64,19 @@ class N {
    * @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.districtRenderer.setVisible(e.visible);
+        this.districtRenderer.setVisible(t.visible);
         break;
       case "subDistrict":
-        this.subDistrictRenderer.setVisible(e.visible);
+        this.subDistrictRenderer.setVisible(t.visible);
         break;
       case "signal":
-        this.signalRenderer.setPointVisible(e.visible);
+        this.signalRenderer.setPointVisible(t.visible);
         break;
       case "signalCluster":
-        this.signalRenderer.setClusterVisible(e.visible);
-        break;
-      case "shanghai_district":
-        this.detachmentLayer.visible = e.visible;
+        this.signalRenderer.setClusterVisible(t.visible);
         break;
     }
     return { status: 0, message: "ok" };
@@ -68,14 +86,14 @@ class N {
    * @param params
    * @returns
    */
-  async locateSignalControlArea(e) {
-    switch (e.type) {
+  async locateSignalControlArea(t) {
+    switch (t.type) {
       case "district":
-        return await this.districtRenderer.locateDistrict(e.id);
+        return await this.districtRenderer.locateDistrict(t.id);
       case "subDistrict":
-        return await this.subDistrictRenderer.locateSubDistrict(e.id);
+        return await this.subDistrictRenderer.locateSubDistrict(t.id);
       case "signal":
-        return await this.signalRenderer.locateSignal(e.id);
+        return await this.signalRenderer.locateSignal(t.id);
       default:
         return { status: 1, message: "未知类型" };
     }
@@ -85,17 +103,17 @@ class N {
    * @param params
    * @returns
    */
-  async highlightSignalControlArea(e) {
-    switch (this.view.closePopup(), e.type) {
+  async highlightSignalControlArea(t) {
+    switch (this.view.closePopup(), t.type) {
       case "district":
-        return await this.districtRenderer.highlightDistrict(e) ? (this.subDistrictRenderer.filter(e), this.signalRenderer.filter(e), await this.subDistrictRenderer.showRoads(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
+        return await this.districtRenderer.highlightDistrict(t) ? (this.subDistrictRenderer.filter(t), this.signalRenderer.filter(t), await this.subDistrictRenderer.showRoads(t), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       case "subDistrict": {
-        const { count: t, parentId: s } = await this.subDistrictRenderer.highlightSubDistrict(e);
-        return t > 0 ? (this.districtRenderer.filter(s), this.signalRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
+        const { count: i, parentId: s } = await this.subDistrictRenderer.highlightSubDistrict(t);
+        return i > 0 ? (this.districtRenderer.filter(s), this.signalRenderer.filter(t), { 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: "未找到信号机" };
+        const { districtId: i, subDistrictId: s, count: e } = await this.signalRenderer.highlightSignal(t.id);
+        return e > 0 ? (this.districtRenderer.filter(i), this.subDistrictRenderer.filter(t), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
       }
       default:
         return { status: 1, message: "未知类型" };
@@ -108,67 +126,7 @@ class N {
   async resetHighlight() {
     return this.districtRenderer.resetFilter(), this.subDistrictRenderer.resetFilter(), this.signalRenderer.resetFilter(), { status: 0, message: "ok" };
   }
-  /**
-   * 加载支队图层
-   * 现场环境用url创建FeatureLayer有各种问题，
-   * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
-   */
-  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: d } = t.options;
-        n.features.forEach((c) => {
-          const o = c.attributes.ZD_NAME;
-          if (o !== "高架支队") {
-            let l = new f({
-              rings: c.geometry.rings
-            });
-            l = y(l);
-            const a = new g({
-              geometry: l,
-              attributes: c.attributes
-            });
-            if (r) {
-              if (r.type === "simple")
-                a.symbol = r.symbol;
-              else if (r.type === "unique-value") {
-                const h = a.getAttribute("OBJECTID"), u = r.uniqueValueInfos.find(
-                  (b) => b.value == h
-                );
-                a.symbol = u ? u.symbol : r.defaultSymbol;
-              }
-            } else
-              a.symbol = {
-                type: "simple-fill",
-                color: [227, 237, 255, 0.4],
-                outline: {
-                  color: [255, 195, 153],
-                  width: 2
-                }
-              };
-            if (i.push(a), d && o !== "边防港航支队" && o !== "机场支队") {
-              const h = new g({
-                geometry: l.centroid,
-                symbol: { ...d.symbol, text: o }
-              });
-              i.push(h);
-            }
-          }
-        }), this.detachmentLayer.addMany(i), this.detachmentLayerLoaded = !0;
-      } catch (s) {
-        console.error("加载支队图层失败:", s);
-        return;
-      }
-  }
 }
 export {
-  N as default
+  f as default
 };

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

@@ -1,6 +1,6 @@
 import { IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
-export default class CrossRenderer {
+export default class SignalRenderer {
     private view;
     private signalMarkerLayer;
     private signalPictureLayer;

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

@@ -1,4 +1,4 @@
-import u from "@arcgis/core/Graphic";
+import l 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";
@@ -22,7 +22,7 @@ class E {
     const a = [];
     e.forEach((s) => {
       s.signals.forEach((i) => {
-        const t = new u({
+        const t = new l({
           geometry: {
             type: "point",
             longitude: i.longitude,
@@ -46,7 +46,7 @@ class E {
         a.push(t);
       }), s.subDistricts.forEach((i) => {
         i.signals.forEach((t) => {
-          const n = new u({
+          const n = new l({
             geometry: {
               type: "point",
               longitude: t.longitude,
@@ -103,8 +103,8 @@ class E {
     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 };
+      const n = i.features[0].attributes.districtId || "", u = i.features[0].attributes.subDistrictId || "";
+      return await o.viewGoto(this.view, i.features), { districtId: n, subDistrictId: u, count: t };
     } else
       this.signalMarkerLayer.definitionExpression = s;
     return { districtId: r, subDistrictId: a, count: t };