gisviewer-vue3-arcgis 1.0.262 → 1.0.263

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

@@ -1,19 +1,19 @@
 import I from "@arcgis/core/Graphic";
 import * as C from "@arcgis/core/core/promiseUtils";
-import * as F from "@arcgis/core/core/reactiveUtils.js";
-import { Polygon as S, Point as J } from "@arcgis/core/geometry";
+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";
 import D from "@arcgis/core/layers/FeatureLayer";
-import w from "@arcgis/core/layers/GraphicsLayer";
+import v from "@arcgis/core/layers/GraphicsLayer";
 import * as G from "@turf/helpers";
 import { lineSliceAlong as x } from "@turf/line-slice-along";
-import v from "axios";
-import { XMLParser as E } from "fast-xml-parser";
-import B from "md5";
+import w from "axios";
+import { XMLParser as J } from "fast-xml-parser";
+import E from "md5";
 import M from "pako";
 import { watch as R } from "vue";
 import T from "../../stores/index.mjs";
-import N from "../common-utils.mjs";
+import A 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({
@@ -294,7 +294,7 @@ class O {
           }
         }
       ]
-    }), this.junctionLayer = new w({ id: "OpenDriveJunction" }), this.sectionLayer = new w({ id: "OpenDriveSection" }), this.highlightLayer = new w({ id: "OpenDriveHighlight" }), this.flashLayer = new w({ id: "OpenDriveFlash" }), this.drawLayer = new w({ id: "Draw" }), this.splitLaneLayer = new w({ id: "SplitLane" }), this.borderLayer = new w({ id: "OpenDriveBorder" }), this.view.map.addMany([
+    }), 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.borderLayer = new v({ id: "OpenDriveBorder" }), this.view.map.addMany([
       this.laneLayer,
       this.sectionLayer,
       this.roadNameLayer,
@@ -310,14 +310,14 @@ class O {
     return this.instance || (this.instance = new O(e)), this.instance;
   }
   async makeMd5FromFile(e) {
-    var i;
+    var t;
     try {
       const s = await (await fetch(e)).text();
-      let n = (i = new E({
+      let r = (t = new J({
         ignoreAttributes: !1,
         allowBooleanAttributes: !0
-      }).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 } };
+      }).parse(s).OpenDRIVE.userData) == null ? void 0 : t.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 };
     }
@@ -329,24 +329,24 @@ class O {
    */
   async showOpenDriveFromFile(e) {
     var d, y, h;
-    this.openDriveClickCallback = e.selectedCallback, this.scaleWatch = F.watch(
+    this.openDriveClickCallback = e.selectedCallback, this.scaleWatch = $.watch(
       () => this.view.scale,
       (u, p) => {
         u > this.junctionScale && p <= this.junctionScale ? this.updateAllJunctionSymbol("marker") : u <= this.junctionScale && p > this.junctionScale && this.updateAllJunctionSymbol("picture");
       }
     );
-    let i = e.file.split("/").pop() || "";
-    i = i.split(".").slice(0, -1).join("."), this.openDriveServer = e.server;
+    let t = e.file.split("/").pop() || "";
+    t = t.split(".").slice(0, -1).join("."), this.openDriveServer = e.server;
     const o = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
     let s;
     try {
-      s = await v.post(
+      s = await w.post(
         o,
         {},
         {
           params: {
             url: e.file,
-            projectName: i
+            projectName: t
           }
         }
       );
@@ -356,21 +356,21 @@ class O {
     if (s.status !== 200)
       return { status: -1, message: s.statusText };
     console.time("渲染用时");
-    const t = s.data.result.geoSetting;
-    N.setGeoData(
-      t.geoReference,
-      t.offsetX,
-      t.offsetY
+    const i = s.data.result.geoSetting;
+    A.setGeoData(
+      i.geoReference,
+      i.offsetX,
+      i.offsetY
     );
-    let c = s.data.result.json;
-    c.startsWith(window.location.protocol) || (c = `${window.location.protocol}//${e.server}${c}`);
-    const n = await fetch(c);
+    let l = s.data.result.json;
+    l.startsWith(window.location.protocol) || (l = `${window.location.protocol}//${e.server}${l}`);
+    const r = await fetch(l);
     let a;
-    if (c.endsWith("bin")) {
-      const u = await n.arrayBuffer(), p = M.inflate(u, { to: "string" });
+    if (l.endsWith("bin")) {
+      const u = await r.arrayBuffer(), p = M.inflate(u, { to: "string" });
       a = JSON.parse(p);
     } else
-      a = await n.json();
+      a = await r.json();
     if (await this.showAllLanes(
       a,
       ((d = e.options) == null ? void 0 : d.showJunctionLane) || !1,
@@ -380,12 +380,12 @@ class O {
       this.showJunction(u);
     }
     e.options && e.options.centerMap !== !1 && await this.view.goTo(this.allLaneGraphics), this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick();
-    const r = T.useAppDataStore;
+    const n = T.useAppDataStore;
     return R(
-      () => r.isSketching,
+      () => n.isSketching,
       () => {
         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());
+        n.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" };
   }
@@ -394,10 +394,10 @@ class O {
    * @param server
    * @param projectName
    */
-  async showOpenDriveFromServer(e, i) {
-    const o = `http://${e}/api/openDrive/analyzeXodr`, s = await v.get(o, {
+  async showOpenDriveFromServer(e, t) {
+    const o = `http://${e}/api/openDrive/analyzeXodr`, s = await w.get(o, {
       headers: {
-        projectName: i
+        projectName: t
       },
       params: {
         analyze: !1,
@@ -406,16 +406,16 @@ class O {
     });
     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);
+    let i = s.data.result.json;
+    i.startsWith(window.location.protocol) || (i = `${window.location.protocol}//${e}${i}`);
+    const l = await fetch(i);
+    let r;
+    if (i.endsWith("bin")) {
+      const a = await l.arrayBuffer(), c = M.inflate(a, { to: "string" });
+      r = JSON.parse(c);
     } else
-      n = await c.json();
-    return await this.showAllLanes(n, !1, !1), { status: 0, message: "ok" };
+      r = await l.json();
+    return await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
   }
   /**
    * 显示所有车道
@@ -424,20 +424,20 @@ class O {
    * @param showRoadName 是否显示道路名称
    * @returns
    */
-  async showAllLanes(e, i, o) {
+  async showAllLanes(e, t, 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.roadNameLayer.visible = o, new Promise((i) => {
+      var c;
+      let l = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
-      const n = [];
-      for (const r of e) {
-        if (!i && r.junction !== "-1")
+      const r = [];
+      for (const n of e) {
+        if (!t && n.junction !== "-1")
           continue;
-        const { id: d, refLine: y } = r;
-        let h = r.name;
+        const { id: d, refLine: y } = n;
+        let h = n.name;
         h.includes("(") && (h = h.slice(0, h.indexOf("("))), h = h.replace(/(.)/g, "$1 ");
         const u = new I({
           geometry: {
@@ -445,72 +445,72 @@ class O {
             paths: [y]
           },
           attributes: {
-            ObjectID: c++,
+            ObjectID: l++,
             roadId: d,
             roadName: h
           }
         });
-        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)
+        this.allRefLineGraphics.push(u), n.laneSections.sort((p, g) => Number(p.id) - Number(g.id));
+        for (let p = 0; p < n.laneSections.length; p++) {
+          const g = n.laneSections[p], m = Number(g.id);
+          for (const f of g.lanePaths) {
+            const b = Number(f.id);
+            if (b === 0)
               continue;
-            const P = f.type, $ = [...f.outerPath], A = f.innerPath.concat(
-              $.reverse()
+            const B = f.type, P = [...f.outerPath], N = f.innerPath.concat(
+              P.reverse()
             );
-            if (A.length <= 3) {
-              console.warn(`lane ${g} has less than 3 points`);
+            if (N.length <= 3) {
+              console.warn(`lane ${b} has less than 3 points`);
               continue;
             }
-            A.push(f.innerPath[0]);
+            N.push(f.innerPath[0]);
             const k = new S({
-              rings: [A]
+              rings: [N]
             });
             if (k) {
               const j = new I({
                 geometry: k,
                 attributes: {
-                  ObjectID: c++,
-                  id: `${d}+${b}+${g}`,
-                  fromNode: r.fromNode,
-                  toNode: r.toNode,
+                  ObjectID: l++,
+                  id: `${d}+${m}+${b}`,
+                  fromNode: n.fromNode,
+                  toNode: n.toNode,
                   roadId: String(d),
-                  roadName: r.name,
-                  sectionId: String(b),
+                  roadName: n.name,
+                  sectionId: String(m),
                   sectionIndex: p,
-                  laneId: g,
-                  type: P,
+                  laneId: b,
+                  type: B,
                   sumoId: "",
                   // 记录左右边线的起始点，用于按长度高亮车道的一部分
                   leftLine: f.innerPath,
                   rightLine: f.outerPath,
                   // array转为逗号分隔的字符串
-                  roadsectBaseIds: (l = m.roadsectBaseIds) == null ? void 0 : l.toString()
+                  roadsectBaseIds: (c = g.roadsectBaseIds) == null ? void 0 : c.toString()
                 }
               });
-              this.allLaneGraphics.push(j), n.push(j);
+              this.allLaneGraphics.push(j), r.push(j);
             }
           }
         }
       }
       const a = setInterval(() => {
-        if (n.length > 0 || this.allRefLineGraphics.length > 0) {
-          if (n.length > 0) {
-            const r = n.splice(0, 100);
+        if (r.length > 0 || this.allRefLineGraphics.length > 0) {
+          if (r.length > 0) {
+            const n = r.splice(0, 100);
             this.laneLayer.applyEdits({
-              addFeatures: r
+              addFeatures: n
             });
           }
           if (this.allRefLineGraphics.length > 0) {
-            const r = this.allRefLineGraphics.splice(0, 10);
+            const n = this.allRefLineGraphics.splice(0, 10);
             this.roadNameLayer.applyEdits({
-              addFeatures: r
+              addFeatures: n
             });
           }
         } else
-          clearInterval(a), t();
+          clearInterval(a), i();
       }, 10);
     });
   }
@@ -520,21 +520,21 @@ class O {
    * @returns
    */
   showJunction(e) {
-    const i = [];
+    const t = [];
     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 t = new J({
+        const i = new F({
           x: s.coordinates[0],
           y: s.coordinates[1]
         });
-        let c = !0;
-        if (o && (c = L.contains(o, t)), c) {
-          const n = new I({
-            geometry: t,
+        let l = !0;
+        if (o && (l = L.contains(o, i)), l) {
+          const r = new I({
+            geometry: i,
             attributes: {
               ...s,
               selected: !1,
@@ -542,42 +542,42 @@ class O {
             },
             symbol: this.getCrossGraphicSymbol(s, "marker")
           });
-          i.push(n);
+          t.push(r);
         }
       }
-    this.junctionLayer.addMany(i);
+    this.junctionLayer.addMany(t);
   }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const e = C.debounce(async (i) => {
-      var c;
-      const s = (c = (await this.view.hitTest(i, {
+    const e = C.debounce(async (t) => {
+      var l;
+      const s = (l = (await this.view.hitTest(t, {
         include: [this.laneLayer, this.junctionLayer]
-      })).results) == null ? void 0 : c.filter(
-        (n) => n.type === "graphic"
+      })).results) == null ? void 0 : l.filter(
+        (r) => r.type === "graphic"
       );
       if (s.length === 0) {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = ""), this.view.closePopup();
         return;
       }
-      const t = s[0];
-      if (this.hitGraphic = t.graphic, t.layer.id === "OpenDriveLane") {
-        const n = `${this.hitGraphic.getAttribute(
+      const i = s[0];
+      if (this.hitGraphic = i.graphic, i.layer.id === "OpenDriveLane") {
+        const r = `${this.hitGraphic.getAttribute(
           "roadId"
-        )}+${this.hitGraphic.getAttribute("sectionId")}`;
-        if (this.currentSectionCode === n || this.selectedSectionIds.includes(n) || this.sectionLayer.graphics.findIndex(
-          (m) => m.getAttribute("id") === n
+        )}+${this.hitGraphic.getAttribute("sectionId")}`, a = this.hitGraphic.getAttribute("roadsectBaseIds");
+        if (this.currentSectionCode === r || this.selectedSectionIds.includes(a) || this.sectionLayer.graphics.findIndex(
+          (m) => m.getAttribute("id") === r
         ) >= 0)
           return;
-        this.currentSectionCode = n;
-        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,
+        this.currentSectionCode = r;
+        const n = this.allLaneGraphics.filter(
+          (m) => `${m.attributes.roadId}+${m.attributes.sectionId}` === r
+        ), d = L.union(
+          n.map((m) => m.geometry)
+        ), y = this.hitGraphic.getAttribute("fromNode"), h = this.hitGraphic.getAttribute("toNode"), u = this.junctionNames.get(y) || y, p = this.junctionNames.get(h) || h, g = new I({
+          geometry: d,
           symbol: {
             type: "simple-fill",
             color: [0, 255, 255, 0.5],
@@ -589,11 +589,11 @@ class O {
           },
           attributes: {
             type: "OpenDriveSection",
-            id: n,
+            id: r,
             selected: !1,
-            fromNodeName: h,
-            toNodeName: u,
-            laneCount: l.length,
+            fromNodeName: u,
+            toNodeName: p,
+            laneCount: n.length,
             roadsectBaseIds: this.hitGraphic.getAttribute("roadsectBaseIds")
           },
           popupTemplate: {
@@ -619,16 +619,16 @@ class O {
             ]
           }
         });
-        this.highlightLayer.removeAll(), this.highlightLayer.add(p);
-      } else if (t.layer.id === "OpenDriveJunction") {
-        const n = this.hitGraphic.getAttribute("id");
-        if (n === this.currentJunctionId)
+        this.highlightLayer.removeAll(), this.highlightLayer.add(g);
+      } else if (i.layer.id === "OpenDriveJunction") {
+        const r = this.hitGraphic.getAttribute("id");
+        if (r === this.currentJunctionId)
           return;
-        this.currentJunctionId = n;
+        this.currentJunctionId = r;
       }
     });
-    this.mouseMoveHandler = this.view.on("pointer-move", async (i) => {
-      e(i).catch(() => {
+    this.mouseMoveHandler = this.view.on("pointer-move", async (t) => {
+      e(t).catch(() => {
       });
     });
   }
@@ -636,48 +636,48 @@ class O {
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = C.debounce(async (i) => {
+    const e = C.debounce(async (t) => {
       var a;
-      const s = (a = (await this.view.hitTest(i, {
+      const s = (a = (await this.view.hitTest(t, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
       })).results) == null ? void 0 : a.filter(
-        (l) => l.type === "graphic"
+        (c) => c.type === "graphic"
       );
       if (s.length === 0)
         return;
-      const t = s[0].graphic, c = t.getAttribute("type"), n = t.getAttribute("id");
-      if (c === "OpenDriveJunction")
-        if (t.getAttribute("selected") === !1) {
-          const l = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, r = await v.get(l, {
+      const i = s[0].graphic, l = i.getAttribute("type"), r = i.getAttribute("id");
+      if (l === "OpenDriveJunction")
+        if (i.getAttribute("selected") === !1) {
+          const c = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, n = await w.get(c, {
             params: {
-              id: n,
+              id: r,
               projectName: this.projectName
             }
           });
-          r.status === 200 && r.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
+          n.status === 200 && n.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
-            details: r.data.result
-          }), t.setAttribute("selected", !0), t.symbol = {
+            id: r,
+            details: n.data.result
+          }), i.setAttribute("selected", !0), i.symbol = {
             type: "picture-marker",
             url: "/GisViewerAssets/Images/point_red.png",
             width: "20px",
             height: "20px"
-          }, this.increasePictureMarkerSize(t, 50));
+          }, this.increasePictureMarkerSize(i, 50));
         } else
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
+            id: r,
             details: void 0
-          }), t.setAttribute("selected", !1), t.symbol = this.getCrossGraphicSymbol(
-            t.attributes,
+          }), i.setAttribute("selected", !1), i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             this.view.scale < this.junctionScale ? "picture" : "marker"
           );
       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")
+        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")
         ).forEach(
-          (r) => r.symbol = {
+          (n) => n.symbol = {
             type: "simple-fill",
             color: [255, 69, 0],
             outline: {
@@ -686,9 +686,9 @@ class O {
             }
           }
         )) : (this.splitLaneLayer.graphics.filter(
-          (r) => r.getAttribute("roadsectBaseIds") === t.getAttribute("roadsectBaseIds")
+          (n) => n.getAttribute("roadsectBaseIds") === i.getAttribute("roadsectBaseIds")
         ).forEach(
-          (r) => r.symbol = {
+          (n) => n.symbol = {
             type: "simple-fill",
             color: [255, 0, 0, 0.8],
             outline: {
@@ -696,16 +696,14 @@ class O {
               width: 1
             }
           }
-        ), this.sectionLayer.remove(t), this.selectedSectionIds = this.selectedSectionIds.filter(
-          (r) => r !== n
-        ), this.openDriveClickCallback && this.openDriveClickCallback({
+        ), this.sectionLayer.remove(i), this.selectedSectionIds = [], this.openDriveClickCallback && this.openDriveClickCallback({
           type: "OpenDriveSection",
-          id: t.getAttribute("edgeId"),
+          id: i.getAttribute("edgeId"),
           details: void 0
         })));
     });
-    this.mouseClickHandler = this.view.on("immediate-click", async (i) => {
-      e(i).catch(() => {
+    this.mouseClickHandler = this.view.on("immediate-click", async (t) => {
+      e(t).catch(() => {
       });
     });
   }
@@ -714,14 +712,14 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  increasePictureMarkerSize(e, i) {
+  increasePictureMarkerSize(e, t) {
     const o = setInterval(() => {
-      const s = e.symbol, t = s.width;
-      t < i ? e.symbol = {
+      const s = e.symbol, i = s.width;
+      i < t ? e.symbol = {
         type: "picture-marker",
         url: s.url,
-        width: t + 1,
-        height: t + 1
+        width: i + 1,
+        height: i + 1
       } : clearInterval(o);
     }, 20);
   }
@@ -730,21 +728,21 @@ class O {
    * @param graphic
    * @param targetSize
    */
-  decreasePictureMarkerSize(e, i) {
+  decreasePictureMarkerSize(e, t) {
     const o = setInterval(() => {
-      const s = e.symbol, t = s.width;
-      t > i ? e.symbol = {
+      const s = e.symbol, i = s.width;
+      i > t ? e.symbol = {
         type: "picture-marker",
         url: s.url,
-        width: t - 1,
-        height: t - 1
+        width: i - 1,
+        height: i - 1
       } : clearInterval(o);
     }, 20);
   }
   async getSumoInfo(e) {
     switch (e.type) {
       case "junction": {
-        const i = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, o = await v.get(i, {
+        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, o = await w.get(t, {
           params: {
             id: e.id,
             projectName: this.projectName
@@ -753,24 +751,24 @@ class O {
         return o.status === 200 ? o.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
       }
       case "edge": {
-        const i = e.id.split("#");
-        let o = i[0];
+        const t = e.id.split("#");
+        let o = t[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
+        t.length === 2 && (s = Number(t[1]));
+        const i = this.allLaneGraphics.find(
+          (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
         );
-        if (t) {
-          const c = `${o}+${t.getAttribute(
+        if (i) {
+          const l = `${o}+${i.getAttribute(
             "sectionId"
-          )}`, n = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await v.get(n, {
+          )}`, r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await w.get(r, {
             params: {
-              id: c,
+              id: l,
               projectName: this.projectName
             }
           });
-          return a.status === 200 ? a.data : { status: -1, message: `路段信息查询失败: ${c}` };
+          return a.status === 200 ? a.data : { status: -1, message: `路段信息查询失败: ${l}` };
         } else
           return { status: -1, message: "未知类型" };
       }
@@ -785,13 +783,13 @@ class O {
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var i, o, s;
+    var t, 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(), (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;
+    }), 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;
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -799,28 +797,28 @@ class O {
    * @returns
    */
   async findSumo(e) {
-    const { type: i, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
-    if (i === "junction")
+    const { type: t, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
+    if (t === "junction")
       return await this.findJunction(o, s);
-    if (i === "edge") {
-      const t = o.split("_");
-      if (t.length > 2)
+    if (t === "edge") {
+      const i = o.split("_");
+      if (i.length > 2)
         return { status: -1, message: "id格式错误" };
-      const c = t.length === 2 ? Number(t[1]) : void 0, n = t[0].split("#");
-      if (n.length > 2)
+      const l = i.length === 2 ? Number(i[1]) : void 0, r = i[0].split("#");
+      if (r.length > 2)
         return { status: -1, message: "id格式错误" };
-      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 });
+      const a = r[0], c = r.length === 2 ? Number(r[1]) : void 0;
+      return await this.findLane({ roadsectId: a, segmentId: c, laneId: l, flash: s });
     } else
       return { status: -1, message: "未知类型" };
   }
-  async findJunction(e, i) {
+  async findJunction(e, t) {
     const o = this.junctionLayer.graphics.find(
       (s) => s.attributes.id === e
     );
     if (!o)
       return { status: -1, message: "未找到。请检查路口编号" };
-    if (i) {
+    if (t) {
       const s = new I({
         geometry: o.geometry,
         symbol: {
@@ -844,41 +842,41 @@ class O {
    * @returns
    */
   async findLane(e) {
-    let { roadsectId: i, segmentId: o, laneId: s } = e;
-    i.startsWith("-") && (i = i.slice(1));
-    let t = this.allLaneGraphics.filter(
-      (a) => a.attributes.roadId === i
+    let { roadsectId: t, segmentId: o, laneId: s } = e;
+    t.startsWith("-") && (t = t.slice(1));
+    let i = this.allLaneGraphics.filter(
+      (a) => a.attributes.roadId === t
     );
-    if (t.length === 0)
+    if (i.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
     if (o !== void 0) {
       const a = [];
-      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)
+      if (i.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], t = t.filter(
-        (l) => Number(l.attributes.sectionId) === o
+      o = a[o], i = i.filter(
+        (c) => Number(c.attributes.sectionId) === o
       );
     }
     if (s !== void 0) {
       const a = [];
-      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)
+      if (i.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], t = t.filter(
-        (l) => Number(l.attributes.laneId) === s
+      s = a[s], i = i.filter(
+        (c) => Number(c.attributes.laneId) === s
       );
     }
-    const c = t.map(
+    const l = i.map(
       (a) => a.geometry
-    ), n = L.union(c);
+    ), r = L.union(l);
     if (e.flash) {
       const a = new I({
-        geometry: n,
+        geometry: r,
         symbol: {
           type: "simple-fill",
           color: [0, 255, 255, 0.6],
@@ -890,7 +888,7 @@ class O {
       });
       this.flashGraphic(a);
     }
-    return await this.view.goTo(n, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(r, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * graphic渐隐渐显闪烁
@@ -898,9 +896,9 @@ class O {
    */
   flashGraphic(e) {
     this.flashLayer.removeAll(), this.flashLayer.add(e);
-    let i = 0, o = !0;
+    let t = 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));
+      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));
     }, 10);
   }
   /**
@@ -909,19 +907,19 @@ class O {
    * @returns
    */
   unselectSumo(e) {
-    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,
+    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,
         this.view.scale < this.junctionScale ? "picture" : "marker"
       ));
-    }), !e || e.type === "edge") {
-      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) => {
+    }) : (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) => {
         const s = o.getAttribute("id");
         this.selectedSectionIds = this.selectedSectionIds.filter(
-          (t) => t !== s
+          (i) => i !== s
         );
-      }), this.sectionLayer.removeMany(i));
+      }), this.sectionLayer.removeMany(t));
     }
     return { status: 0, message: "ok" };
   }
@@ -933,31 +931,31 @@ class O {
   async selectSumo(e) {
     switch (e.type) {
       case "junction":
-        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" };
+        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" };
         }), { status: -1, message: "未找到路口" };
       case "edge": {
-        const i = e.id.split("#");
-        let o = String(i[0]);
+        const t = e.id.split("#");
+        let o = String(t[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 t.forEach((n) => {
-            const a = n.getAttribute("roadId") + "+" + n.getAttribute("sectionId");
+        t.length === 2 && (s = Number(t[1]));
+        let i = [];
+        if (t.length === 1 ? i = this.allLaneGraphics.filter(
+          (l) => l.getAttribute("roadId") === o
+        ) : t.length === 2 && (i = this.allLaneGraphics.filter(
+          (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
+        )), i.length > 0) {
+          const l = /* @__PURE__ */ new Map();
+          return i.forEach((r) => {
+            const a = r.getAttribute("roadId") + "+" + r.getAttribute("sectionId");
             this.selectedSectionIds.includes(a) || this.selectedSectionIds.push(a);
-            let l = c.get(a);
-            l ? l.push(n.geometry) : (l = [n.geometry], c.set(a, l));
-          }), c.forEach(async (n, a) => {
-            const l = L.union(n), r = new I({
-              geometry: l,
+            let c = l.get(a);
+            c ? c.push(r.geometry) : (c = [r.geometry], l.set(a, c));
+          }), l.forEach(async (r, a) => {
+            const c = L.union(r), n = new I({
+              geometry: c,
               symbol: {
                 type: "simple-fill",
                 color: [0, 255, 255, 0.5],
@@ -974,7 +972,7 @@ class O {
                 selected: !0
               }
             });
-            this.sectionLayer.add(r), await this.view.goTo(r);
+            this.sectionLayer.add(n), await this.view.goTo(n);
           }), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
@@ -984,96 +982,101 @@ class O {
     }
   }
   async geometrySearch(e) {
-    const i = new S({
+    const t = new S({
       rings: [e]
     }), o = await this.laneLayer.queryFeatures({
-      geometry: i,
+      geometry: t,
       outFields: ["*"]
-    }), s = [], t = [];
+    }), s = [], i = [];
     for (const a of o.features) {
-      const l = a.getAttribute("roadId"), r = a.getAttribute("sectionIndex"), d = `${l}#${r}`;
+      const c = a.getAttribute("roadId"), n = a.getAttribute("sectionIndex"), d = `${c}#${n}`;
       if (s.indexOf(d) === -1) {
         s.push(d), this.selectSumo({
           type: "edge",
           id: d
         });
-        const y = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, h = await v.get(y, {
+        const y = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, h = await w.get(y, {
           params: {
-            id: `${l}+${a.getAttribute("sectionId")}`,
+            id: `${c}+${a.getAttribute("sectionId")}`,
             projectName: this.projectName
           }
         });
-        h.status === 200 && h.data.status === 0 && t.push(h.data.result);
+        h.status === 200 && h.data.status === 0 && i.push(h.data.result);
       }
     }
-    const c = this.junctionLayer.graphics.filter((a) => {
-      const l = a.geometry;
-      return L.contains(i, l);
-    }), n = [];
-    for (const a of c) {
-      const l = a.getAttribute("id");
+    const l = this.junctionLayer.graphics.filter((a) => {
+      const c = a.geometry;
+      return L.contains(t, c);
+    }), r = [];
+    for (const a of l) {
+      const c = a.getAttribute("id");
       this.selectSumo({
         type: "junction",
-        id: l
+        id: c
       });
-      const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, d = await v.get(r, {
+      const n = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, d = await w.get(n, {
         params: {
-          id: l,
+          id: c,
           projectName: this.projectName
         }
       });
-      d.status === 200 && d.data.status === 0 && n.push(d.data.result);
+      d.status === 200 && d.data.status === 0 && r.push(d.data.result);
     }
     return {
       status: 0,
       message: "ok",
       result: {
-        junctions: n,
-        edges: t
+        junctions: r,
+        edges: i
       }
     };
   }
+  /**
+   * 封闭车道，使用sumo的id
+   * @param params
+   * @returns
+   */
   async splitLane(e) {
     const o = e.id.split("_");
     if (o.length !== 2)
       return { status: -1, message: "车道编号格式错误" };
-    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((g) => g.getAttribute("roadId") === n && g.getAttribute("sectionIndex") === c);
+    const s = Number(o[1]), i = o[0].split("#"), l = i.length === 2 ? Number(i[1]) : 0;
+    let r = i[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)
       return { status: -1, message: "未找到路段" };
-    const l = a.length - s, r = a.find(
-      (g) => Math.abs(g.getAttribute("laneId")) === l
+    const c = a.length - s, n = a.find(
+      (b) => Math.abs(b.getAttribute("laneId")) === c
     );
-    if (!r)
+    if (!n)
       return { status: -1, message: "未找到车道" };
-    const d = e.start || 0, y = e.end || 100, h = G.lineString(r.getAttribute("leftLine")), u = x(h, d, y, {
+    const d = e.start || 0, y = e.end || 100, h = G.lineString(n.getAttribute("leftLine")), u = x(h, d, y, {
       units: "meters"
-    }), p = G.lineString(r.getAttribute("rightLine")), m = x(p, d, y, {
+    }), p = G.lineString(n.getAttribute("rightLine")), g = x(p, d, y, {
       units: "meters"
-    }), b = u.geometry.coordinates.concat(
-      m.geometry.coordinates.reverse()
+    }), m = u.geometry.coordinates.concat(
+      g.geometry.coordinates.reverse()
     );
-    b.push(b[b.length - 1]);
+    m.push(m[m.length - 1]);
     const f = new I({
       geometry: new S({
-        rings: [b]
+        rings: [m]
       }),
       attributes: {
-        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"),
+        ObjectID: n.getAttribute("ObjectID"),
+        id: n.getAttribute("id"),
+        fromNode: n.getAttribute("fromNode"),
+        toNode: n.getAttribute("toNode"),
+        roadId: n.getAttribute("roadId"),
+        roadName: n.getAttribute("roadName"),
+        sectionId: n.getAttribute("sectionId"),
+        sectionIndex: n.getAttribute("sectionIndex"),
+        laneId: n.getAttribute("laneId"),
+        type: n.getAttribute("type"),
+        sumoId: n.getAttribute("sumoId"),
         leftLine: u.geometry.coordinates,
-        rightLine: m.geometry.coordinates
+        rightLine: g.geometry.coordinates
       },
       symbol: {
         type: "simple-fill",
@@ -1083,39 +1086,100 @@ class O {
         }
       }
     });
-    return this.splitLaneLayer.add(f), N.viewGoto(this.view, [f]), { status: 0, message: "ok", result: { coordinates: b } };
+    return this.splitLaneLayer.add(f), A.viewGoto(this.view, [f]), { status: 0, message: "ok", result: { coordinates: m } };
   }
-  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 = {
+  /**
+   * 封闭车道，使用可计算路网的id
+   * @param params
+   */
+  blockLane(e) {
+    const t = 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();
+      return console.log(
+        t[0].getAttribute("roadsectBaseIds"),
+        this.selectedSectionIds,
+        this.selectedSectionIds.includes(
+          t[0].getAttribute("roadsectBaseIds")
+        )
+      ), i.symbol = {
         type: "simple-fill",
-        color: [255, 0, 0, 0.8],
+        color: this.selectedSectionIds.includes(
+          t[0].getAttribute("roadsectBaseIds")
+        ) ? [255, 69, 0, 0.8] : [255, 0, 0, 0.8],
         outline: {
           color: "red"
         }
-      }, t;
+      }, i;
     });
-    this.splitLaneLayer.addMany(o), N.viewGoto(this.view, o);
+    this.splitLaneLayer.addMany(o), A.viewGoto(this.view, o);
   }
   clearSplitLane() {
     this.splitLaneLayer.removeAll();
   }
+  selectComputable(e) {
+    if (e.type === "roadsectBase") {
+      this.allLaneGraphics.forEach((o) => {
+        o.getAttribute("roadsectBaseIds") || console.log(o.attributes);
+      });
+      const t = this.allLaneGraphics.filter((o) => {
+        var s;
+        return (s = o.getAttribute("roadsectBaseIds")) == null ? void 0 : s.includes(e.id);
+      });
+      if (t.length > 0) {
+        const o = L.union(
+          t.map((r) => r.geometry)
+        ), s = t[0].getAttribute("roadsectBaseIds"), i = new I({
+          geometry: o,
+          symbol: {
+            type: "simple-fill",
+            color: [0, 255, 255, 0.5],
+            style: "solid",
+            outline: {
+              color: [0, 255, 255],
+              width: 1
+            }
+          },
+          attributes: {
+            type: "OpenDriveSection",
+            roadsectBaseIds: s
+          }
+        });
+        this.sectionLayer.removeAll(), this.sectionLayer.add(i), A.viewGoto(this.view, [i]), this.selectedSectionIds = [s];
+        const l = this.splitLaneLayer.graphics.filter(
+          (r) => {
+            var a;
+            return (a = r.getAttribute("roadsectBaseIds")) == null ? void 0 : a.includes(e.id);
+          }
+        );
+        l.length > 0 && l.forEach(
+          (r) => r.symbol = {
+            type: "simple-fill",
+            color: [255, 69, 0],
+            outline: {
+              color: "red",
+              width: 2
+            }
+          }
+        );
+      }
+    }
+  }
   /**
    * 更新所有路口的symbol
    * @param symbolStyle
    */
   updateAllJunctionSymbol(e) {
-    const i = this.junctionLayer.graphics.clone();
-    this.junctionLayer.removeAll(), i.forEach((o) => {
+    const t = this.junctionLayer.graphics.clone();
+    this.junctionLayer.removeAll(), t.forEach((o) => {
       o.getAttribute("selected") || (o.symbol = this.getCrossGraphicSymbol(
         o.attributes,
         e
       ));
-    }), this.junctionLayer.addMany(i.toArray());
+    }), this.junctionLayer.addMany(t.toArray());
   }
   /**
    * 生成路口点符号。在不同比例尺下，使用不同的符号
@@ -1123,16 +1187,16 @@ class O {
    * @param symbolType
    * @returns
    */
-  getCrossGraphicSymbol(e, i) {
+  getCrossGraphicSymbol(e, t) {
     const o = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
-    if (i === "marker")
+    if (t === "marker")
       return {
         type: "picture-marker",
         url: `/GisViewerAssets/Images/cross/${o ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
         width: "32px",
         height: "32px"
       };
-    if (i === "picture")
+    if (t === "picture")
       return o ? {
         type: "cim",
         data: {