gisviewer-vue3-arcgis 1.0.247 → 1.0.249

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

@@ -1,36 +1,28 @@
 import M from "@arcgis/core/Basemap";
 import d from "@arcgis/core/config";
 import * as k from "@arcgis/core/core/reactiveUtils";
-import { Multipoint as L, Polygon as P, Polyline as C, Point as T } from "@arcgis/core/geometry";
-import * as w from "@arcgis/core/geometry/support/webMercatorUtils";
-import W from "@arcgis/core/layers/FeatureLayer";
-import z from "@arcgis/core/layers/GeoJSONLayer";
-import x from "@arcgis/core/layers/GroupLayer";
-import I from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
+import { Multipoint as P, Polygon as C, Polyline as W, Point as T } from "@arcgis/core/geometry";
+import * as u from "@arcgis/core/geometry/support/webMercatorUtils";
+import z from "@arcgis/core/layers/FeatureLayer";
+import x from "@arcgis/core/layers/GeoJSONLayer";
+import I from "@arcgis/core/layers/GroupLayer";
+import G from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
 import S from "@arcgis/core/layers/MapImageLayer";
-import G from "@arcgis/core/layers/TileLayer";
-import H from "@arcgis/core/layers/WebTileLayer";
-import R from "@arcgis/core/layers/WMSLayer";
-import B from "@arcgis/core/Map";
-import O from "@arcgis/core/views/MapView";
-import N from "@arcgis/core/views/SceneView";
-import U from "@turf/destination";
-import * as E from "@turf/helpers";
-import A from "./custom-layer/custom-wmts-layer.mjs";
-class oe {
+import H from "@arcgis/core/layers/TileLayer";
+import R from "@arcgis/core/layers/WebTileLayer";
+import B from "@arcgis/core/layers/WMSLayer";
+import O from "@arcgis/core/Map";
+import N from "@arcgis/core/views/MapView";
+import U from "@arcgis/core/views/SceneView";
+import E from "@turf/destination";
+import * as A from "@turf/helpers";
+import J from "./custom-layer/custom-wmts-layer.mjs";
+class ae {
   constructor() {
     this.mapConfig = {}, this.watchHandleMap = /* @__PURE__ */ new Map(), this.handleIndex = 0, this.zoomWatchHandle = null;
   }
   processUrl(e) {
-    if (e) {
-      if (e.startsWith("http://") || e.startsWith("https://"))
-        return e;
-      if (e.startsWith("{{"))
-        return e.replace("{{geoServer}}", this.mapConfig.geoServer);
-      if (e.startsWith("/"))
-        return this.mapConfig.assetsRoot + e;
-    } else
-      return e;
+    return e && (e.startsWith("http://") || e.startsWith("https://") ? e : e.startsWith("{{") ? e.replace("{{geoServer}}", this.mapConfig.geoServer) : this.mapConfig.assetsRoot + e);
   }
   /**
    * 初始化地图
@@ -38,18 +30,18 @@ class oe {
    * @returns view
    */
   async initialize(e) {
-    var m, u, b, v;
+    var w, v, b, y;
     this.mapConfig = e.mapConfig;
     const { container: i, markerClickCallback: s, mapClickCallback: a } = e;
     d.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, d.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, d.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const r = new B();
-    if (((m = this.mapConfig) == null ? void 0 : m.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new O({
+    const r = new O();
+    ((w = this.mapConfig) == null ? void 0 : w.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new N({
       map: r,
       container: i,
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
-    })) : this.view = new N({
+    })) : this.view = new U({
       map: r,
       container: i,
       environment: {
@@ -58,7 +50,7 @@ class oe {
           type: "virtual"
         }
       },
-      ...(u = this.mapConfig) == null ? void 0 : u.mapOptions
+      ...(v = this.mapConfig) == null ? void 0 : v.mapOptions
     }), this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
@@ -68,10 +60,10 @@ class oe {
       buttonEnabled: !1,
       breakpoint: !1
     }, this.view.on("click", async (t) => {
-      var h, y;
+      var h, f;
       if (a) {
         let o = t.mapPoint;
-        o.spatialReference.isWebMercator && (o = w.webMercatorToGeographic(
+        o.spatialReference.isWebMercator && (o = u.webMercatorToGeographic(
           o
         )), a(
           [o.x, o.y],
@@ -82,20 +74,20 @@ class oe {
       if (this.view.type === "3d") {
         const o = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
-          const l = w.webMercatorToGeographic(
+          const l = u.webMercatorToGeographic(
             o.position
-          ), f = {
+          ), p = {
             heading: o.heading,
             tilt: o.tilt,
             position: l.toJSON()
           };
-          console.log(f), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(f));
+          console.log(p), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(p));
         } else
           console.log(o.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
         let o = this.view.center;
-        this.view.spatialReference.isWebMercator && (o = w.webMercatorToGeographic(
+        this.view.spatialReference.isWebMercator && (o = u.webMercatorToGeographic(
           o
         )), console.log({
           center: o.toJSON(),
@@ -103,47 +95,69 @@ class oe {
           scale: this.view.scale
         });
       }
-      const n = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
+      const c = (f = (await this.view.hitTest(t)).results) == null ? void 0 : f.filter(
         (o) => o.type === "graphic"
       );
-      n.length > 0 && n.forEach((o) => {
-        var f;
+      c.length > 0 && c.forEach((o) => {
+        var p;
         const l = o.graphic;
-        (f = l.attributes) != null && f.type && s && s(
+        (p = l.attributes) != null && p.type && s && s(
           l.attributes.type,
           l.attributes.id,
           l.attributes,
           t
         );
       });
+    });
+    {
+      let t = 0, n = !1;
+      this.view.on("pointer-move", async (c) => {
+        var f;
+        const h = performance.now();
+        if (!(n || h - t < 100)) {
+          t = h, n = !0;
+          try {
+            const l = (f = (await this.view.hitTest(c)).results) == null ? void 0 : f.some(
+              (L) => L.type === "graphic"
+            ), p = this.view.container;
+            p && (p.style.cursor = l ? "pointer" : "default");
+          } finally {
+            n = !1;
+          }
+        }
+      });
+    }
+    if (this.view.on("pointer-leave", () => {
+      const t = this.view.container;
+      t && (t.style.cursor = "default");
     }), (b = this.mapConfig) != null && b.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
-      const c = this.processUrl(t.url);
-      let n = null;
+      const n = this.processUrl(t.url);
+      let c = null;
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          n = new H({
-            urlTemplate: c,
+          c = new R({
+            urlTemplate: n,
             ...t.options
           });
           break;
         }
         case "tile": {
-          n = new G({
-            url: c,
+          c = new H({
+            url: n,
             ...t.options
           });
           break;
         }
-        case "customWMTS".toLowerCase(): {
-          n = new A({
-            urlTemplate: c,
+        case "customwmts".toLowerCase(): {
+          c = new J({
+            urlTemplate: n,
             ...t.options
           });
           break;
         }
-        case "mapImage".toLowerCase(): {
-          n = new S({
-            url: c,
+        case "mapimage".toLowerCase(): {
+          c = new S({
+            url: n,
             ...t.options
           });
           break;
@@ -154,19 +168,19 @@ class oe {
           break;
         }
         case "feature": {
-          n = new W({ url: c, ...t.options });
+          c = new z({ url: n, ...t.options });
           break;
         }
         case "3dtiles": {
-          n = new I({
-            url: c,
+          c = new G({
+            url: n,
             ...t.options
           });
           break;
         }
         case "wms": {
-          n = new R({
-            url: c,
+          c = new B({
+            url: n,
             ...t.options
           });
           break;
@@ -175,31 +189,31 @@ class oe {
           console.warn(`不支持的图层类型: ${t.type}`);
           break;
       }
-      if (n)
+      if (c)
         if (t.group) {
           let h = r.findLayerById(t.group);
-          h && h.type === "group" ? h.add(n) : (h = new x({
+          h && h.type === "group" ? h.add(c) : (h = new I({
             id: t.group,
             title: t.groupTitle,
             visibilityMode: "inherited",
-            layers: [n],
+            layers: [c],
             visible: t.groupVisible !== !1
           }), r.add(h));
         } else
-          r.add(n);
+          r.add(c);
     }) : r.basemap = new M({
       style: {
         id: "arcgis/light-gray",
         language: "zh-CN"
       }
-    }), (v = this.mapConfig) != null && v.hdLayers) {
+    }), (y = this.mapConfig) != null && y.hdLayers) {
       const t = this.mapConfig.hdLayers.map(
-        (c) => (
+        (n) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new z({
-            url: this.processUrl(c.url),
-            ...c.options,
-            title: c.options.id
+          new x({
+            url: this.processUrl(n.url),
+            ...n.options,
+            title: n.options.id
           })
         )
       );
@@ -207,23 +221,23 @@ class oe {
     }
     this.view.ui.remove("attribution"), await this.view.when();
     const g = this.mapConfig.camera;
-    let p;
+    let m;
     if (this.view.type === "2d") {
       let t = this.view.center;
-      this.view.spatialReference.isWebMercator && (t = w.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = u.webMercatorToGeographic(
         t
-      )), p = { center: [t.x, t.y], zoom: this.view.zoom };
+      )), m = { center: [t.x, t.y], zoom: this.view.zoom };
     } else {
       let t = this.view.camera.position;
-      this.view.spatialReference.isWebMercator && (t = w.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = u.webMercatorToGeographic(
         t
-      )), p = {
+      )), m = {
         position: t,
         heading: this.view.camera.heading,
         tilt: this.view.camera.tilt
       };
     }
-    return g ? g.home = p : this.mapConfig.camera = { home: p }, this.view;
+    return g ? g.home = m : this.mapConfig.camera = { home: m }, this.view;
   }
   setLayerVisibility(e) {
     const { id: i, visible: s } = e, a = this.view.map.findLayerById(i);
@@ -244,19 +258,22 @@ class oe {
           e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new C(e.target);
+          e.target = new W(e.target);
           break;
         case "polygon":
-          e.target = new P(e.target);
+          e.target = new C(e.target);
           break;
         case "multipoint":
-          e.target = new L(e.target);
+          e.target = new P(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
     }
     return { status: 0, message: "成功" };
   }
+  setMapZoom(e) {
+    return this.view ? (this.view.zoom = e, { status: 0, message: "成功" }) : { status: -1, message: "未初始化" };
+  }
   /**
    * 在一定的高度，以一定的角度去观察某个坐标
    * */
@@ -278,8 +295,8 @@ class oe {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * e.height, r = U(
-        E.point(e.center),
+      const a = Math.tan(i * Math.PI / 180) * e.height, r = E(
+        A.point(e.center),
         a,
         s + 180,
         {
@@ -317,8 +334,8 @@ class oe {
     const r = 1e3 / 30, g = k.watch(
       () => this.view.center,
       () => {
-        const p = this.transformPoints(e), m = Date.now();
-        m - s > r && (i(p), s = m);
+        const m = this.transformPoints(e), w = Date.now();
+        w - s > r && (i(m), s = w);
       }
     );
     return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, g), { handle: this.handleIndex, points: this.transformPoints(e) };
@@ -353,5 +370,5 @@ class oe {
   }
 }
 export {
-  oe as default
+  ae as default
 };

package/es/src/gis-map/utils/open-drive-renderer/index.d.ts

@@ -110,7 +110,7 @@ export default class OpenDriveRenderer {
      * @param params
      * @returns
      */
-    selectSumo(params: IFindSumoParams): IResult;
+    selectSumo(params: IFindSumoParams): Promise<IResult>;
     geometrySearch(coordinate: number[][]): Promise<IResult>;
     splitLane(params: ISplitOpenDriveLaneParams): Promise<IResult>;
     clearSplitLane(): void;

package/es/src/gis-map/utils/open-drive-renderer/index.mjs

@@ -4,7 +4,7 @@ import * as $ from "@arcgis/core/core/reactiveUtils.js";
 import { Polygon as S, Point as P } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
 import D from "@arcgis/core/layers/FeatureLayer";
-import I from "@arcgis/core/layers/GraphicsLayer";
+import w from "@arcgis/core/layers/GraphicsLayer";
 import * as k from "@turf/helpers";
 import { lineSliceAlong as x } from "@turf/line-slice-along";
 import b from "axios";
@@ -289,7 +289,7 @@ class O {
           }
         }
       ]
-    }), this.junctionLayer = new I({ id: "OpenDriveJunction" }), this.sectionLayer = new I({ id: "OpenDriveSection" }), this.highlightLayer = new I({ id: "OpenDriveHighlight" }), this.flashLayer = new I({ id: "OpenDriveFlash" }), this.drawLayer = new I({ id: "Draw" }), this.splitLaneLayer = new I({ id: "SplitLane" }), this.borderLayer = new I({ id: "OpenDriveBorder" }), this.view.map.addMany([
+    }), this.junctionLayer = new w({ id: "OpenDriveJunction" }), this.sectionLayer = new w({ id: "OpenDriveSection" }), this.highlightLayer = new w({ id: "OpenDriveHighlight" }), this.flashLayer = new w({ id: "OpenDriveFlash" }), this.drawLayer = new w({ id: "Draw" }), this.splitLaneLayer = new w({ id: "SplitLane" }), this.borderLayer = new w({ id: "OpenDriveBorder" }), this.view.map.addMany([
       this.laneLayer,
       this.sectionLayer,
       this.roadNameLayer,
@@ -439,7 +439,7 @@ class O {
             const v = Number(u.id);
             if (v === 0)
               continue;
-            const w = u.type, M = [...u.outerPath], A = u.innerPath.concat(
+            const I = u.type, M = [...u.outerPath], A = u.innerPath.concat(
               M.reverse()
             );
             if (A.length <= 3) {
@@ -463,7 +463,7 @@ class O {
                   sectionId: String(d),
                   sectionIndex: m,
                   laneId: v,
-                  type: w,
+                  type: I,
                   sumoId: "",
                   // 记录左右边线的起始点，用于按长度高亮车道的一部分
                   leftLine: u.innerPath,
@@ -904,7 +904,7 @@ class O {
    * @param params
    * @returns
    */
-  selectSumo(e) {
+  async selectSumo(e) {
     switch (e.type) {
       case "junction":
         return this.junctionLayer.graphics.forEach((t) => {
@@ -929,7 +929,7 @@ class O {
             this.selectedSectionIds.includes(a) || this.selectedSectionIds.push(a);
             let n = c.get(a);
             n ? n.push(r.geometry) : (n = [r.geometry], c.set(a, n));
-          }), c.forEach((r, a) => {
+          }), c.forEach(async (r, a) => {
             const n = L.union(r), l = new g({
               geometry: n,
               symbol: {
@@ -948,7 +948,7 @@ class O {
                 selected: !0
               }
             });
-            this.sectionLayer.add(l);
+            this.sectionLayer.add(l), await this.view.goTo(l);
           }), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
@@ -1014,11 +1014,11 @@ class O {
     const o = Number(s[1]), i = s[0].split("#"), c = i.length === 2 ? Number(i[1]) : 0;
     let r = i[0];
     r.startsWith("-") && (r = r.slice(1));
-    const a = this.allLaneGraphics.filter((w) => w.getAttribute("roadId") === r && w.getAttribute("sectionIndex") === c);
+    const a = this.allLaneGraphics.filter((I) => I.getAttribute("roadId") === r && I.getAttribute("sectionIndex") === c);
     if (a.length === 0)
       return { status: -1, message: "未找到路段" };
     const n = a.length - o, l = a.find(
-      (w) => Math.abs(w.getAttribute("laneId")) === n
+      (I) => Math.abs(I.getAttribute("laneId")) === n
     );
     if (!l)
       return { status: -1, message: "未找到车道" };

package/es/src/types/index.d.ts

@@ -324,4 +324,6 @@ export interface IShowEdpassDeviceParams {
     deviceState: string;
     mode: string;
     visible: boolean;
+    zdCode?: string;
+    ddCode?: string;
 }

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

@@ -1,6 +1,7 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
 import { IEditSignalControlAreaParams, IFindSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowEdpassDeviceParams, IShowGreenWaveBandParams, IShowJurisdictionParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import EdpassDeviceController from './utils/edpass-device-controller';
 import GreenWaveBandController from './utils/green-wave-band-controller';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
@@ -12,7 +13,6 @@ import RoadConfigTool from './utils/road-config-tool';
 import EditSignalArea from './utils/signal-control-area/edit-area';
 import ShowSignalArea from './utils/signal-control-area/show-area';
 import TrafficFlow from './utils/traffic-flow';
-import EdpassDeviceController from './utils/edpass-device-controller';
 declare const _sfc_main: import("vue").DefineComponent<{
     config: {
         type: StringConstructor;
@@ -69,6 +69,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
             rColor?: string | undefined;
         };
     }[];
+    scaleToZoom: (scale: number) => number;
+    removeZoomWatch: (() => void) | null;
+    lastEmittedZoomInt: number | null;
+    emitZoomIfChanged: (z: number) => void;
     mapViewer: import("vue").ComputedRef<MapView | SceneView>;
     handleStartSaveTrackLog: () => void;
     handleDownloadTrackLog: () => void;
@@ -76,6 +80,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     handleShowPlateNumber: () => void;
     setMapCenter: (params: ISetMapCenterParams) => Promise<import("../types").IResult>;
     setMapCamera: (params: ISetMapCameraParams) => Promise<import("../types").IResult>;
+    setMapZoom: (zoom: number) => import("../types").IResult;
     lookAt: (params: ILookAtParams) => Promise<void>;
     setLayerVisibility: (params: ILayerVisibleParams) => import("../types").IResult;
     requestCoordinateTransform: (points: number[][], callback: (points: number[][]) => void) => {
@@ -174,7 +179,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     } | undefined;
     setEdpassLayerVisibility: (params: IShowEdpassDeviceParams) => Promise<import("../types").IResult>;
     props: any;
-    emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
+    emit: (event: "mapLoaded" | "markerClick" | "mapClick" | "update:zoom", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{
         displayMode: {
             type: StringConstructor;
@@ -299,7 +304,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             required: true;
         };
     }>>, {}, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick" | "update:zoom")[], "mapLoaded" | "markerClick" | "mapClick" | "update:zoom", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     config: {
         type: StringConstructor;
         required: true;
@@ -312,5 +317,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onMapLoaded?: ((...args: any[]) => any) | undefined;
     onMarkerClick?: ((...args: any[]) => any) | undefined;
     onMapClick?: ((...args: any[]) => any) | undefined;
+    "onUpdate:zoom"?: ((...args: any[]) => any) | undefined;
 }, {}, {}>;
 export default _sfc_main;

package/lib/src/gis-map/gis-map.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),k=require("./stores/index.js");require("./style/index.css");const Xe=require("./utils/detect-gpu.js"),T=require("./utils/green-wave-band-controller/index.js"),Ye=require("./utils/holo-flow/index.js"),Fe=require("./utils/holo-flow/signal-countdown-panel.vue.js"),Re=require("./utils/map-initializer.js"),V=require("./utils/open-drive-renderer/index.js"),_=require("./utils/overlay.js"),$e=require("./utils/police-jurisdiction.js"),et=require("./utils/queue-length.js"),q=require("./utils/road-config-tool/index.js"),tt=require("./utils/signal-control-area/edit-area.js"),at=require("./utils/signal-control-area/show-area.js"),nt=require("./utils/traffic-flow.js"),rt=require("./utils/edpass-device-controller.js"),st={class:"gis-viewer"},it={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},ot=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick"],setup(B,{expose:I,emit:x}){const v=n.ref(null);let i,d,l,o,a,r,f,t,u,s,m,y,S;const w=n.ref(!1);k.registerStore();const A=k.default.useAppDataStore,L=n.reactive([]);Xe.default(),n.onMounted(async()=>{if(!v.value)return;document.addEventListener("keydown",p=>{p.ctrlKey&&p.key==="i"&&(w.value=!w.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:g}=e.appContext.config.globalProperties,c=await(await fetch(D.config)).json();c.assetsRoot=D.assetsRoot||g,A.mapConfig=c,d=new Re.default,A.mapInitializer=d,i=await d.initialize({container:v.value,mapConfig:c,markerClickCallback:(p,b,O,Ke)=>{h("markerClick",p,b,O,Ke)},mapClickCallback:(p,b,O)=>{h("mapClick",p,b,O)}}),a=new Ye.default(i,L),await a.init(),h("mapLoaded")}),n.onUnmounted(()=>{s==null||s.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),o==null||o.disconnectTrafficFlow()});const M=n.computed(()=>i),E=()=>{const e=k.default.useAppDataStore;e.saveTrackLog=!0},N=()=>{a.downloadTrackLog()},P=()=>{C("vehicleId")},H=()=>{C("plateNumber")},z=async e=>await d.setMapCenter(e),G=async e=>await d.setMapCamera(e),W=async e=>await d.lookAt(e),j=e=>d.setLayerVisibility(e),J=(e,g)=>d.requestCoordinateTransform(e,g),Q=e=>{d.cancelCoordinateTransform(e)},U=e=>{d.setMapZoomRange(e)},Z=e=>(l||(l=new q.default(i)),l.showLaneNumber(e)),K=()=>{l==null||l.clearLaneNumber()},X=async e=>(l||(l=new q.default(i)),await l.initializeSearch(e)),Y=async()=>l==null?void 0:l.calCrossIndicatorArea(),F=async()=>{},R=async(e,g)=>{o||(o=new nt.default(i)),o.connectTrafficFlow(e,g)},$=()=>{o==null||o.disconnectTrafficFlow()},ee=async e=>{a.handleVehicleTraceData(e)},te=()=>{a.clearHoloTrace()},ae=e=>{a.setInterpolate(e)},ne=async e=>{await a.handleSignalData(e)},re=async e=>{await a.initializeLampGroup(e)},se=e=>{a.handleUniSignalData(e)},ie=()=>{a.clearHoloSignal()},oe=e=>{o==null||o.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},ce=e=>{a==null||a.togglePause(e)},le=e=>{o==null||o.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},C=e=>{a==null||a.updatePanelContent(e)},ue=async e=>(r||(r=new _.default(i)),r.addOverlays(e)),de=e=>(r||(r=new _.default(i)),r.addMask(e)),me=()=>{r==null||r.removeMask()},ge=e=>r==null?void 0:r.removeOverlaysByType(e),pe=e=>r==null?void 0:r.removeOverlaysById(e),fe=()=>r==null?void 0:r.removeAllOverlays(),ye=()=>{r==null||r.showAllOverlays()},ve=e=>{f||(f=new et.default(i)),f.updateQueueLength(e)},Se=()=>{f==null||f.removeQueueLength()},we=async(e,g)=>(t||(t=new V.default(i)),await t.showOpenDriveFromServer(e,g)),Ce=async e=>(t||(t=new V.default(i)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),he=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},be=async()=>await(t==null?void 0:t.clearOpenDrive()),Oe=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},ke=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Ae=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Le=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},De=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},Te=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},Ve=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},_e=async e=>(s||(s=new at.default(i)),await s.showSignalControlArea(e)),qe=async()=>await(s==null?void 0:s.clearSignalControlArea()),Be=e=>s==null?void 0:s.setLayerVisibility(e),Ie=async e=>s?await(s==null?void 0:s.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},xe=async e=>s?await s.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Me=()=>s?s.resetHighlight():{status:-1,message:"未加载信号控制区"},Ee=e=>(u||(u=new tt.default(i)),u.showSubSignalControlArea(e)),Ne=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Pe=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},He=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},ze=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ge=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},We=e=>(m||(m=new T.default(i)),m.addGreenWaveBand(e)),je=()=>{if(!m)return{status:-1,message:"未加载绿波带"};m.stopAddGreenWaveBand()},Je=async e=>(m||(m=new T.default(i)),await m.showGreenWaveBand(e)),Qe=async e=>(y||(y=new $e.default(i)),await y.showJurisdiction(e)),Ue=()=>{if(!y)return{status:-1,message:"未加载警务管辖区"};y.clearJurisdiction()},Ze=async e=>(S||(S=new rt.default(i)),await S.setEdpassLayerVisibility(e)),D=B,h=x;return I({mapViewer:M,setLayerVisibility:j,setMapCenter:z,lookAt:W,setMapCamera:G,setMapZoomRange:U,requestCoordinateTransform:J,cancelCoordinateTransform:Q,addOverlays:ue,addMask:de,removeMask:me,showAllOverlays:ye,removeOverlaysByType:ge,removeOverlaysById:pe,removeAllOverlays:fe,showLaneNumber:Z,clearLaneNumber:K,initializeAreaTool:X,calCrossIndicatorArea:Y,calRoadIndicatorArea:F,connectCarFlow:R,disconnectCarFlow:$,handleHoloVehicleTraceData:ee,clearHoloTrace:te,initializeLampGroup:re,handleUniSignalData:se,handleHoloSignalData:ne,clearHoloSignal:ie,setInterpolate:ae,toggleTrafficInfo:oe,toggleTrafficObject:le,toggleVehicleInfo:C,togglePause:ce,updateQueueLength:ve,removeQueueLength:Se,showOpenDriveFromServer:we,showOpenDriveFromFile:Ce,clearOpenDrive:be,setOpendriveVisibility:he,geometrySearchInOpenDrive:Le,findSumoInOpenDrive:Oe,selectSumoInOpenDrive:ke,unselectSumoInOpenDrive:Ae,getSumoInfo:De,splitOpenDriveLane:Te,clearSplitOpenDriveLane:Ve,showSignalControlArea:_e,clearSignalControlArea:qe,setSignalControlAreaVisibility:Be,locateSignalControlArea:Ie,highlightSignalControlArea:xe,resetHighlightSignalControlArea:Me,showSubSignalControlArea:Ee,editSubSignalControlArea:Ne,stopEditSubSignalControlArea:Pe,selectSubSignalControlAreaCross:He,unselectSubSignalControlAreaCross:ze,changeSubSignalControlAreaBorderVisibility:Ge,addGreenWaveBand:We,stopAddGreenWaveBand:je,showGreenWaveBand:Je,showPoliceArea:Qe,clearPoliceArea:Ue,setEdpassLayerVisibility:Ze}),(e,g)=>(n.openBlock(),n.createElementBlock("div",st,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:v},[n.withDirectives(n.createElementVNode("div",it,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:E}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:N}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:P}," 显示车辆id "),n.createElementVNode("button",{onClick:H},"显示车辆号牌")],512),[[n.vShow,w.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(L,(c,p)=>(n.openBlock(),n.createBlock(Fe.default,{key:p,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=ot;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),D=require("./stores/index.js");require("./style/index.css");const at=require("./utils/detect-gpu.js"),nt=require("./utils/edpass-device-controller.js"),I=require("./utils/green-wave-band-controller/index.js"),rt=require("./utils/holo-flow/index.js"),st=require("./utils/holo-flow/signal-countdown-panel.vue.js"),ot=require("./utils/map-initializer.js"),M=require("./utils/open-drive-renderer/index.js"),x=require("./utils/overlay.js"),it=require("./utils/police-jurisdiction.js"),ct=require("./utils/queue-length.js"),z=require("./utils/road-config-tool/index.js"),lt=require("./utils/signal-control-area/edit-area.js"),ut=require("./utils/signal-control-area/show-area.js"),dt=require("./utils/traffic-flow.js"),mt={class:"gis-viewer"},pt={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},gt=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick","update:zoom"],setup(E,{expose:N,emit:P}){const h=n.ref(null);let r,p,l,i,a,s,f,t,u,o,g,y,C;const b=n.ref(!1);D.registerStore();const T=D.default.useAppDataStore,V=n.reactive([]),_=e=>Math.log2(591657527591555e-6/e);let v=null,q=null;const O=e=>{if(!Number.isFinite(e))return;const d=Math.round(e);d!==q&&(q=d,S("update:zoom",d))};at.default(),n.onMounted(async()=>{if(!h.value)return;document.addEventListener("keydown",m=>{m.ctrlKey&&m.key==="i"&&(b.value=!b.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:d}=e.appContext.config.globalProperties,c=await(await fetch(B.config)).json();c.assetsRoot=B.assetsRoot||d,T.mapConfig=c,p=new ot.default,T.mapInitializer=p,r=await p.initialize({container:h.value,mapConfig:c,markerClickCallback:(m,A,L,tt)=>{S("markerClick",m,A,L,tt)},mapClickCallback:(m,A,L)=>{S("mapClick",m,A,L)}});const w=r.zoom??(r.scale?_(r.scale):void 0);typeof w=="number"&&O(w);const et=r.zoom!==void 0?r.watch("zoom",m=>{O(m)}):r.watch("scale",m=>{typeof m=="number"&&m>0&&O(_(m))});v=()=>et.remove(),a=new rt.default(r,V),await a.init(),S("mapLoaded")}),n.onUnmounted(()=>{o==null||o.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),i==null||i.disconnectTrafficFlow(),v==null||v(),v=null});const H=n.computed(()=>r),G=()=>{const e=D.default.useAppDataStore;e.saveTrackLog=!0},Z=()=>{a.downloadTrackLog()},W=()=>{k("vehicleId")},j=()=>{k("plateNumber")},J=async e=>await p.setMapCenter(e),Q=async e=>await p.setMapCamera(e),U=e=>p.setMapZoom(e),K=async e=>await p.lookAt(e),F=e=>p.setLayerVisibility(e),X=(e,d)=>p.requestCoordinateTransform(e,d),Y=e=>{p.cancelCoordinateTransform(e)},R=e=>{p.setMapZoomRange(e)},$=e=>(l||(l=new z.default(r)),l.showLaneNumber(e)),ee=()=>{l==null||l.clearLaneNumber()},te=async e=>(l||(l=new z.default(r)),await l.initializeSearch(e)),ae=async()=>l==null?void 0:l.calCrossIndicatorArea(),ne=async()=>{},re=async(e,d)=>{i||(i=new dt.default(r)),i.connectTrafficFlow(e,d)},se=()=>{i==null||i.disconnectTrafficFlow()},oe=async e=>{a.handleVehicleTraceData(e)},ie=()=>{a.clearHoloTrace()},ce=e=>{a.setInterpolate(e)},le=async e=>{await a.handleSignalData(e)},ue=async e=>{await a.initializeLampGroup(e)},de=e=>{a.handleUniSignalData(e)},me=()=>{a.clearHoloSignal()},pe=e=>{i==null||i.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},ge=e=>{a==null||a.togglePause(e)},fe=e=>{i==null||i.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},k=e=>{a==null||a.updatePanelContent(e)},ye=async e=>(s||(s=new x.default(r)),s.addOverlays(e)),ve=e=>(s||(s=new x.default(r)),s.addMask(e)),Se=()=>{s==null||s.removeMask()},we=e=>s==null?void 0:s.removeOverlaysByType(e),he=e=>s==null?void 0:s.removeOverlaysById(e),Ce=()=>s==null?void 0:s.removeAllOverlays(),be=()=>{s==null||s.showAllOverlays()},Oe=e=>{f||(f=new ct.default(r)),f.updateQueueLength(e)},ke=()=>{f==null||f.removeQueueLength()},Ae=async(e,d)=>(t||(t=new M.default(r)),await t.showOpenDriveFromServer(e,d)),Le=async e=>(t||(t=new M.default(r)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),De=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},Te=async()=>await(t==null?void 0:t.clearOpenDrive()),Ve=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},_e=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},qe=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Be=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},Ie=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},Me=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},xe=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},ze=async e=>(o||(o=new ut.default(r)),await o.showSignalControlArea(e)),Ee=async()=>await(o==null?void 0:o.clearSignalControlArea()),Ne=e=>o==null?void 0:o.setLayerVisibility(e),Pe=async e=>o?await(o==null?void 0:o.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},He=async e=>o?await o.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Ge=()=>o?o.resetHighlight():{status:-1,message:"未加载信号控制区"},Ze=e=>(u||(u=new lt.default(r)),u.showSubSignalControlArea(e)),We=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},je=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},Je=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Qe=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ue=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},Ke=e=>(g||(g=new I.default(r)),g.addGreenWaveBand(e)),Fe=()=>{if(!g)return{status:-1,message:"未加载绿波带"};g.stopAddGreenWaveBand()},Xe=async e=>(g||(g=new I.default(r)),await g.showGreenWaveBand(e)),Ye=async e=>(y||(y=new it.default(r)),await y.showJurisdiction(e)),Re=()=>{if(!y)return{status:-1,message:"未加载警务管辖区"};y.clearJurisdiction()},$e=async e=>(C||(C=new nt.default(r)),await C.setEdpassLayerVisibility(e)),B=E,S=P;return N({mapViewer:H,setLayerVisibility:F,setMapCenter:J,lookAt:K,setMapCamera:Q,setMapZoom:U,setMapZoomRange:R,requestCoordinateTransform:X,cancelCoordinateTransform:Y,addOverlays:ye,addMask:ve,removeMask:Se,showAllOverlays:be,removeOverlaysByType:we,removeOverlaysById:he,removeAllOverlays:Ce,showLaneNumber:$,clearLaneNumber:ee,initializeAreaTool:te,calCrossIndicatorArea:ae,calRoadIndicatorArea:ne,connectCarFlow:re,disconnectCarFlow:se,handleHoloVehicleTraceData:oe,clearHoloTrace:ie,initializeLampGroup:ue,handleUniSignalData:de,handleHoloSignalData:le,clearHoloSignal:me,setInterpolate:ce,toggleTrafficInfo:pe,toggleTrafficObject:fe,toggleVehicleInfo:k,togglePause:ge,updateQueueLength:Oe,removeQueueLength:ke,showOpenDriveFromServer:Ae,showOpenDriveFromFile:Le,clearOpenDrive:Te,setOpendriveVisibility:De,geometrySearchInOpenDrive:Be,findSumoInOpenDrive:Ve,selectSumoInOpenDrive:_e,unselectSumoInOpenDrive:qe,getSumoInfo:Ie,splitOpenDriveLane:Me,clearSplitOpenDriveLane:xe,showSignalControlArea:ze,clearSignalControlArea:Ee,setSignalControlAreaVisibility:Ne,locateSignalControlArea:Pe,highlightSignalControlArea:He,resetHighlightSignalControlArea:Ge,showSubSignalControlArea:Ze,editSubSignalControlArea:We,stopEditSubSignalControlArea:je,selectSubSignalControlAreaCross:Je,unselectSubSignalControlAreaCross:Qe,changeSubSignalControlAreaBorderVisibility:Ue,addGreenWaveBand:Ke,stopAddGreenWaveBand:Fe,showGreenWaveBand:Xe,showPoliceArea:Ye,clearPoliceArea:Re,setEdpassLayerVisibility:$e}),(e,d)=>(n.openBlock(),n.createElementBlock("div",mt,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:h},[n.withDirectives(n.createElementVNode("div",pt,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:G}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:Z}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:W}," 显示车辆id "),n.createElementVNode("button",{onClick:j},"显示车辆号牌")],512),[[n.vShow,b.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(V,(c,w)=>(n.openBlock(),n.createBlock(st.default,{key:w,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=gt;

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

@@ -54,6 +54,10 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
             rColor?: string | undefined;
         };
     }[];
+    scaleToZoom: (scale: number) => number;
+    removeZoomWatch: (() => void) | null;
+    lastEmittedZoomInt: number | null;
+    emitZoomIfChanged: (z: number) => void;
     mapViewer: import("vue").ComputedRef<__esri.MapView | __esri.SceneView>;
     handleStartSaveTrackLog: () => void;
     handleDownloadTrackLog: () => void;
@@ -61,6 +65,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     handleShowPlateNumber: () => void;
     setMapCenter: (params: import("../types").ISetMapCenterParams) => Promise<import("../types").IResult>;
     setMapCamera: (params: import("../types").ISetMapCameraParams) => Promise<import("../types").IResult>;
+    setMapZoom: (zoom: number) => import("../types").IResult;
     lookAt: (params: import("../types").ILookAtParams) => Promise<void>;
     setLayerVisibility: (params: import("../types").ILayerVisibleParams) => import("../types").IResult;
     requestCoordinateTransform: (points: number[][], callback: (points: number[][]) => void) => {
@@ -159,7 +164,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     } | undefined;
     setEdpassLayerVisibility: (params: import("../types").IShowEdpassDeviceParams) => Promise<import("../types").IResult>;
     props: any;
-    emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
+    emit: (event: "mapLoaded" | "markerClick" | "mapClick" | "update:zoom", ...args: any[]) => void;
     SignalCountdownPanel: import("vue").DefineComponent<{
         displayMode: {
             type: StringConstructor;
@@ -284,7 +289,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
             required: true;
         };
     }>>, {}, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick" | "update:zoom")[], "mapLoaded" | "markerClick" | "mapClick" | "update:zoom", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     config: {
         type: StringConstructor;
         required: true;
@@ -297,5 +302,6 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     onMapLoaded?: ((...args: any[]) => any) | undefined;
     onMarkerClick?: ((...args: any[]) => any) | undefined;
     onMapClick?: ((...args: any[]) => any) | undefined;
+    "onUpdate:zoom"?: ((...args: any[]) => any) | undefined;
 }, {}, {}>>;
 export default GisMap;

package/lib/src/gis-map/utils/edpass-device-controller.d.ts

@@ -7,6 +7,8 @@ export default class EdpassDeviceController {
     private kkAbnormalLayer;
     private mapInitializer;
     private watchHandle;
+    private currentZdCode;
+    private currentDdCode;
     constructor(view: __esri.MapView | __esri.SceneView);
     setEdpassLayerVisibility(params: IShowEdpassDeviceParams): Promise<IResult>;
     private getLayerConfig;