gisviewer-vue3-arcgis 1.0.119 → 1.0.121

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

@@ -66,9 +66,9 @@ export default class CommonUtils {
     static getStdVecEntries(std_vec: any, delete_vec?: boolean): any[];
     static getStdMapEntries(std_map: any): any[];
     static getStdMapKeys(std_map: any, delete_map?: boolean): any[];
-    private static geoReference;
-    private static xOffset;
-    private static yOffset;
+    static geoReference: string;
+    static xOffset: number;
+    static yOffset: number;
     static setGeoData(geoReference: string, xOffset: number, yOffset: number): void;
     /**
      * OpenDrive坐标转换为WGS84坐标
@@ -76,6 +76,7 @@ export default class CommonUtils {
      * @returns
      */
     static transformLineProjection(line: number[][]): number[][];
+    static transformPointProjection(point: number[]): number[];
     static pointsEqual(point1: number[], point2: number[]): boolean;
     static getExtensionLine(pt1: number[], pt2: number[], distance: number): turf.Position;
 }

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

@@ -1,11 +1,11 @@
-import { Point as P, Polyline as f } from "@arcgis/core/geometry";
+import { Point as L, 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 u from "@turf/bearing";
 import p from "@turf/destination";
 import * as a from "@turf/helpers";
-import L from "pako";
-import O from "proj4";
+import l from "pako";
+import h from "proj4";
 class i {
   /**
    * 得到某个点在一定方向、距离之外的另一个点
@@ -18,7 +18,7 @@ class i {
     const r = a.point([t.x, t.y]), s = p(r, n, e, {
       units: "meters"
     });
-    return new P({
+    return new L({
       x: s.geometry.coordinates[0],
       y: s.geometry.coordinates[1]
     });
@@ -40,12 +40,12 @@ class i {
   static extendLineInTowDir(t, e) {
     const n = t.paths[0], r = a.point(n[0]), s = a.point(n[1]), o = u(s, r), c = p(r, e, o, {
       units: "meters"
-    }), h = o > 0 ? o - 180 : o + 180, l = p(s, e, h, {
+    }), P = o > 0 ? o - 180 : o + 180, O = p(s, e, P, {
       units: "meters"
     });
     return new f({
       paths: [
-        [c.geometry.coordinates, l.geometry.coordinates]
+        [c.geometry.coordinates, O.geometry.coordinates]
       ]
     });
   }
@@ -149,7 +149,7 @@ class i {
         e.push(o.charCodeAt(0));
       }
       const r = new Uint8Array(e);
-      return L.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) => O(i.geoReference).inverse([
+        (e) => h(i.geoReference).inverse([
           e[0] - i.xOffset,
           e[1] - i.yOffset
         ])
@@ -195,6 +195,19 @@ class i {
       ), t;
     }
   }
+  static transformPointProjection(t) {
+    try {
+      return h(i.geoReference).inverse([
+        t[0] - i.xOffset,
+        t[1] - i.yOffset
+      ]);
+    } catch {
+      return console.error(
+        "OpenDrive坐标转换为WGS84坐标失败",
+        i.geoReference
+      ), t;
+    }
+  }
   static pointsEqual(t, e) {
     return Math.abs(t[0] - e[0]) < Number.EPSILON && Math.abs(t[1] - e[1]) < Number.EPSILON;
   }

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

@@ -1,19 +1,19 @@
-import M from "@arcgis/core/Basemap";
-import T from "@arcgis/core/Map";
-import g from "@arcgis/core/config";
-import * as P from "@arcgis/core/core/reactiveUtils";
-import { Polygon as z, Polyline as W, Point as k } from "@arcgis/core/geometry";
+import b from "@arcgis/core/Basemap";
+import u from "@arcgis/core/config";
+import * as M from "@arcgis/core/core/reactiveUtils";
+import { Polygon as T, Polyline as z, Point as P } from "@arcgis/core/geometry";
 import * as f from "@arcgis/core/geometry/support/webMercatorUtils";
-import x from "@arcgis/core/layers/GeoJSONLayer";
-import L from "@arcgis/core/layers/TileLayer";
-import R from "@arcgis/core/layers/WebTileLayer";
-import S from "@arcgis/core/views/MapView";
+import W from "@arcgis/core/layers/GeoJSONLayer";
+import x from "@arcgis/core/layers/TileLayer";
+import L from "@arcgis/core/layers/WebTileLayer";
+import S from "@arcgis/core/Map";
+import R from "@arcgis/core/views/MapView";
 import H from "@arcgis/core/views/SceneView";
 import I from "@turf/destination";
 import * as O from "@turf/helpers";
-import G from "../stores/index.mjs";
-function y(m, t) {
-  return m.startsWith("http://") || m.startsWith("https://") ? m : t + m;
+import C from "../stores/index.mjs";
+function k(h, e) {
+  return h && (h.startsWith("http://") || h.startsWith("https://") ? h : e + h);
 }
 class Q {
   constructor() {
@@ -24,18 +24,18 @@ class Q {
    * @param params 容器
    * @returns view
    */
-  async initialize(t) {
-    const i = G.useAppDataStore, e = JSON.parse(JSON.stringify(i.mapConfig));
-    this.mapConfig = e;
-    const { container: a, markerClickCallback: r, mapClickCallback: d } = t;
-    g.assetsPath = `${e.assetsRoot}/ArcgisAssets`, g.fontsUrl = `${e.assetsRoot}/fonts`, g.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const c = new T();
-    if ((e == null ? void 0 : e.mapOptions.mode.toLowerCase()) === "2d" ? this.view = new S({
-      map: c,
+  async initialize(e) {
+    const i = C.useAppDataStore, t = JSON.parse(JSON.stringify(i.mapConfig));
+    this.mapConfig = t;
+    const { container: a, markerClickCallback: r, mapClickCallback: d } = e;
+    u.assetsPath = `${t.assetsRoot}/ArcgisAssets`, u.fontsUrl = `${t.assetsRoot}/fonts`, u.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
+    const n = new S();
+    if ((t == null ? void 0 : t.mapOptions.mode.toLowerCase()) === "2d" ? this.view = new R({
+      map: n,
       container: a,
-      ...e.mapOptions
+      ...t.mapOptions
     }) : this.view = new H({
-      map: c,
+      map: n,
       container: a,
       environment: {
         atmosphereEnabled: !0,
@@ -43,9 +43,9 @@ class Q {
           type: "virtual"
         }
       },
-      ...e == null ? void 0 : e.mapOptions
+      ...t == null ? void 0 : t.mapOptions
     }), this.view.on("click", async (s) => {
-      var v, b;
+      var y, v;
       if (d) {
         let o = s.mapPoint;
         o.spatialReference.isWebMercator && (o = f.webMercatorToGeographic(
@@ -59,14 +59,14 @@ class Q {
       if (this.view.type === "3d") {
         const o = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
-          const l = f.webMercatorToGeographic(
+          const m = f.webMercatorToGeographic(
             o.position
           ), w = {
             heading: o.heading,
             tilt: o.tilt,
-            position: l.toJSON()
+            position: m.toJSON()
           };
-          console.log(w), (v = navigator.clipboard) == null || v.writeText(JSON.stringify(w));
+          console.log(w), (y = navigator.clipboard) == null || y.writeText(JSON.stringify(w));
         } else
           console.log(o.toJSON());
         console.log(this.view.zoom, this.view.scale);
@@ -79,135 +79,136 @@ class Q {
           zoom: this.view.zoom
         });
       }
-      const h = (b = (await this.view.hitTest(s)).results) == null ? void 0 : b.filter(
+      const c = (v = (await this.view.hitTest(s)).results) == null ? void 0 : v.filter(
         (o) => o.type === "graphic"
       );
-      h.length > 0 && h.forEach((o) => {
+      c.length > 0 && c.forEach((o) => {
         var w;
-        const l = o.graphic;
-        (w = l.attributes) != null && w.type && r && r(
-          l.attributes.type,
-          l.attributes.id,
-          l.attributes,
+        const m = o.graphic;
+        (w = m.attributes) != null && w.type && r && r(
+          m.attributes.type,
+          m.attributes.id,
+          m.attributes,
           s
         );
       });
-    }), e != null && e.baseLayers ? e.baseLayers.forEach((s) => {
+    }), t != null && t.baseLayers ? t.baseLayers.forEach((s) => {
+      const l = k(s.url, t.assetsRoot);
       switch (s.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          const n = y(s.url, e.assetsRoot), h = new R({
-            urlTemplate: n,
+          const c = new L({
+            urlTemplate: l,
             ...s.options
           });
-          c.add(h);
+          n.add(c);
           break;
         }
         case "tile": {
-          const n = y(s.url, e.assetsRoot), h = new L({
-            url: n,
+          const c = new x({
+            url: l,
             ...s.options
           });
-          c.add(h);
+          n.add(c);
           break;
         }
         case "arcgis": {
-          const n = new M(s.options);
-          c.basemap = n;
+          const c = new b(s.options);
+          n.basemap = c;
           break;
         }
       }
-    }) : c.basemap = new M({
+    }) : n.basemap = new b({
       style: {
         id: "arcgis/dark-gray",
         language: "zh-CN"
       }
-    }), e != null && e.hdLayers) {
-      const s = e.hdLayers.map(
-        (n) => (
+    }), t != null && t.hdLayers) {
+      const s = t.hdLayers.map(
+        (l) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new x({
-            url: y(n.url, e.assetsRoot),
-            ...n.options,
-            title: n.options.id
+          new W({
+            url: k(l.url, t.assetsRoot),
+            ...l.options,
+            title: l.options.id
           })
         )
       );
-      c.addMany(s);
+      n.addMany(s);
     }
     this.view.ui.remove("attribution"), this.view.ui.add("compass", "top-left"), await this.view.when();
     const p = this.mapConfig.camera;
-    let u;
+    let g;
     if (this.view.type === "2d") {
       let s = this.view.center;
       this.view.spatialReference.isWebMercator && (s = f.webMercatorToGeographic(
         s
-      )), u = { center: [s.x, s.y], zoom: this.view.zoom };
+      )), g = { center: [s.x, s.y], zoom: this.view.zoom };
     } else {
       let s = this.view.camera.position;
       this.view.spatialReference.isWebMercator && (s = f.webMercatorToGeographic(
         s
-      )), u = {
+      )), g = {
         position: s,
         heading: this.view.camera.heading,
         tilt: this.view.camera.tilt
       };
     }
-    return p ? p.home = u : this.mapConfig.camera = { home: u }, this.view;
+    return p ? p.home = g : this.mapConfig.camera = { home: g }, this.view;
   }
-  setLayerVisibility(t) {
-    const { id: i, visible: e } = t, a = this.view.map.findLayerById(i);
-    return a ? (a.visible = e, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+  setLayerVisibility(e) {
+    const { id: i, visible: t } = e, a = this.view.map.findLayerById(i);
+    return a ? (a.visible = t, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
   }
   /**
    * 设置地图中心点
    * @param params
    * @returns
    */
-  async setMapCenter(t) {
+  async setMapCenter(e) {
     var i;
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    if (t.center || t.target) {
-      switch ((i = t.target) == null ? void 0 : i.type) {
+    if (e.center || e.target) {
+      switch ((i = e.target) == null ? void 0 : i.type) {
         case "point":
-          t.target = new k(t.target);
+          e.target = new P(e.target);
           break;
         case "polyline":
-          t.target = new W(t.target);
+          e.target = new z(e.target);
           break;
         case "polygon":
-          t.target = new z(t.target);
+          e.target = new T(e.target);
           break;
       }
-      await this.view.goTo(t, { duration: (t.duration || 0) * 1e3 });
+      await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
     }
     return { status: 0, message: "成功" };
   }
   /**
    * 在一定的高度，以一定的角度去观察某个坐标
    * */
-  async lookAt(t) {
+  async lookAt(e) {
     if (this.view.type === "2d")
       return;
-    const i = t.tilt || 0, e = t.heading || 0;
+    const i = e.tilt || 0, t = e.heading || 0;
     if (i === 0)
       await this.view.goTo(
         {
           position: {
-            x: t.center[0],
-            y: t.center[1],
-            z: t.height
+            x: e.center[0],
+            y: e.center[1],
+            z: e.height
           },
-          heading: e,
+          heading: t,
           tilt: 0
         },
-        { duration: (t.duration || 2) * 1e3 }
+        { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * t.height, r = I(
-        O.point(t.center),
+      const a = Math.tan(i * Math.PI / 180) * e.height, r = I(
+        O.point(e.center),
         a,
-        e + 180,
+        t + 180,
         {
           units: "meters"
         }
@@ -217,63 +218,63 @@ class Q {
           position: {
             x: r.geometry.coordinates[0],
             y: r.geometry.coordinates[1],
-            z: t.height
+            z: e.height
           },
-          heading: e,
+          heading: t,
           tilt: i
         },
-        { duration: (t.duration || 2) * 1e3 }
+        { duration: (e.duration || 2) * 1e3 }
       );
     }
   }
-  async setMapCamera(t) {
+  async setMapCamera(e) {
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    const { name: i, duration: e = 0 } = t, { camera: a } = this.mapConfig;
+    const { name: i, duration: t = 0 } = e, { camera: a } = this.mapConfig;
     if (!a)
       return { status: -1, message: "未配置camera" };
     const r = a[i];
-    return r ? (await this.view.goTo(r, { duration: e * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
+    return r ? (await this.view.goTo(r, { duration: t * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
    * 经纬度转像素坐标，在地图移动时回调
    * */
-  requestCoordinateTransform(t, i) {
-    let e = 0;
-    const r = 1e3 / 30, d = P.watch(
+  requestCoordinateTransform(e, i) {
+    let t = 0;
+    const r = 1e3 / 30, d = M.watch(
       () => this.view.center,
       () => {
-        const c = this.transformPoints(t), p = Date.now();
-        p - e > r && (i(c), e = p);
+        const n = this.transformPoints(e), p = Date.now();
+        p - t > r && (i(n), t = p);
       }
     );
-    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, d), { handle: this.handleIndex, points: this.transformPoints(t) };
+    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, d), { handle: this.handleIndex, points: this.transformPoints(e) };
   }
-  transformPoints(t) {
-    return t.map((i) => {
-      const e = new k({
+  transformPoints(e) {
+    return e.map((i) => {
+      const t = new P({
         x: i[0],
         y: i[1]
-      }), a = this.view.toScreen(e);
+      }), a = this.view.toScreen(t);
       return [a.x, a.y];
     });
   }
   /**
    * 停止坐标转换回调
    * */
-  cancelCoordinateTransform(t) {
-    const i = this.watchHandleMap.get(t);
-    i && (i.remove(), this.watchHandleMap.delete(t));
+  cancelCoordinateTransform(e) {
+    const i = this.watchHandleMap.get(e);
+    i && (i.remove(), this.watchHandleMap.delete(e));
   }
   /**
    * 设置地图zoom范围
    * */
-  setMapZoomRange(t) {
-    const { min: i, max: e } = t;
-    !i && !e || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = P.watch(
+  setMapZoomRange(e) {
+    const { min: i, max: t } = e;
+    !i && !t || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = M.watch(
       () => this.view.zoom,
       (a) => {
-        i && a <= i && (this.view.zoom = i), e && a >= e && (this.view.zoom = e);
+        i && a <= i && (this.view.zoom = i), t && a >= t && (this.view.zoom = t);
       }
     ));
   }

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

@@ -1,8 +1,7 @@
-import View from '@arcgis/core/views/View';
 import { IFindSumoParams, IResult, IShowOpenDriveFromFileParams, ISplitOpenDriveLaneParams } from '../../../types';
 export default class OpenDriveRenderer {
     private static instance;
-    static getInstance(view: View): OpenDriveRenderer;
+    static getInstance(view: __esri.MapView | __esri.SceneView): OpenDriveRenderer;
     private readonly view;
     private laneLayer;
     private roadNameLayer;
@@ -10,8 +9,12 @@ export default class OpenDriveRenderer {
     private highlightLayer;
     private allLaneGraphics;
     private allRefLineGraphics;
+    private mouseMoveHandler;
+    private mouseClickHandler;
     private wasmLoader;
-    constructor(view: View);
+    constructor(view: __esri.MapView | __esri.SceneView);
+    private projectName;
+    private openDriveServer;
     showOpenDriveFromFile(params: IShowOpenDriveFromFileParams): Promise<IResult>;
     /**
      * 从服务器载入OpenDrive文件解析结果并显示
@@ -21,6 +24,23 @@ export default class OpenDriveRenderer {
     showOpenDriveFromServer(server: string, projectName: string): Promise<IResult>;
     private showAllLanes;
     private showJunction;
+    private currentSectionCode;
+    private currentJunctionId;
+    private hitGraphic;
+    private highlightGraphic;
+    /**
+     * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
+     */
+    private monitorMouseMove;
+    /**
+     * 监听鼠标点击事件，获取高亮要素的拓扑信息
+     */
+    private monitorMouseClick;
+    private increasePictureMarkerSize;
+    private decreasePictureMarkerSize;
+    /**
+     * 清除OpenDrive内容
+     */
     clearOpenDrive(): Promise<void>;
     /**
      * 用sumo的id定位车道、基本段、路段