gisviewer-vue3-arcgis 1.0.258 → 1.0.262

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

@@ -1,19 +1,19 @@
-import g from "@arcgis/core/Graphic";
+import I from "@arcgis/core/Graphic";
 import * as C from "@arcgis/core/core/promiseUtils";
-import * as $ from "@arcgis/core/core/reactiveUtils.js";
-import { Polygon as S, Point as P } from "@arcgis/core/geometry";
+import * as F from "@arcgis/core/core/reactiveUtils.js";
+import { Polygon as S, Point as J } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
 import D from "@arcgis/core/layers/FeatureLayer";
 import w from "@arcgis/core/layers/GraphicsLayer";
-import * as k from "@turf/helpers";
+import * as G from "@turf/helpers";
 import { lineSliceAlong as x } from "@turf/line-slice-along";
-import b from "axios";
-import { XMLParser as F } from "fast-xml-parser";
-import J from "md5";
-import G from "pako";
+import v from "axios";
+import { XMLParser as E } from "fast-xml-parser";
+import B from "md5";
+import M from "pako";
 import { watch as R } from "vue";
-import E from "../../stores/index.mjs";
-import T from "../common-utils.mjs";
+import T from "../../stores/index.mjs";
+import N from "../common-utils.mjs";
 class O {
   constructor(e) {
     this.junctionNames = /* @__PURE__ */ new Map(), this.junctionScale = 5e3, this.xodrBorder = [], this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.selectedSectionIds = [], this.currentJunctionId = "", this.view = e, this.laneLayer = new D({
@@ -73,6 +73,11 @@ class O {
           name: "toNode",
           alias: "终点路口",
           type: "string"
+        },
+        {
+          name: "roadsectBaseIds",
+          alias: "基本段编号",
+          type: "string"
         }
       ],
       objectIdField: "ObjectID",
@@ -305,16 +310,16 @@ class O {
     return this.instance || (this.instance = new O(e)), this.instance;
   }
   async makeMd5FromFile(e) {
-    var t;
+    var i;
     try {
-      const o = await (await fetch(e)).text();
-      let n = (t = new F({
+      const s = await (await fetch(e)).text();
+      let n = (i = new E({
         ignoreAttributes: !1,
         allowBooleanAttributes: !0
-      }).parse(o).OpenDRIVE.userData) == null ? void 0 : t.border;
-      return n ? n = JSON.parse(n) : n = [], { status: 0, message: "ok", result: { md5: J(o), border: n } };
-    } catch (s) {
-      return { status: -1, message: s.message };
+      }).parse(s).OpenDRIVE.userData) == null ? void 0 : i.border;
+      return n ? n = JSON.parse(n) : n = [], { status: 0, message: "ok", result: { md5: B(s), border: n } };
+    } catch (o) {
+      return { status: -1, message: o.message };
     }
   }
   /**
@@ -323,58 +328,64 @@ class O {
    * @returns
    */
   async showOpenDriveFromFile(e) {
-    var y, m, f;
-    this.openDriveClickCallback = e.selectedCallback, this.scaleWatch = $.watch(
+    var d, y, h;
+    this.openDriveClickCallback = e.selectedCallback, this.scaleWatch = F.watch(
       () => this.view.scale,
-      (d, u) => {
-        d > this.junctionScale && u <= this.junctionScale ? this.updateAllJunctionSymbol("marker") : d <= this.junctionScale && u > this.junctionScale && this.updateAllJunctionSymbol("picture");
+      (u, p) => {
+        u > this.junctionScale && p <= this.junctionScale ? this.updateAllJunctionSymbol("marker") : u <= this.junctionScale && p > this.junctionScale && this.updateAllJunctionSymbol("picture");
       }
     );
-    let t = e.file.split("/").pop() || "";
-    t = t.split(".").slice(0, -1).join("."), console.log(`OpenDriveRenderer: 显示OpenDrive文件 ${t}`), this.openDriveServer = e.server;
-    const s = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
-    let o;
+    let i = e.file.split("/").pop() || "";
+    i = i.split(".").slice(0, -1).join("."), this.openDriveServer = e.server;
+    const o = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
+    let s;
     try {
-      o = await b.post(
-        s,
+      s = await v.post(
+        o,
         {},
         {
           params: {
             url: e.file,
-            projectName: t
+            projectName: i
           }
         }
       );
-    } catch (d) {
-      return { status: -1, message: d.message };
+    } catch (u) {
+      return { status: -1, message: u.message };
     }
-    if (o.status !== 200)
-      return { status: -1, message: o.statusText };
+    if (s.status !== 200)
+      return { status: -1, message: s.statusText };
     console.time("渲染用时");
-    const i = o.data.result.geoSetting;
-    T.setGeoData(
-      i.geoReference,
-      i.offsetX,
-      i.offsetY
+    const t = s.data.result.geoSetting;
+    N.setGeoData(
+      t.geoReference,
+      t.offsetX,
+      t.offsetY
     );
-    let c = o.data.result.json;
+    let c = s.data.result.json;
     c.startsWith(window.location.protocol) || (c = `${window.location.protocol}//${e.server}${c}`);
-    const a = await (await fetch(c)).arrayBuffer(), r = G.inflate(a, { to: "string" }), l = JSON.parse(r);
+    const n = await fetch(c);
+    let a;
+    if (c.endsWith("bin")) {
+      const u = await n.arrayBuffer(), p = M.inflate(u, { to: "string" });
+      a = JSON.parse(p);
+    } else
+      a = await n.json();
     if (await this.showAllLanes(
-      l,
-      ((y = e.options) == null ? void 0 : y.showJunctionLane) || !1,
-      ((m = e.options) == null ? void 0 : m.showRoadName) || !0
-    ), ((f = e.options) == null ? void 0 : f.showJunctionPoint) !== !1) {
-      const d = o.data.result.junctions;
-      this.showJunction(d);
+      a,
+      ((d = e.options) == null ? void 0 : d.showJunctionLane) || !1,
+      ((y = e.options) == null ? void 0 : y.showRoadName) || !0
+    ), ((h = e.options) == null ? void 0 : h.showJunctionPoint) !== !1) {
+      const u = s.data.result.junctions;
+      this.showJunction(u);
     }
     e.options && e.options.centerMap !== !1 && await this.view.goTo(this.allLaneGraphics), this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick();
-    const p = E.useAppDataStore;
+    const r = T.useAppDataStore;
     return R(
-      () => p.isSketching,
+      () => r.isSketching,
       () => {
-        var d, u;
-        p.isSketching ? ((d = this.mouseMoveHandler) == null || d.remove(), this.mouseMoveHandler = void 0, (u = this.mouseClickHandler) == null || u.remove(), this.mouseClickHandler = void 0) : (this.monitorMouseMove(), this.monitorMouseClick());
+        var u, p;
+        r.isSketching ? ((u = this.mouseMoveHandler) == null || u.remove(), this.mouseMoveHandler = void 0, (p = this.mouseClickHandler) == null || p.remove(), this.mouseClickHandler = void 0) : (this.monitorMouseMove(), this.monitorMouseClick());
       }
     ), console.timeEnd("渲染用时"), { status: 0, message: "ok" };
   }
@@ -383,22 +394,28 @@ class O {
    * @param server
    * @param projectName
    */
-  async showOpenDriveFromServer(e, t) {
-    const s = `http://${e}/api/openDrive/analyzeXodr`, o = await b.get(s, {
+  async showOpenDriveFromServer(e, i) {
+    const o = `http://${e}/api/openDrive/analyzeXodr`, s = await v.get(o, {
       headers: {
-        projectName: t
+        projectName: i
       },
       params: {
         analyze: !1,
         compressed: !0
       }
     });
-    if (o.status !== 200)
-      throw new Error(`OpenDriveRenderer: ${o.statusText}`);
-    let i = o.data.result.json;
-    i.startsWith(window.location.protocol) || (i = `${window.location.protocol}//${e}${i}`);
-    const n = await (await fetch(i)).arrayBuffer(), a = G.inflate(n, { to: "string" }), r = JSON.parse(a);
-    return console.log(r), await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
+    if (s.status !== 200)
+      throw new Error(`OpenDriveRenderer: ${s.statusText}`);
+    let t = s.data.result.json;
+    t.startsWith(window.location.protocol) || (t = `${window.location.protocol}//${e}${t}`);
+    const c = await fetch(t);
+    let n;
+    if (t.endsWith("bin")) {
+      const a = await c.arrayBuffer(), l = M.inflate(a, { to: "string" });
+      n = JSON.parse(l);
+    } else
+      n = await c.json();
+    return await this.showAllLanes(n, !1, !1), { status: 0, message: "ok" };
   }
   /**
    * 显示所有车道
@@ -407,68 +424,70 @@ class O {
    * @param showRoadName 是否显示道路名称
    * @returns
    */
-  async showAllLanes(e, t, s) {
-    console.log(e);
-    const o = await this.laneLayer.queryFeatures();
-    return o.features.length > 0 && this.laneLayer.applyEdits({
-      deleteFeatures: o.features
-    }), this.roadNameLayer.visible = s, new Promise((i) => {
+  async showAllLanes(e, i, o) {
+    const s = await this.laneLayer.queryFeatures();
+    return s.features.length > 0 && this.laneLayer.applyEdits({
+      deleteFeatures: s.features
+    }), this.roadNameLayer.visible = o, new Promise((t) => {
+      var l;
       let c = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
       const n = [];
       for (const r of e) {
-        if (!t && r.junction !== "-1")
+        if (!i && r.junction !== "-1")
           continue;
-        const { id: l, refLine: h } = r;
-        let p = r.name;
-        p.includes("(") && (p = p.slice(0, p.indexOf("("))), p = p.replace(/(.)/g, "$1 ");
-        const y = new g({
+        const { id: d, refLine: y } = r;
+        let h = r.name;
+        h.includes("(") && (h = h.slice(0, h.indexOf("("))), h = h.replace(/(.)/g, "$1 ");
+        const u = new I({
           geometry: {
             type: "polyline",
-            paths: [h]
+            paths: [y]
           },
           attributes: {
             ObjectID: c++,
-            roadId: l,
-            roadName: p
+            roadId: d,
+            roadName: h
           }
         });
-        this.allRefLineGraphics.push(y), r.laneSections.sort((m, f) => Number(m.id) - Number(f.id));
-        for (let m = 0; m < r.laneSections.length; m++) {
-          const f = r.laneSections[m], d = Number(f.id);
-          for (const u of f.lanePaths) {
-            const v = Number(u.id);
-            if (v === 0)
+        this.allRefLineGraphics.push(u), r.laneSections.sort((p, m) => Number(p.id) - Number(m.id));
+        for (let p = 0; p < r.laneSections.length; p++) {
+          const m = r.laneSections[p], b = Number(m.id);
+          for (const f of m.lanePaths) {
+            const g = Number(f.id);
+            if (g === 0)
               continue;
-            const I = u.type, M = [...u.outerPath], A = u.innerPath.concat(
-              M.reverse()
+            const P = f.type, $ = [...f.outerPath], A = f.innerPath.concat(
+              $.reverse()
             );
             if (A.length <= 3) {
-              console.warn(`lane ${v} has less than 3 points`);
+              console.warn(`lane ${g} has less than 3 points`);
               continue;
             }
-            A.push(u.innerPath[0]);
-            const N = new S({
+            A.push(f.innerPath[0]);
+            const k = new S({
               rings: [A]
             });
-            if (N) {
-              const j = new g({
-                geometry: N,
+            if (k) {
+              const j = new I({
+                geometry: k,
                 attributes: {
                   ObjectID: c++,
-                  id: `${l}+${d}+${v}`,
+                  id: `${d}+${b}+${g}`,
                   fromNode: r.fromNode,
                   toNode: r.toNode,
-                  roadId: String(l),
+                  roadId: String(d),
                   roadName: r.name,
-                  sectionId: String(d),
-                  sectionIndex: m,
-                  laneId: v,
-                  type: I,
+                  sectionId: String(b),
+                  sectionIndex: p,
+                  laneId: g,
+                  type: P,
                   sumoId: "",
                   // 记录左右边线的起始点，用于按长度高亮车道的一部分
-                  leftLine: u.innerPath,
-                  rightLine: u.outerPath
+                  leftLine: f.innerPath,
+                  rightLine: f.outerPath,
+                  // array转为逗号分隔的字符串
+                  roadsectBaseIds: (l = m.roadsectBaseIds) == null ? void 0 : l.toString()
                 }
               });
               this.allLaneGraphics.push(j), n.push(j);
@@ -491,7 +510,7 @@ class O {
             });
           }
         } else
-          clearInterval(a), i();
+          clearInterval(a), t();
       }, 10);
     });
   }
@@ -501,64 +520,64 @@ class O {
    * @returns
    */
   showJunction(e) {
-    const t = [];
-    let s;
-    this.xodrBorder.length > 0 && (s = new S({
+    const i = [];
+    let o;
+    this.xodrBorder.length > 0 && (o = new S({
       rings: [this.xodrBorder]
     }));
-    for (const o of e)
-      if (o && (this.junctionNames.set(o.id, o.name), o.nodeType = o.type, o.crossId)) {
-        const i = new P({
-          x: o.coordinates[0],
-          y: o.coordinates[1]
+    for (const s of e)
+      if (s && (this.junctionNames.set(s.id, s.name), s.nodeType = s.type, s.crossId)) {
+        const t = new J({
+          x: s.coordinates[0],
+          y: s.coordinates[1]
         });
         let c = !0;
-        if (s && (c = L.contains(s, i)), c) {
-          const n = new g({
-            geometry: i,
+        if (o && (c = L.contains(o, t)), c) {
+          const n = new I({
+            geometry: t,
             attributes: {
-              ...o,
+              ...s,
               selected: !1,
               type: "OpenDriveJunction"
             },
-            symbol: this.getCrossGraphicSymbol(o, "marker")
+            symbol: this.getCrossGraphicSymbol(s, "marker")
           });
-          t.push(n);
+          i.push(n);
         }
       }
-    this.junctionLayer.addMany(t);
+    this.junctionLayer.addMany(i);
   }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const e = C.debounce(async (t) => {
+    const e = C.debounce(async (i) => {
       var c;
-      const o = (c = (await this.view.hitTest(t, {
+      const s = (c = (await this.view.hitTest(i, {
         include: [this.laneLayer, this.junctionLayer]
       })).results) == null ? void 0 : c.filter(
         (n) => n.type === "graphic"
       );
-      if (o.length === 0) {
+      if (s.length === 0) {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = ""), this.view.closePopup();
         return;
       }
-      const i = o[0];
-      if (this.hitGraphic = i.graphic, i.layer.id === "OpenDriveLane") {
+      const t = s[0];
+      if (this.hitGraphic = t.graphic, t.layer.id === "OpenDriveLane") {
         const n = `${this.hitGraphic.getAttribute(
           "roadId"
         )}+${this.hitGraphic.getAttribute("sectionId")}`;
         if (this.currentSectionCode === n || this.selectedSectionIds.includes(n) || this.sectionLayer.graphics.findIndex(
-          (d) => d.getAttribute("id") === n
+          (m) => m.getAttribute("id") === n
         ) >= 0)
           return;
         this.currentSectionCode = n;
-        const r = this.allLaneGraphics.filter(
-          (d) => `${d.attributes.roadId}+${d.attributes.sectionId}` === n
-        ), l = L.union(
-          r.map((d) => d.geometry)
-        ), h = this.hitGraphic.getAttribute("fromNode"), p = this.hitGraphic.getAttribute("toNode"), y = this.junctionNames.get(h) || h, m = this.junctionNames.get(p) || p, f = new g({
-          geometry: l,
+        const l = this.allLaneGraphics.filter(
+          (m) => `${m.attributes.roadId}+${m.attributes.sectionId}` === n
+        ), r = L.union(
+          l.map((m) => m.geometry)
+        ), d = this.hitGraphic.getAttribute("fromNode"), y = this.hitGraphic.getAttribute("toNode"), h = this.junctionNames.get(d) || d, u = this.junctionNames.get(y) || y, p = new I({
+          geometry: r,
           symbol: {
             type: "simple-fill",
             color: [0, 255, 255, 0.5],
@@ -572,9 +591,10 @@ class O {
             type: "OpenDriveSection",
             id: n,
             selected: !1,
-            fromNodeName: y,
-            toNodeName: m,
-            laneCount: r.length
+            fromNodeName: h,
+            toNodeName: u,
+            laneCount: l.length,
+            roadsectBaseIds: this.hitGraphic.getAttribute("roadsectBaseIds")
           },
           popupTemplate: {
             title: this.hitGraphic.getAttribute("roadName"),
@@ -599,16 +619,16 @@ class O {
             ]
           }
         });
-        this.highlightLayer.removeAll(), this.highlightLayer.add(f);
-      } else if (i.layer.id === "OpenDriveJunction") {
+        this.highlightLayer.removeAll(), this.highlightLayer.add(p);
+      } else if (t.layer.id === "OpenDriveJunction") {
         const n = this.hitGraphic.getAttribute("id");
         if (n === this.currentJunctionId)
           return;
         this.currentJunctionId = n;
       }
     });
-    this.mouseMoveHandler = this.view.on("pointer-move", async (t) => {
-      e(t).catch(() => {
+    this.mouseMoveHandler = this.view.on("pointer-move", async (i) => {
+      e(i).catch(() => {
       });
     });
   }
@@ -616,71 +636,76 @@ class O {
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = C.debounce(async (t) => {
+    const e = C.debounce(async (i) => {
       var a;
-      const o = (a = (await this.view.hitTest(t, {
+      const s = (a = (await this.view.hitTest(i, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
       })).results) == null ? void 0 : a.filter(
-        (r) => r.type === "graphic"
+        (l) => l.type === "graphic"
       );
-      if (o.length === 0)
+      if (s.length === 0)
         return;
-      const i = o[0].graphic, c = i.getAttribute("type"), n = i.getAttribute("id");
+      const t = s[0].graphic, c = t.getAttribute("type"), n = t.getAttribute("id");
       if (c === "OpenDriveJunction")
-        if (i.getAttribute("selected") === !1) {
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, l = await b.get(r, {
+        if (t.getAttribute("selected") === !1) {
+          const l = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, r = await v.get(l, {
             params: {
               id: n,
               projectName: this.projectName
             }
           });
-          l.status === 200 && l.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
+          r.status === 200 && r.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
             id: n,
-            details: l.data.result
-          }), i.setAttribute("selected", !0), i.symbol = {
+            details: r.data.result
+          }), t.setAttribute("selected", !0), t.symbol = {
             type: "picture-marker",
             url: "/GisViewerAssets/Images/point_red.png",
             width: "20px",
             height: "20px"
-          }, this.increasePictureMarkerSize(i, 50));
+          }, this.increasePictureMarkerSize(t, 50));
         } else
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
             id: n,
             details: void 0
-          }), i.setAttribute("selected", !1), i.symbol = this.getCrossGraphicSymbol(
-            i.attributes,
+          }), t.setAttribute("selected", !1), t.symbol = this.getCrossGraphicSymbol(
+            t.attributes,
             this.view.scale < this.junctionScale ? "picture" : "marker"
           );
-      else if (c === "OpenDriveSection")
-        if (i.layer.id === "OpenDriveHighlight") {
-          this.highlightLayer.remove(i), this.sectionLayer.add(i), i.setAttribute("selected", !0), this.selectedSectionIds.push(n);
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, l = await b.get(r, {
-            params: {
-              id: n,
-              projectName: this.projectName
+      else
+        c === "OpenDriveSection" && (t.layer.id === "OpenDriveHighlight" ? (this.highlightLayer.remove(t), this.sectionLayer.add(t), t.setAttribute("selected", !0), this.selectedSectionIds.push(n), this.splitLaneLayer.graphics.filter(
+          (r) => r.getAttribute("roadsectBaseIds") === t.getAttribute("roadsectBaseIds")
+        ).forEach(
+          (r) => r.symbol = {
+            type: "simple-fill",
+            color: [255, 69, 0],
+            outline: {
+              color: "red",
+              width: 2
             }
-          });
-          if (l.status === 200 && l.data.status === 0 && this.openDriveClickCallback) {
-            const h = l.data.result.obj_id;
-            i.setAttribute("edgeId", h), this.openDriveClickCallback({
-              type: "OpenDriveSection",
-              id: h,
-              details: l.data.result
-            });
           }
-        } else
-          this.sectionLayer.remove(i), this.selectedSectionIds = this.selectedSectionIds.filter(
-            (r) => r !== n
-          ), this.openDriveClickCallback && this.openDriveClickCallback({
-            type: "OpenDriveSection",
-            id: i.getAttribute("edgeId"),
-            details: void 0
-          });
+        )) : (this.splitLaneLayer.graphics.filter(
+          (r) => r.getAttribute("roadsectBaseIds") === t.getAttribute("roadsectBaseIds")
+        ).forEach(
+          (r) => r.symbol = {
+            type: "simple-fill",
+            color: [255, 0, 0, 0.8],
+            outline: {
+              color: "red",
+              width: 1
+            }
+          }
+        ), this.sectionLayer.remove(t), this.selectedSectionIds = this.selectedSectionIds.filter(
+          (r) => r !== n
+        ), this.openDriveClickCallback && this.openDriveClickCallback({
+          type: "OpenDriveSection",
+          id: t.getAttribute("edgeId"),
+          details: void 0
+        })));
     });
-    this.mouseClickHandler = this.view.on("immediate-click", async (t) => {
-      e(t).catch(() => {
+    this.mouseClickHandler = this.view.on("immediate-click", async (i) => {
+      e(i).catch(() => {
       });
     });
   }
@@ -689,15 +714,15 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  increasePictureMarkerSize(e, t) {
-    const s = setInterval(() => {
-      const o = e.symbol, i = o.width;
-      i < t ? e.symbol = {
+  increasePictureMarkerSize(e, i) {
+    const o = setInterval(() => {
+      const s = e.symbol, t = s.width;
+      t < i ? e.symbol = {
         type: "picture-marker",
-        url: o.url,
-        width: i + 1,
-        height: i + 1
-      } : clearInterval(s);
+        url: s.url,
+        width: t + 1,
+        height: t + 1
+      } : clearInterval(o);
     }, 20);
   }
   /**
@@ -705,41 +730,41 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  decreasePictureMarkerSize(e, t) {
-    const s = setInterval(() => {
-      const o = e.symbol, i = o.width;
-      i > t ? e.symbol = {
+  decreasePictureMarkerSize(e, i) {
+    const o = setInterval(() => {
+      const s = e.symbol, t = s.width;
+      t > i ? e.symbol = {
         type: "picture-marker",
-        url: o.url,
-        width: i - 1,
-        height: i - 1
-      } : clearInterval(s);
+        url: s.url,
+        width: t - 1,
+        height: t - 1
+      } : clearInterval(o);
     }, 20);
   }
   async getSumoInfo(e) {
     switch (e.type) {
       case "junction": {
-        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, s = await b.get(t, {
+        const i = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, o = await v.get(i, {
           params: {
             id: e.id,
             projectName: this.projectName
           }
         });
-        return s.status === 200 ? s.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
+        return o.status === 200 ? o.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
       }
       case "edge": {
-        const t = e.id.split("#");
-        let s = t[0];
-        s.startsWith("-") && (s = s.slice(1));
-        let o = 0;
-        t.length === 2 && (o = Number(t[1]));
-        const i = this.allLaneGraphics.find(
-          (c) => c.getAttribute("roadId") === s && c.getAttribute("sectionIndex") === o
+        const i = e.id.split("#");
+        let o = i[0];
+        o.startsWith("-") && (o = o.slice(1));
+        let s = 0;
+        i.length === 2 && (s = Number(i[1]));
+        const t = this.allLaneGraphics.find(
+          (c) => c.getAttribute("roadId") === o && c.getAttribute("sectionIndex") === s
         );
-        if (i) {
-          const c = `${s}+${i.getAttribute(
+        if (t) {
+          const c = `${o}+${t.getAttribute(
             "sectionId"
-          )}`, n = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await b.get(n, {
+          )}`, n = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await v.get(n, {
             params: {
               id: c,
               projectName: this.projectName
@@ -760,13 +785,13 @@ class O {
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var t, s, o;
+    var i, o, s;
     let e = await this.laneLayer.queryFeatures();
     e.features.length > 0 && await this.laneLayer.applyEdits({
       deleteFeatures: e.features
     }), e = await this.roadNameLayer.queryFeatures(), e.features.length > 0 && await this.roadNameLayer.applyEdits({
       deleteFeatures: e.features
-    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.sectionLayer.removeAll(), this.flashLayer.removeAll(), this.borderLayer.removeAll(), (t = this.mouseMoveHandler) == null || t.remove(), this.mouseMoveHandler = void 0, (s = this.mouseClickHandler) == null || s.remove(), this.mouseClickHandler = void 0, (o = this.scaleWatch) == null || o.remove(), this.scaleWatch = void 0;
+    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.sectionLayer.removeAll(), this.flashLayer.removeAll(), this.borderLayer.removeAll(), (i = this.mouseMoveHandler) == null || i.remove(), this.mouseMoveHandler = void 0, (o = this.mouseClickHandler) == null || o.remove(), this.mouseClickHandler = void 0, (s = this.scaleWatch) == null || s.remove(), this.scaleWatch = void 0;
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -774,30 +799,30 @@ class O {
    * @returns
    */
   async findSumo(e) {
-    const { type: t, id: s } = e, o = e.flash === void 0 ? !0 : e.flash;
-    if (t === "junction")
-      return await this.findJunction(s, o);
-    if (t === "edge") {
-      const i = s.split("_");
-      if (i.length > 2)
+    const { type: i, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
+    if (i === "junction")
+      return await this.findJunction(o, s);
+    if (i === "edge") {
+      const t = o.split("_");
+      if (t.length > 2)
         return { status: -1, message: "id格式错误" };
-      const c = i.length === 2 ? Number(i[1]) : void 0, n = i[0].split("#");
+      const c = t.length === 2 ? Number(t[1]) : void 0, n = t[0].split("#");
       if (n.length > 2)
         return { status: -1, message: "id格式错误" };
-      const a = n[0], r = n.length === 2 ? Number(n[1]) : void 0;
-      return await this.findLane({ roadsectId: a, segmentId: r, laneId: c, flash: o });
+      const a = n[0], l = n.length === 2 ? Number(n[1]) : void 0;
+      return await this.findLane({ roadsectId: a, segmentId: l, laneId: c, flash: s });
     } else
       return { status: -1, message: "未知类型" };
   }
-  async findJunction(e, t) {
-    const s = this.junctionLayer.graphics.find(
-      (o) => o.attributes.id === e
+  async findJunction(e, i) {
+    const o = this.junctionLayer.graphics.find(
+      (s) => s.attributes.id === e
     );
-    if (!s)
+    if (!o)
       return { status: -1, message: "未找到。请检查路口编号" };
-    if (t) {
-      const o = new g({
-        geometry: s.geometry,
+    if (i) {
+      const s = new I({
+        geometry: o.geometry,
         symbol: {
           type: "simple-marker",
           style: "circle",
@@ -809,9 +834,9 @@ class O {
           }
         }
       });
-      this.flashGraphic(o);
+      this.flashGraphic(s);
     }
-    return await this.view.goTo(s.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(o.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -819,40 +844,40 @@ class O {
    * @returns
    */
   async findLane(e) {
-    let { roadsectId: t, segmentId: s, laneId: o } = e;
-    t.startsWith("-") && (t = t.slice(1));
-    let i = this.allLaneGraphics.filter(
-      (a) => a.attributes.roadId === t
+    let { roadsectId: i, segmentId: o, laneId: s } = e;
+    i.startsWith("-") && (i = i.slice(1));
+    let t = this.allLaneGraphics.filter(
+      (a) => a.attributes.roadId === i
     );
-    if (i.length === 0)
+    if (t.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
-    if (s !== void 0) {
+    if (o !== void 0) {
       const a = [];
-      if (i.forEach((r) => {
-        const l = Number(r.attributes.sectionId);
-        a.indexOf(l) === -1 && a.push(l);
-      }), a.sort((r, l) => r - l), s > a.length - 1)
+      if (t.forEach((l) => {
+        const r = Number(l.attributes.sectionId);
+        a.indexOf(r) === -1 && a.push(r);
+      }), a.sort((l, r) => l - r), o > a.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
-      s = a[s], i = i.filter(
-        (r) => Number(r.attributes.sectionId) === s
+      o = a[o], t = t.filter(
+        (l) => Number(l.attributes.sectionId) === o
       );
     }
-    if (o !== void 0) {
+    if (s !== void 0) {
       const a = [];
-      if (i.forEach((r) => {
-        const l = Number(r.attributes.laneId);
-        a.indexOf(l) === -1 && a.push(l);
-      }), a.sort((r, l) => r - l), o > a.length - 1)
+      if (t.forEach((l) => {
+        const r = Number(l.attributes.laneId);
+        a.indexOf(r) === -1 && a.push(r);
+      }), a.sort((l, r) => l - r), s > a.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
-      o = a[o], i = i.filter(
-        (r) => Number(r.attributes.laneId) === o
+      s = a[s], t = t.filter(
+        (l) => Number(l.attributes.laneId) === s
       );
     }
-    const c = i.map(
+    const c = t.map(
       (a) => a.geometry
     ), n = L.union(c);
     if (e.flash) {
-      const a = new g({
+      const a = new I({
         geometry: n,
         symbol: {
           type: "simple-fill",
@@ -873,9 +898,9 @@ class O {
    */
   flashGraphic(e) {
     this.flashLayer.removeAll(), this.flashLayer.add(e);
-    let t = 0, s = !0;
-    const o = setInterval(() => {
-      s ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (s = !1, t++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (s = !0)), t >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(o));
+    let i = 0, o = !0;
+    const s = setInterval(() => {
+      o ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (o = !1, i++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (o = !0)), i >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(s));
     }, 10);
   }
   /**
@@ -884,19 +909,19 @@ class O {
    * @returns
    */
   unselectSumo(e) {
-    if ((!e || e.type === "junction") && this.junctionLayer.graphics.forEach((t) => {
-      (!e || !e.id || e.id === "" || e.id === t.getAttribute("id")) && t.getAttribute("selected") && (t.setAttribute("selected", !1), t.symbol = this.getCrossGraphicSymbol(
-        t.attributes,
+    if ((!e || e.type === "junction") && this.junctionLayer.graphics.forEach((i) => {
+      (!e || !e.id || e.id === "" || e.id === i.getAttribute("id")) && i.getAttribute("selected") && (i.setAttribute("selected", !1), i.symbol = this.getCrossGraphicSymbol(
+        i.attributes,
         this.view.scale < this.junctionScale ? "picture" : "marker"
       ));
     }), !e || e.type === "edge") {
-      let t;
-      !e || !e.id || e.id === "" ? t = this.sectionLayer.graphics.toArray() : t = this.sectionLayer.graphics.filter((s) => s.getAttribute("edgeId") === e.id).toArray(), t.length > 0 && (t.forEach((s) => {
-        const o = s.getAttribute("id");
+      let i;
+      !e || !e.id || e.id === "" ? i = this.sectionLayer.graphics.toArray() : i = this.sectionLayer.graphics.filter((o) => o.getAttribute("edgeId") === e.id).toArray(), i.length > 0 && (i.forEach((o) => {
+        const s = o.getAttribute("id");
         this.selectedSectionIds = this.selectedSectionIds.filter(
-          (i) => i !== o
+          (t) => t !== s
         );
-      }), this.sectionLayer.removeMany(t));
+      }), this.sectionLayer.removeMany(i));
     }
     return { status: 0, message: "ok" };
   }
@@ -908,31 +933,31 @@ class O {
   async selectSumo(e) {
     switch (e.type) {
       case "junction":
-        return this.junctionLayer.graphics.forEach((t) => {
-          if (e.id === t.getAttribute("id"))
-            return t.setAttribute("selected", !0), t.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(t, 50), { status: 0, message: "ok" };
+        return this.junctionLayer.graphics.forEach((i) => {
+          if (e.id === i.getAttribute("id"))
+            return i.setAttribute("selected", !0), i.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(i, 50), { status: 0, message: "ok" };
         }), { status: -1, message: "未找到路口" };
       case "edge": {
-        const t = e.id.split("#");
-        let s = String(t[0]);
-        s.startsWith("-") && (s = s.slice(1));
-        let o = 0;
-        t.length === 2 && (o = Number(t[1]));
-        let i = [];
-        if (t.length === 1 ? i = this.allLaneGraphics.filter(
-          (c) => c.getAttribute("roadId") === s
-        ) : t.length === 2 && (i = this.allLaneGraphics.filter(
-          (c) => c.getAttribute("roadId") === s && c.getAttribute("sectionIndex") === o
-        )), i.length > 0) {
+        const i = e.id.split("#");
+        let o = String(i[0]);
+        o.startsWith("-") && (o = o.slice(1));
+        let s = 0;
+        i.length === 2 && (s = Number(i[1]));
+        let t = [];
+        if (i.length === 1 ? t = this.allLaneGraphics.filter(
+          (c) => c.getAttribute("roadId") === o
+        ) : i.length === 2 && (t = this.allLaneGraphics.filter(
+          (c) => c.getAttribute("roadId") === o && c.getAttribute("sectionIndex") === s
+        )), t.length > 0) {
           const c = /* @__PURE__ */ new Map();
-          return i.forEach((n) => {
+          return t.forEach((n) => {
             const a = n.getAttribute("roadId") + "+" + n.getAttribute("sectionId");
             this.selectedSectionIds.includes(a) || this.selectedSectionIds.push(a);
-            let r = c.get(a);
-            r ? r.push(n.geometry) : (r = [n.geometry], c.set(a, r));
+            let l = c.get(a);
+            l ? l.push(n.geometry) : (l = [n.geometry], c.set(a, l));
           }), c.forEach(async (n, a) => {
-            const r = L.union(n), l = new g({
-              geometry: r,
+            const l = L.union(n), r = new I({
+              geometry: l,
               symbol: {
                 type: "simple-fill",
                 color: [0, 255, 255, 0.5],
@@ -949,7 +974,7 @@ class O {
                 selected: !0
               }
             });
-            this.sectionLayer.add(l), await this.view.goTo(l);
+            this.sectionLayer.add(r), await this.view.goTo(r);
           }), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
@@ -959,96 +984,96 @@ class O {
     }
   }
   async geometrySearch(e) {
-    const t = new S({
+    const i = new S({
       rings: [e]
-    }), s = await this.laneLayer.queryFeatures({
-      geometry: t,
+    }), o = await this.laneLayer.queryFeatures({
+      geometry: i,
       outFields: ["*"]
-    }), o = [], i = [];
-    for (const a of s.features) {
-      const r = a.getAttribute("roadId"), l = a.getAttribute("sectionIndex"), h = `${r}#${l}`;
-      if (o.indexOf(h) === -1) {
-        o.push(h), this.selectSumo({
+    }), s = [], t = [];
+    for (const a of o.features) {
+      const l = a.getAttribute("roadId"), r = a.getAttribute("sectionIndex"), d = `${l}#${r}`;
+      if (s.indexOf(d) === -1) {
+        s.push(d), this.selectSumo({
           type: "edge",
-          id: h
+          id: d
         });
-        const p = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, y = await b.get(p, {
+        const y = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, h = await v.get(y, {
           params: {
-            id: `${r}+${a.getAttribute("sectionId")}`,
+            id: `${l}+${a.getAttribute("sectionId")}`,
             projectName: this.projectName
           }
         });
-        y.status === 200 && y.data.status === 0 && i.push(y.data.result);
+        h.status === 200 && h.data.status === 0 && t.push(h.data.result);
       }
     }
     const c = this.junctionLayer.graphics.filter((a) => {
-      const r = a.geometry;
-      return L.contains(t, r);
+      const l = a.geometry;
+      return L.contains(i, l);
     }), n = [];
     for (const a of c) {
-      const r = a.getAttribute("id");
+      const l = a.getAttribute("id");
       this.selectSumo({
         type: "junction",
-        id: r
+        id: l
       });
-      const l = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, h = await b.get(l, {
+      const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, d = await v.get(r, {
         params: {
-          id: r,
+          id: l,
           projectName: this.projectName
         }
       });
-      h.status === 200 && h.data.status === 0 && n.push(h.data.result);
+      d.status === 200 && d.data.status === 0 && n.push(d.data.result);
     }
     return {
       status: 0,
       message: "ok",
       result: {
         junctions: n,
-        edges: i
+        edges: t
       }
     };
   }
   async splitLane(e) {
-    const s = e.id.split("_");
-    if (s.length !== 2)
+    const o = e.id.split("_");
+    if (o.length !== 2)
       return { status: -1, message: "车道编号格式错误" };
-    const o = Number(s[1]), i = s[0].split("#"), c = i.length === 2 ? Number(i[1]) : 0;
-    let n = i[0];
+    const s = Number(o[1]), t = o[0].split("#"), c = t.length === 2 ? Number(t[1]) : 0;
+    let n = t[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((g) => g.getAttribute("roadId") === n && g.getAttribute("sectionIndex") === c);
     if (a.length === 0)
       return { status: -1, message: "未找到路段" };
-    const r = a.length - o, l = a.find(
-      (I) => Math.abs(I.getAttribute("laneId")) === r
+    const l = a.length - s, r = a.find(
+      (g) => Math.abs(g.getAttribute("laneId")) === l
     );
-    if (!l)
+    if (!r)
       return { status: -1, message: "未找到车道" };
-    const h = e.start || 0, p = e.end || 100, y = k.lineString(l.getAttribute("leftLine")), m = x(y, h, p, {
+    const d = e.start || 0, y = e.end || 100, h = G.lineString(r.getAttribute("leftLine")), u = x(h, d, y, {
       units: "meters"
-    }), f = k.lineString(l.getAttribute("rightLine")), d = x(f, h, p, {
+    }), p = G.lineString(r.getAttribute("rightLine")), m = x(p, d, y, {
       units: "meters"
-    }), u = m.geometry.coordinates.concat(
-      d.geometry.coordinates.reverse()
+    }), b = u.geometry.coordinates.concat(
+      m.geometry.coordinates.reverse()
     );
-    u.push(u[u.length - 1]);
-    const v = new g({
+    b.push(b[b.length - 1]);
+    const f = new I({
       geometry: new S({
-        rings: [u]
+        rings: [b]
       }),
       attributes: {
-        ObjectID: l.getAttribute("ObjectID"),
-        id: l.getAttribute("id"),
-        fromNode: l.getAttribute("fromNode"),
-        toNode: l.getAttribute("toNode"),
-        roadId: l.getAttribute("roadId"),
-        roadName: l.getAttribute("roadName"),
-        sectionId: l.getAttribute("sectionId"),
-        sectionIndex: l.getAttribute("sectionIndex"),
-        laneId: l.getAttribute("laneId"),
-        type: l.getAttribute("type"),
-        sumoId: l.getAttribute("sumoId"),
-        leftLine: m.geometry.coordinates,
-        rightLine: d.geometry.coordinates
+        ObjectID: r.getAttribute("ObjectID"),
+        id: r.getAttribute("id"),
+        fromNode: r.getAttribute("fromNode"),
+        toNode: r.getAttribute("toNode"),
+        roadId: r.getAttribute("roadId"),
+        roadName: r.getAttribute("roadName"),
+        sectionId: r.getAttribute("sectionId"),
+        sectionIndex: r.getAttribute("sectionIndex"),
+        laneId: r.getAttribute("laneId"),
+        type: r.getAttribute("type"),
+        sumoId: r.getAttribute("sumoId"),
+        leftLine: u.geometry.coordinates,
+        rightLine: m.geometry.coordinates
       },
       symbol: {
         type: "simple-fill",
@@ -1058,7 +1083,23 @@ class O {
         }
       }
     });
-    return this.splitLaneLayer.add(v), this.view.goTo(v), { status: 0, message: "ok", result: { coordinates: u } };
+    return this.splitLaneLayer.add(f), N.viewGoto(this.view, [f]), { status: 0, message: "ok", result: { coordinates: b } };
+  }
+  blockOpenDriveLane(e) {
+    const o = this.allLaneGraphics.filter((s) => {
+      let t = String(s.getAttribute("laneId"));
+      return t.startsWith("-") && (t = t.slice(1)), s.getAttribute("roadId") === e.roadsectId && s.getAttribute("roadsectBaseIds").includes(e.roadsectBaseId) && t === String(e.laneId);
+    }).map((s) => {
+      const t = s.clone();
+      return t.symbol = {
+        type: "simple-fill",
+        color: [255, 0, 0, 0.8],
+        outline: {
+          color: "red"
+        }
+      }, t;
+    });
+    this.splitLaneLayer.addMany(o), N.viewGoto(this.view, o);
   }
   clearSplitLane() {
     this.splitLaneLayer.removeAll();
@@ -1068,13 +1109,13 @@ class O {
    * @param symbolStyle
    */
   updateAllJunctionSymbol(e) {
-    const t = this.junctionLayer.graphics.clone();
-    this.junctionLayer.removeAll(), t.forEach((s) => {
-      s.getAttribute("selected") || (s.symbol = this.getCrossGraphicSymbol(
-        s.attributes,
+    const i = this.junctionLayer.graphics.clone();
+    this.junctionLayer.removeAll(), i.forEach((o) => {
+      o.getAttribute("selected") || (o.symbol = this.getCrossGraphicSymbol(
+        o.attributes,
         e
       ));
-    }), this.junctionLayer.addMany(t.toArray());
+    }), this.junctionLayer.addMany(i.toArray());
   }
   /**
    * 生成路口点符号。在不同比例尺下，使用不同的符号
@@ -1082,17 +1123,17 @@ class O {
    * @param symbolType
    * @returns
    */
-  getCrossGraphicSymbol(e, t) {
-    const s = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
-    if (t === "marker")
+  getCrossGraphicSymbol(e, i) {
+    const o = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
+    if (i === "marker")
       return {
         type: "picture-marker",
-        url: `/GisViewerAssets/Images/cross/${s ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
+        url: `/GisViewerAssets/Images/cross/${o ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
         width: "32px",
         height: "32px"
       };
-    if (t === "picture")
-      return s ? {
+    if (i === "picture")
+      return o ? {
         type: "cim",
         data: {
           type: "CIMSymbolReference",
@@ -1130,7 +1171,7 @@ class O {
                       height: 12,
                       horizontalAlignment: "Center",
                       offsetX: 0,
-                      offsetY: s ? 25 : 15,
+                      offsetY: o ? 25 : 15,
                       haloSize: 2,
                       haloSymbol: {
                         type: "CIMPolygonSymbol",