gisviewer-vue3-arcgis 1.0.158 → 1.0.159

package/es/src/gis-map/utils/common-utils.d.ts

@@ -80,7 +80,7 @@ export default class CommonUtils {
     static pointsEqual(point1: number[], point2: number[]): boolean;
     static getExtensionLine(pt1: number[], pt2: number[], distance: number): turf.Position;
     static isCoordinateValid(coordinate: {
-        latitude: number;
-        longitude: number;
+        latitude: number | string;
+        longitude: number | string;
     }): boolean;
 }

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

@@ -1,11 +1,11 @@
-import { Point as d, Polyline as f } from "@arcgis/core/geometry";
+import { Point as O, Polyline as f } from "@arcgis/core/geometry";
 import * as g from "@arcgis/core/geometry/geometryEngineAsync";
-import * as y from "@arcgis/core/geometry/support/webMercatorUtils";
+import * as l from "@arcgis/core/geometry/support/webMercatorUtils";
 import p from "@turf/bearing";
 import u from "@turf/destination";
-import * as a from "@turf/helpers";
-import O from "pako";
-import h from "proj4";
+import * as o from "@turf/helpers";
+import L from "pako";
+import y from "proj4";
 class i {
   /**
    * 得到某个点在一定方向、距离之外的另一个点
@@ -15,10 +15,10 @@ class i {
    * @returns
    */
   static destinationWithPoint(t, e, n) {
-    const r = a.point([t.x, t.y]), s = u(r, n, e, {
+    const r = o.point([t.x, t.y]), s = u(r, n, e, {
       units: "meters"
     });
-    return new d({
+    return new O({
       x: s.geometry.coordinates[0],
       y: s.geometry.coordinates[1]
     });
@@ -29,7 +29,7 @@ class i {
    * @returns
    */
   static angleOfLine(t) {
-    const e = t.paths[0], n = a.point(e[0]), r = a.point(e[e.length - 1]);
+    const e = t.paths[0], n = o.point(e[0]), r = o.point(e[e.length - 1]);
     return p(n, r);
   }
   /**
@@ -38,9 +38,9 @@ class i {
    * @param distance
    */
   static extendLineInTowDir(t, e) {
-    const n = t.paths[0], r = a.point(n[0]), s = a.point(n[1]), o = p(s, r), c = u(r, e, o, {
+    const n = t.paths[0], r = o.point(n[0]), s = o.point(n[1]), a = p(s, r), c = u(r, e, a, {
       units: "meters"
-    }), l = o > 0 ? o - 180 : o + 180, P = u(s, e, l, {
+    }), h = a > 0 ? a - 180 : a + 180, P = u(s, e, h, {
       units: "meters"
     });
     return new f({
@@ -82,9 +82,9 @@ class i {
           e,
           s
         ), await i.pointDistance(r) > 2.5) {
-          const o = new f({ paths: [r] });
+          const a = new f({ paths: [r] });
           return (await i.getOffsetLine(
-            o,
+            a,
             -s
           )).paths[0];
         }
@@ -114,8 +114,8 @@ class i {
     n !== 0 && (t = await i.getOffsetLine(t, n));
     const r = await g.intersect(t, e);
     if (r instanceof f) {
-      const s = r.paths[0], o = s[0], c = s[s.length - 1];
-      return [o, c];
+      const s = r.paths[0], a = s[0], c = s[s.length - 1];
+      return [a, c];
     }
     return [];
   }
@@ -126,12 +126,12 @@ class i {
    * @returns 平移后的polyline
    */
   static async getOffsetLine(t, e) {
-    const n = y.geographicToWebMercator(t), r = await g.offset(
+    const n = l.geographicToWebMercator(t), r = await g.offset(
       n,
       e,
       "meters"
     );
-    return y.webMercatorToGeographic(
+    return l.webMercatorToGeographic(
       r,
       !1
     );
@@ -145,11 +145,11 @@ class i {
     try {
       const e = [], n = t.split("");
       for (let s = 0; s < n.length; s++) {
-        const o = n[s];
-        e.push(o.charCodeAt(0));
+        const a = n[s];
+        e.push(a.charCodeAt(0));
       }
       const r = new Uint8Array(e);
-      return O.inflate(r, { to: "string" });
+      return L.inflate(r, { to: "string" });
     } catch {
       console.log(`非压缩内容: ${t}`);
     }
@@ -183,7 +183,7 @@ class i {
   static transformLineProjection(t) {
     try {
       return t.map(
-        (e) => h(i.geoReference).inverse([
+        (e) => y(i.geoReference).inverse([
           e[0] - i.xOffset,
           e[1] - i.yOffset
         ])
@@ -197,7 +197,7 @@ class i {
   }
   static transformPointProjection(t) {
     try {
-      return h(i.geoReference).inverse([
+      return y(i.geoReference).inverse([
         t[0] - i.xOffset,
         t[1] - i.yOffset
       ]);
@@ -212,11 +212,11 @@ class i {
     return Math.abs(t[0] - e[0]) < Number.EPSILON && Math.abs(t[1] - e[1]) < Number.EPSILON;
   }
   static getExtensionLine(t, e, n) {
-    const r = a.point(t), s = a.point(e), o = p(r, s);
-    return u(s, n, o, { units: "meters" }).geometry.coordinates;
+    const r = o.point(t), s = o.point(e), a = p(r, s);
+    return u(s, n, a, { units: "meters" }).geometry.coordinates;
   }
   static isCoordinateValid(t) {
-    return t.latitude !== void 0 && t.longitude !== void 0 && !isNaN(t.latitude) && !isNaN(t.longitude) && t.latitude !== 0 && t.longitude !== 0;
+    return typeof t.latitude == "string" && (t.latitude = Number(t.latitude)), typeof t.longitude == "string" && (t.longitude = Number(t.longitude)), t.latitude !== null && t.longitude !== null && !isNaN(t.latitude) && !isNaN(t.longitude) && t.latitude !== 0 && t.longitude !== 0;
   }
 }
 export {

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

@@ -1,41 +1,41 @@
 import h from "../common-utils.mjs";
 class r {
-  constructor(t) {
+  constructor(s) {
     this.parentName = "", this.crosses = [], this.subDistricts = [], this.areaColor = [
       Math.floor(Math.random() * 255),
       Math.floor(Math.random() * 255),
       Math.floor(Math.random() * 255)
-    ], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.id, this.name = t.name, this.parentId = t.parentId;
-    for (const s of t.children)
-      if (s.children) {
-        const o = new r(s);
+    ], this.crossCount = 0, this.subDistrictCount = 0, this.id = s.id, this.name = s.name, this.parentId = s.parentId;
+    for (const t of s.children)
+      if (t.children) {
+        const o = new r(t);
         o.parentName = this.name;
-        const n = this.areaColor[0], e = this.areaColor[1], a = this.areaColor[2], i = Math.random() * 200 - 100;
+        const a = this.areaColor[0], n = this.areaColor[1], e = this.areaColor[2], i = Math.random() * 200 - 100;
         o.areaColor = [
-          n + i,
-          e + i,
-          a + i
+          Math.max(a + i, 100),
+          Math.max(n + i, 100),
+          Math.max(e + i, 100)
         ], this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
-      } else {
+      } else if (h.isCoordinateValid(t)) {
         const o = {
-          id: s.id,
-          name: s.name,
-          parentId: s.parentId,
-          latitude: Number(s.latitude),
-          longitude: Number(s.longitude),
-          signalId: s.signalId,
-          isKey: s.isKey === 1
+          id: t.id,
+          name: t.name,
+          parentId: t.parentId,
+          latitude: Number(t.latitude),
+          longitude: Number(t.longitude),
+          signalId: t.signalId,
+          isKey: t.isKey === 1
         };
         this.crosses.push(o), this.crossCount++;
       }
   }
   getAllCrossCoordinates() {
-    const t = [];
-    for (const s of this.crosses)
-      h.isCoordinateValid(s) && t.push([s.longitude, s.latitude]);
-    for (const s of this.subDistricts)
-      t.push(...s.getAllCrossCoordinates());
-    return t;
+    const s = [];
+    for (const t of this.crosses)
+      s.push([t.longitude, t.latitude]);
+    for (const t of this.subDistricts)
+      s.push(...t.getAllCrossCoordinates());
+    return s;
   }
 }
 export {

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

@@ -5,12 +5,10 @@ export default class SignalControlAreaController {
     private subDistrictControllerLayer;
     private crossLayer;
     private highlightLayer;
-    private districtControllers;
     private watchHandle?;
-    private openDriveServerUrl;
     private readonly crossScale;
     constructor(view: __esri.MapView | __esri.SceneView);
-    showSignalControlArea(params: any): Promise<IResult>;
+    showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;
     locateSignalControlArea(params: {
         id: string;
@@ -27,14 +25,12 @@ export default class SignalControlAreaController {
      */
     private findAreaGraphic;
     /**
-     * 显示区控
+     * 绘制区控与子区
      * @param districtController
+     * @param isDistrict 是否是区控
      * @returns
      */
-    private showDistrict;
-    private showSubDistrictCross;
-    private loadedSubDistricts;
-    private showSubDistrictRoad;
+    private drawArea;
     /**
      * 生成路口点符号。在不同比例尺下，使用不同的符号
      * @param attributes

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

@@ -1,32 +1,26 @@
 import * as u from "@arcgis/core/core/reactiveUtils.js";
-import { Polyline as g } from "@arcgis/core/geometry";
-import * as y from "@arcgis/core/geometry/geometryEngine.js";
-import a from "@arcgis/core/Graphic";
-import l from "@arcgis/core/layers/GraphicsLayer";
-import f from "@turf/buffer";
-import b from "@turf/concave";
-import * as n from "@turf/helpers";
-import C from "axios";
-import S from "../../stores/index.mjs";
-import m from "../common-utils.mjs";
-import v from "./district-controller.mjs";
-class k {
+import y from "@arcgis/core/Graphic";
+import h from "@arcgis/core/layers/GraphicsLayer";
+import p from "@turf/buffer";
+import f from "@turf/convex";
+import * as o from "@turf/helpers";
+import d from "concaveman";
+import b from "./district-controller.mjs";
+class x {
   constructor(e) {
-    this.districtControllers = [], this.crossScale = 5e3, this.loadedSubDistricts = [], this.view = e;
-    const i = S.useAppDataStore.mapConfig;
-    this.openDriveServerUrl = i.openDriveServer.url, this.districtControllerLayer = new l({
+    this.crossScale = 5e3, this.view = e, this.districtControllerLayer = new h({
       id: "districtControllerLayer",
       maxScale: 144447,
       minScale: 1155582
-    }), this.subDistrictControllerLayer = new l({
+    }), this.subDistrictControllerLayer = new h({
       id: "subDistrictControllerLayer",
       maxScale: 0,
       minScale: 144447
-    }), this.crossLayer = new l({
+    }), this.crossLayer = new h({
       id: "crossLayer",
       maxScale: 0,
       minScale: 36112
-    }), this.highlightLayer = new l({
+    }), this.highlightLayer = new h({
       id: "highlightLayer"
     }), this.view.map.addMany([
       this.districtControllerLayer,
@@ -35,80 +29,82 @@ class k {
       this.highlightLayer
     ]);
   }
-  async showSignalControlArea(e) {
-    console.time("showSignalControlArea"), this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0;
-    for (const r of e) {
-      const i = new v(r);
-      this.showDistrict(i), this.districtControllers.push(i);
+  showSignalControlArea(e) {
+    this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0;
+    for (const t of e) {
+      const r = new b(t);
+      this.drawArea(r, !0);
     }
-    this.watchHandle = u.watch(
+    return this.watchHandle = u.watch(
       () => this.view.scale,
-      (r, i) => {
-        r > this.crossScale && i <= this.crossScale ? (this.crossLayer.graphics.forEach((t) => {
-          t.symbol = this.getCrossGraphicSymbol(
-            t.attributes,
+      (t, r) => {
+        console.log(t, r), t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((s) => {
+          s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
             "marker"
           );
-        }), this.highlightLayer.graphics.forEach((t) => {
-          t.getAttribute("type") === "cross" && (t.symbol = this.getCrossGraphicSymbol(
-            t.attributes,
+        }), this.highlightLayer.graphics.forEach((s) => {
+          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
             "marker"
           ));
-        })) : r <= this.crossScale && i > this.crossScale && (this.crossLayer.graphics.forEach((t) => {
-          t.symbol = this.getCrossGraphicSymbol(
-            t.attributes,
+        })) : t <= this.crossScale && r > this.crossScale && (this.crossLayer.graphics.forEach((s) => {
+          s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
             "picture"
           );
-        }), this.highlightLayer.graphics.forEach((t) => {
-          t.getAttribute("type") === "cross" && (t.symbol = this.getCrossGraphicSymbol(
-            t.attributes,
+        }), this.highlightLayer.graphics.forEach((s) => {
+          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
             "picture"
           ));
         }));
       }
-    );
-    for (const r of this.districtControllers)
-      for (const i of r.subDistricts)
-        await this.showSubDistrictRoad(i);
-    return console.timeEnd("showSignalControlArea"), { status: 0, message: "ok" };
+    ), { status: 0, message: "ok" };
   }
   clearSignalControlArea() {
     var e;
     return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.watchHandle) == null || e.remove(), this.view.closePopup(), { status: 0, message: "ok" };
   }
   async locateSignalControlArea(e) {
-    const r = this.findAreaGraphic(e.id);
-    return r ? (r[0].attributes.type === "cross" ? await this.view.goTo({
-      target: r,
+    const t = this.findAreaGraphic(e.id);
+    return t ? (t.attributes.type === "cross" ? await this.view.goTo({
+      target: t.geometry,
       scale: 1500
-    }) : await this.view.goTo(r), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
+    }) : await this.view.goTo(t.geometry), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
   }
   showPopup(e) {
-    const r = e.geometry.type === "point" ? e.geometry : e.geometry.centroid;
+    const t = e.geometry.type === "point" ? e.geometry : e.geometry.centroid;
     this.view.openPopup({
       features: [e],
-      location: r
+      location: t
     });
   }
   async highlightSignalControlArea(e) {
     if (!e.id || e.id === "")
       return { status: 1, message: "请输入id" };
     this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !1, this.subDistrictControllerLayer.visible = !1, this.crossLayer.visible = !1;
-    for (const s of this.districtControllers)
-      for (const o of s.subDistricts)
-        (o.id === e.id || o.parentId === e.id) && await this.showSubDistrictRoad(o);
-    const r = this.districtControllerLayer.graphics.filter((s) => s.getAttribute("id") === e.id).toArray().map((s) => s.clone()), i = this.subDistrictControllerLayer.graphics.filter(
-      (s) => s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
-    ).toArray().map((s) => s.clone()), t = this.crossLayer.graphics.filter(
-      (s) => s.getAttribute("id") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
-    ).toArray().map((s) => s.clone());
-    return r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), t.length > 0 && this.highlightLayer.addMany(t), this.highlightLayer.graphics.length === 0 ? { status: 1, message: "未找到" } : (r.length > 0 ? await this.view.goTo(r) : i.length > 0 ? await this.view.goTo({
-      target: i,
-      scale: this.crossScale - 500
-    }) : t.length > 1 ? await this.view.goTo(t) : await this.view.goTo({
-      target: t[0].geometry,
-      scale: 1500
-    }), { status: 0, message: "ok" });
+    const t = this.districtControllerLayer.graphics.filter((i) => i.getAttribute("id") === e.id).toArray().map((i) => i.clone()), r = this.subDistrictControllerLayer.graphics.filter(
+      (i) => i.getAttribute("id") === e.id || i.getAttribute("parentId") === e.id
+    ).toArray().map((i) => i.clone()), s = this.crossLayer.graphics.filter(
+      (i) => i.getAttribute("id") === e.id || i.getAttribute("districtId") === e.id || i.getAttribute("subDistrictId") === e.id
+    ).toArray().map((i) => i.clone());
+    if (t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), s.length > 0 && this.highlightLayer.addMany(s), this.highlightLayer.graphics.length === 0)
+      return { status: 1, message: "未找到" };
+    if (t.length > 0)
+      await this.view.goTo(t);
+    else if (r.length > 0) {
+      const i = r[0].geometry.centroid;
+      await this.view.goTo({
+        target: i,
+        scale: this.crossScale - 500
+      });
+    } else
+      s.length > 1 ? await this.view.goTo(s) : await this.view.goTo({
+        target: s[0].geometry,
+        scale: 1500
+      });
+    return { status: 0, message: "ok" };
   }
   resetHighlight() {
     return this.highlightLayer.removeAll(), this.view.closePopup(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0, this.crossLayer.visible = !0, { status: 0, message: "ok" };
@@ -119,35 +115,47 @@ class k {
    * @returns
    */
   findAreaGraphic(e) {
-    let r = this.districtControllerLayer.graphics.filter(
-      (i) => i.attributes.id === e
+    let t = this.districtControllerLayer.graphics.find(
+      (r) => r.attributes.id === e
     );
-    if (r || (r = this.subDistrictControllerLayer.graphics.filter(
-      (i) => i.attributes.getAttribute("subDistrictId") === e
-    )), r || (r = this.crossLayer.graphics.filter((i) => i.attributes.id === e)), r.length !== 0)
-      return r.toArray();
+    return t || (t = this.subDistrictControllerLayer.graphics.find(
+      (r) => r.attributes.id === e
+    )), t || (t = this.crossLayer.graphics.find((r) => r.attributes.id === e)), t;
   }
   /**
-   * 显示区控
+   * 绘制区控与子区
    * @param districtController
+   * @param isDistrict 是否是区控
    * @returns
    */
-  showDistrict(e) {
+  drawArea(e, t) {
     const r = e.getAllCrossCoordinates();
     if (r.length >= 2) {
-      let t = null;
+      let i = null;
       if (r.length === 2)
-        t = n.lineString(r);
-      else if (r.length > 2) {
-        const p = n.featureCollection(
-          r.map((d) => n.point(d))
-        );
-        t = b(p);
+        i = o.lineString(r);
+      else {
+        if (t) {
+          const n = o.featureCollection(
+            r.map((g) => o.point(g))
+          );
+          i = f(n);
+        } else {
+          const n = d(r, 0.5);
+          n.length >= 4 && (i = o.polygon([n]));
+        }
+        i || (i = o.lineString(r));
       }
-      t || (t = n.lineString(r));
-      const s = f(t.geometry, 200, {
-        units: "meters"
-      }), o = [
+      const l = p(
+        i.geometry,
+        // 区控面积更大，需要更大的缓冲半径
+        t ? 200 : 30,
+        {
+          units: "meters"
+        }
+      );
+      let a;
+      t ? a = [
         {
           fieldName: "id",
           label: "区控编号"
@@ -160,7 +168,17 @@ class k {
           fieldName: "subDistrictCount",
           label: "子区数量"
         }
-      ], c = {
+      ] : a = [
+        {
+          fieldName: "parentName",
+          label: "所属区控"
+        },
+        {
+          fieldName: "crossCount",
+          label: "路口数量"
+        }
+      ];
+      const m = {
         type: "signalControlArea",
         id: e.id,
         name: e.name,
@@ -168,112 +186,58 @@ class k {
         parentName: e.parentName,
         crossCount: e.crossCount,
         subDistrictCount: e.subDistrictCount
-      }, h = new a({
+      }, c = new y({
         geometry: {
           type: "polygon",
-          rings: s.geometry.coordinates
+          rings: l.geometry.coordinates
         },
         symbol: {
           type: "simple-fill",
-          color: [...e.areaColor, 0.1],
+          color: [...e.areaColor, 0.2],
           outline: {
             color: e.areaColor,
-            width: 2
+            width: 3,
+            style: t ? "solid" : "long-dash"
           }
         },
-        attributes: c,
+        attributes: m,
         popupTemplate: {
-          title: `区控  ${e.name}`,
+          title: `${t ? "区控" : "子区"}  ${e.name}`,
           content: [
             {
               type: "fields",
-              fieldInfos: o
+              fieldInfos: a
             }
           ]
         }
       });
-      this.districtControllerLayer.add(h);
+      t ? this.districtControllerLayer.add(c) : this.subDistrictControllerLayer.add(c);
     }
-    for (let t = 0; t < e.subDistricts.length; t++) {
-      const s = e.subDistricts[t];
-      this.showSubDistrictCross(s);
-    }
-    const i = [];
-    e.crosses = e.crosses.filter(
-      (t) => m.isCoordinateValid(t)
-    ), e.crosses.forEach((t) => {
-      if (m.isCoordinateValid(t)) {
-        const s = {
-          type: "cross",
-          id: t.id,
-          name: t.name,
-          color: e.areaColor,
-          signalId: t.signalId,
-          districtId: e.id,
-          districtName: e.name,
-          isKey: t.isKey
-        }, o = new a({
-          geometry: {
-            type: "point",
-            x: t.longitude,
-            y: t.latitude
-          },
-          symbol: this.getCrossGraphicSymbol(s, "marker"),
-          attributes: s,
-          popupTemplate: {
-            title: t.name,
-            content: [
-              {
-                type: "fields",
-                fieldInfos: [
-                  {
-                    fieldName: "districtName",
-                    label: "区控名称"
-                  },
-                  {
-                    fieldName: "id",
-                    label: "路口编号"
-                  },
-                  {
-                    fieldName: "signalId",
-                    label: "信号机编号"
-                  }
-                ]
-              }
-            ]
-          }
-        });
-        i.push(o);
-      } else
-        console.log("路口坐标无效", t);
-    }), this.crossLayer.addMany(i);
-  }
-  showSubDistrictCross(e) {
-    const r = [];
-    e.crosses = e.crosses.filter(
-      (i) => m.isCoordinateValid(i)
-    ), e.crosses.forEach((i) => {
-      const t = {
+    for (const i of e.subDistricts)
+      this.drawArea(i, !1);
+    const s = [];
+    e.crosses.forEach((i) => {
+      const l = {
         type: "cross",
         id: i.id,
         name: i.name,
         color: e.areaColor,
         signalId: i.signalId,
-        districtId: e.parentId,
-        districtName: e.parentName,
-        subDistrictId: e.id,
-        subDistrictName: e.name,
+        districtId: t ? e.id : e.parentId,
+        districtName: t ? e.name : e.parentName,
+        subDistrictId: t ? "" : e.id,
+        subDistrictName: t ? "" : e.name,
         isKey: i.isKey
-      }, s = new a({
+      }, a = new y({
         geometry: {
           type: "point",
           x: i.longitude,
           y: i.latitude
         },
-        symbol: this.getCrossGraphicSymbol(t, "marker"),
-        attributes: t,
+        symbol: this.getCrossGraphicSymbol(l, "marker"),
+        attributes: l,
         popupTemplate: {
-          title: `${i.name}`,
+          title: i.name,
           content: [
             {
               type: "fields",
@@ -299,74 +263,8 @@ class k {
           ]
         }
       });
-      r.push(s);
-    }), this.crossLayer.addMany(r);
-  }
-  async showSubDistrictRoad(e) {
-    if (e.crosses.length > 1 && !this.loadedSubDistricts.includes(e.id) && this.openDriveServerUrl && this.openDriveServerUrl !== "") {
-      this.loadedSubDistricts.push(e.id);
-      const r = await C.get(
-        `http://${this.openDriveServerUrl}/api/computable/getRoadsectWithinJunctions`,
-        {
-          params: {
-            junctionIds: e.crosses.map((i) => i.id).join(",")
-          }
-        }
-      );
-      if (r.status === 200) {
-        const i = r.data.result;
-        if (i.length > 0) {
-          const t = i.map((h) => new g({ paths: [h] })), s = y.geodesicBuffer(
-            t,
-            5,
-            "meters"
-          ), o = y.union(
-            s
-          ), c = new a({
-            geometry: o,
-            symbol: {
-              type: "simple-fill",
-              color: [...e.areaColor, 0.8],
-              outline: {
-                color: e.areaColor,
-                width: 1
-              }
-            },
-            attributes: {
-              type: "subDistrict",
-              districtId: e.parentId,
-              districtName: e.parentName,
-              subDistrictId: e.id,
-              subDistrictName: e.name,
-              crossCount: e.crosses.length
-            },
-            popupTemplate: {
-              title: `子区  ${e.name}`,
-              content: [
-                {
-                  type: "fields",
-                  fieldInfos: [
-                    {
-                      fieldName: "districtName",
-                      label: "区控名称"
-                    },
-                    {
-                      fieldName: "subDistrictName",
-                      label: "子区名称"
-                    },
-                    {
-                      fieldName: "crossCount",
-                      label: "路口数量"
-                    }
-                  ]
-                }
-              ]
-            }
-          });
-          this.subDistrictControllerLayer.add(c);
-        }
-      }
-    }
+      s.push(a);
+    }), this.crossLayer.addMany(s);
   }
   /**
    * 生成路口点符号。在不同比例尺下，使用不同的符号
@@ -374,10 +272,10 @@ class k {
    * @param symbolType
    * @returns
    */
-  getCrossGraphicSymbol(e, r) {
-    const { isKey: i, color: t } = e;
-    if (r === "marker")
-      return i ? {
+  getCrossGraphicSymbol(e, t) {
+    const { isKey: r, color: s } = e;
+    if (t === "marker")
+      return r ? {
         type: "picture-marker",
         url: "/GisViewerAssets/Images/icon_star.png",
         width: "30px",
@@ -385,14 +283,14 @@ class k {
       } : {
         type: "simple-marker",
         style: "circle",
-        color: t,
+        color: s,
         size: 8,
         outline: {
           color: "white",
           width: 1
         }
       };
-    if (r === "picture")
+    if (t === "picture")
       return {
         type: "cim",
         data: {
@@ -431,7 +329,7 @@ class k {
                       height: 12,
                       horizontalAlignment: "Center",
                       offsetX: 0,
-                      offsetY: i ? 60 : 40,
+                      offsetY: r ? 50 : 40,
                       haloSize: 1,
                       haloSymbol: {
                         type: "CIMPolygonSymbol",
@@ -470,11 +368,11 @@ class k {
                   y: 0
                 },
                 anchorPointUnits: "Relative",
-                size: i ? 45 : 30,
+                size: r ? 45 : 30,
                 rotateClockwise: !0,
                 textureFilter: "Picture",
-                url: `/GisViewerAssets/Images/xhj_${i ? 4 : 1}.png`,
-                offsetY: i ? 22 : 15
+                url: `/GisViewerAssets/Images/xhj_${r ? 4 : 1}.png`,
+                offsetY: r ? 22 : 15
               }
             ]
           }
@@ -483,5 +381,5 @@ class k {
   }
 }
 export {
-  k as default
+  x as default
 };

package/lib/src/gis-map/utils/common-utils.d.ts

@@ -80,7 +80,7 @@ export default class CommonUtils {
     static pointsEqual(point1: number[], point2: number[]): boolean;
     static getExtensionLine(pt1: number[], pt2: number[], distance: number): turf.Position;
     static isCoordinateValid(coordinate: {
-        latitude: number;
-        longitude: number;
+        latitude: number | string;
+        longitude: number | string;
     }): boolean;
 }

package/lib/src/gis-map/utils/common-utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@arcgis/core/geometry"),L=require("@arcgis/core/geometry/geometryEngineAsync"),w=require("@arcgis/core/geometry/support/webMercatorUtils"),p=require("@turf/bearing"),g=require("@turf/destination"),b=require("@turf/helpers"),S=require("pako"),P=require("proj4");function y(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const n=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,n.get?n:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const l=y(L),d=y(w),c=y(b);class i{static destinationWithPoint(e,t,n){const r=c.point([e.x,e.y]),s=g(r,n,t,{units:"meters"});return new u.Point({x:s.geometry.coordinates[0],y:s.geometry.coordinates[1]})}static angleOfLine(e){const t=e.paths[0],n=c.point(t[0]),r=c.point(t[t.length-1]);return p(n,r)}static extendLineInTowDir(e,t){const n=e.paths[0],r=c.point(n[0]),s=c.point(n[1]),o=p(s,r),f=g(r,t,o,{units:"meters"}),h=o>0?o-180:o+180,O=g(s,t,h,{units:"meters"});return new u.Polyline({paths:[[f.geometry.coordinates,O.geometry.coordinates]]})}static async getIntersectPointOfTwoLines(e,t){const n=await l.intersectLinesToPoints(e,t);if(n.length)return n[0]}static async getIntersectPointsOfStopLineAndLane(e,t,n){let r=await i.getIntersectPointOfLineAndPolygon(e,t);if(await i.pointDistance(r)<3&&n){for(const s of n)if(r=await i.getIntersectPointOfLineAndPolygon(e,t,s),await i.pointDistance(r)>2.5){const o=new u.Polyline({paths:[r]});return(await i.getOffsetLine(o,-s)).paths[0]}}else return r;return[]}static async pointDistance(e){if(e.length<2)return 0;const t=new u.Polyline({paths:[e]});return await l.geodesicLength(t,"meters")}static async getIntersectPointOfLineAndPolygon(e,t,n=0){n!==0&&(e=await i.getOffsetLine(e,n));const r=await l.intersect(e,t);if(r instanceof u.Polyline){const s=r.paths[0],o=s[0],f=s[s.length-1];return[o,f]}return[]}static async getOffsetLine(e,t){const n=d.geographicToWebMercator(e),r=await l.offset(n,t,"meters");return d.webMercatorToGeographic(r,!1)}static unzip(e){try{const t=[],n=e.split("");for(let s=0;s<n.length;s++){const o=n[s];t.push(o.charCodeAt(0))}const r=new Uint8Array(t);return S.inflate(r,{to:"string"})}catch{console.log(`非压缩内容: ${e}`)}}static getStdVecEntries(e,t=!1){const n=new Array(e.size());for(let r=0;r<e.size();r++)n[r]=e.get(r);return t&&e.delete(),n}static getStdMapEntries(e){const t=[];for(const n of i.getStdMapKeys(e))t.push([n,e.get(n)]);return t}static getStdMapKeys(e,t=!1){const n=[],r=e.keys();for(let s=0;s<r.size();s++)n.push(r.get(s));return r.delete(),t&&e.delete(),n}static setGeoData(e,t,n){i.geoReference=e,i.xOffset=t,i.yOffset=n}static transformLineProjection(e){try{return e.map(t=>P(i.geoReference).inverse([t[0]-i.xOffset,t[1]-i.yOffset]))}catch{return console.error("OpenDrive坐标转换为WGS84坐标失败",i.geoReference),e}}static transformPointProjection(e){try{return P(i.geoReference).inverse([e[0]-i.xOffset,e[1]-i.yOffset])}catch{return console.error("OpenDrive坐标转换为WGS84坐标失败",i.geoReference),e}}static pointsEqual(e,t){return Math.abs(e[0]-t[0])<Number.EPSILON&&Math.abs(e[1]-t[1])<Number.EPSILON}static getExtensionLine(e,t,n){const r=c.point(e),s=c.point(t),o=p(r,s);return g(s,n,o,{units:"meters"}).geometry.coordinates}static isCoordinateValid(e){return e.latitude!==void 0&&e.longitude!==void 0&&!isNaN(e.latitude)&&!isNaN(e.longitude)&&e.latitude!==0&&e.longitude!==0}}exports.default=i;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@arcgis/core/geometry"),L=require("@arcgis/core/geometry/geometryEngineAsync"),w=require("@arcgis/core/geometry/support/webMercatorUtils"),p=require("@turf/bearing"),g=require("@turf/destination"),b=require("@turf/helpers"),S=require("pako"),P=require("proj4");function y(c){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(c){for(const t in c)if(t!=="default"){const n=Object.getOwnPropertyDescriptor(c,t);Object.defineProperty(e,t,n.get?n:{enumerable:!0,get:()=>c[t]})}}return e.default=c,Object.freeze(e)}const l=y(L),h=y(w),o=y(b);class i{static destinationWithPoint(e,t,n){const r=o.point([e.x,e.y]),s=g(r,n,t,{units:"meters"});return new u.Point({x:s.geometry.coordinates[0],y:s.geometry.coordinates[1]})}static angleOfLine(e){const t=e.paths[0],n=o.point(t[0]),r=o.point(t[t.length-1]);return p(n,r)}static extendLineInTowDir(e,t){const n=e.paths[0],r=o.point(n[0]),s=o.point(n[1]),a=p(s,r),f=g(r,t,a,{units:"meters"}),d=a>0?a-180:a+180,O=g(s,t,d,{units:"meters"});return new u.Polyline({paths:[[f.geometry.coordinates,O.geometry.coordinates]]})}static async getIntersectPointOfTwoLines(e,t){const n=await l.intersectLinesToPoints(e,t);if(n.length)return n[0]}static async getIntersectPointsOfStopLineAndLane(e,t,n){let r=await i.getIntersectPointOfLineAndPolygon(e,t);if(await i.pointDistance(r)<3&&n){for(const s of n)if(r=await i.getIntersectPointOfLineAndPolygon(e,t,s),await i.pointDistance(r)>2.5){const a=new u.Polyline({paths:[r]});return(await i.getOffsetLine(a,-s)).paths[0]}}else return r;return[]}static async pointDistance(e){if(e.length<2)return 0;const t=new u.Polyline({paths:[e]});return await l.geodesicLength(t,"meters")}static async getIntersectPointOfLineAndPolygon(e,t,n=0){n!==0&&(e=await i.getOffsetLine(e,n));const r=await l.intersect(e,t);if(r instanceof u.Polyline){const s=r.paths[0],a=s[0],f=s[s.length-1];return[a,f]}return[]}static async getOffsetLine(e,t){const n=h.geographicToWebMercator(e),r=await l.offset(n,t,"meters");return h.webMercatorToGeographic(r,!1)}static unzip(e){try{const t=[],n=e.split("");for(let s=0;s<n.length;s++){const a=n[s];t.push(a.charCodeAt(0))}const r=new Uint8Array(t);return S.inflate(r,{to:"string"})}catch{console.log(`非压缩内容: ${e}`)}}static getStdVecEntries(e,t=!1){const n=new Array(e.size());for(let r=0;r<e.size();r++)n[r]=e.get(r);return t&&e.delete(),n}static getStdMapEntries(e){const t=[];for(const n of i.getStdMapKeys(e))t.push([n,e.get(n)]);return t}static getStdMapKeys(e,t=!1){const n=[],r=e.keys();for(let s=0;s<r.size();s++)n.push(r.get(s));return r.delete(),t&&e.delete(),n}static setGeoData(e,t,n){i.geoReference=e,i.xOffset=t,i.yOffset=n}static transformLineProjection(e){try{return e.map(t=>P(i.geoReference).inverse([t[0]-i.xOffset,t[1]-i.yOffset]))}catch{return console.error("OpenDrive坐标转换为WGS84坐标失败",i.geoReference),e}}static transformPointProjection(e){try{return P(i.geoReference).inverse([e[0]-i.xOffset,e[1]-i.yOffset])}catch{return console.error("OpenDrive坐标转换为WGS84坐标失败",i.geoReference),e}}static pointsEqual(e,t){return Math.abs(e[0]-t[0])<Number.EPSILON&&Math.abs(e[1]-t[1])<Number.EPSILON}static getExtensionLine(e,t,n){const r=o.point(e),s=o.point(t),a=p(r,s);return g(s,n,a,{units:"meters"}).geometry.coordinates}static isCoordinateValid(e){return typeof e.latitude=="string"&&(e.latitude=Number(e.latitude)),typeof e.longitude=="string"&&(e.longitude=Number(e.longitude)),e.latitude!==null&&e.longitude!==null&&!isNaN(e.latitude)&&!isNaN(e.longitude)&&e.latitude!==0&&e.longitude!==0}}exports.default=i;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("../common-utils.js");class r{constructor(s){this.parentName="",this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new r(t);o.parentName=this.name;const e=this.areaColor[0],n=this.areaColor[1],a=this.areaColor[2],i=Math.random()*200-100;o.areaColor=[e+i,n+i,a+i],this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else{const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,isKey:t.isKey===1};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)u.default.isCoordinateValid(t)&&s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=r;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("../common-utils.js");class r{constructor(s){this.parentName="",this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new r(t);o.parentName=this.name;const e=this.areaColor[0],a=this.areaColor[1],n=this.areaColor[2],i=Math.random()*200-100;o.areaColor=[Math.max(e+i,100),Math.max(a+i,100),Math.max(n+i,100)],this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else if(h.default.isCoordinateValid(t)){const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,isKey:t.isKey===1};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=r;

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

@@ -5,12 +5,10 @@ export default class SignalControlAreaController {
     private subDistrictControllerLayer;
     private crossLayer;
     private highlightLayer;
-    private districtControllers;
     private watchHandle?;
-    private openDriveServerUrl;
     private readonly crossScale;
     constructor(view: __esri.MapView | __esri.SceneView);
-    showSignalControlArea(params: any): Promise<IResult>;
+    showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;
     locateSignalControlArea(params: {
         id: string;
@@ -27,14 +25,12 @@ export default class SignalControlAreaController {
      */
     private findAreaGraphic;
     /**
-     * 显示区控
+     * 绘制区控与子区
      * @param districtController
+     * @param isDistrict 是否是区控
      * @returns
      */
-    private showDistrict;
-    private showSubDistrictCross;
-    private loadedSubDistricts;
-    private showSubDistrictRoad;
+    private drawArea;
     /**
      * 生成路口点符号。在不同比例尺下，使用不同的符号
      * @param attributes

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("@arcgis/core/core/reactiveUtils.js"),b=require("@arcgis/core/geometry"),C=require("@arcgis/core/geometry/geometryEngine.js"),l=require("@arcgis/core/Graphic"),n=require("@arcgis/core/layers/GraphicsLayer"),v=require("@turf/buffer"),S=require("@turf/concave"),L=require("@turf/helpers"),w=require("axios"),I=require("../../stores/index.js"),d=require("../common-utils.js"),A=require("./district-controller.js");function y(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const i in a)if(i!=="default"){const r=Object.getOwnPropertyDescriptor(a,i);Object.defineProperty(e,i,r.get?r:{enumerable:!0,get:()=>a[i]})}}return e.default=a,Object.freeze(e)}const D=y(f),m=y(C),c=y(L);class N{constructor(e){this.districtControllers=[],this.crossScale=5e3,this.loadedSubDistricts=[],this.view=e;const r=I.default.useAppDataStore.mapConfig;this.openDriveServerUrl=r.openDriveServer.url,this.districtControllerLayer=new n({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new n({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new n({id:"crossLayer",maxScale:0,minScale:36112}),this.highlightLayer=new n({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}async showSignalControlArea(e){console.time("showSignalControlArea"),this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0;for(const i of e){const r=new A.default(i);this.showDistrict(r),this.districtControllers.push(r)}this.watchHandle=D.watch(()=>this.view.scale,(i,r)=>{i>this.crossScale&&r<=this.crossScale?(this.crossLayer.graphics.forEach(t=>{t.symbol=this.getCrossGraphicSymbol(t.attributes,"marker")}),this.highlightLayer.graphics.forEach(t=>{t.getAttribute("type")==="cross"&&(t.symbol=this.getCrossGraphicSymbol(t.attributes,"marker"))})):i<=this.crossScale&&r>this.crossScale&&(this.crossLayer.graphics.forEach(t=>{t.symbol=this.getCrossGraphicSymbol(t.attributes,"picture")}),this.highlightLayer.graphics.forEach(t=>{t.getAttribute("type")==="cross"&&(t.symbol=this.getCrossGraphicSymbol(t.attributes,"picture"))}))});for(const i of this.districtControllers)for(const r of i.subDistricts)await this.showSubDistrictRoad(r);return console.timeEnd("showSignalControlArea"),{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.watchHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const i=this.findAreaGraphic(e.id);return i?(i[0].attributes.type==="cross"?await this.view.goTo({target:i,scale:1500}):await this.view.goTo(i),{status:0,message:"ok"}):{status:1,message:"未找到"}}showPopup(e){const i=e.geometry.type==="point"?e.geometry:e.geometry.centroid;this.view.openPopup({features:[e],location:i})}async highlightSignalControlArea(e){if(!e.id||e.id==="")return{status:1,message:"请输入id"};this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;for(const s of this.districtControllers)for(const o of s.subDistricts)(o.id===e.id||o.parentId===e.id)&&await this.showSubDistrictRoad(o);const i=this.districtControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id).toArray().map(s=>s.clone()),r=this.subDistrictControllerLayer.graphics.filter(s=>s.getAttribute("districtId")===e.id||s.getAttribute("subDistrictId")===e.id).toArray().map(s=>s.clone()),t=this.crossLayer.graphics.filter(s=>s.getAttribute("id")===e.id||s.getAttribute("districtId")===e.id||s.getAttribute("subDistrictId")===e.id).toArray().map(s=>s.clone());return i.length>0&&this.highlightLayer.addMany(i),r.length>0&&this.highlightLayer.addMany(r),t.length>0&&this.highlightLayer.addMany(t),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(i.length>0?await this.view.goTo(i):r.length>0?await this.view.goTo({target:r,scale:this.crossScale-500}):t.length>1?await this.view.goTo(t):await this.view.goTo({target:t[0].geometry,scale:1500}),{status:0,message:"ok"})}resetHighlight(){return this.highlightLayer.removeAll(),this.view.closePopup(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0,this.crossLayer.visible=!0,{status:0,message:"ok"}}findAreaGraphic(e){let i=this.districtControllerLayer.graphics.filter(r=>r.attributes.id===e);if(i||(i=this.subDistrictControllerLayer.graphics.filter(r=>r.attributes.getAttribute("subDistrictId")===e)),i||(i=this.crossLayer.graphics.filter(r=>r.attributes.id===e)),i.length!==0)return i.toArray()}showDistrict(e){const i=e.getAllCrossCoordinates();if(i.length>=2){let t=null;if(i.length===2)t=c.lineString(i);else if(i.length>2){const p=c.featureCollection(i.map(g=>c.point(g)));t=S(p)}t||(t=c.lineString(i));const s=v(t.geometry,200,{units:"meters"}),o=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}],h={type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},u=new l({geometry:{type:"polygon",rings:s.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,.1],outline:{color:e.areaColor,width:2}},attributes:h,popupTemplate:{title:`区控  ${e.name}`,content:[{type:"fields",fieldInfos:o}]}});this.districtControllerLayer.add(u)}for(let t=0;t<e.subDistricts.length;t++){const s=e.subDistricts[t];this.showSubDistrictCross(s)}const r=[];e.crosses=e.crosses.filter(t=>d.default.isCoordinateValid(t)),e.crosses.forEach(t=>{if(d.default.isCoordinateValid(t)){const s={type:"cross",id:t.id,name:t.name,color:e.areaColor,signalId:t.signalId,districtId:e.id,districtName:e.name,isKey:t.isKey},o=new l({geometry:{type:"point",x:t.longitude,y:t.latitude},symbol:this.getCrossGraphicSymbol(s,"marker"),attributes:s,popupTemplate:{title:t.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}});r.push(o)}else console.log("路口坐标无效",t)}),this.crossLayer.addMany(r)}showSubDistrictCross(e){const i=[];e.crosses=e.crosses.filter(r=>d.default.isCoordinateValid(r)),e.crosses.forEach(r=>{const t={type:"cross",id:r.id,name:r.name,color:e.areaColor,signalId:r.signalId,districtId:e.parentId,districtName:e.parentName,subDistrictId:e.id,subDistrictName:e.name,isKey:r.isKey},s=new l({geometry:{type:"point",x:r.longitude,y:r.latitude},symbol:this.getCrossGraphicSymbol(t,"marker"),attributes:t,popupTemplate:{title:`${r.name}`,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}});i.push(s)}),this.crossLayer.addMany(i)}async showSubDistrictRoad(e){if(e.crosses.length>1&&!this.loadedSubDistricts.includes(e.id)&&this.openDriveServerUrl&&this.openDriveServerUrl!==""){this.loadedSubDistricts.push(e.id);const i=await w.get(`http://${this.openDriveServerUrl}/api/computable/getRoadsectWithinJunctions`,{params:{junctionIds:e.crosses.map(r=>r.id).join(",")}});if(i.status===200){const r=i.data.result;if(r.length>0){const t=r.map(u=>new b.Polyline({paths:[u]})),s=m.geodesicBuffer(t,5,"meters"),o=m.union(s),h=new l({geometry:o,symbol:{type:"simple-fill",color:[...e.areaColor,.8],outline:{color:e.areaColor,width:1}},attributes:{type:"subDistrict",districtId:e.parentId,districtName:e.parentName,subDistrictId:e.id,subDistrictName:e.name,crossCount:e.crosses.length},popupTemplate:{title:`子区  ${e.name}`,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"crossCount",label:"路口数量"}]}]}});this.subDistrictControllerLayer.add(h)}}}}getCrossGraphicSymbol(e,i){const{isKey:r,color:t}=e;if(i==="marker")return r?{type:"picture-marker",url:"/GisViewerAssets/Images/icon_star.png",width:"30px",height:"30px"}:{type:"simple-marker",style:"circle",color:t,size:8,outline:{color:"white",width:1}};if(i==="picture")return{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:r?60:40,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:r?45:30,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/xhj_${r?4:1}.png`,offsetY:r?22:15}]}}}}}exports.default=N;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("@arcgis/core/core/reactiveUtils.js"),u=require("@arcgis/core/Graphic"),h=require("@arcgis/core/layers/GraphicsLayer"),f=require("@turf/buffer"),b=require("@turf/convex"),L=require("@turf/helpers"),C=require("concaveman"),v=require("./district-controller.js");function g(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const w=g(d),l=g(L);class A{constructor(e){this.crossScale=5e3,this.view=e,this.districtControllerLayer=new h({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new h({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new h({id:"crossLayer",maxScale:0,minScale:36112}),this.highlightLayer=new h({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}showSignalControlArea(e){this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0;for(const t of e){const r=new v.default(t);this.drawArea(r,!0)}return this.watchHandle=w.watch(()=>this.view.scale,(t,r)=>{console.log(t,r),t>this.crossScale&&r<=this.crossScale?(this.crossLayer.graphics.forEach(s=>{s.symbol=this.getCrossGraphicSymbol(s.attributes,"marker")}),this.highlightLayer.graphics.forEach(s=>{s.getAttribute("type")==="cross"&&(s.symbol=this.getCrossGraphicSymbol(s.attributes,"marker"))})):t<=this.crossScale&&r>this.crossScale&&(this.crossLayer.graphics.forEach(s=>{s.symbol=this.getCrossGraphicSymbol(s.attributes,"picture")}),this.highlightLayer.graphics.forEach(s=>{s.getAttribute("type")==="cross"&&(s.symbol=this.getCrossGraphicSymbol(s.attributes,"picture"))}))}),{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.watchHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const t=this.findAreaGraphic(e.id);return t?(t.attributes.type==="cross"?await this.view.goTo({target:t.geometry,scale:1500}):await this.view.goTo(t.geometry),{status:0,message:"ok"}):{status:1,message:"未找到"}}showPopup(e){const t=e.geometry.type==="point"?e.geometry:e.geometry.centroid;this.view.openPopup({features:[e],location:t})}async highlightSignalControlArea(e){if(!e.id||e.id==="")return{status:1,message:"请输入id"};this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id).toArray().map(i=>i.clone()),r=this.subDistrictControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("parentId")===e.id).toArray().map(i=>i.clone()),s=this.crossLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("districtId")===e.id||i.getAttribute("subDistrictId")===e.id).toArray().map(i=>i.clone());if(t.length>0&&this.highlightLayer.addMany(t),r.length>0&&this.highlightLayer.addMany(r),s.length>0&&this.highlightLayer.addMany(s),this.highlightLayer.graphics.length===0)return{status:1,message:"未找到"};if(t.length>0)await this.view.goTo(t);else if(r.length>0){const i=r[0].geometry.centroid;await this.view.goTo({target:i,scale:this.crossScale-500})}else s.length>1?await this.view.goTo(s):await this.view.goTo({target:s[0].geometry,scale:1500});return{status:0,message:"ok"}}resetHighlight(){return this.highlightLayer.removeAll(),this.view.closePopup(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0,this.crossLayer.visible=!0,{status:0,message:"ok"}}findAreaGraphic(e){let t=this.districtControllerLayer.graphics.find(r=>r.attributes.id===e);return t||(t=this.subDistrictControllerLayer.graphics.find(r=>r.attributes.id===e)),t||(t=this.crossLayer.graphics.find(r=>r.attributes.id===e)),t}drawArea(e,t){const r=e.getAllCrossCoordinates();if(r.length>=2){let i=null;if(r.length===2)i=l.lineString(r);else{if(t){const c=l.featureCollection(r.map(p=>l.point(p)));i=b(c)}else{const c=C(r,.5);c.length>=4&&(i=l.polygon([c]))}i||(i=l.lineString(r))}const n=f(i.geometry,t?200:30,{units:"meters"});let o;t?o=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:o=[{fieldName:"parentName",label:"所属区控"},{fieldName:"crossCount",label:"路口数量"}];const m={type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},y=new u({geometry:{type:"polygon",rings:n.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,.2],outline:{color:e.areaColor,width:3,style:t?"solid":"long-dash"}},attributes:m,popupTemplate:{title:`${t?"区控":"子区"}  ${e.name}`,content:[{type:"fields",fieldInfos:o}]}});t?this.districtControllerLayer.add(y):this.subDistrictControllerLayer.add(y)}for(const i of e.subDistricts)this.drawArea(i,!1);const s=[];e.crosses.forEach(i=>{const n={type:"cross",id:i.id,name:i.name,color:e.areaColor,signalId:i.signalId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,isKey:i.isKey},o=new u({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:this.getCrossGraphicSymbol(n,"marker"),attributes:n,popupTemplate:{title:i.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}});s.push(o)}),this.crossLayer.addMany(s)}getCrossGraphicSymbol(e,t){const{isKey:r,color:s}=e;if(t==="marker")return r?{type:"picture-marker",url:"/GisViewerAssets/Images/icon_star.png",width:"30px",height:"30px"}:{type:"simple-marker",style:"circle",color:s,size:8,outline:{color:"white",width:1}};if(t==="picture")return{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:r?50:40,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:r?45:30,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/xhj_${r?4:1}.png`,offsetY:r?22:15}]}}}}}exports.default=A;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.158",
+  "version": "1.0.159",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [
@@ -35,6 +35,7 @@
     "@types/pako": "^2.0.0",
     "@vitest/coverage-c8": "^0.29.2",
     "axios": "^1.4.0",
+    "concaveman": "^1.2.1",
     "fast-xml-parser": "^4.4.0",
     "md5": "^2.3.0",
     "pako": "^2.1.0",