gisviewer-vue3-arcgis 1.0.114 → 1.0.116

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

@@ -1,6 +1,6 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
-import { ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IStartCrossBufferParam, IToggleTrafficInfoParams } from '../types';
+import { IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, IStartCrossBufferParam, IToggleTrafficInfoParams } from '../types';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
 import OpenDriveRenderer from './utils/open-drive-renderer';
@@ -67,8 +67,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
     showAllOverlays: () => void;
     updateQueueLength: (params: IQueueLengthParams[]) => void;
     removeQueueLength: () => void;
-    showOpenDrive: (server: string, projectName: string) => Promise<void>;
-    hideOpenDrive: () => Promise<void>;
+    showOpenDriveFromServer: (server: string, projectName: string) => Promise<import("../types").IResult>;
+    showOpenDriveFromFile: (params: IShowOpenDriveFromFileParams) => Promise<import("../types").IResult>;
+    clearOpenDrive: () => Promise<void>;
+    findSumoInOpenDrive: (params: IFindSumoParams) => Promise<import("../types").IResult>;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -1,104 +1,103 @@
-import { defineComponent as ie, ref as h, onMounted as le, getCurrentInstance as pe, computed as me, openBlock as ue, createElementBlock as de, createElementVNode as m, withDirectives as fe, vShow as ge } from "vue";
-import C, { registerStore as we } from "./stores/index.mjs";
+import { defineComponent as pe, ref as h, onMounted as ue, getCurrentInstance as fe, computed as ge, openBlock as de, createElementBlock as we, createElementVNode as p, withDirectives as ve, vShow as ye } from "vue";
+import C, { registerStore as he } from "./stores/index.mjs";
 import "./style/index.css";
-import ve from "./utils/holo-flow/index.mjs";
-import ye from "./utils/map-initializer.mjs";
-import he from "./utils/open-drive-renderer/index.mjs";
-import Ce from "./utils/overlay.mjs";
-import ke from "./utils/queue-length.mjs";
-import k from "./utils/road-config-tool/index.mjs";
-import Te from "./utils/traffic-flow.mjs";
-const Oe = { class: "gis-viewer" }, Le = { style: { position: "absolute", bottom: "10px", left: "10px" } }, Be = /* @__PURE__ */ ie({
+import Ce from "./utils/holo-flow/index.mjs";
+import ke from "./utils/map-initializer.mjs";
+import k from "./utils/open-drive-renderer/index.mjs";
+import Oe from "./utils/overlay.mjs";
+import Te from "./utils/queue-length.mjs";
+import O from "./utils/road-config-tool/index.mjs";
+import Le from "./utils/traffic-flow.mjs";
+const Se = { class: "gis-viewer" }, be = { style: { position: "absolute", bottom: "10px", left: "10px" } }, Re = /* @__PURE__ */ pe({
   __name: "gis-map",
   props: {
     config: {},
     assetsRoot: {}
   },
   emits: ["mapLoaded", "markerClick", "mapClick"],
-  setup(T, { expose: O, emit: L }) {
+  setup(T, { expose: L, emit: S }) {
     const u = h(null);
-    let r, s, o, a, n, t, i, l;
-    const d = h(!1);
-    we(), le(async () => {
+    let s, c, a, n, r, t, l, o;
+    const f = h(!1);
+    he(), ue(async () => {
       if (!u.value)
         return;
-      document.addEventListener("keydown", (p) => {
-        p.ctrlKey && p.key === "i" && (d.value = !d.value);
+      document.addEventListener("keydown", (m) => {
+        m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
-      const e = pe(), { $gisviewerAssetsRoot: c } = e.appContext.config.globalProperties, y = await (await fetch(v.config)).json();
-      y.assetsRoot = v.assetsRoot || c;
-      const se = C.useAppDataStore;
-      se.mapConfig = y, s = new ye(), r = await s.initialize({
+      const e = fe(), { $gisviewerAssetsRoot: i } = e.appContext.config.globalProperties, y = await (await fetch(v.config)).json();
+      y.assetsRoot = v.assetsRoot || i;
+      const le = C.useAppDataStore;
+      le.mapConfig = y, c = new ke(), s = await c.initialize({
         container: u.value,
-        markerClickCallback: (p, g, w, ce) => {
-          f("markerClick", p, g, w, ce);
+        markerClickCallback: (m, d, w, me) => {
+          g("markerClick", m, d, w, me);
         },
-        mapClickCallback: (p, g, w) => {
-          f("mapClick", p, g, w);
+        mapClickCallback: (m, d, w) => {
+          g("mapClick", m, d, w);
         }
-      }), n = new ve(r), await n.init(), f("mapLoaded");
+      }), r = new Ce(s), await r.init(), g("mapLoaded");
     });
-    const b = me(() => r), I = () => {
+    const b = ge(() => s), D = () => {
       const e = C.useAppDataStore;
       e.saveTrackLog = !0;
-    }, D = () => {
-      n.downloadTrackLog();
-    }, A = async (e) => await s.setMapCenter(e), S = async (e) => await s.setMapCamera(e), _ = async (e) => await s.lookAt(e), x = (e) => s.setLayerVisibility(e), M = (e, c) => s.requestCoordinateTransform(e, c), R = (e) => {
-      s.cancelCoordinateTransform(e);
-    }, V = (e) => {
-      s.setMapZoomRange(e);
-    }, B = (e) => (o || (o = new k(r)), o.showLaneNumber(e)), H = () => {
-      o == null || o.clearLaneNumber();
-    }, z = async (e) => (o || (o = new k(r)), await o.initializeSearch(e)), N = async () => o == null ? void 0 : o.calCrossIndicatorArea(), Q = async () => {
-    }, j = async (e, c) => {
-      a || (a = new Te(r)), a.connectTrafficFlow(e, c);
+    }, I = () => {
+      r.downloadTrackLog();
+    }, A = async (e) => await c.setMapCenter(e), _ = async (e) => await c.setMapCamera(e), x = async (e) => await c.lookAt(e), M = (e) => c.setLayerVisibility(e), F = (e, i) => c.requestCoordinateTransform(e, i), V = (e) => {
+      c.cancelCoordinateTransform(e);
+    }, B = (e) => {
+      c.setMapZoomRange(e);
+    }, H = (e) => (a || (a = new O(s)), a.showLaneNumber(e)), R = () => {
+      a == null || a.clearLaneNumber();
+    }, z = async (e) => (a || (a = new O(s)), await a.initializeSearch(e)), N = async () => a == null ? void 0 : a.calCrossIndicatorArea(), Q = async () => {
+    }, j = async (e, i) => {
+      n || (n = new Le(s)), n.connectTrafficFlow(e, i);
     }, P = () => {
-      a == null || a.disconnectTrafficFlow();
+      n == null || n.disconnectTrafficFlow();
     }, E = (e) => {
-      n.handleVehicleTraceData(e);
+      r.handleVehicleTraceData(e);
     }, Z = () => {
-      n.clearHoloTrace();
+      r.clearHoloTrace();
     }, q = (e) => {
-      n.setInterpolate(e);
-    }, F = async (e) => {
-      await n.handleSignalData(e);
-    }, K = () => {
-      n.clearHoloSignal();
-    }, $ = (e) => {
-      a == null || a.toggleTrafficInfo(e), n.toggleTrafficInfo(e);
+      r.setInterpolate(e);
+    }, K = async (e) => {
+      await r.handleSignalData(e);
+    }, $ = () => {
+      r.clearHoloSignal();
     }, G = (e) => {
-      n.togglePause(e);
+      n == null || n.toggleTrafficInfo(e), r.toggleTrafficInfo(e);
     }, J = (e) => {
-      a == null || a.toggleTrafficObject(e), n.toggleTrafficObject(e);
+      r.togglePause(e);
     }, U = (e) => {
-      n.updatePanelContent(e);
-    }, W = async (e) => (t || (t = new Ce(r)), t.addOverlays(e)), X = (e) => t == null ? void 0 : t.removeOverlaysByType(e), Y = (e) => t == null ? void 0 : t.removeOverlaysById(e), ee = () => t == null ? void 0 : t.removeAllOverlays(), te = () => {
+      n == null || n.toggleTrafficObject(e), r.toggleTrafficObject(e);
+    }, W = (e) => {
+      r.updatePanelContent(e);
+    }, X = async (e) => (t || (t = new Oe(s)), t.addOverlays(e)), Y = (e) => t == null ? void 0 : t.removeOverlaysByType(e), ee = (e) => t == null ? void 0 : t.removeOverlaysById(e), te = () => t == null ? void 0 : t.removeAllOverlays(), oe = () => {
       t == null || t.showAllOverlays();
-    }, oe = (e) => {
-      i || (i = new ke(r)), i.updateQueueLength(e);
-    }, ae = () => {
-      i == null || i.removeQueueLength();
-    }, ne = async (e, c) => {
-      l || (l = new he(r)), await l.showOpenDrive(e, c);
-    }, re = async () => {
-      await (l == null ? void 0 : l.hideOpenDrive());
-    }, v = T, f = L;
-    return O({
+    }, ae = (e) => {
+      l || (l = new Te(s)), l.updateQueueLength(e);
+    }, ne = () => {
+      l == null || l.removeQueueLength();
+    }, re = async (e, i) => (o || (o = new k(s)), await o.showOpenDriveFromServer(e, i)), se = async (e) => (o || (o = new k(s)), await o.showOpenDriveFromFile(e)), ce = async () => await (o == null ? void 0 : o.clearOpenDrive()), ie = async (e) => o ? await (o == null ? void 0 : o.findSumo(e)) : {
+      status: -1,
+      message: "未加载OpenDrive地图"
+    }, v = T, g = S;
+    return L({
       mapViewer: b,
-      setLayerVisibility: x,
+      setLayerVisibility: M,
       setMapCenter: A,
-      lookAt: _,
-      setMapCamera: S,
-      setMapZoomRange: V,
-      requestCoordinateTransform: M,
-      cancelCoordinateTransform: R,
-      addOverlays: W,
-      showAllOverlays: te,
-      removeOverlaysByType: X,
-      removeOverlaysById: Y,
-      removeAllOverlays: ee,
-      showLaneNumber: B,
-      clearLaneNumber: H,
+      lookAt: x,
+      setMapCamera: _,
+      setMapZoomRange: B,
+      requestCoordinateTransform: F,
+      cancelCoordinateTransform: V,
+      addOverlays: X,
+      showAllOverlays: oe,
+      removeOverlaysByType: Y,
+      removeOverlaysById: ee,
+      removeAllOverlays: te,
+      showLaneNumber: H,
+      clearLaneNumber: R,
       initializeAreaTool: z,
       calCrossIndicatorArea: N,
       calRoadIndicatorArea: Q,
@@ -106,36 +105,38 @@ const Oe = { class: "gis-viewer" }, Le = { style: { position: "absolute", bottom
       disconnectCarFlow: P,
       handleHoloVehicleTraceData: E,
       clearHoloTrace: Z,
-      handleHoloSignalData: F,
-      clearHoloSignal: K,
+      handleHoloSignalData: K,
+      clearHoloSignal: $,
       setInterpolate: q,
-      toggleTrafficInfo: $,
-      toggleTrafficObject: J,
-      toggleVehicleInfo: U,
-      togglePause: G,
-      updateQueueLength: oe,
-      removeQueueLength: ae,
-      showOpenDrive: ne,
-      hideOpenDrive: re
-    }), (e, c) => (ue(), de("div", Oe, [
-      m("div", {
+      toggleTrafficInfo: G,
+      toggleTrafficObject: U,
+      toggleVehicleInfo: W,
+      togglePause: J,
+      updateQueueLength: ae,
+      removeQueueLength: ne,
+      showOpenDriveFromServer: re,
+      showOpenDriveFromFile: se,
+      clearOpenDrive: ce,
+      findSumoInOpenDrive: ie
+    }), (e, i) => (de(), we("div", Se, [
+      p("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
         ref: u
       }, [
-        fe(m("div", Le, [
-          m("button", {
+        ve(p("div", be, [
+          p("button", {
             style: { "margin-right": "10px" },
-            onClick: I
+            onClick: D
           }, " 开始记录 "),
-          m("button", { onClick: D }, "下载日志")
+          p("button", { onClick: I }, "下载日志")
         ], 512), [
-          [ge, d.value]
+          [ye, f.value]
         ])
       ], 512)
     ]));
   }
 });
 export {
-  Be as default
+  Re as default
 };

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

@@ -57,8 +57,10 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     showAllOverlays: () => void;
     updateQueueLength: (params: import("../types").IQueueLengthParams[]) => void;
     removeQueueLength: () => void;
-    showOpenDrive: (server: string, projectName: string) => Promise<void>;
-    hideOpenDrive: () => Promise<void>;
+    showOpenDriveFromServer: (server: string, projectName: string) => Promise<import("../types").IResult>;
+    showOpenDriveFromFile: (params: import("../types").IShowOpenDriveFromFileParams) => Promise<import("../types").IResult>;
+    clearOpenDrive: () => Promise<void>;
+    findSumoInOpenDrive: (params: import("../types").IFindSumoParams) => Promise<import("../types").IResult>;
     props: any;
     emit: (event: "mapLoaded" | "markerClick" | "mapClick", ...args: any[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mapLoaded" | "markerClick" | "mapClick")[], "mapLoaded" | "markerClick" | "mapClick", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/es/src/gis-map/stores/appData.d.ts

@@ -1,4 +1,7 @@
 export declare const useAppDataStore: import("pinia").StoreDefinition<"appData", {
     mapConfig: {};
     saveTrackLog: boolean;
+    geoReference: string;
+    xOffset: number;
+    yOffset: number;
 }, {}, {}>;

package/es/src/gis-map/stores/appData.mjs

@@ -1,10 +1,13 @@
-import { defineStore as a } from "pinia";
-const t = a("appData", {
+import { defineStore as e } from "pinia";
+const a = e("appData", {
   state: () => ({
     mapConfig: {},
-    saveTrackLog: !1
+    saveTrackLog: !1,
+    geoReference: "",
+    xOffset: 0,
+    yOffset: 0
   })
 });
 export {
-  t as useAppDataStore
+  a as useAppDataStore
 };

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

@@ -1,4 +1,5 @@
 import { Point, Polygon, Polyline } from '@arcgis/core/geometry';
+import * as turf from '@turf/helpers';
 export default class CommonUtils {
     /**
      * 得到某个点在一定方向、距离之外的另一个点
@@ -62,4 +63,15 @@ export default class CommonUtils {
      * @returns
      */
     static unzip(key: string): string | undefined;
+    static getStdVecEntries(std_vec: any, delete_vec?: boolean): any[];
+    static getStdMapEntries(std_map: any): any[];
+    static getStdMapKeys(std_map: any, delete_map?: boolean): any[];
+    /**
+     * OpenDrive坐标转换为WGS84坐标
+     * @param line
+     * @returns
+     */
+    static transformLineProjection(line: 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,13 @@
-import { Point as y, Polyline as f } from "@arcgis/core/geometry";
-import * as g from "@arcgis/core/geometry/geometryEngineAsync";
-import * as u from "@arcgis/core/geometry/support/webMercatorUtils";
-import h from "@turf/bearing";
-import p from "@turf/destination";
+import { Point as m, Polyline as f } from "@arcgis/core/geometry";
+import * as p from "@arcgis/core/geometry/geometryEngineAsync";
+import * as l from "@arcgis/core/geometry/support/webMercatorUtils";
+import u from "@turf/bearing";
+import g from "@turf/destination";
 import * as a from "@turf/helpers";
-import w from "pako";
-class s {
+import P from "pako";
+import L from "proj4";
+import { useAppDataStore as w } from "../stores/appData.mjs";
+class i {
   /**
    * 得到某个点在一定方向、距离之外的另一个点
    * @param point
@@ -14,12 +16,12 @@ class s {
    * @returns
    */
   static destinationWithPoint(t, e, n) {
-    const i = a.point([t.x, t.y]), o = p(i, n, e, {
+    const r = a.point([t.x, t.y]), s = g(r, n, e, {
       units: "meters"
     });
-    return new y({
-      x: o.geometry.coordinates[0],
-      y: o.geometry.coordinates[1]
+    return new m({
+      x: s.geometry.coordinates[0],
+      y: s.geometry.coordinates[1]
     });
   }
   /**
@@ -28,8 +30,8 @@ class s {
    * @returns
    */
   static angleOfLine(t) {
-    const e = t.paths[0], n = a.point(e[0]), i = a.point(e[e.length - 1]);
-    return h(n, i);
+    const e = t.paths[0], n = a.point(e[0]), r = a.point(e[e.length - 1]);
+    return u(n, r);
   }
   /**
    * 在头尾两个方向上延长折线
@@ -37,14 +39,14 @@ class s {
    * @param distance
    */
   static extendLineInTowDir(t, e) {
-    const n = t.paths[0], i = a.point(n[0]), o = a.point(n[1]), r = h(o, i), c = p(i, e, r, {
+    const n = t.paths[0], r = a.point(n[0]), s = a.point(n[1]), o = u(s, r), c = g(r, e, o, {
       units: "meters"
-    }), l = r > 0 ? r - 180 : r + 180, P = p(o, e, l, {
+    }), y = o > 0 ? o - 180 : o + 180, h = g(s, e, y, {
       units: "meters"
     });
     return new f({
       paths: [
-        [c.geometry.coordinates, P.geometry.coordinates]
+        [c.geometry.coordinates, h.geometry.coordinates]
       ]
     });
   }
@@ -55,7 +57,7 @@ class s {
    * @returns
    */
   static async getIntersectPointOfTwoLines(t, e) {
-    const n = await g.intersectLinesToPoints(
+    const n = await p.intersectLinesToPoints(
       t,
       e
     );
@@ -70,25 +72,25 @@ class s {
    * @returns
    */
   static async getIntersectPointsOfStopLineAndLane(t, e, n) {
-    let i = await s.getIntersectPointOfLineAndPolygon(
+    let r = await i.getIntersectPointOfLineAndPolygon(
       t,
       e
     );
-    if (await s.pointDistance(i) < 3 && n) {
-      for (const o of n)
-        if (i = await s.getIntersectPointOfLineAndPolygon(
+    if (await i.pointDistance(r) < 3 && n) {
+      for (const s of n)
+        if (r = await i.getIntersectPointOfLineAndPolygon(
           t,
           e,
-          o
-        ), await s.pointDistance(i) > 2.5) {
-          const r = new f({ paths: [i] });
-          return (await s.getOffsetLine(
-            r,
-            -o
+          s
+        ), await i.pointDistance(r) > 2.5) {
+          const o = new f({ paths: [r] });
+          return (await i.getOffsetLine(
+            o,
+            -s
           )).paths[0];
         }
     } else
-      return i;
+      return r;
     return [];
   }
   /**
@@ -100,7 +102,7 @@ class s {
     if (t.length < 2)
       return 0;
     const e = new f({ paths: [t] });
-    return await g.geodesicLength(e, "meters");
+    return await p.geodesicLength(e, "meters");
   }
   /**
    * 线按一定距离平移之后，与面相交的两个端点
@@ -110,11 +112,11 @@ class s {
    * @returns 线面交线的头尾端点
    */
   static async getIntersectPointOfLineAndPolygon(t, e, n = 0) {
-    n !== 0 && (t = await s.getOffsetLine(t, n));
-    const i = await g.intersect(t, e);
-    if (i instanceof f) {
-      const o = i.paths[0], r = o[0], c = o[o.length - 1];
-      return [r, c];
+    n !== 0 && (t = await i.getOffsetLine(t, n));
+    const r = await p.intersect(t, e);
+    if (r instanceof f) {
+      const s = r.paths[0], o = s[0], c = s[s.length - 1];
+      return [o, c];
     }
     return [];
   }
@@ -125,13 +127,13 @@ class s {
    * @returns 平移后的polyline
    */
   static async getOffsetLine(t, e) {
-    const n = u.geographicToWebMercator(t), i = await g.offset(
+    const n = l.geographicToWebMercator(t), r = await p.offset(
       n,
       e,
       "meters"
     );
-    return u.webMercatorToGeographic(
-      i,
+    return l.webMercatorToGeographic(
+      r,
       !1
     );
   }
@@ -143,17 +145,53 @@ class s {
   static unzip(t) {
     try {
       const e = [], n = t.split("");
-      for (let o = 0; o < n.length; o++) {
-        const r = n[o];
-        e.push(r.charCodeAt(0));
+      for (let s = 0; s < n.length; s++) {
+        const o = n[s];
+        e.push(o.charCodeAt(0));
       }
-      const i = new Uint8Array(e);
-      return w.inflate(i, { to: "string" });
+      const r = new Uint8Array(e);
+      return P.inflate(r, { to: "string" });
     } catch {
       console.log(`非压缩内容: ${t}`);
     }
   }
+  static getStdVecEntries(t, e = !1) {
+    const n = new Array(t.size());
+    for (let r = 0; r < t.size(); r++)
+      n[r] = t.get(r);
+    return e && t.delete(), n;
+  }
+  static getStdMapEntries(t) {
+    const e = [];
+    for (const n of i.getStdMapKeys(t))
+      e.push([n, t.get(n)]);
+    return e;
+  }
+  static getStdMapKeys(t, e = !1) {
+    const n = [], r = t.keys();
+    for (let s = 0; s < r.size(); s++)
+      n.push(r.get(s));
+    return r.delete(), e && t.delete(), n;
+  }
+  /**
+   * OpenDrive坐标转换为WGS84坐标
+   * @param line
+   * @returns
+   */
+  static transformLineProjection(t) {
+    const e = w(), n = e.geoReference, r = e.xOffset, s = e.yOffset;
+    return t.map(
+      (o) => L(n).inverse([o[0] - r, o[1] - s])
+    );
+  }
+  static pointsEqual(t, e) {
+    return Math.abs(t[0] - e[0]) < Number.EPSILON && Math.abs(t[1] - e[1]) < Number.EPSILON;
+  }
+  static getExtensionLine(t, e, n) {
+    const r = a.point(t), s = a.point(e), o = u(r, s);
+    return g(s, n, o, { units: "meters" }).geometry.coordinates;
+  }
 }
 export {
-  s as default
+  i as default
 };

package/es/src/gis-map/utils/holo-flow/trace-holo-flow.d.ts

@@ -3,8 +3,6 @@ export default class TraceHoloFlow {
     private readonly traceRenderer;
     constructor(view: __esri.View);
     init(): Promise<void>;
-    private appDataStore;
-    private logTable;
     downloadLog(): void;
     /**
      * 处理全息流轨迹数据