gisviewer-vue3-arcgis 1.0.122 → 1.0.124

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

@@ -3,14 +3,19 @@ import * as D from "@arcgis/core/core/promiseUtils";
 import { Polygon as N } from "@arcgis/core/geometry";
 import * as k from "@arcgis/core/geometry/geometryEngineAsync";
 import C from "@arcgis/core/layers/FeatureLayer";
-import m from "@arcgis/core/layers/GraphicsLayer";
-import f from "axios";
+import f from "@arcgis/core/layers/GraphicsLayer";
+import g from "axios";
+import F from "md5";
 import G from "pako";
 import j from "../common-utils.mjs";
-import F from "./wasm-loader.mjs";
+import A from "./wasm-loader.mjs";
 class S {
   constructor(t) {
-    this.wasmLoader = F.getInstance(), this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.currentJunctionId = "", this.view = t, this.laneLayer = new C({
+    this.wasmLoader = A.getInstance(), this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.currentJunctionId = "", this.view = t, this.view.popup.visibleElements = {
+      closeButton: !1,
+      collapseButton: !1,
+      actionBar: !1
+    }, this.laneLayer = new C({
       id: "OpenDriveLane",
       fields: [
         {
@@ -268,7 +273,7 @@ class S {
           }
         }
       ]
-    }), this.junctionLayer = new m({ id: "OpenDriveJunction" }), this.sectionLayer = new m({ id: "OpenDriveSection" }), this.highlightLayer = new m({ id: "OpenDriveHighlight" }), this.flashLayer = new m({ id: "OpenDriveFlash" }), this.view.map.addMany([
+    }), this.junctionLayer = new f({ id: "OpenDriveJunction" }), this.sectionLayer = new f({ id: "OpenDriveSection" }), this.highlightLayer = new f({ id: "OpenDriveHighlight" }), this.flashLayer = new f({ id: "OpenDriveFlash" }), this.view.map.addMany([
       this.laneLayer,
       this.junctionLayer,
       this.sectionLayer,
@@ -280,21 +285,31 @@ class S {
   static getInstance(t) {
     return this.instance || (this.instance = new S(t)), this.instance;
   }
+  async makeMd5FromFile(t) {
+    const i = await (await fetch(t)).text();
+    return F(i);
+  }
   async showOpenDriveFromFile(t) {
     var h, d;
-    this.openDriveClickCallback = t.selectedCallback, this.projectName = Date.now().toString(), this.openDriveServer = t.server;
-    const o = `http://${this.openDriveServer}/api/openDrive/uploadXodr`, i = await f.post(
-      o,
-      {},
-      {
-        params: {
-          url: t.file,
-          projectName: this.projectName
+    this.openDriveClickCallback = t.selectedCallback, this.projectName = await this.makeMd5FromFile(t.file), this.openDriveServer = t.server, await this.makeMd5FromFile(t.file);
+    const a = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
+    let i;
+    try {
+      i = await g.post(
+        a,
+        {},
+        {
+          params: {
+            url: t.file,
+            projectName: this.projectName
+          }
         }
-      }
-    );
+      );
+    } catch (u) {
+      return { status: -1, message: u.message };
+    }
     if (i.status !== 200)
-      throw new Error(`OpenDriveRenderer: ${i.statusText}`);
+      return { status: -1, message: i.statusText };
     console.time("渲染用时");
     const s = i.data.result.geoSetting;
     j.setGeoData(
@@ -304,16 +319,16 @@ class S {
     );
     let e = i.data.result.json;
     e.startsWith(window.location.protocol) || (e = `${window.location.protocol}//${t.server}${e}`);
-    const r = await (await fetch(e)).arrayBuffer(), n = G.inflate(r, { to: "string" }), a = JSON.parse(n);
+    const r = await (await fetch(e)).arrayBuffer(), n = G.inflate(r, { to: "string" }), o = JSON.parse(n);
     await this.showAllLanes(
-      a,
+      o,
       ((h = t.options) == null ? void 0 : h.showJunctionLane) || !1,
       ((d = t.options) == null ? void 0 : d.showRoadName) || !0
     );
     const l = i.data.result.junctions;
     if (this.showJunction(l), t.options && t.options.centerMap !== !1) {
-      const g = j.transformPointProjection([0, 0]);
-      await this.view.goTo(g);
+      const u = j.transformPointProjection([0, 0]);
+      await this.view.goTo(u);
     }
     return this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick(), console.timeEnd("渲染用时"), { status: 0, message: "ok" };
   }
@@ -322,10 +337,10 @@ class S {
    * @param server
    * @param projectName
    */
-  async showOpenDriveFromServer(t, o) {
-    const i = `http://${t}/api/openDrive/analyzeXodr`, s = await f.get(i, {
+  async showOpenDriveFromServer(t, a) {
+    const i = `http://${t}/api/openDrive/analyzeXodr`, s = await g.get(i, {
       headers: {
-        projectName: o
+        projectName: a
       },
       params: {
         analyze: !1,
@@ -336,10 +351,10 @@ class S {
       throw new Error(`OpenDriveRenderer: ${s.statusText}`);
     let e = s.data.result.json;
     e.startsWith(window.location.protocol) || (e = `${window.location.protocol}//${t}${e}`);
-    const r = await (await fetch(e)).arrayBuffer(), n = G.inflate(r, { to: "string" }), a = JSON.parse(n);
-    return await this.showAllLanes(a, !1, !1), { status: 0, message: "ok" };
+    const r = await (await fetch(e)).arrayBuffer(), n = G.inflate(r, { to: "string" }), o = JSON.parse(n);
+    return await this.showAllLanes(o, !1, !1), { status: 0, message: "ok" };
   }
-  async showAllLanes(t, o, i) {
+  async showAllLanes(t, a, i) {
     const s = await this.laneLayer.queryFeatures();
     return s.features.length > 0 && this.laneLayer.applyEdits({
       deleteFeatures: s.features
@@ -347,13 +362,13 @@ class S {
       let c = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
       const r = [];
-      for (const a of t) {
-        if (!o && a.junction !== "-1")
+      for (const o of t) {
+        if (!a && o.junction !== "-1")
           continue;
-        const { id: l, refLine: h } = a;
-        let d = a.name;
+        const { id: l, refLine: h } = o;
+        let d = o.name;
         d.includes("(") && (d = d.slice(0, d.indexOf("("))), d = d.replace(/(.)/g, "$1 ");
-        const g = new p({
+        const u = new p({
           geometry: {
             type: "polyline",
             paths: [h]
@@ -364,39 +379,39 @@ class S {
             roadName: d
           }
         });
-        this.allRefLineGraphics.push(g);
-        for (const v of a.laneSections) {
+        this.allRefLineGraphics.push(u);
+        for (const v of o.laneSections) {
           const b = Number(v.id);
-          for (const u of v.lanePaths) {
-            const y = Number(u.id);
-            if (y === 0)
+          for (const y of v.lanePaths) {
+            const m = Number(y.id);
+            if (m === 0)
               continue;
-            const O = u.type, w = u.innerPath.concat(
-              u.outerPath.reverse()
+            const O = y.type, w = y.innerPath.concat(
+              y.outerPath.reverse()
             );
             if (w.length <= 3) {
-              console.warn(`lane ${y} has less than 3 points`);
+              console.warn(`lane ${m} has less than 3 points`);
               continue;
             }
-            w.push(u.innerPath[0]);
-            const L = new N({
+            w.push(y.innerPath[0]);
+            const I = new N({
               rings: [w]
             });
-            if (L) {
-              const I = new p({
-                geometry: L,
+            if (I) {
+              const L = new p({
+                geometry: I,
                 attributes: {
                   ObjectID: c++,
-                  id: `${l}+${b}+${y}`,
+                  id: `${l}+${b}+${m}`,
                   roadId: l,
-                  roadName: a.name,
+                  roadName: o.name,
                   sectionId: b,
-                  laneId: y,
+                  laneId: m,
                   type: O,
                   sumoId: ""
                 }
               });
-              this.allLaneGraphics.push(I), r.push(I);
+              this.allLaneGraphics.push(L), r.push(L);
             }
           }
         }
@@ -404,15 +419,15 @@ class S {
       const n = setInterval(() => {
         if (r.length > 0 || this.allRefLineGraphics.length > 0) {
           if (r.length > 0) {
-            const a = r.splice(0, 100);
+            const o = r.splice(0, 100);
             this.laneLayer.applyEdits({
-              addFeatures: a
+              addFeatures: o
             });
           }
           if (this.allRefLineGraphics.length > 0) {
-            const a = this.allRefLineGraphics.splice(0, 10);
+            const o = this.allRefLineGraphics.splice(0, 10);
             this.roadNameLayer.applyEdits({
-              addFeatures: a
+              addFeatures: o
             });
           }
         } else
@@ -421,7 +436,7 @@ class S {
     });
   }
   showJunction(t) {
-    const o = [];
+    const a = [];
     for (const i of t) {
       i.nodeType = i.type;
       const s = new p({
@@ -437,28 +452,28 @@ class S {
         },
         symbol: {
           type: "picture-marker",
-          url: i.crossId ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/normal-cross.png",
+          url: i.crossId ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png",
           width: 30,
           height: 30
         }
       });
-      o.push(s);
+      a.push(s);
     }
-    this.junctionLayer.addMany(o);
+    this.junctionLayer.addMany(a);
   }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const t = D.debounce(async (o) => {
+    const t = D.debounce(async (a) => {
       var c;
-      const s = (c = (await this.view.hitTest(o, {
+      const s = (c = (await this.view.hitTest(a, {
         include: [this.laneLayer, this.junctionLayer]
       })).results) == null ? void 0 : c.filter(
         (r) => r.type === "graphic"
       );
       if (s.length === 0) {
-        this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightGraphic = void 0, this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = "", this.highlightGraphic = void 0, this.highlightLayer.removeAll());
+        this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightGraphic = void 0, this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = "", this.view.closePopup());
         return;
       }
       const e = s[0];
@@ -469,20 +484,20 @@ class S {
         ) >= 0)
           return;
         this.currentSectionCode = r;
-        const a = this.allLaneGraphics.filter(
+        const o = this.allLaneGraphics.filter(
           (h) => `${h.attributes.roadId}+${h.attributes.sectionId}` === r
         ), l = await k.union(
-          a.map((h) => h.geometry)
+          o.map((h) => h.geometry)
         );
         this.highlightGraphic = new p({
           geometry: l,
           symbol: {
             type: "simple-fill",
-            color: [255, 0, 0, 0.5],
+            color: [0, 255, 255, 0.5],
             style: "solid",
             outline: {
-              color: "red",
-              width: 2
+              color: [0, 255, 255],
+              width: 1
             }
           },
           attributes: {
@@ -492,29 +507,23 @@ class S {
           }
         }), this.highlightLayer.removeAll(), this.highlightLayer.add(this.highlightGraphic);
       } else if (e.layer.id === "OpenDriveJunction") {
-        const r = this.hitGraphic.attributes.id;
+        const r = this.hitGraphic.getAttribute("id");
         if (r === this.currentJunctionId)
           return;
         this.currentJunctionId = r;
-        const n = new p({
-          geometry: this.hitGraphic.geometry,
-          symbol: {
-            type: "text",
-            color: "black",
-            backgroundColor: "gray",
-            text: `${this.hitGraphic.attributes.name}
-${this.hitGraphic.attributes.id}`,
-            font: {
-              size: 10
-            },
-            yoffset: 40
-          }
+        const n = this.hitGraphic.getAttribute("name"), o = this.hitGraphic.getAttribute("crossId");
+        this.view.popup.open({
+          title: n,
+          content: `<table>
+          <tr><td>路口编号</td><td>${r}</td></tr>
+          <tr><td>信号机编号</td><td>${o || "无信控"}</td></tr>
+          </table>`,
+          location: this.hitGraphic.geometry
         });
-        this.highlightLayer.removeAll(), this.highlightLayer.add(n);
       }
     });
-    this.mouseMoveHandler = this.view.on("pointer-move", async (o) => {
-      t(o).catch(() => {
+    this.mouseMoveHandler = this.view.on("pointer-move", async (a) => {
+      t(a).catch(() => {
       });
     });
   }
@@ -522,19 +531,19 @@ ${this.hitGraphic.attributes.id}`,
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const t = D.debounce(async (o) => {
+    const t = D.debounce(async (a) => {
       var n;
-      const s = (n = (await this.view.hitTest(o, {
+      const s = (n = (await this.view.hitTest(a, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
       })).results) == null ? void 0 : n.filter(
-        (a) => a.type === "graphic"
+        (o) => o.type === "graphic"
       );
       if (s.length === 0)
         return;
       const e = s[0].graphic, c = e.getAttribute("type"), r = e.getAttribute("id");
       if (c === "OpenDriveJunction")
         if (e.getAttribute("selected") === !1) {
-          const a = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, l = await f.get(a, {
+          const o = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, l = await g.get(o, {
             params: {
               id: r,
               projectName: this.projectName
@@ -545,12 +554,15 @@ ${this.hitGraphic.attributes.id}`,
             id: r,
             details: l.data.result
           }), e.setAttribute("selected", !0), e.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(e, 50));
-        } else
+        } else {
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
             id: r,
             details: void 0
-          }), e.setAttribute("selected", !1), e.symbol.url = "/GisViewerAssets/Images/point_green.png", this.decreasePictureMarkerSize(e, 30);
+          }), e.setAttribute("selected", !1);
+          const o = e.getAttribute("crossId");
+          e.symbol.url = o ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png", this.decreasePictureMarkerSize(e, 30);
+        }
       else if (c === "OpenDriveSection")
         if (e.getAttribute("selected"))
           this.sectionLayer.remove(e), this.openDriveClickCallback && this.openDriveClickCallback({
@@ -560,7 +572,7 @@ ${this.hitGraphic.attributes.id}`,
           });
         else {
           this.highlightLayer.remove(e), this.sectionLayer.add(e), e.setAttribute("selected", !0);
-          const a = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, l = await f.get(a, {
+          const o = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, l = await g.get(o, {
             params: {
               id: r,
               projectName: this.projectName
@@ -573,15 +585,15 @@ ${this.hitGraphic.attributes.id}`,
           });
         }
     });
-    this.mouseClickHandler = this.view.on("immediate-click", async (o) => {
-      t(o).catch(() => {
+    this.mouseClickHandler = this.view.on("immediate-click", async (a) => {
+      t(a).catch(() => {
       });
     });
   }
-  increasePictureMarkerSize(t, o) {
+  increasePictureMarkerSize(t, a) {
     const i = setInterval(() => {
       const s = t.symbol, e = s.width;
-      e < o ? t.symbol = {
+      e < a ? t.symbol = {
         type: "picture-marker",
         url: s.url,
         width: e + 1,
@@ -589,10 +601,10 @@ ${this.hitGraphic.attributes.id}`,
       } : clearInterval(i);
     }, 20);
   }
-  decreasePictureMarkerSize(t, o) {
+  decreasePictureMarkerSize(t, a) {
     const i = setInterval(() => {
       const s = t.symbol, e = s.width;
-      e > o ? t.symbol = {
+      e > a ? t.symbol = {
         type: "picture-marker",
         url: s.url,
         width: e - 1,
@@ -604,13 +616,13 @@ ${this.hitGraphic.attributes.id}`,
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var o, i;
+    var a, i;
     let t = await this.laneLayer.queryFeatures();
     t.features.length > 0 && await this.laneLayer.applyEdits({
       deleteFeatures: t.features
     }), t = await this.roadNameLayer.queryFeatures(), t.features.length > 0 && await this.roadNameLayer.applyEdits({
       deleteFeatures: t.features
-    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.wasmLoader.clear(), (o = this.mouseMoveHandler) == null || o.remove(), (i = this.mouseClickHandler) == null || i.remove();
+    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.wasmLoader.clear(), (a = this.mouseMoveHandler) == null || a.remove(), (i = this.mouseClickHandler) == null || i.remove();
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -618,28 +630,28 @@ ${this.hitGraphic.attributes.id}`,
    * @returns
    */
   async findSumo(t) {
-    const { type: o, id: i } = t, s = t.flash === void 0 ? !0 : t.flash;
-    if (o === "junction")
+    const { type: a, id: i } = t, s = t.flash === void 0 ? !0 : t.flash;
+    if (a === "junction")
       return await this.findJunction(i, s);
-    if (o === "edge") {
+    if (a === "edge") {
       const e = i.split("+");
       if (e.length > 2)
         return { status: -1, message: "id格式错误" };
       const c = e.length === 2 ? Number(e[1]) : void 0, r = e[0].split("#");
       if (r.length > 2)
         return { status: -1, message: "id格式错误" };
-      const n = r[0], a = r.length === 2 ? Number(r[1]) : void 0;
-      return await this.findLane({ roadsectId: n, segmentId: a, laneId: c, flash: s });
+      const n = r[0], o = r.length === 2 ? Number(r[1]) : void 0;
+      return await this.findLane({ roadsectId: n, segmentId: o, laneId: c, flash: s });
     } else
       return { status: -1, message: "未知类型" };
   }
-  async findJunction(t, o) {
+  async findJunction(t, a) {
     const i = this.junctionLayer.graphics.find(
       (s) => s.attributes.id === t
     );
     if (!i)
       return { status: -1, message: "未找到。请检查路口编号" };
-    if (o) {
+    if (a) {
       const s = new p({
         geometry: i.geometry,
         symbol: {
@@ -663,33 +675,33 @@ ${this.hitGraphic.attributes.id}`,
    * @returns
    */
   async findLane(t) {
-    let { roadsectId: o, segmentId: i, laneId: s } = t;
-    o.startsWith("-") && (o = o.slice(1));
+    let { roadsectId: a, segmentId: i, laneId: s } = t;
+    a.startsWith("-") && (a = a.slice(1));
     let e = this.allLaneGraphics.filter(
-      (n) => n.attributes.roadId === o
+      (n) => n.attributes.roadId === a
     );
     if (e.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
     if (i !== void 0) {
       const n = [];
-      if (e.forEach((a) => {
-        const l = Number(a.attributes.sectionId);
+      if (e.forEach((o) => {
+        const l = Number(o.attributes.sectionId);
         n.indexOf(l) === -1 && n.push(l);
-      }), n.sort((a, l) => a - l), i > n.length - 1)
+      }), n.sort((o, l) => o - l), i > n.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
       i = n[i], e = e.filter(
-        (a) => Number(a.attributes.sectionId) === i
+        (o) => Number(o.attributes.sectionId) === i
       );
     }
     if (s !== void 0) {
       const n = [];
-      if (e.forEach((a) => {
-        const l = Number(a.attributes.laneId);
+      if (e.forEach((o) => {
+        const l = Number(o.attributes.laneId);
         n.indexOf(l) === -1 && n.push(l);
-      }), n.sort((a, l) => a - l), s > n.length - 1)
+      }), n.sort((o, l) => o - l), s > n.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
       s = n[s], e = e.filter(
-        (a) => Number(a.attributes.laneId) === s
+        (o) => Number(o.attributes.laneId) === s
       );
     }
     const c = e.map(
@@ -714,9 +726,9 @@ ${this.hitGraphic.attributes.id}`,
   }
   flashGraphic(t) {
     this.flashLayer.removeAll(), this.flashLayer.add(t);
-    let o = 0, i = !0;
+    let a = 0, i = !0;
     const s = setInterval(() => {
-      i ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (i = !1, o++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (i = !0)), o >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(s));
+      i ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (i = !1, a++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (i = !0)), a >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(s));
     }, 10);
   }
   async splitLane(t) {

package/es/src/gis-map/utils/signal-control-area-controller/district-controller.d.ts

@@ -0,0 +1,20 @@
+interface ICross {
+    id: string;
+    name: string;
+    parentId: string;
+    latitude: number;
+    longitude: number;
+}
+export default class DistrictController {
+    id: string;
+    name: string;
+    parentId: string;
+    crosses: ICross[];
+    subDistricts: DistrictController[];
+    areaColor: number[];
+    crossCount: number;
+    subDistrictCount: number;
+    constructor(params: any);
+    getAllCrossCoordinates(): number[][];
+}
+export {};

package/es/src/gis-map/utils/signal-control-area-controller/district-controller.mjs

@@ -0,0 +1,34 @@
+class i {
+  constructor(t) {
+    this.crosses = [], this.subDistricts = [], this.areaColor = [
+      Math.floor(Math.random() * 255),
+      Math.floor(Math.random() * 255),
+      Math.floor(Math.random() * 255)
+    ], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.id, this.name = t.name, this.parentId = t.parentId;
+    for (const s of t.children)
+      if (s.children) {
+        const o = new i(s);
+        o.areaColor = this.areaColor, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
+      } else {
+        const o = {
+          id: s.id,
+          name: s.name,
+          parentId: s.parentId,
+          latitude: s.latitude,
+          longitude: s.longitude
+        };
+        this.crosses.push(o), this.crossCount++;
+      }
+  }
+  getAllCrossCoordinates() {
+    const t = [];
+    for (const s of this.crosses)
+      t.push([s.longitude, s.latitude]);
+    for (const s of this.subDistricts)
+      t.push(...s.getAllCrossCoordinates());
+    return t;
+  }
+}
+export {
+  i as default
+};

package/es/src/gis-map/utils/signal-control-area-controller/index.d.ts

@@ -0,0 +1,15 @@
+import { IResult } from '../../../types';
+export default class SignalControlAreaController {
+    private view;
+    private districtControllerLayer;
+    private subDistrictControllerLayer;
+    private crossLayer;
+    private eventHandle?;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    showSignalControlArea(params: any): IResult;
+    clearSignalControlArea(): IResult;
+    locateSignalControlArea(params: {
+        id: string;
+    }): IResult;
+    private drawArea;
+}