gisviewer-vue3-arcgis 1.0.227 → 1.0.229

package/es/src/gis-map/gis-map.vue.d.ts

@@ -8,8 +8,8 @@ import OpenDriveRenderer from './utils/open-drive-renderer';
 import Overlay from './utils/overlay';
 import QueueLength from './utils/queue-length';
 import RoadConfigTool from './utils/road-config-tool';
-import EditSignalArea from './utils/signal-control-area-controller/edit-area';
-import ShowSignalArea from './utils/signal-control-area-controller/show-area';
+import EditSignalArea from './utils/signal-control-area/edit-area';
+import ShowSignalArea from './utils/signal-control-area/show-area';
 import TrafficFlow from './utils/traffic-flow';
 declare const _sfc_main: import("vue").DefineComponent<{
     config: {
@@ -235,6 +235,12 @@ declare const _sfc_main: import("vue").DefineComponent<{
             animation: string;
         }>;
         rImage: import("vue").ComputedRef<string>;
+        /**
+         * 开始坐标转换，经纬度坐标转屏幕坐标。
+         * @param points
+         * @param callback 回调函数，参数为转换后的屏幕坐标。地图移动、缩放、缩放时，会多次调用该回调函数。
+         * @returns handle 坐标转换句柄，用于停止坐标转换。
+         * */
         rNumberStyle: import("vue").ComputedRef<any>;
         rLampStyle: import("vue").ComputedRef<{
             display: string;

package/es/src/gis-map/gis-map.vue.mjs

@@ -10,8 +10,8 @@ import B from "./utils/open-drive-renderer/index.mjs";
 import I from "./utils/overlay.mjs";
 import ct from "./utils/queue-length.mjs";
 import M from "./utils/road-config-tool/index.mjs";
-import lt from "./utils/signal-control-area-controller/edit-area.mjs";
-import ut from "./utils/signal-control-area-controller/show-area.mjs";
+import lt from "./utils/signal-control-area/edit-area.mjs";
+import ut from "./utils/signal-control-area/show-area.mjs";
 import mt from "./utils/traffic-flow.mjs";
 const pt = { class: "gis-viewer" }, gt = { style: { position: "absolute", bottom: "80px", left: "10px", "z-index": "9999" } }, Bt = /* @__PURE__ */ $e({
   __name: "gis-map",

package/es/src/gis-map/index.d.ts

@@ -17,8 +17,8 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     overlay: import("./utils/overlay").default;
     queueLength: import("./utils/queue-length").default;
     openDriveRenderer: import("./utils/open-drive-renderer").default;
-    editSignalAreaController: import("./utils/signal-control-area-controller/edit-area").default;
-    showSignalAreaController: import("./utils/signal-control-area-controller/show-area").default;
+    editSignalAreaController: import("./utils/signal-control-area/edit-area").default;
+    showSignalAreaController: import("./utils/signal-control-area/show-area").default;
     greenWaveBandController: import("./utils/green-wave-band-controller").default;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {

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

@@ -15,7 +15,7 @@ export default class DistrictController {
     parentName: string;
     signals: ICross[];
     subDistricts: DistrictController[];
-    areaColor: number[];
+    areaColor: [number, number, number];
     signalCount: number;
     subDistrictCount: number;
     constructor(params: any, style: string);
@@ -24,5 +24,6 @@ export default class DistrictController {
      * @returns
      */
     getAllSignalCoordinates(): number[][];
+    private getDarkNonGrayColor;
 }
 export {};

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

@@ -0,0 +1,45 @@
+import d from "../common-utils.mjs";
+class r {
+  constructor(s, n) {
+    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, n === "alarm" && (this.areaColor = [255, 0, 0]);
+    for (const t of s.children)
+      if (t.children) {
+        const i = new r(t, n);
+        i.id = t.id, i.name = `SS ${t.name}`, i.parentId = this.id, i.parentName = this.name, this.subDistricts.push(i), this.subDistrictCount++, this.signalCount += i.signalCount;
+      } else if (d.isCoordinateValid(t)) {
+        const i = {
+          id: t.id,
+          name: t.name,
+          parentId: t.parentId,
+          latitude: Number(t.latitude),
+          longitude: Number(t.longitude),
+          signalId: t.signalId,
+          nodeId: t.nodeId,
+          isKey: t.isKey === 1
+        };
+        this.signals.push(i), this.signalCount++;
+      }
+  }
+  /**
+   * 获取区控/子区下的所有信号机
+   * @returns
+   */
+  getAllSignalCoordinates() {
+    const s = [];
+    for (const n of this.signals)
+      s.push([n.longitude, n.latitude]);
+    for (const n of this.subDistricts)
+      s.push(...n.getAllSignalCoordinates());
+    return s;
+  }
+  getDarkNonGrayColor() {
+    const s = Math.floor(Math.random() * 360), n = 80 + Math.random() * 20, t = 15 + Math.random() * 15, i = n / 100 * Math.min(t / 100, 1 - t / 100), o = (e) => {
+      const a = (e + s / 30) % 12, l = t / 100 - i * Math.max(Math.min(a - 3, 9 - a, 1), -1);
+      return Math.round(255 * l);
+    };
+    return [o(0), o(8), o(4)];
+  }
+}
+export {
+  r as default
+};

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

@@ -0,0 +1,40 @@
+import { IResult } from '../../../types';
+import DistrictController from './district-controller';
+export default class DistrictRenderer {
+    private view;
+    /** 区控虚线图层 */
+    private districtControllerDashLayer;
+    /** 区控实线图层，区控符号由半透明实线+不透明虚线组成 */
+    private districtControllerSolidLayer;
+    style: string;
+    private hasGpu;
+    constructor(view: __esri.MapView | __esri.SceneView, hasGpu: boolean);
+    /**
+     * 显示区控
+     * @param controllers 区控控制器数组
+     */
+    showDistricts(controllers: DistrictController[]): Promise<void>;
+    /**
+     * 清除区控图层
+     */
+    clearDistricts(): Promise<void>;
+    /**
+     * 设置区控图层可见性
+     * @param visible
+     */
+    setVisible(visible: boolean): void;
+    /**
+     * 定位区控
+     * @param id
+     * @returns
+     */
+    locateDistrict(id: string): Promise<IResult>;
+    /**
+     * 高亮区控, 其他区控隐藏
+     * @param id 区控ID
+     * @return 返回高亮区控的数量
+     */
+    highlightDistrict(id: string): Promise<number>;
+    filter(id: string): void;
+    resetFilter(): void;
+}

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

@@ -0,0 +1,123 @@
+import u from "@arcgis/core/Graphic";
+import n 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(
+      C
+    ), this.districtControllerSolidLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer.popupEnabled = !0, this.view.map.addMany([
+      this.districtControllerDashLayer,
+      this.districtControllerSolidLayer
+    ]);
+  }
+  /**
+   * 显示区控
+   * @param controllers 区控控制器数组
+   */
+  async showDistricts(t) {
+    await this.clearDistricts();
+    const i = [];
+    for (let e = 0; e < t.length; e++) {
+      const r = t[e], s = r.getAllSignalCoordinates();
+      let o = null;
+      if (s.length >= 2)
+        if (s.length === 2)
+          o = a.lineString(s);
+        else {
+          const h = a.featureCollection(
+            s.map((c) => a.point(c))
+          );
+          o = y(h), o || (o = a.lineString(s));
+        }
+      else if (s.length === 1)
+        o = a.point(s[0]);
+      else
+        continue;
+      const l = p(o.geometry, 200, {
+        units: "meters"
+      }), d = new u({
+        geometry: {
+          type: "polyline",
+          paths: l.geometry.coordinates
+        },
+        attributes: {
+          ObjectID: e,
+          id: r.id,
+          name: r.name,
+          subDistrictCount: r.subDistrictCount,
+          signalCount: r.signalCount,
+          parentId: r.parentId,
+          parentName: r.parentName,
+          selected: this.style,
+          type: "district"
+        }
+      });
+      i.push(d);
+    }
+    await this.districtControllerDashLayer.applyEdits({
+      addFeatures: i
+    }), await this.districtControllerSolidLayer.applyEdits({
+      addFeatures: i
+    }), await this.view.goTo(i, {
+      duration: this.hasGpu ? 1e3 : 0
+    });
+  }
+  /**
+   * 清除区控图层
+   */
+  async clearDistricts() {
+    let t = await this.districtControllerDashLayer.queryFeatures();
+    await this.districtControllerDashLayer.applyEdits({
+      deleteFeatures: t.features
+    }), this.districtControllerDashLayer.definitionExpression = "1=1", t = await this.districtControllerSolidLayer.queryFeatures(), await this.districtControllerSolidLayer.applyEdits({
+      deleteFeatures: t.features
+    }), this.districtControllerSolidLayer.definitionExpression = "1=1";
+  }
+  /**
+   * 设置区控图层可见性
+   * @param visible
+   */
+  setVisible(t) {
+    this.districtControllerDashLayer.visible = t, this.districtControllerSolidLayer.visible = t;
+  }
+  /**
+   * 定位区控
+   * @param id
+   * @returns
+   */
+  async locateDistrict(t) {
+    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: "未找到区控" };
+  }
+  /**
+   * 高亮区控, 其他区控隐藏
+   * @param id 区控ID
+   * @return 返回高亮区控的数量
+   */
+  async highlightDistrict(t) {
+    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;
+  }
+  filter(t) {
+    const i = `id = '${t}'`;
+    this.districtControllerDashLayer.definitionExpression = i, this.districtControllerSolidLayer.definitionExpression = i;
+  }
+  resetFilter() {
+    this.districtControllerDashLayer.definitionExpression = "1=1", this.districtControllerSolidLayer.definitionExpression = "1=1";
+  }
+}
+export {
+  S as default
+};

package/es/src/gis-map/utils/{signal-control-area-controller → signal-control-area}/layer-symbol.d.ts

@@ -1,7 +1,14 @@
+/** 区控的虚线边框图层 */
 declare const districtDashLineLayerOptions: any;
+/** 区控的实线边框图层 */
 declare const districtSolidLineLayerOptions: any;
+/** 子区图层 */
 declare const subDistrictLayerOptions: any;
+declare const subDistrictPointLayerOptions: any;
+/** 信号机圆点图层 */
 declare const signalMarkerLayerOptions: any;
+/** 信号机图标图层 */
 declare const signalPictureLayerOptions: any;
+/** 信号机聚合图层 */
 declare const signalClusterLayerOptions: any;
-export { districtDashLineLayerOptions, districtSolidLineLayerOptions, signalClusterLayerOptions, signalMarkerLayerOptions, signalPictureLayerOptions, subDistrictLayerOptions };
+export { districtDashLineLayerOptions, districtSolidLineLayerOptions, signalClusterLayerOptions, signalMarkerLayerOptions, signalPictureLayerOptions, subDistrictLayerOptions, subDistrictPointLayerOptions };

package/es/src/gis-map/utils/{signal-control-area-controller → signal-control-area}/layer-symbol.mjs

@@ -135,7 +135,7 @@ const e = {
   source: [],
   objectIdField: "ObjectID",
   outFields: ["*"],
-  geometryType: "polyline",
+  geometryType: "point",
   fields: [
     {
       name: "ObjectID",
@@ -150,11 +150,19 @@ const e = {
       type: "string"
     },
     {
-      name: "parentId",
+      name: "districtId",
+      type: "string"
+    },
+    {
+      name: "districtName",
+      type: "string"
+    },
+    {
+      name: "subDistrictId",
       type: "string"
     },
     {
-      name: "parentName",
+      name: "subDistrictName",
       type: "string"
     },
     {
@@ -171,17 +179,17 @@ const e = {
     }
   ],
   popupTemplate: {
-    title: "{name} 子区",
+    title: "{subDistrictName} 子区",
     content: [
       {
         type: "fields",
         fieldInfos: [
           {
-            fieldName: "id",
-            label: "区控编号"
+            fieldName: "subDistrictId",
+            label: "子区编号"
           },
           {
-            fieldName: "parentName",
+            fieldName: "districtName",
             label: "所属区控"
           },
           {
@@ -191,38 +199,8 @@ const e = {
         ]
       }
     ]
-  },
-  renderer: {
-    type: "unique-value",
-    field: "selected",
-    defaultSymbol: {
-      type: "simple-line",
-      style: "solid",
-      color: [5, 196, 104],
-      width: 2
-    },
-    uniqueValueInfos: [
-      {
-        value: "alert",
-        symbol: {
-          type: "simple-line",
-          style: "solid",
-          color: [255, 0, 0],
-          width: 2
-        }
-      },
-      {
-        value: "false",
-        symbol: {
-          type: "simple-line",
-          style: "solid",
-          color: [180, 180, 180],
-          width: 1
-        }
-      }
-    ]
   }
-}, l = {
+}, r = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -316,7 +294,7 @@ const e = {
       size: 4,
       outline: {
         color: "white",
-        width: 1
+        width: 0
       }
     },
     uniqueValueInfos: [
@@ -325,11 +303,11 @@ const e = {
         symbol: {
           type: "simple-marker",
           style: "circle",
-          color: [254, 172, 22],
-          size: 12,
+          color: [254, 172, 22, 0.8],
+          size: 8,
           outline: {
             color: "white",
-            width: 1
+            width: 0
           }
         }
       },
@@ -338,11 +316,11 @@ const e = {
         symbol: {
           type: "simple-marker",
           style: "circle",
-          color: [5, 116, 255],
+          color: [5, 116, 255, 0.8],
           size: 8,
           outline: {
             color: "white",
-            width: 1
+            width: 0
           }
         }
       },
@@ -351,11 +329,11 @@ const e = {
         symbol: {
           type: "simple-marker",
           style: "circle",
-          color: [180, 180, 180],
-          size: 12,
+          color: [180, 180, 180, 0.8],
+          size: 8,
           outline: {
             color: "white",
-            width: 1
+            width: 0
           }
         }
       },
@@ -364,17 +342,41 @@ const e = {
         symbol: {
           type: "simple-marker",
           style: "circle",
-          color: [180, 180, 180],
+          color: [180, 180, 180, 0.8],
           size: 8,
           outline: {
             color: "white",
-            width: 1
+            width: 0
           }
         }
       }
+    ],
+    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
+          }
+        ]
+      }
     ]
   }
-}, r = {
+}, l = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -551,7 +553,7 @@ const e = {
                     y: 0
                   },
                   anchorPointUnits: "Relative",
-                  size: 40,
+                  size: 20,
                   rotateClockwise: !0,
                   textureFilter: "Picture",
                   url: "/GisViewerAssets/Images/cross/gis_gjxklk_orange.png"
@@ -655,8 +657,8 @@ const e = {
         symbol: {
           type: "picture-marker",
           url: "/GisViewerAssets/Images/cross/gis_gjxk_gray.png",
-          width: 40,
-          height: 40
+          width: 20,
+          height: 20
         }
       },
       {
@@ -668,6 +670,22 @@ const e = {
           height: 20
         }
       }
+    ],
+    visualVariables: [
+      {
+        type: "size",
+        valueExpression: "$view.scale",
+        stops: [
+          {
+            size: 28,
+            value: 2250
+          },
+          {
+            size: 24,
+            value: 4500
+          }
+        ]
+      }
     ]
   }
 }, s = {
@@ -889,7 +907,7 @@ export {
   e as districtDashLineLayerOptions,
   t as districtSolidLineLayerOptions,
   s as signalClusterLayerOptions,
-  l as signalMarkerLayerOptions,
-  r as signalPictureLayerOptions,
-  i as subDistrictLayerOptions
+  r as signalMarkerLayerOptions,
+  l as signalPictureLayerOptions,
+  i as subDistrictPointLayerOptions
 };

package/es/src/gis-map/utils/{signal-control-area-controller → signal-control-area}/show-area.d.ts

@@ -5,18 +5,10 @@ export default class SignalControlAreaController1 {
     /** 支队图层 */
     private detachmentLayer;
     private detachmentLayerLoaded;
-    /** 区控虚线图层 */
-    private districtControllerDashLayer;
-    /** 区控实线图层，区控符号由半透明实线+不透明虚线组成 */
-    private districtControllerSolidLayer;
+    private districtRenderer;
+    private subDistrictRenderer;
+    private signalRenderer;
     /** 子区图层 */
-    private subDistrictControllerLayer;
-    /** 信号机圆点图层 */
-    private signalMarkerLayer;
-    /** 信号机图标图层 */
-    private signalPictureLayer;
-    /** 信号机聚合图层 */
-    private signalClusterLayer;
     private clickHandler;
     private districtControllerOid;
     private subDistrictControllerOid;
@@ -77,15 +69,13 @@ export default class SignalControlAreaController1 {
      * @returns
      */
     private generateGraphic;
-    private viewHitTest;
     /**
      * 重置所有graphic的置灰状态
      */
-    private resetSelectedSymbol;
     /**
      * 加载支队图层
      * 现场环境用url创建FeatureLayer有各种问题，
-     * 改为图层到处未json，用json创建Graphic，再将Graphic添加到FeatureLayer
+     * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
      */
     private loadDetachmentLayer;
 }