gisviewer-vue3-arcgis 1.0.170 → 1.0.172

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 { IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import { IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
 import OpenDriveRenderer from './utils/open-drive-renderer';
@@ -34,9 +34,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
         mapConfig: {};
         saveTrackLog: boolean;
         isSketching: boolean;
-        countdownPanels: import("../types").ISignalCountdownProps[];
+        countdownPanels: ISignalCountdownProps[];
     }, {}, {}>;
-    countdownPanelInfos: import("vue").Ref<{
+    countdownPanelProps: {
         displayMode: string;
         crossId: string;
         roadId: string;
@@ -58,7 +58,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             rNumber?: number | undefined;
             rColor?: string | undefined;
         };
-    }[]>;
+    }[];
     mapViewer: import("vue").ComputedRef<MapView | SceneView>;
     startSaveTrackLog: () => void;
     downloadTrackLog: () => void;

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

@@ -1,29 +1,28 @@
-import { defineComponent as xe, ref as O, onMounted as Be, getCurrentInstance as Pe, onUnmounted as Ve, computed as ze, openBlock as v, createElementBlock as k, createElementVNode as g, withDirectives as Ne, vShow as Qe, Fragment as je, renderList as Ee, unref as Ze, createBlock as $e } from "vue";
-import { storeToRefs as qe } from "pinia";
-import A, { registerStore as Ke } from "./stores/index.mjs";
+import { defineComponent as He, ref as O, reactive as xe, onMounted as Be, getCurrentInstance as Pe, onUnmounted as Ve, computed as ze, openBlock as v, createElementBlock as k, createElementVNode as g, withDirectives as Ne, vShow as Qe, Fragment as je, renderList as Ee, createBlock as Ze } from "vue";
+import A, { registerStore as $e } from "./stores/index.mjs";
 import "./style/index.css";
-import T from "./utils/holo-flow/index.mjs";
-import Re from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
+import qe from "./utils/holo-flow/index.mjs";
+import Ke from "./utils/holo-flow/signal-countdown-panel.vue.mjs";
 import Ue from "./utils/map-initializer.mjs";
 import L from "./utils/open-drive-renderer/index.mjs";
-import D from "./utils/overlay.mjs";
+import T from "./utils/overlay.mjs";
 import Ge from "./utils/queue-length.mjs";
-import b from "./utils/road-config-tool/index.mjs";
-import I from "./utils/signal-control-area-controller/index.mjs";
+import D from "./utils/road-config-tool/index.mjs";
+import b from "./utils/signal-control-area-controller/index.mjs";
 import Je from "./utils/traffic-flow.mjs";
-const We = { class: "gis-viewer" }, Xe = { style: { position: "absolute", bottom: "10px", left: "10px" } }, mt = /* @__PURE__ */ xe({
+const Re = { class: "gis-viewer" }, We = { style: { position: "absolute", bottom: "10px", left: "10px" } }, lt = /* @__PURE__ */ He({
   __name: "gis-map",
   props: {
     config: {},
     assetsRoot: {}
   },
   emits: ["mapLoaded", "markerClick", "mapClick"],
-  setup(M, { expose: _, emit: H }) {
+  setup(I, { expose: M, emit: _ }) {
     const d = O(null);
     let o, l, c, s, a, n, p, t, r;
     const f = O(!1);
-    Ke();
-    const h = A.useAppDataStore, { countdownPanels: x } = qe(h);
+    $e();
+    const H = A.useAppDataStore, h = xe([]);
     Be(async () => {
       if (!d.value)
         return;
@@ -31,153 +30,153 @@ const We = { class: "gis-viewer" }, Xe = { style: { position: "absolute", bottom
         m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
       const e = Pe(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(C.config)).json();
-      i.assetsRoot = C.assetsRoot || u, h.mapConfig = i, l = new Ue(), o = await l.initialize({
+      i.assetsRoot = C.assetsRoot || u, H.mapConfig = i, l = new Ue(), o = await l.initialize({
         container: d.value,
         mapConfig: i,
-        markerClickCallback: (m, y, S, He) => {
-          w("markerClick", m, y, S, He);
+        markerClickCallback: (m, S, w, _e) => {
+          y("markerClick", m, S, w, _e);
         },
-        mapClickCallback: (m, y, S) => {
-          w("mapClick", m, y, S);
+        mapClickCallback: (m, S, w) => {
+          y("mapClick", m, S, w);
         }
-      }), a = new T(o), await a.init(), w("mapLoaded");
+      }), a = new qe(o, h), await a.init(), y("mapLoaded");
     }), Ve(() => {
       r == null || r.clearSignalControlArea(), t == null || t.clearOpenDrive(), a.clearHoloTrace(), a.clearHoloSignal(), s == null || s.disconnectTrafficFlow();
     });
-    const B = ze(() => o), P = () => {
+    const x = ze(() => o), B = () => {
       const e = A.useAppDataStore;
       e.saveTrackLog = !0;
-    }, V = () => {
+    }, P = () => {
       a.downloadTrackLog();
-    }, z = async (e) => await l.setMapCenter(e), N = async (e) => await l.setMapCamera(e), Q = async (e) => await l.lookAt(e), j = (e) => l.setLayerVisibility(e), E = (e, u) => l.requestCoordinateTransform(e, u), Z = (e) => {
+    }, V = async (e) => await l.setMapCenter(e), z = async (e) => await l.setMapCamera(e), N = async (e) => await l.lookAt(e), Q = (e) => l.setLayerVisibility(e), j = (e, u) => l.requestCoordinateTransform(e, u), E = (e) => {
       l.cancelCoordinateTransform(e);
-    }, $ = (e) => {
+    }, Z = (e) => {
       l.setMapZoomRange(e);
-    }, q = (e) => (c || (c = new b(o)), c.showLaneNumber(e)), K = () => {
+    }, $ = (e) => (c || (c = new D(o)), c.showLaneNumber(e)), q = () => {
       c == null || c.clearLaneNumber();
-    }, R = async (e) => (c || (c = new b(o)), await c.initializeSearch(e)), U = async () => c == null ? void 0 : c.calCrossIndicatorArea(), G = async () => {
+    }, K = async (e) => (c || (c = new D(o)), await c.initializeSearch(e)), U = async () => c == null ? void 0 : c.calCrossIndicatorArea(), G = async () => {
     }, J = async (e, u) => {
       s || (s = new Je(o)), s.connectTrafficFlow(e, u);
-    }, W = () => {
+    }, R = () => {
       s == null || s.disconnectTrafficFlow();
-    }, X = async (e) => {
-      a || (a = new T(o), await a.init()), a.handleVehicleTraceData(e);
-    }, Y = () => {
+    }, W = async (e) => {
+      a.handleVehicleTraceData(e);
+    }, X = () => {
       a.clearHoloTrace();
-    }, F = (e) => {
+    }, Y = (e) => {
       a.setInterpolate(e);
-    }, ee = async (e) => {
+    }, F = async (e) => {
       await a.handleSignalData(e);
-    }, te = () => {
+    }, ee = () => {
       a.clearHoloSignal();
-    }, ae = (e) => {
+    }, te = (e) => {
       s == null || s.toggleTrafficInfo(e), a == null || a.toggleTrafficInfo(e);
-    }, ne = (e) => {
+    }, ae = (e) => {
       a == null || a.togglePause(e);
-    }, re = (e) => {
+    }, ne = (e) => {
       s == null || s.toggleTrafficObject(e), a == null || a.toggleTrafficObject(e);
-    }, se = (e) => {
+    }, re = (e) => {
       a == null || a.updatePanelContent(e);
-    }, oe = async (e) => (n || (n = new D(o)), n.addOverlays(e)), ie = (e) => (n || (n = new D(o)), n.addMask(e)), ce = () => {
+    }, se = async (e) => (n || (n = new T(o)), n.addOverlays(e)), oe = (e) => (n || (n = new T(o)), n.addMask(e)), ie = () => {
       n == null || n.removeMask();
-    }, le = (e) => n == null ? void 0 : n.removeOverlaysByType(e), ue = (e) => n == null ? void 0 : n.removeOverlaysById(e), me = () => n == null ? void 0 : n.removeAllOverlays(), pe = () => {
+    }, ce = (e) => n == null ? void 0 : n.removeOverlaysByType(e), le = (e) => n == null ? void 0 : n.removeOverlaysById(e), ue = () => n == null ? void 0 : n.removeAllOverlays(), me = () => {
       n == null || n.showAllOverlays();
-    }, ge = (e) => {
+    }, pe = (e) => {
       p || (p = new Ge(o)), p.updateQueueLength(e);
-    }, de = () => {
+    }, ge = () => {
       p == null || p.removeQueueLength();
-    }, fe = async (e, u) => (t || (t = new L(o)), await t.showOpenDriveFromServer(e, u)), we = async (e) => (t || (t = new L(o)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ye = async () => await (t == null ? void 0 : t.clearOpenDrive()), Se = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
+    }, de = async (e, u) => (t || (t = new L(o)), await t.showOpenDriveFromServer(e, u)), fe = async (e) => (t || (t = new L(o)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), ye = async () => await (t == null ? void 0 : t.clearOpenDrive()), Se = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, ve = async (e) => t ? t.selectSumo(e) : {
+    }, we = async (e) => t ? t.selectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, he = async (e) => t ? t.unselectSumo(e) : {
+    }, ve = async (e) => t ? t.unselectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ce = async (e) => t ? await t.geometrySearch(e) : {
+    }, he = async (e) => t ? await t.geometrySearch(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Oe = async (e) => t ? await t.getSumoInfo(e) : {
+    }, Ce = async (e) => t ? await t.getSumoInfo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, ke = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
+    }, Oe = async (e) => t ? await (t == null ? void 0 : t.splitLane(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ae = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
+    }, ke = async () => t ? t == null ? void 0 : t.clearSplitLane() : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Te = (e) => (r || (r = new I(o)), r.showSignalControlArea(e)), Le = () => {
+    }, Ae = (e) => (r || (r = new b(o)), r.showSignalControlArea(e)), Le = () => {
       r == null || r.clearSignalControlArea();
-    }, De = async (e) => r ? await r.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, be = async (e) => r ? await r.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ie = () => r ? r.resetHighlight() : { status: -1, message: "未加载信号控制区" }, Me = (e) => (r || (r = new I(o)), r.showSubSignalControlArea(e)), _e = () => r ? r.editSubSignalArea() : { status: -1, message: "未加载信号控制区" }, C = M, w = H;
-    return _({
-      mapViewer: B,
-      setLayerVisibility: j,
-      setMapCenter: z,
-      lookAt: Q,
-      setMapCamera: N,
-      setMapZoomRange: $,
-      requestCoordinateTransform: E,
-      cancelCoordinateTransform: Z,
-      addOverlays: oe,
-      addMask: ie,
-      removeMask: ce,
-      showAllOverlays: pe,
-      removeOverlaysByType: le,
-      removeOverlaysById: ue,
-      removeAllOverlays: me,
-      showLaneNumber: q,
-      clearLaneNumber: K,
-      initializeAreaTool: R,
+    }, Te = async (e) => r ? await r.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, De = async (e) => r ? await r.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, be = () => r ? r.resetHighlight() : { status: -1, message: "未加载信号控制区" }, Ie = (e) => (r || (r = new b(o)), r.showSubSignalControlArea(e)), Me = () => r ? r.editSubSignalArea() : { status: -1, message: "未加载信号控制区" }, C = I, y = _;
+    return M({
+      mapViewer: x,
+      setLayerVisibility: Q,
+      setMapCenter: V,
+      lookAt: N,
+      setMapCamera: z,
+      setMapZoomRange: Z,
+      requestCoordinateTransform: j,
+      cancelCoordinateTransform: E,
+      addOverlays: se,
+      addMask: oe,
+      removeMask: ie,
+      showAllOverlays: me,
+      removeOverlaysByType: ce,
+      removeOverlaysById: le,
+      removeAllOverlays: ue,
+      showLaneNumber: $,
+      clearLaneNumber: q,
+      initializeAreaTool: K,
       calCrossIndicatorArea: U,
       calRoadIndicatorArea: G,
       connectCarFlow: J,
-      disconnectCarFlow: W,
-      handleHoloVehicleTraceData: X,
-      clearHoloTrace: Y,
-      handleHoloSignalData: ee,
-      clearHoloSignal: te,
-      setInterpolate: F,
-      toggleTrafficInfo: ae,
-      toggleTrafficObject: re,
-      toggleVehicleInfo: se,
-      togglePause: ne,
-      updateQueueLength: ge,
-      removeQueueLength: de,
-      showOpenDriveFromServer: fe,
-      showOpenDriveFromFile: we,
+      disconnectCarFlow: R,
+      handleHoloVehicleTraceData: W,
+      clearHoloTrace: X,
+      handleHoloSignalData: F,
+      clearHoloSignal: ee,
+      setInterpolate: Y,
+      toggleTrafficInfo: te,
+      toggleTrafficObject: ne,
+      toggleVehicleInfo: re,
+      togglePause: ae,
+      updateQueueLength: pe,
+      removeQueueLength: ge,
+      showOpenDriveFromServer: de,
+      showOpenDriveFromFile: fe,
       clearOpenDrive: ye,
-      geometrySearchInOpenDrive: Ce,
+      geometrySearchInOpenDrive: he,
       findSumoInOpenDrive: Se,
-      selectSumoInOpenDrive: ve,
-      unselectSumoInOpenDrive: he,
-      getSumoInfo: Oe,
-      splitOpenDriveLane: ke,
-      clearSplitOpenDriveLane: Ae,
-      showSignalControlArea: Te,
+      selectSumoInOpenDrive: we,
+      unselectSumoInOpenDrive: ve,
+      getSumoInfo: Ce,
+      splitOpenDriveLane: Oe,
+      clearSplitOpenDriveLane: ke,
+      showSignalControlArea: Ae,
       clearSignalControlArea: Le,
-      locateSignalControlArea: De,
-      highlightSignalControlArea: be,
-      resetHighlightSignalControlArea: Ie,
-      showSubSignalControlArea: Me,
-      editSubSignalControlArea: _e
-    }), (e, u) => (v(), k("div", We, [
+      locateSignalControlArea: Te,
+      highlightSignalControlArea: De,
+      resetHighlightSignalControlArea: be,
+      showSubSignalControlArea: Ie,
+      editSubSignalControlArea: Me
+    }), (e, u) => (v(), k("div", Re, [
       g("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
         ref: d
       }, [
-        Ne(g("div", Xe, [
+        Ne(g("div", We, [
           g("button", {
             style: { "margin-right": "10px" },
-            onClick: P
+            onClick: B
           }, " 开始记录 "),
-          g("button", { onClick: V }, "下载日志")
+          g("button", { onClick: P }, "下载日志")
         ], 512), [
           [Qe, f.value]
         ])
       ], 512),
-      (v(!0), k(je, null, Ee(Ze(x), (i, m) => (v(), $e(Re, {
+      (v(!0), k(je, null, Ee(h, (i, m) => (v(), Ze(Ke, {
         key: m,
         "display-mode": i.displayMode,
         "road-id": i.crossId,
@@ -193,5 +192,5 @@ const We = { class: "gis-viewer" }, Xe = { style: { position: "absolute", bottom
   }
 });
 export {
-  mt as default
+  lt as default
 };

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

@@ -25,7 +25,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         isSketching: boolean;
         countdownPanels: import("../types").ISignalCountdownProps[];
     }, {}, {}>;
-    countdownPanelInfos: import("vue").Ref<{
+    countdownPanelProps: {
         displayMode: string;
         crossId: string;
         roadId: string;
@@ -47,7 +47,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
             rNumber?: number | undefined;
             rColor?: string | undefined;
         };
-    }[]>;
+    }[];
     mapViewer: import("vue").ComputedRef<__esri.MapView | __esri.SceneView>;
     startSaveTrackLog: () => void;
     downloadTrackLog: () => void;

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

@@ -1,9 +1,10 @@
-import { IToggleTrafficInfoParams } from '../../../types';
+import { ISignalCountdownProps, IToggleTrafficInfoParams } from '../../../types';
 export default class Index {
     private readonly view;
     private traceHoloFlow;
     private signalHoloFlow;
-    constructor(view: __esri.MapView | __esri.SceneView);
+    private signalCountdownPanelProps;
+    constructor(view: __esri.MapView | __esri.SceneView, signalCountdownPanelProps: ISignalCountdownProps[]);
     init(): Promise<void>;
     /**
      * 处理全息流轨迹数据

package/es/src/gis-map/utils/holo-flow/index.mjs

@@ -1,12 +1,12 @@
 import { toRaw as i } from "vue";
 import { EVehiclePlateState as a } from "../../../types/index.mjs";
-import r from "../../stores/index.mjs";
+import n from "../../stores/index.mjs";
 import s from "./signal-holo-flow.mjs";
-import n from "./signal-holo-flow-lsr.mjs";
+import r from "./signal-holo-flow-lsr.mjs";
 import c from "./trace-holo-flow.mjs";
 class m {
-  constructor(o) {
-    this.view = o;
+  constructor(o, e) {
+    this.view = o, this.signalCountdownPanelProps = e;
   }
   async init() {
     this.traceHoloFlow = new c(this.view), await this.traceHoloFlow.init();
@@ -60,8 +60,11 @@ class m {
   async handleSignalData(o) {
     var e, l;
     if (!this.signalHoloFlow) {
-      const t = r.useAppDataStore;
-      ((l = (e = i(t.mapConfig).holoFlow) == null ? void 0 : e.signal) == null ? void 0 : l.style) === "LSR" ? this.signalHoloFlow = new n(this.view) : this.signalHoloFlow = new s(this.view), await this.signalHoloFlow.initializeLayer();
+      const t = n.useAppDataStore;
+      ((l = (e = i(t.mapConfig).holoFlow) == null ? void 0 : e.signal) == null ? void 0 : l.style) === "LSR" ? this.signalHoloFlow = new r(
+        this.view,
+        this.signalCountdownPanelProps
+      ) : this.signalHoloFlow = new s(this.view), await this.signalHoloFlow.initializeLayer();
     }
     await this.signalHoloFlow.handleSignalData(o);
   }

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

@@ -1,21 +1,16 @@
+import { ISignalCountdownProps } from '../../../types';
 import SignalHoloFlow from './signal-holo-flow';
 export default class LSRSignalHoloFlow extends SignalHoloFlow {
     private stopLineLayer;
-    private store;
     private watchHandle;
-    constructor(view: __esri.MapView | __esri.SceneView);
+    private countdownPanelProps;
+    constructor(view: __esri.MapView | __esri.SceneView, countdownPanelInfos: ISignalCountdownProps[]);
     private stopLineMap;
     initializeLayer(): Promise<void>;
     private currentPanelScale;
     private getPanelScale;
     handleSignalData(data: any): Promise<void>;
     clearSignal(): void;
-    /**
-     * 从停止线坐标计算面板位置
-     * @param coordinates
-     * @returns
-     */
-    private getPanelPoint;
     /**
      * 从停止线坐标计算面板旋转角度
      * @param coordinates