gisviewer-vue3-arcgis 1.0.235 → 1.0.237

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

@@ -1,4 +1,5 @@
 import { Point, Polygon, Polyline } from '@arcgis/core/geometry';
+import Graphic from '@arcgis/core/Graphic';
 import * as turf from '@turf/helpers';
 export default class CommonUtils {
     /**
@@ -89,4 +90,5 @@ export default class CommonUtils {
      * @returns
      */
     static getCenterPointInLine(line: number[][]): number[];
+    static viewGoto(view: __esri.MapView | __esri.SceneView, target: Graphic[]): Promise<void>;
 }

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

@@ -1,13 +1,13 @@
-import { Point as L, Polyline as f } from "@arcgis/core/geometry";
-import * as g from "@arcgis/core/geometry/geometryEngineAsync";
+import { Point as L, Polyline as g } from "@arcgis/core/geometry";
+import * as f from "@arcgis/core/geometry/geometryEngineAsync";
 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 * as c from "@turf/helpers";
 import d from "@turf/length";
 import O from "@turf/line-slice-along";
 import w from "pako";
-import y from "proj4";
+import h from "proj4";
 class s {
   /**
    * 得到某个点在一定方向、距离之外的另一个点
@@ -17,7 +17,7 @@ class s {
    * @returns
    */
   static destinationWithPoint(t, e, n) {
-    const r = a.point([t.x, t.y]), i = u(r, n, e, {
+    const r = c.point([t.x, t.y]), i = u(r, n, e, {
       units: "meters"
     });
     return new L({
@@ -31,7 +31,7 @@ class s {
    * @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 = c.point(e[0]), r = c.point(e[e.length - 1]);
     return p(n, r);
   }
   /**
@@ -40,14 +40,14 @@ class s {
    * @param distance
    */
   static extendLineInTowDir(t, e) {
-    const n = t.paths[0], r = a.point(n[0]), i = a.point(n[1]), o = p(i, r), c = u(r, e, o, {
+    const n = t.paths[0], r = c.point(n[0]), i = c.point(n[1]), o = p(i, r), a = u(r, e, o, {
       units: "meters"
-    }), h = o > 0 ? o - 180 : o + 180, P = u(i, e, h, {
+    }), y = o > 0 ? o - 180 : o + 180, P = u(i, e, y, {
       units: "meters"
     });
-    return new f({
+    return new g({
       paths: [
-        [c.geometry.coordinates, P.geometry.coordinates]
+        [a.geometry.coordinates, P.geometry.coordinates]
       ]
     });
   }
@@ -58,7 +58,7 @@ class s {
    * @returns
    */
   static async getIntersectPointOfTwoLines(t, e) {
-    const n = await g.intersectLinesToPoints(
+    const n = await f.intersectLinesToPoints(
       t,
       e
     );
@@ -84,7 +84,7 @@ class s {
           e,
           i
         ), await s.pointDistance(r) > 2.5) {
-          const o = new f({ paths: [r] });
+          const o = new g({ paths: [r] });
           return (await s.getOffsetLine(
             o,
             -i
@@ -102,8 +102,8 @@ class s {
   static async pointDistance(t) {
     if (t.length < 2)
       return 0;
-    const e = new f({ paths: [t] });
-    return await g.geodesicLength(e, "meters");
+    const e = new g({ paths: [t] });
+    return await f.geodesicLength(e, "meters");
   }
   /**
    * 线按一定距离平移之后，与面相交的两个端点
@@ -114,10 +114,10 @@ class s {
    */
   static async getIntersectPointOfLineAndPolygon(t, e, n = 0) {
     n !== 0 && (t = await s.getOffsetLine(t, n));
-    const r = await g.intersect(t, e);
-    if (r instanceof f) {
-      const i = r.paths[0], o = i[0], c = i[i.length - 1];
-      return [o, c];
+    const r = await f.intersect(t, e);
+    if (r instanceof g) {
+      const i = r.paths[0], o = i[0], a = i[i.length - 1];
+      return [o, a];
     }
     return [];
   }
@@ -128,7 +128,7 @@ class s {
    * @returns 平移后的polyline
    */
   static async getOffsetLine(t, e) {
-    const n = l.geographicToWebMercator(t), r = await g.offset(
+    const n = l.geographicToWebMercator(t), r = await f.offset(
       n,
       e,
       "meters"
@@ -185,7 +185,7 @@ class s {
   static transformLineProjection(t) {
     try {
       return t.map(
-        (e) => y(s.geoReference).inverse([
+        (e) => h(s.geoReference).inverse([
           e[0] - s.xOffset,
           e[1] - s.yOffset
         ])
@@ -199,7 +199,7 @@ class s {
   }
   static transformPointProjection(t) {
     try {
-      return y(s.geoReference).inverse([
+      return h(s.geoReference).inverse([
         t[0] - s.xOffset,
         t[1] - s.yOffset
       ]);
@@ -214,7 +214,7 @@ class s {
     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), i = a.point(e), o = p(r, i);
+    const r = c.point(t), i = c.point(e), o = p(r, i);
     return u(i, n, o, { units: "meters" }).geometry.coordinates;
   }
   static isCoordinateValid(t) {
@@ -226,11 +226,25 @@ class s {
    * @returns
    */
   static getCenterPointInLine(t) {
-    const e = a.lineString(t), n = d(e, { units: "meters" }) / 2, r = O(e, 0, n, {
+    const e = c.lineString(t), n = d(e, { units: "meters" }) / 2, r = O(e, 0, n, {
       units: "meters"
     });
     return r.geometry.coordinates[r.geometry.coordinates.length - 1];
   }
+  static async viewGoto(t, e) {
+    var i;
+    if (localStorage.getItem("gpu") !== "Unknown")
+      await t.goTo(e, {
+        duration: 1e3
+      });
+    else if (e.length > 0) {
+      const o = e.map((a) => a.geometry).filter((a) => a);
+      if (o.length > 0) {
+        const a = (i = await f.union(o)) == null ? void 0 : i.extent;
+        a && (t.extent = a);
+      }
+    }
+  }
 }
 export {
   s as default

package/es/src/gis-map/utils/detect-gpu.mjs

@@ -35,10 +35,10 @@ const s = (e) => {
     return "Unknown";
   }
   return i(e);
-}, u = () => {
-  const e = l();
-  return console.log("GPU:", e), localStorage.setItem("gpu", e), e;
+}, a = () => {
+  let e = l();
+  return console.log("GPU:", e), (!e.toLowerCase().includes("nvidia") && !e.toLowerCase().includes("amd") && !e.toLowerCase().includes("intel") || e.toLowerCase().includes("520") || e.toLowerCase().includes("swiftshader")) && (console.log("GPU is not supported or unknown:", e), e = "Unknown"), localStorage.setItem("gpu", e), e;
 };
 export {
-  u as default
+  a as default
 };

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

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

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

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

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

@@ -7,8 +7,7 @@ export default class DistrictRenderer {
     /** 区控实线图层，区控符号由半透明实线+不透明虚线组成 */
     private districtControllerSolidLayer;
     style: string;
-    private hasGpu;
-    constructor(view: __esri.MapView | __esri.SceneView, hasGpu: boolean);
+    constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 显示区控
      * @param controllers 区控控制器数组

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

@@ -1,14 +1,15 @@
 import u from "@arcgis/core/Graphic";
-import n from "@arcgis/core/layers/FeatureLayer";
+import l from "@arcgis/core/layers/FeatureLayer";
 import * as a from "@turf/helpers";
-import { convex as y, buffer as p } from "@turf/turf";
-import { districtDashLineLayerOptions as f, districtSolidLineLayerOptions as C } from "./layer-symbol.mjs";
-class S {
-  constructor(t, i) {
-    this.style = "", this.hasGpu = !0, this.view = t, this.hasGpu = i, this.districtControllerDashLayer = new n(
-      f
-    ), this.districtControllerDashLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer = new n(
+import { convex as p, buffer as f } from "@turf/turf";
+import n from "../common-utils.mjs";
+import { districtDashLineLayerOptions as C, districtSolidLineLayerOptions as L } from "./layer-symbol.mjs";
+class x {
+  constructor(t) {
+    this.style = "", this.view = t, this.districtControllerDashLayer = new l(
       C
+    ), this.districtControllerDashLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer = new l(
+      L
     ), this.districtControllerSolidLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer.popupEnabled = !0, this.view.map.addMany([
       this.districtControllerDashLayer,
       this.districtControllerSolidLayer
@@ -29,20 +30,20 @@ class S {
           o = a.lineString(s);
         else {
           const h = a.featureCollection(
-            s.map((c) => a.point(c))
+            s.map((y) => a.point(y))
           );
-          o = y(h), o || (o = a.lineString(s));
+          o = p(h), o || (o = a.lineString(s));
         }
       else if (s.length === 1)
         o = a.point(s[0]);
       else
         continue;
-      const l = p(o.geometry, 200, {
+      const d = f(o.geometry, 200, {
         units: "meters"
-      }), d = new u({
+      }), c = new u({
         geometry: {
           type: "polyline",
-          paths: l.geometry.coordinates
+          paths: d.geometry.coordinates
         },
         attributes: {
           ObjectID: e,
@@ -56,15 +57,13 @@ class S {
           type: "district"
         }
       });
-      i.push(d);
+      i.push(c);
     }
     await this.districtControllerDashLayer.applyEdits({
       addFeatures: i
     }), await this.districtControllerSolidLayer.applyEdits({
       addFeatures: i
-    }), await this.view.goTo(i, {
-      duration: this.hasGpu ? 1e3 : 0
-    });
+    }), await n.viewGoto(this.view, i);
   }
   /**
    * 清除区控图层
@@ -93,9 +92,7 @@ class S {
     const i = this.districtControllerDashLayer.createQuery();
     i.where = `id = '${t}'`, i.returnGeometry = !0, i.outFields = ["*"];
     const e = await this.districtControllerDashLayer.queryFeatures(i);
-    return e.features.length > 0 ? (await this.view.goTo(e.features, {
-      duration: this.hasGpu ? 1e3 : 0
-    }), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
+    return e.features.length > 0 ? (await n.viewGoto(this.view, e.features), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
   }
   /**
    * 高亮区控, 其他区控隐藏
@@ -106,9 +103,7 @@ class S {
     const i = this.districtControllerDashLayer.definitionExpression;
     this.districtControllerDashLayer.definitionExpression = `id = '${t}'`;
     const e = await this.districtControllerDashLayer.queryFeatures(), r = e.features.length;
-    return r > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${t}'`, await this.view.goTo(e.features, {
-      duration: this.hasGpu ? 1e3 : 0
-    })) : this.districtControllerDashLayer.definitionExpression = i, r;
+    return r > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${t}'`, await n.viewGoto(this.view, e.features)) : this.districtControllerDashLayer.definitionExpression = i, r;
   }
   filter(t) {
     const i = `id = '${t}'`;
@@ -119,5 +114,5 @@ class S {
   }
 }
 export {
-  S as default
+  x as default
 };

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

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

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

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