gisviewer-vue3-arcgis 1.0.153 → 1.0.155

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, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import { IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, 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';
@@ -63,6 +63,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
     toggleTrafficObject: (params: IToggleTrafficInfoParams) => void;
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: IOverlayParam) => Promise<import("../types").IResult>;
+    addMask: (params: IMaskParam) => void;
+    removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;
     removeOverlaysById: (ids: string[]) => import("../types").IResult;
     removeAllOverlays: () => import("../types").IResult;

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

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

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

@@ -52,6 +52,8 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     toggleTrafficObject: (params: import("../types").IToggleTrafficInfoParams) => void;
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: import("../types").IOverlayParam) => Promise<import("../types").IResult>;
+    addMask: (params: import("../types").IMaskParam) => void;
+    removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;
     removeOverlaysById: (ids: string[]) => import("../types").IResult;
     removeAllOverlays: () => import("../types").IResult;

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

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

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

@@ -1,12 +1,14 @@
-import { EVehiclePlateState as l } from "../../../types/index.mjs";
-import a from "./signal-holo-flow.mjs";
-import t from "./trace-holo-flow.mjs";
-class n {
+import { EVehiclePlateState as a } from "../../../types/index.mjs";
+import i from "../../stores/index.mjs";
+import r from "./signal-holo-flow.mjs";
+import s from "./signal-holo-flow-lsr.mjs";
+import n from "./trace-holo-flow.mjs";
+class p {
   constructor(e) {
     this.view = e;
   }
   async init() {
-    this.traceHoloFlow = new t(this.view), await this.traceHoloFlow.init();
+    this.traceHoloFlow = new n(this.view), await this.traceHoloFlow.init();
   }
   /**
    * 处理全息流轨迹数据
@@ -37,25 +39,30 @@ class n {
     this.traceHoloFlow.togglePause(e);
   }
   updatePanelContent(e) {
-    let o = l.None;
+    let o = a.None;
     switch (e) {
       case "none":
-        o = l.None;
+        o = a.None;
         break;
       case "plateNumber":
-        o = l.PlateNumber;
+        o = a.PlateNumber;
         break;
       case "vehicleId":
-        o = l.Id;
+        o = a.Id;
         break;
       case "mix":
-        o = l.Mix;
+        o = a.Mix;
         break;
     }
     this.traceHoloFlow.updatePanelContent(o);
   }
   async handleSignalData(e) {
-    this.signalHoloFlow || (this.signalHoloFlow = new a(this.view), await this.signalHoloFlow.initializeLayer()), await this.signalHoloFlow.handleSignalData(e);
+    var o, l;
+    if (!this.signalHoloFlow) {
+      const t = i.useAppDataStore;
+      ((l = (o = JSON.parse(JSON.stringify(t.mapConfig)).holoFlow) == null ? void 0 : o.signal) == null ? void 0 : l.style) === "LSR" ? this.signalHoloFlow = new s(this.view) : this.signalHoloFlow = new r(this.view), await this.signalHoloFlow.initializeLayer();
+    }
+    await this.signalHoloFlow.handleSignalData(e);
   }
   clearHoloSignal() {
     var e;
@@ -69,5 +76,5 @@ class n {
   }
 }
 export {
-  n as default
+  p as default
 };

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

@@ -0,0 +1,9 @@
+import SignalHoloFlow from './signal-holo-flow';
+export default class LSRSignalHoloFlow extends SignalHoloFlow {
+    private stopLineLayer;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    private stopLineMap;
+    initializeLayer(): Promise<void>;
+    handleSignalData(data: any): Promise<void>;
+    clearSignal(): void;
+}

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

@@ -0,0 +1,43 @@
+import c from "@arcgis/core/Graphic";
+import h from "@arcgis/core/layers/GraphicsLayer";
+import d from "./signal-holo-flow.mjs";
+class f extends d {
+  constructor(e) {
+    super(e), this.stopLineLayer = new h(), this.stopLineMap = /* @__PURE__ */ new Map(), this.view.map.add(this.stopLineLayer);
+  }
+  async initializeLayer() {
+    var s, a;
+    console.time("初始化停止线图层");
+    let e = (a = (s = this.mapConfig.holoFlow) == null ? void 0 : s.signal) == null ? void 0 : a.stopLineLayer;
+    if (!e)
+      return;
+    e = this.mapConfig.assetsRoot + "/" + e;
+    const o = await (await fetch(e)).json();
+    console.log(o.features.length), o.features.forEach((t) => {
+      const { roadId: n, nodeId: r } = t.properties, { coordinates: p } = t.geometry, l = this.stopLineMap.get(r);
+      l ? l.set(n, p) : this.stopLineMap.set(r, /* @__PURE__ */ new Map([[n, p]]));
+    }), console.timeEnd("初始化停止线图层"), console.log(this.stopLineMap.size);
+  }
+  async handleSignalData(e) {
+    const { crossId: i } = e, o = this.stopLineMap.get(i);
+    o && o.forEach((s, a) => {
+      const t = new c({
+        geometry: {
+          type: "polyline",
+          paths: [s]
+        },
+        symbol: {
+          type: "simple-line",
+          color: [255, 0, 0],
+          width: 4
+        }
+      });
+      this.stopLineLayer.add(t);
+    });
+  }
+  clearSignal() {
+  }
+}
+export {
+  f as default
+};

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

@@ -1,7 +1,6 @@
-import View from '@arcgis/core/views/View';
 export default class SignalHoloFlow {
-    private view;
-    private mapConfig;
+    protected view: __esri.MapView | __esri.SceneView;
+    protected mapConfig: any;
     /** 显示停止线的图层 */
     private phaseLineLayer;
     /** 每个路口的当前相位 */
@@ -11,7 +10,7 @@ export default class SignalHoloFlow {
     private countdownWatchHandel;
     private plateBackground;
     private lastDataTime;
-    constructor(view: View);
+    constructor(view: __esri.MapView | __esri.SceneView);
     /**
      * 初始化相位线图层
      * */

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

@@ -11,6 +11,7 @@ export default class OpenDriveRenderer {
     private flashLayer;
     private drawLayer;
     private splitLaneLayer;
+    private borderLayer;
     private allLaneGraphics;
     private allRefLineGraphics;
     private mouseMoveHandler;

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

@@ -3,16 +3,17 @@ import * as j from "@arcgis/core/core/promiseUtils";
 import { Polygon as N } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
 import k from "@arcgis/core/layers/FeatureLayer";
-import v from "@arcgis/core/layers/GraphicsLayer";
+import I from "@arcgis/core/layers/GraphicsLayer";
 import * as G from "@turf/helpers";
 import { lineSliceAlong as C } from "@turf/line-slice-along";
 import b from "axios";
-import $ from "md5";
+import { XMLParser as x } from "fast-xml-parser";
+import F from "md5";
 import O from "pako";
-import { watch as x } from "vue";
+import { watch as P } from "vue";
 import J from "../../stores/index.mjs";
-import P from "../common-utils.mjs";
-class F {
+import E from "../common-utils.mjs";
+class M {
   constructor(e) {
     this.junctionNames = /* @__PURE__ */ new Map(), this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.selectedSectionIds = [], this.currentJunctionId = "", this.view = e, this.laneLayer = new k({
       id: "OpenDriveLane",
@@ -287,7 +288,7 @@ class F {
           }
         }
       ]
-    }), this.junctionLayer = new v({ id: "OpenDriveJunction" }), this.sectionLayer = new v({ id: "OpenDriveSection" }), this.highlightLayer = new v({ id: "OpenDriveHighlight" }), this.flashLayer = new v({ id: "OpenDriveFlash" }), this.drawLayer = new v({ id: "Draw" }), this.splitLaneLayer = new v({ id: "SplitLane" }), this.view.map.addMany([
+    }), 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.laneLayer,
       this.junctionLayer,
       this.sectionLayer,
@@ -295,18 +296,23 @@ class F {
       this.highlightLayer,
       this.flashLayer,
       this.drawLayer,
-      this.splitLaneLayer
+      this.splitLaneLayer,
+      this.borderLayer
     ]);
   }
   static getInstance(e) {
-    return this.instance || (this.instance = new F(e)), this.instance;
+    return this.instance || (this.instance = new M(e)), this.instance;
   }
   async makeMd5FromFile(e) {
+    var t;
     try {
-      const i = await (await fetch(e)).text();
-      return { status: 0, message: "ok", result: $(i) };
-    } catch (t) {
-      return { status: -1, message: t.message };
+      const r = await (await fetch(e)).text(), n = (t = new x({
+        ignoreAttributes: !1,
+        allowBooleanAttributes: !0
+      }).parse(r).OpenDRIVE.userData) == null ? void 0 : t.border;
+      return { status: 0, message: "ok", result: { md5: F(r), border: n } };
+    } catch (i) {
+      return { status: -1, message: i.message };
     }
   }
   /**
@@ -320,7 +326,7 @@ class F {
     const t = await this.makeMd5FromFile(e.file);
     if (t.status !== 0)
       return t;
-    this.projectName = t.result, console.timeEnd("md5用时"), this.openDriveServer = e.server, await this.makeMd5FromFile(e.file);
+    this.projectName = t.result.md5, console.timeEnd("md5用时"), console.log(t.result.border), this.openDriveServer = e.server;
     const i = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
     let r;
     try {
@@ -341,7 +347,7 @@ class F {
       return { status: -1, message: r.statusText };
     console.time("渲染用时");
     const s = r.data.result.geoSetting;
-    P.setGeoData(
+    E.setGeoData(
       s.geoReference,
       s.offsetX,
       s.offsetY
@@ -357,7 +363,7 @@ class F {
     const d = r.data.result.junctions;
     this.showJunction(d), e.options && e.options.centerMap !== !1 && await this.view.goTo(this.allLaneGraphics), this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick();
     const h = J.useAppDataStore;
-    return x(
+    return P(
       () => h.isSketching,
       () => {
         var m, f;
@@ -426,8 +432,8 @@ class F {
             const w = Number(u.id);
             if (w === 0)
               continue;
-            const I = u.type, M = [...u.outerPath], S = u.innerPath.concat(
-              M.reverse()
+            const v = u.type, $ = [...u.outerPath], S = u.innerPath.concat(
+              $.reverse()
             );
             if (S.length <= 3) {
               console.warn(`lane ${w} has less than 3 points`);
@@ -450,7 +456,7 @@ class F {
                   sectionId: String(f),
                   sectionIndex: p,
                   laneId: w,
-                  type: I,
+                  type: v,
                   sumoId: "",
                   // 记录左右边线的起始点，用于按长度高亮车道的一部分
                   leftLine: u.innerPath,
@@ -1021,11 +1027,11 @@ class F {
     const r = Number(i[1]), s = i[0].split("#"), c = s.length === 2 ? Number(s[1]) : 0;
     let n = s[0];
     n.startsWith("-") && (n = n.slice(1));
-    const a = this.allLaneGraphics.filter((I) => I.getAttribute("roadId") === n && I.getAttribute("sectionIndex") === c);
+    const a = this.allLaneGraphics.filter((v) => v.getAttribute("roadId") === n && v.getAttribute("sectionIndex") === c);
     if (a.length === 0)
       return { status: -1, message: "未找到路段" };
     const o = a.length - r, l = a.find(
-      (I) => Math.abs(I.getAttribute("laneId")) === o
+      (v) => Math.abs(v.getAttribute("laneId")) === o
     );
     if (!l)
       return { status: -1, message: "未找到车道" };
@@ -1071,5 +1077,5 @@ class F {
   }
 }
 export {
-  F as default
+  M as default
 };

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

@@ -2,7 +2,7 @@ import Graphic from '@arcgis/core/Graphic';
 import GraphicsLayer from '@arcgis/core/layers/GraphicsLayer';
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
-import { IOverlay, IOverlayParam, IPointSymbol, IResult } from '../../types';
+import { IMaskParam, IOverlay, IOverlayParam, IPointSymbol, IResult } from '../../types';
 interface IOverlayOptions {
     id: string;
 }
@@ -11,6 +11,8 @@ export default class Overlay {
     overlayLayer: GraphicsLayer;
     constructor(view: MapView | SceneView, options?: IOverlayOptions);
     private defaultPointSymbol;
+    addMask(params: IMaskParam): void;
+    removeMask(): void;
     /**
      * 添加覆盖物
      * @param params