gisviewer-vue3-arcgis 1.0.263 → 1.0.265

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

@@ -1,5 +1,5 @@
 import I from "@arcgis/core/Graphic";
-import * as C from "@arcgis/core/core/promiseUtils";
+import * as j from "@arcgis/core/core/promiseUtils";
 import * as $ from "@arcgis/core/core/reactiveUtils.js";
 import { Polygon as S, Point as F } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
@@ -310,13 +310,13 @@ class O {
     return this.instance || (this.instance = new O(e)), this.instance;
   }
   async makeMd5FromFile(e) {
-    var t;
+    var i;
     try {
       const s = await (await fetch(e)).text();
-      let r = (t = new J({
+      let r = (i = new J({
         ignoreAttributes: !1,
         allowBooleanAttributes: !0
-      }).parse(s).OpenDRIVE.userData) == null ? void 0 : t.border;
+      }).parse(s).OpenDRIVE.userData) == null ? void 0 : i.border;
       return r ? r = JSON.parse(r) : r = [], { status: 0, message: "ok", result: { md5: E(s), border: r } };
     } catch (o) {
       return { status: -1, message: o.message };
@@ -335,8 +335,8 @@ class O {
         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("."), this.openDriveServer = e.server;
+    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 {
@@ -346,7 +346,7 @@ class O {
         {
           params: {
             url: e.file,
-            projectName: t
+            projectName: i
           }
         }
       );
@@ -356,11 +356,11 @@ class O {
     if (s.status !== 200)
       return { status: -1, message: s.statusText };
     console.time("渲染用时");
-    const i = s.data.result.geoSetting;
+    const t = s.data.result.geoSetting;
     A.setGeoData(
-      i.geoReference,
-      i.offsetX,
-      i.offsetY
+      t.geoReference,
+      t.offsetX,
+      t.offsetY
     );
     let l = s.data.result.json;
     l.startsWith(window.location.protocol) || (l = `${window.location.protocol}//${e.server}${l}`);
@@ -394,10 +394,10 @@ class O {
    * @param server
    * @param projectName
    */
-  async showOpenDriveFromServer(e, t) {
+  async showOpenDriveFromServer(e, i) {
     const o = `http://${e}/api/openDrive/analyzeXodr`, s = await w.get(o, {
       headers: {
-        projectName: t
+        projectName: i
       },
       params: {
         analyze: !1,
@@ -406,11 +406,11 @@ class O {
     });
     if (s.status !== 200)
       throw new Error(`OpenDriveRenderer: ${s.statusText}`);
-    let i = s.data.result.json;
-    i.startsWith(window.location.protocol) || (i = `${window.location.protocol}//${e}${i}`);
-    const l = await fetch(i);
+    let t = s.data.result.json;
+    t.startsWith(window.location.protocol) || (t = `${window.location.protocol}//${e}${t}`);
+    const l = await fetch(t);
     let r;
-    if (i.endsWith("bin")) {
+    if (t.endsWith("bin")) {
       const a = await l.arrayBuffer(), c = M.inflate(a, { to: "string" });
       r = JSON.parse(c);
     } else
@@ -424,17 +424,17 @@ class O {
    * @param showRoadName 是否显示道路名称
    * @returns
    */
-  async showAllLanes(e, t, o) {
+  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((i) => {
+    }), this.roadNameLayer.visible = o, new Promise((t) => {
       var c;
       let l = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
       const r = [];
       for (const n of e) {
-        if (!t && n.junction !== "-1")
+        if (!i && n.junction !== "-1")
           continue;
         const { id: d, refLine: y } = n;
         let h = n.name;
@@ -457,20 +457,20 @@ class O {
             const b = Number(f.id);
             if (b === 0)
               continue;
-            const B = f.type, P = [...f.outerPath], N = f.innerPath.concat(
+            const B = f.type, P = [...f.outerPath], k = f.innerPath.concat(
               P.reverse()
             );
-            if (N.length <= 3) {
+            if (k.length <= 3) {
               console.warn(`lane ${b} has less than 3 points`);
               continue;
             }
-            N.push(f.innerPath[0]);
-            const k = new S({
-              rings: [N]
+            k.push(f.innerPath[0]);
+            const N = new S({
+              rings: [k]
             });
-            if (k) {
-              const j = new I({
-                geometry: k,
+            if (N) {
+              const C = new I({
+                geometry: N,
                 attributes: {
                   ObjectID: l++,
                   id: `${d}+${m}+${b}`,
@@ -490,7 +490,7 @@ class O {
                   roadsectBaseIds: (c = g.roadsectBaseIds) == null ? void 0 : c.toString()
                 }
               });
-              this.allLaneGraphics.push(j), r.push(j);
+              this.allLaneGraphics.push(C), r.push(C);
             }
           }
         }
@@ -510,7 +510,7 @@ class O {
             });
           }
         } else
-          clearInterval(a), i();
+          clearInterval(a), t();
       }, 10);
     });
   }
@@ -520,21 +520,21 @@ class O {
    * @returns
    */
   showJunction(e) {
-    const t = [];
+    const i = [];
     let o;
     this.xodrBorder.length > 0 && (o = new S({
       rings: [this.xodrBorder]
     }));
     for (const s of e)
       if (s && (this.junctionNames.set(s.id, s.name), s.nodeType = s.type, s.crossId)) {
-        const i = new F({
+        const t = new F({
           x: s.coordinates[0],
           y: s.coordinates[1]
         });
         let l = !0;
-        if (o && (l = L.contains(o, i)), l) {
+        if (o && (l = L.contains(o, t)), l) {
           const r = new I({
-            geometry: i,
+            geometry: t,
             attributes: {
               ...s,
               selected: !1,
@@ -542,18 +542,18 @@ class O {
             },
             symbol: this.getCrossGraphicSymbol(s, "marker")
           });
-          t.push(r);
+          i.push(r);
         }
       }
-    this.junctionLayer.addMany(t);
+    this.junctionLayer.addMany(i);
   }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const e = C.debounce(async (t) => {
+    const e = j.debounce(async (i) => {
       var l;
-      const s = (l = (await this.view.hitTest(t, {
+      const s = (l = (await this.view.hitTest(i, {
         include: [this.laneLayer, this.junctionLayer]
       })).results) == null ? void 0 : l.filter(
         (r) => r.type === "graphic"
@@ -562,8 +562,8 @@ class O {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = ""), this.view.closePopup();
         return;
       }
-      const i = s[0];
-      if (this.hitGraphic = i.graphic, i.layer.id === "OpenDriveLane") {
+      const t = s[0];
+      if (this.hitGraphic = t.graphic, t.layer.id === "OpenDriveLane") {
         const r = `${this.hitGraphic.getAttribute(
           "roadId"
         )}+${this.hitGraphic.getAttribute("sectionId")}`, a = this.hitGraphic.getAttribute("roadsectBaseIds");
@@ -594,7 +594,8 @@ class O {
             fromNodeName: u,
             toNodeName: p,
             laneCount: n.length,
-            roadsectBaseIds: this.hitGraphic.getAttribute("roadsectBaseIds")
+            roadsectBaseIds: this.hitGraphic.getAttribute("roadsectBaseIds"),
+            roadId: this.hitGraphic.getAttribute("roadId")
           },
           popupTemplate: {
             title: this.hitGraphic.getAttribute("roadName"),
@@ -620,15 +621,15 @@ class O {
           }
         });
         this.highlightLayer.removeAll(), this.highlightLayer.add(g);
-      } else if (i.layer.id === "OpenDriveJunction") {
+      } else if (t.layer.id === "OpenDriveJunction") {
         const r = this.hitGraphic.getAttribute("id");
         if (r === this.currentJunctionId)
           return;
         this.currentJunctionId = r;
       }
     });
-    this.mouseMoveHandler = this.view.on("pointer-move", async (t) => {
-      e(t).catch(() => {
+    this.mouseMoveHandler = this.view.on("pointer-move", async (i) => {
+      e(i).catch(() => {
       });
     });
   }
@@ -636,18 +637,18 @@ class O {
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = C.debounce(async (t) => {
+    const e = j.debounce(async (i) => {
       var a;
-      const s = (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(
         (c) => c.type === "graphic"
       );
       if (s.length === 0)
         return;
-      const i = s[0].graphic, l = i.getAttribute("type"), r = i.getAttribute("id");
+      const t = s[0].graphic, l = t.getAttribute("type"), r = t.getAttribute("id");
       if (l === "OpenDriveJunction")
-        if (i.getAttribute("selected") === !1) {
+        if (t.getAttribute("selected") === !1) {
           const c = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, n = await w.get(c, {
             params: {
               id: r,
@@ -658,24 +659,24 @@ class O {
             type: "OpenDriveJunction",
             id: r,
             details: n.data.result
-          }), i.setAttribute("selected", !0), i.symbol = {
+          }), 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: r,
             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
-        l === "OpenDriveSection" && (i.layer.id === "OpenDriveHighlight" ? (this.highlightLayer.removeAll(), this.sectionLayer.removeAll(), this.selectedSectionIds = [], this.sectionLayer.add(i), i.setAttribute("selected", !0), this.selectedSectionIds.push(r), this.splitLaneLayer.graphics.filter(
-          (n) => n.getAttribute("roadsectBaseIds") === i.getAttribute("roadsectBaseIds")
+        l === "OpenDriveSection" && (t.layer.id === "OpenDriveHighlight" ? (this.highlightLayer.removeAll(), this.sectionLayer.removeAll(), this.selectedSectionIds = [], this.sectionLayer.add(t), t.setAttribute("selected", !0), this.selectedSectionIds.push(r), this.splitLaneLayer.graphics.filter(
+          (n) => n.getAttribute("roadsectBaseIds") === t.getAttribute("roadsectBaseIds")
         ).forEach(
           (n) => n.symbol = {
             type: "simple-fill",
@@ -685,8 +686,15 @@ class O {
               width: 2
             }
           }
-        )) : (this.splitLaneLayer.graphics.filter(
-          (n) => n.getAttribute("roadsectBaseIds") === i.getAttribute("roadsectBaseIds")
+        ), this.openDriveClickCallback && this.openDriveClickCallback({
+          type: "OpenDriveSection",
+          id: t.getAttribute("id"),
+          details: {
+            roadsectId: t.getAttribute("roadId"),
+            roadsectBaseIds: t.getAttribute("roadsectBaseIds")
+          }
+        })) : (this.splitLaneLayer.graphics.filter(
+          (n) => n.getAttribute("roadsectBaseIds") === t.getAttribute("roadsectBaseIds")
         ).forEach(
           (n) => n.symbol = {
             type: "simple-fill",
@@ -696,14 +704,17 @@ class O {
               width: 1
             }
           }
-        ), this.sectionLayer.remove(i), this.selectedSectionIds = [], this.openDriveClickCallback && this.openDriveClickCallback({
-          type: "OpenDriveSection",
-          id: i.getAttribute("edgeId"),
-          details: void 0
+        ), this.sectionLayer.remove(t), this.selectedSectionIds = [], this.openDriveClickCallback && this.openDriveClickCallback({
+          type: "CloseOpenDriveSection",
+          id: t.getAttribute("roadsectBaseIds"),
+          details: {
+            roadsectId: t.getAttribute("roadId"),
+            roadsectBaseIds: t.getAttribute("roadsectBaseIds")
+          }
         })));
     });
-    this.mouseClickHandler = this.view.on("immediate-click", async (t) => {
-      e(t).catch(() => {
+    this.mouseClickHandler = this.view.on("immediate-click", async (i) => {
+      e(i).catch(() => {
       });
     });
   }
@@ -712,14 +723,14 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  increasePictureMarkerSize(e, t) {
+  increasePictureMarkerSize(e, i) {
     const o = setInterval(() => {
-      const s = e.symbol, i = s.width;
-      i < t ? e.symbol = {
+      const s = e.symbol, t = s.width;
+      t < i ? e.symbol = {
         type: "picture-marker",
         url: s.url,
-        width: i + 1,
-        height: i + 1
+        width: t + 1,
+        height: t + 1
       } : clearInterval(o);
     }, 20);
   }
@@ -728,21 +739,21 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  decreasePictureMarkerSize(e, t) {
+  decreasePictureMarkerSize(e, i) {
     const o = setInterval(() => {
-      const s = e.symbol, i = s.width;
-      i > t ? e.symbol = {
+      const s = e.symbol, t = s.width;
+      t > i ? e.symbol = {
         type: "picture-marker",
         url: s.url,
-        width: i - 1,
-        height: i - 1
+        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`, o = await w.get(t, {
+        const i = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, o = await w.get(i, {
           params: {
             id: e.id,
             projectName: this.projectName
@@ -751,16 +762,16 @@ class O {
         return o.status === 200 ? o.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
       }
       case "edge": {
-        const t = e.id.split("#");
-        let o = t[0];
+        const i = e.id.split("#");
+        let o = i[0];
         o.startsWith("-") && (o = o.slice(1));
         let s = 0;
-        t.length === 2 && (s = Number(t[1]));
-        const i = this.allLaneGraphics.find(
+        i.length === 2 && (s = Number(i[1]));
+        const t = this.allLaneGraphics.find(
           (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
         );
-        if (i) {
-          const l = `${o}+${i.getAttribute(
+        if (t) {
+          const l = `${o}+${t.getAttribute(
             "sectionId"
           )}`, r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await w.get(r, {
             params: {
@@ -783,13 +794,13 @@ class O {
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var t, o, s;
+    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, (o = this.mouseClickHandler) == null || o.remove(), this.mouseClickHandler = void 0, (s = this.scaleWatch) == null || s.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定位车道、基本段、路段
@@ -797,14 +808,14 @@ class O {
    * @returns
    */
   async findSumo(e) {
-    const { type: t, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
-    if (t === "junction")
+    const { type: i, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
+    if (i === "junction")
       return await this.findJunction(o, s);
-    if (t === "edge") {
-      const i = o.split("_");
-      if (i.length > 2)
+    if (i === "edge") {
+      const t = o.split("_");
+      if (t.length > 2)
         return { status: -1, message: "id格式错误" };
-      const l = i.length === 2 ? Number(i[1]) : void 0, r = i[0].split("#");
+      const l = t.length === 2 ? Number(t[1]) : void 0, r = t[0].split("#");
       if (r.length > 2)
         return { status: -1, message: "id格式错误" };
       const a = r[0], c = r.length === 2 ? Number(r[1]) : void 0;
@@ -812,13 +823,13 @@ class O {
     } else
       return { status: -1, message: "未知类型" };
   }
-  async findJunction(e, t) {
+  async findJunction(e, i) {
     const o = this.junctionLayer.graphics.find(
       (s) => s.attributes.id === e
     );
     if (!o)
       return { status: -1, message: "未找到。请检查路口编号" };
-    if (t) {
+    if (i) {
       const s = new I({
         geometry: o.geometry,
         symbol: {
@@ -842,36 +853,36 @@ class O {
    * @returns
    */
   async findLane(e) {
-    let { roadsectId: t, segmentId: o, laneId: s } = 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 (o !== void 0) {
       const a = [];
-      if (i.forEach((c) => {
+      if (t.forEach((c) => {
         const n = Number(c.attributes.sectionId);
         a.indexOf(n) === -1 && a.push(n);
       }), a.sort((c, n) => c - n), o > a.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
-      o = a[o], i = i.filter(
+      o = a[o], t = t.filter(
         (c) => Number(c.attributes.sectionId) === o
       );
     }
     if (s !== void 0) {
       const a = [];
-      if (i.forEach((c) => {
+      if (t.forEach((c) => {
         const n = Number(c.attributes.laneId);
         a.indexOf(n) === -1 && a.push(n);
       }), a.sort((c, n) => c - n), s > a.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
-      s = a[s], i = i.filter(
+      s = a[s], t = t.filter(
         (c) => Number(c.attributes.laneId) === s
       );
     }
-    const l = i.map(
+    const l = t.map(
       (a) => a.geometry
     ), r = L.union(l);
     if (e.flash) {
@@ -896,9 +907,9 @@ class O {
    */
   flashGraphic(e) {
     this.flashLayer.removeAll(), this.flashLayer.add(e);
-    let t = 0, o = !0;
+    let i = 0, o = !0;
     const s = setInterval(() => {
-      o ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (o = !1, t++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (o = !0)), t >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(s));
+      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);
   }
   /**
@@ -907,19 +918,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"
       ));
     }) : (this.highlightLayer.removeAll(), this.sectionLayer.removeAll(), this.selectedSectionIds = [], this.splitLaneLayer.removeAll()), !e || e.type === "edge") {
-      let t;
-      !e || !e.id || e.id === "" ? t = this.sectionLayer.graphics.toArray() : t = this.sectionLayer.graphics.filter((o) => o.getAttribute("edgeId") === e.id).toArray(), t.length > 0 && (t.forEach((o) => {
+      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 !== s
+          (t) => t !== s
         );
-      }), this.sectionLayer.removeMany(t));
+      }), this.sectionLayer.removeMany(i));
     }
     return { status: 0, message: "ok" };
   }
@@ -931,24 +942,24 @@ 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 o = String(t[0]);
+        const i = e.id.split("#");
+        let o = String(i[0]);
         o.startsWith("-") && (o = o.slice(1));
         let s = 0;
-        t.length === 2 && (s = Number(t[1]));
-        let i = [];
-        if (t.length === 1 ? i = this.allLaneGraphics.filter(
+        i.length === 2 && (s = Number(i[1]));
+        let t = [];
+        if (i.length === 1 ? t = this.allLaneGraphics.filter(
           (l) => l.getAttribute("roadId") === o
-        ) : t.length === 2 && (i = this.allLaneGraphics.filter(
+        ) : i.length === 2 && (t = this.allLaneGraphics.filter(
           (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
-        )), i.length > 0) {
+        )), t.length > 0) {
           const l = /* @__PURE__ */ new Map();
-          return i.forEach((r) => {
+          return t.forEach((r) => {
             const a = r.getAttribute("roadId") + "+" + r.getAttribute("sectionId");
             this.selectedSectionIds.includes(a) || this.selectedSectionIds.push(a);
             let c = l.get(a);
@@ -982,12 +993,12 @@ class O {
     }
   }
   async geometrySearch(e) {
-    const t = new S({
+    const i = new S({
       rings: [e]
     }), o = await this.laneLayer.queryFeatures({
-      geometry: t,
+      geometry: i,
       outFields: ["*"]
-    }), s = [], i = [];
+    }), s = [], t = [];
     for (const a of o.features) {
       const c = a.getAttribute("roadId"), n = a.getAttribute("sectionIndex"), d = `${c}#${n}`;
       if (s.indexOf(d) === -1) {
@@ -1001,12 +1012,12 @@ class O {
             projectName: this.projectName
           }
         });
-        h.status === 200 && h.data.status === 0 && i.push(h.data.result);
+        h.status === 200 && h.data.status === 0 && t.push(h.data.result);
       }
     }
     const l = this.junctionLayer.graphics.filter((a) => {
       const c = a.geometry;
-      return L.contains(t, c);
+      return L.contains(i, c);
     }), r = [];
     for (const a of l) {
       const c = a.getAttribute("id");
@@ -1027,7 +1038,7 @@ class O {
       message: "ok",
       result: {
         junctions: r,
-        edges: i
+        edges: t
       }
     };
   }
@@ -1040,8 +1051,8 @@ class O {
     const o = e.id.split("_");
     if (o.length !== 2)
       return { status: -1, message: "车道编号格式错误" };
-    const s = Number(o[1]), i = o[0].split("#"), l = i.length === 2 ? Number(i[1]) : 0;
-    let r = i[0];
+    const s = Number(o[1]), t = o[0].split("#"), l = t.length === 2 ? Number(t[1]) : 0;
+    let r = t[0];
     r.startsWith("-") && (r = r.slice(1));
     const a = this.allLaneGraphics.filter((b) => b.getAttribute("roadId") === r && b.getAttribute("sectionIndex") === l);
     if (a.length === 0)
@@ -1093,27 +1104,27 @@ class O {
    * @param params
    */
   blockLane(e) {
-    const t = this.allLaneGraphics.filter((s) => {
+    const i = this.allLaneGraphics.filter((s) => {
       var l;
-      let i = String(s.getAttribute("laneId"));
-      return i.startsWith("-") && (i = i.slice(1)), s.getAttribute("roadId") === e.roadsectId && ((l = s.getAttribute("roadsectBaseIds")) == null ? void 0 : l.includes(e.roadsectBaseId)) && i === String(e.laneId);
-    }), o = t.map((s) => {
-      const i = s.clone();
+      let t = String(s.getAttribute("laneId"));
+      return t.startsWith("-") && (t = t.slice(1)), s.getAttribute("roadId") === e.roadsectId && ((l = s.getAttribute("roadsectBaseIds")) == null ? void 0 : l.includes(e.roadsectBaseId)) && t === String(e.laneId);
+    }), o = i.map((s) => {
+      const t = s.clone();
       return console.log(
-        t[0].getAttribute("roadsectBaseIds"),
+        i[0].getAttribute("roadsectBaseIds"),
         this.selectedSectionIds,
         this.selectedSectionIds.includes(
-          t[0].getAttribute("roadsectBaseIds")
+          i[0].getAttribute("roadsectBaseIds")
         )
-      ), i.symbol = {
+      ), t.symbol = {
         type: "simple-fill",
         color: this.selectedSectionIds.includes(
-          t[0].getAttribute("roadsectBaseIds")
+          i[0].getAttribute("roadsectBaseIds")
         ) ? [255, 69, 0, 0.8] : [255, 0, 0, 0.8],
         outline: {
           color: "red"
         }
-      }, i;
+      }, t;
     });
     this.splitLaneLayer.addMany(o), A.viewGoto(this.view, o);
   }
@@ -1125,14 +1136,14 @@ class O {
       this.allLaneGraphics.forEach((o) => {
         o.getAttribute("roadsectBaseIds") || console.log(o.attributes);
       });
-      const t = this.allLaneGraphics.filter((o) => {
+      const i = this.allLaneGraphics.filter((o) => {
         var s;
         return (s = o.getAttribute("roadsectBaseIds")) == null ? void 0 : s.includes(e.id);
       });
-      if (t.length > 0) {
+      if (i.length > 0) {
         const o = L.union(
-          t.map((r) => r.geometry)
-        ), s = t[0].getAttribute("roadsectBaseIds"), i = new I({
+          i.map((r) => r.geometry)
+        ), s = i[0].getAttribute("roadsectBaseIds"), t = new I({
           geometry: o,
           symbol: {
             type: "simple-fill",
@@ -1148,7 +1159,7 @@ class O {
             roadsectBaseIds: s
           }
         });
-        this.sectionLayer.removeAll(), this.sectionLayer.add(i), A.viewGoto(this.view, [i]), this.selectedSectionIds = [s];
+        this.sectionLayer.removeAll(), this.sectionLayer.add(t), A.viewGoto(this.view, [t]), this.selectedSectionIds = [s];
         const l = this.splitLaneLayer.graphics.filter(
           (r) => {
             var a;
@@ -1173,13 +1184,13 @@ class O {
    * @param symbolStyle
    */
   updateAllJunctionSymbol(e) {
-    const t = this.junctionLayer.graphics.clone();
-    this.junctionLayer.removeAll(), t.forEach((o) => {
+    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());
   }
   /**
    * 生成路口点符号。在不同比例尺下，使用不同的符号
@@ -1187,16 +1198,16 @@ class O {
    * @param symbolType
    * @returns
    */
-  getCrossGraphicSymbol(e, t) {
+  getCrossGraphicSymbol(e, i) {
     const o = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
-    if (t === "marker")
+    if (i === "marker")
       return {
         type: "picture-marker",
         url: `/GisViewerAssets/Images/cross/${o ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
         width: "32px",
         height: "32px"
       };
-    if (t === "picture")
+    if (i === "picture")
       return o ? {
         type: "cim",
         data: {