gisviewer-vue3-arcgis 1.0.139 → 1.0.141

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

@@ -14,6 +14,7 @@ export default class OpenDriveRenderer {
     private allRefLineGraphics;
     private mouseMoveHandler;
     private mouseClickHandler;
+    private junctionNames;
     constructor(view: __esri.MapView | __esri.SceneView);
     private projectName;
     private openDriveServer;
@@ -49,7 +50,6 @@ export default class OpenDriveRenderer {
     private currentJunctionId;
     private hitGraphic;
     private highlightGraphic;
-    private monitorMouseDrag;
     /**
      * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
      */

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

@@ -1,20 +1,19 @@
 import p from "@arcgis/core/Graphic";
-import * as j from "@arcgis/core/core/promiseUtils";
+import * as k from "@arcgis/core/core/promiseUtils";
 import { Polygon as O } from "@arcgis/core/geometry";
-import * as I from "@arcgis/core/geometry/geometryEngine";
-import G from "@arcgis/core/layers/FeatureLayer";
-import f from "@arcgis/core/layers/GraphicsLayer";
-import m from "axios";
+import * as L from "@arcgis/core/geometry/geometryEngine";
+import j from "@arcgis/core/layers/FeatureLayer";
+import b from "@arcgis/core/layers/GraphicsLayer";
+import g from "axios";
 import F from "md5";
-import S from "pako";
+import G from "pako";
 import A from "../common-utils.mjs";
-class C {
+class S {
   constructor(e) {
-    this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.currentJunctionId = "", this.view = e, this.view.popup.visibleElements = {
-      closeButton: !1,
+    this.junctionNames = /* @__PURE__ */ new Map(), this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.currentJunctionId = "", this.view = e, this.view.popup.visibleElements = {
       collapseButton: !1,
       actionBar: !1
-    }, this.laneLayer = new G({
+    }, this.laneLayer = new j({
       id: "OpenDriveLane",
       fields: [
         {
@@ -56,6 +55,16 @@ class C {
           name: "sumoId",
           alias: "sumo编号",
           type: "string"
+        },
+        {
+          name: "fromNode",
+          alias: "起点路口",
+          type: "string"
+        },
+        {
+          name: "toNode",
+          alias: "终点路口",
+          type: "string"
         }
       ],
       objectIdField: "ObjectID",
@@ -222,7 +231,7 @@ class C {
           }
         ]
       }
-    }), this.roadNameLayer = new G({
+    }), this.roadNameLayer = new j({
       id: "OpenDriveRoadName",
       fields: [
         {
@@ -272,7 +281,7 @@ class C {
           }
         }
       ]
-    }), 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.drawLayer = new f({ id: "Draw" }), this.view.map.addMany([
+    }), this.junctionLayer = new b({ id: "OpenDriveJunction" }), this.sectionLayer = new b({ id: "OpenDriveSection" }), this.highlightLayer = new b({ id: "OpenDriveHighlight" }), this.flashLayer = new b({ id: "OpenDriveFlash" }), this.drawLayer = new b({ id: "Draw" }), this.view.map.addMany([
       this.laneLayer,
       this.junctionLayer,
       this.sectionLayer,
@@ -283,7 +292,7 @@ class C {
     ]);
   }
   static getInstance(e) {
-    return this.instance || (this.instance = new C(e)), this.instance;
+    return this.instance || (this.instance = new S(e)), this.instance;
   }
   async makeMd5FromFile(e) {
     try {
@@ -299,7 +308,7 @@ class C {
    * @returns
    */
   async showOpenDriveFromFile(e) {
-    var d, g;
+    var h, f;
     this.openDriveClickCallback = e.selectedCallback, console.time("md5用时");
     const t = await this.makeMd5FromFile(e.file);
     if (t.status !== 0)
@@ -308,7 +317,7 @@ class C {
     const i = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
     let o;
     try {
-      o = await m.post(
+      o = await g.post(
         i,
         {},
         {
@@ -318,8 +327,8 @@ class C {
           }
         }
       );
-    } catch (u) {
-      return { status: -1, message: u.message };
+    } catch (d) {
+      return { status: -1, message: d.message };
     }
     if (o.status !== 200)
       return { status: -1, message: o.statusText };
@@ -332,16 +341,16 @@ class C {
     );
     let l = o.data.result.json;
     l.startsWith(window.location.protocol) || (l = `${window.location.protocol}//${e.server}${l}`);
-    const a = await (await fetch(l)).arrayBuffer(), r = S.inflate(a, { to: "string" }), c = JSON.parse(r);
+    const n = await (await fetch(l)).arrayBuffer(), r = G.inflate(n, { to: "string" }), c = JSON.parse(r);
     await this.showAllLanes(
       c,
-      ((d = e.options) == null ? void 0 : d.showJunctionLane) || !1,
-      ((g = e.options) == null ? void 0 : g.showRoadName) || !0
+      ((h = e.options) == null ? void 0 : h.showJunctionLane) || !1,
+      ((f = e.options) == null ? void 0 : f.showRoadName) || !0
     );
-    const h = o.data.result.junctions;
-    if (this.showJunction(h), e.options && e.options.centerMap !== !1) {
-      const u = A.transformPointProjection([0, 0]);
-      await this.view.goTo(u);
+    const m = o.data.result.junctions;
+    if (this.showJunction(m), e.options && e.options.centerMap !== !1) {
+      const d = A.transformPointProjection([0, 0]);
+      await this.view.goTo(d);
     }
     return this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick(), console.timeEnd("渲染用时"), { status: 0, message: "ok" };
   }
@@ -351,7 +360,7 @@ class C {
    * @param projectName
    */
   async showOpenDriveFromServer(e, t) {
-    const i = `http://${e}/api/openDrive/analyzeXodr`, o = await m.get(i, {
+    const i = `http://${e}/api/openDrive/analyzeXodr`, o = await g.get(i, {
       headers: {
         projectName: t
       },
@@ -364,7 +373,7 @@ class C {
       throw new Error(`OpenDriveRenderer: ${o.statusText}`);
     let s = o.data.result.json;
     s.startsWith(window.location.protocol) || (s = `${window.location.protocol}//${e}${s}`);
-    const n = await (await fetch(s)).arrayBuffer(), a = S.inflate(n, { to: "string" }), r = JSON.parse(a);
+    const a = await (await fetch(s)).arrayBuffer(), n = G.inflate(a, { to: "string" }), r = JSON.parse(n);
     return await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
   }
   /**
@@ -381,66 +390,68 @@ class C {
     }), this.roadNameLayer.visible = i, new Promise((s) => {
       let l = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
-      const n = [];
+      const a = [];
       for (const r of e) {
         if (!t && r.junction !== "-1")
           continue;
-        const { id: c, refLine: h } = r;
-        let d = r.name;
-        d.includes("(") && (d = d.slice(0, d.indexOf("("))), d = d.replace(/(.)/g, "$1 ");
-        const g = new p({
+        const { id: c, refLine: m } = r;
+        let h = r.name;
+        h.includes("(") && (h = h.slice(0, h.indexOf("("))), h = h.replace(/(.)/g, "$1 ");
+        const f = new p({
           geometry: {
             type: "polyline",
-            paths: [h]
+            paths: [m]
           },
           attributes: {
             ObjectID: l++,
             roadId: c,
-            roadName: d
+            roadName: h
           }
         });
-        this.allRefLineGraphics.push(g), r.laneSections.sort((u, w) => Number(u.id) - Number(w.id));
-        for (let u = 0; u < r.laneSections.length; u++) {
-          const w = r.laneSections[u], L = Number(w.id);
-          for (const y of w.lanePaths) {
-            const b = Number(y.id);
-            if (b === 0)
+        this.allRefLineGraphics.push(f), r.laneSections.sort((d, y) => Number(d.id) - Number(y.id));
+        for (let d = 0; d < r.laneSections.length; d++) {
+          const y = r.laneSections[d], u = Number(y.id);
+          for (const w of y.lanePaths) {
+            const v = Number(w.id);
+            if (v === 0)
               continue;
-            const N = y.type, v = y.innerPath.concat(
-              y.outerPath.reverse()
+            const C = w.type, I = w.innerPath.concat(
+              w.outerPath.reverse()
             );
-            if (v.length <= 3) {
-              console.warn(`lane ${b} has less than 3 points`);
+            if (I.length <= 3) {
+              console.warn(`lane ${v} has less than 3 points`);
               continue;
             }
-            v.push(y.innerPath[0]);
-            const D = new O({
-              rings: [v]
+            I.push(w.innerPath[0]);
+            const N = new O({
+              rings: [I]
             });
-            if (D) {
-              const k = new p({
-                geometry: D,
+            if (N) {
+              const D = new p({
+                geometry: N,
                 attributes: {
                   ObjectID: l++,
-                  id: `${c}+${L}+${b}`,
+                  id: `${c}+${u}+${v}`,
+                  fromNode: r.fromNode,
+                  toNode: r.toNode,
                   roadId: c,
                   roadName: r.name,
-                  sectionId: L,
-                  sectionIndex: u,
-                  laneId: b,
-                  type: N,
+                  sectionId: u,
+                  sectionIndex: d,
+                  laneId: v,
+                  type: C,
                   sumoId: ""
                 }
               });
-              this.allLaneGraphics.push(k), n.push(k);
+              this.allLaneGraphics.push(D), a.push(D);
             }
           }
         }
       }
-      const a = setInterval(() => {
-        if (n.length > 0 || this.allRefLineGraphics.length > 0) {
-          if (n.length > 0) {
-            const r = n.splice(0, 100);
+      const n = setInterval(() => {
+        if (a.length > 0 || this.allRefLineGraphics.length > 0) {
+          if (a.length > 0) {
+            const r = a.splice(0, 100);
             this.laneLayer.applyEdits({
               addFeatures: r
             });
@@ -452,7 +463,7 @@ class C {
             });
           }
         } else
-          clearInterval(a), s();
+          clearInterval(n), s();
       }, 10);
     });
   }
@@ -466,7 +477,7 @@ class C {
     for (const i of e) {
       if (!i)
         continue;
-      i.nodeType = i.type;
+      this.junctionNames.set(i.id, i.name), i.nodeType = i.type;
       const o = new p({
         geometry: {
           type: "point",
@@ -483,24 +494,40 @@ class C {
           url: i.crossId ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png",
           width: 30,
           height: 30
+        },
+        popupTemplate: {
+          title: i.name,
+          content: [
+            {
+              type: "fields",
+              fieldInfos: [
+                {
+                  fieldName: "id",
+                  label: "路口编号"
+                },
+                {
+                  fieldName: "crossId",
+                  label: "信号机编号"
+                }
+              ]
+            }
+          ]
         }
       });
       t.push(o);
     }
     this.junctionLayer.addMany(t);
   }
-  monitorMouseDrag() {
-  }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const e = j.debounce(async (t) => {
+    const e = k.debounce(async (t) => {
       var l;
       const o = (l = (await this.view.hitTest(t, {
         include: [this.laneLayer, this.junctionLayer]
       })).results) == null ? void 0 : l.filter(
-        (n) => n.type === "graphic"
+        (a) => a.type === "graphic"
       );
       if (o.length === 0) {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightGraphic = void 0, this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = "", this.view.closePopup());
@@ -508,17 +535,19 @@ class C {
       }
       const s = o[0];
       if (this.hitGraphic = s.graphic, s.layer.id === "OpenDriveLane") {
-        const n = `${this.hitGraphic.attributes.roadId}+${this.hitGraphic.attributes.sectionId}`;
-        if (n === this.currentSectionCode || this.sectionLayer.graphics.findIndex(
-          (h) => h.getAttribute("id") === n
+        const a = `${this.hitGraphic.getAttribute(
+          "roadId"
+        )}+${this.hitGraphic.getAttribute("sectionId")}`;
+        if (a === this.currentSectionCode || this.sectionLayer.graphics.findIndex(
+          (u) => u.getAttribute("id") === a
         ) >= 0)
           return;
-        this.currentSectionCode = n;
+        this.currentSectionCode = a;
         const r = this.allLaneGraphics.filter(
-          (h) => `${h.attributes.roadId}+${h.attributes.sectionId}` === n
-        ), c = I.union(
-          r.map((h) => h.geometry)
-        );
+          (u) => `${u.attributes.roadId}+${u.attributes.sectionId}` === a
+        ), c = L.union(
+          r.map((u) => u.geometry)
+        ), m = this.hitGraphic.getAttribute("fromNode"), h = this.hitGraphic.getAttribute("toNode"), f = this.junctionNames.get(m) || m, d = this.junctionNames.get(h) || h;
         this.highlightGraphic = new p({
           geometry: c,
           symbol: {
@@ -532,22 +561,46 @@ class C {
           },
           attributes: {
             type: "OpenDriveSection",
-            id: n,
-            selected: !1
+            id: a,
+            selected: !1,
+            fromNodeName: f,
+            toNodeName: d,
+            laneCount: r.length
+          },
+          popupTemplate: {
+            title: this.hitGraphic.getAttribute("roadName"),
+            content: [
+              {
+                type: "fields",
+                fieldInfos: [
+                  {
+                    fieldName: "fromNodeName",
+                    label: "起点路口"
+                  },
+                  {
+                    fieldName: "toNodeName",
+                    label: "终点路口"
+                  },
+                  {
+                    fieldName: "laneCount",
+                    label: "车道数量"
+                  }
+                ]
+              }
+            ]
           }
         }), this.highlightLayer.removeAll(), this.highlightLayer.add(this.highlightGraphic);
+        const y = this.view.toMap(t);
+        this.view.openPopup({
+          features: [this.highlightGraphic],
+          location: y
+        });
       } else if (s.layer.id === "OpenDriveJunction") {
-        const n = this.hitGraphic.getAttribute("id");
-        if (n === this.currentJunctionId)
+        const a = this.hitGraphic.getAttribute("id");
+        if (a === this.currentJunctionId)
           return;
-        this.currentJunctionId = n;
-        const a = this.hitGraphic.getAttribute("name"), r = this.hitGraphic.getAttribute("crossId");
-        this.view.openPopup({
-          title: a,
-          content: `<table>
-          <tr><td>路口编号</td><td>${n}</td></tr>
-          <tr><td>信号机编号</td><td>${r || "无信控"}</td></tr>
-          </table>`,
+        this.currentJunctionId = a, this.view.openPopup({
+          features: [this.hitGraphic],
           location: this.hitGraphic.geometry
         });
       }
@@ -561,33 +614,33 @@ class C {
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = j.debounce(async (t) => {
-      var a;
-      const o = (a = (await this.view.hitTest(t, {
+    const e = k.debounce(async (t) => {
+      var n;
+      const o = (n = (await this.view.hitTest(t, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
-      })).results) == null ? void 0 : a.filter(
+      })).results) == null ? void 0 : n.filter(
         (r) => r.type === "graphic"
       );
       if (o.length === 0)
         return;
-      const s = o[0].graphic, l = s.getAttribute("type"), n = s.getAttribute("id");
+      const s = o[0].graphic, l = s.getAttribute("type"), a = s.getAttribute("id");
       if (l === "OpenDriveJunction")
         if (s.getAttribute("selected") === !1) {
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, c = await m.get(r, {
+          const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, c = await g.get(r, {
             params: {
-              id: n,
+              id: a,
               projectName: this.projectName
             }
           });
           c.status === 200 && c.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
+            id: a,
             details: c.data.result
           }), s.setAttribute("selected", !0), s.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(s, 50));
         } else {
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
+            id: a,
             details: void 0
           }), s.setAttribute("selected", !1);
           const r = s.getAttribute("crossId");
@@ -597,20 +650,20 @@ class C {
         if (s.getAttribute("selected"))
           this.sectionLayer.remove(s), this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveSection",
-            id: n,
+            id: a,
             details: void 0
           });
         else {
           this.highlightLayer.remove(s), this.sectionLayer.add(s), s.setAttribute("selected", !0);
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, c = await m.get(r, {
+          const r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, c = await g.get(r, {
             params: {
-              id: n,
+              id: a,
               projectName: this.projectName
             }
           });
           c.status === 200 && c.data.status === 0 && this.openDriveClickCallback && (s.setAttribute("edgeId", c.data.result.obj_id), this.openDriveClickCallback({
             type: "OpenDriveSection",
-            id: n,
+            id: a,
             details: c.data.result
           }));
         }
@@ -655,7 +708,7 @@ class C {
   async getSumoInfo(e) {
     switch (e.type) {
       case "junction": {
-        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, i = await m.get(t, {
+        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, i = await g.get(t, {
           params: {
             id: e.id,
             projectName: this.projectName
@@ -675,13 +728,13 @@ class C {
         if (s) {
           const l = `${i}+${s.getAttribute(
             "sectionId"
-          )}`, n = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await m.get(n, {
+          )}`, a = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, n = await g.get(a, {
             params: {
               id: l,
               projectName: this.projectName
             }
           });
-          return a.status === 200 ? a.data : { status: -1, message: `路段信息查询失败: ${l}` };
+          return n.status === 200 ? n.data : { status: -1, message: `路段信息查询失败: ${l}` };
         } else
           return { status: -1, message: "未知类型" };
       }
@@ -714,11 +767,11 @@ class C {
       const s = i.split("+");
       if (s.length > 2)
         return { status: -1, message: "id格式错误" };
-      const l = s.length === 2 ? Number(s[1]) : void 0, n = s[0].split("#");
-      if (n.length > 2)
+      const l = s.length === 2 ? Number(s[1]) : void 0, a = s[0].split("#");
+      if (a.length > 2)
         return { status: -1, message: "id格式错误" };
-      const a = n[0], r = n.length === 2 ? Number(n[1]) : void 0;
-      return await this.findLane({ roadsectId: a, segmentId: r, laneId: l, flash: o });
+      const n = a[0], r = a.length === 2 ? Number(a[1]) : void 0;
+      return await this.findLane({ roadsectId: n, segmentId: r, laneId: l, flash: o });
     } else
       return { status: -1, message: "未知类型" };
   }
@@ -755,38 +808,38 @@ class C {
     let { roadsectId: t, segmentId: i, laneId: o } = e;
     t.startsWith("-") && (t = t.slice(1));
     let s = this.allLaneGraphics.filter(
-      (a) => a.attributes.roadId === t
+      (n) => n.attributes.roadId === t
     );
     if (s.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
     if (i !== void 0) {
-      const a = [];
+      const n = [];
       if (s.forEach((r) => {
         const c = Number(r.attributes.sectionId);
-        a.indexOf(c) === -1 && a.push(c);
-      }), a.sort((r, c) => r - c), i > a.length - 1)
+        n.indexOf(c) === -1 && n.push(c);
+      }), n.sort((r, c) => r - c), i > n.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
-      i = a[i], s = s.filter(
+      i = n[i], s = s.filter(
         (r) => Number(r.attributes.sectionId) === i
       );
     }
     if (o !== void 0) {
-      const a = [];
+      const n = [];
       if (s.forEach((r) => {
         const c = Number(r.attributes.laneId);
-        a.indexOf(c) === -1 && a.push(c);
-      }), a.sort((r, c) => r - c), o > a.length - 1)
+        n.indexOf(c) === -1 && n.push(c);
+      }), n.sort((r, c) => r - c), o > n.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
-      o = a[o], s = s.filter(
+      o = n[o], s = s.filter(
         (r) => Number(r.attributes.laneId) === o
       );
     }
     const l = s.map(
-      (a) => a.geometry
-    ), n = I.union(l);
+      (n) => n.geometry
+    ), a = L.union(l);
     if (e.flash) {
-      const a = new p({
-        geometry: n,
+      const n = new p({
+        geometry: a,
         symbol: {
           type: "simple-fill",
           color: [255, 0, 0, 0.5],
@@ -797,9 +850,9 @@ class C {
           }
         }
       });
-      this.flashGraphic(a);
+      this.flashGraphic(n);
     }
-    return await this.view.goTo(n, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(a, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * graphic渐隐渐显闪烁
@@ -857,9 +910,9 @@ class C {
           (l) => l.getAttribute("roadId") === i && l.getAttribute("sectionIndex") === o
         );
         if (s.length > 0) {
-          const l = I.union(
-            s.map((a) => a.geometry)
-          ), n = new p({
+          const l = L.union(
+            s.map((n) => n.geometry)
+          ), a = new p({
             geometry: l,
             symbol: {
               type: "simple-fill",
@@ -876,7 +929,7 @@ class C {
               selected: !0
             }
           });
-          return this.sectionLayer.add(n), { status: 0, message: "ok" };
+          return this.sectionLayer.add(a), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
       }
@@ -889,5 +942,5 @@ class C {
   }
 }
 export {
-  C as default
+  S as default
 };

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

@@ -31,4 +31,11 @@ export default class SignalControlAreaController {
      * @returns
      */
     private drawArea;
+    /**
+     * 生成路口点符号。在不同比例尺下，使用不同的符号
+     * @param attributes
+     * @param symbolType
+     * @returns
+     */
+    private getCrossGraphicSymbol;
 }

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

@@ -1,11 +1,12 @@
-import * as g from "@arcgis/core/core/reactiveUtils.js";
-import n from "@arcgis/core/Graphic";
+import * as p from "@arcgis/core/core/reactiveUtils.js";
+import y from "@arcgis/core/Graphic";
 import o from "@arcgis/core/layers/GraphicsLayer";
-import m from "@turf/buffer";
-import d from "@turf/convex";
-import * as l from "@turf/helpers";
-import p from "./district-controller.mjs";
-class C {
+import g from "@turf/buffer";
+import d from "@turf/concave";
+import f from "@turf/convex";
+import * as n from "@turf/helpers";
+import b from "./district-controller.mjs";
+class x {
   constructor(e) {
     this.crossScale = 3e3, this.view = e, this.view.popup.visibleElements = {
       closeButton: !0,
@@ -34,51 +35,33 @@ class C {
   }
   showSignalControlArea(e) {
     this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0;
-    for (const i of e) {
-      const r = new p(i);
-      this.drawArea(r, !0);
+    for (const t of e) {
+      const i = new b(t);
+      this.drawArea(i, !0);
     }
-    return this.watchHandle = g.watch(
+    return this.watchHandle = p.watch(
       () => this.view.scale,
-      (i, r) => {
-        i > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((t) => {
-          t.symbol = {
-            type: "simple-marker",
-            style: t.getAttribute("isKey") ? "diamond" : "circle",
-            color: t.getAttribute("color"),
-            size: t.getAttribute("isKey") ? 16 : 8,
-            outline: {
-              color: t.getAttribute("isKey") ? "red" : "white",
-              width: t.getAttribute("isKey") ? 2 : 1
-            }
-          };
-        }), this.highlightLayer.graphics.forEach((t) => {
-          t.getAttribute("type") === "cross" && (t.symbol = {
-            type: "simple-marker",
-            style: t.getAttribute("isKey") ? "diamond" : "circle",
-            color: t.getAttribute("color"),
-            size: t.getAttribute("isKey") ? 16 : 8,
-            outline: {
-              color: t.getAttribute("isKey") ? "red" : "white",
-              width: t.getAttribute("isKey") ? 2 : 1
-            }
-          });
-        })) : i <= this.crossScale && r > this.crossScale && (this.crossLayer.graphics.forEach((t) => {
-          t.symbol = {
-            type: "picture-marker",
-            url: `/GisViewerAssets/Images/xhj_${t.getAttribute("isKey") ? 4 : 1}.png`,
-            width: t.getAttribute("isKey") ? "55px" : "37px",
-            height: t.getAttribute("isKey") ? "85px" : "57px",
-            yoffset: t.getAttribute("isKey") ? "37px" : "25px"
-          };
-        }), this.highlightLayer.graphics.forEach((t) => {
-          t.getAttribute("type") === "cross" && (t.symbol = {
-            type: "picture-marker",
-            url: `/GisViewerAssets/Images/xhj_${t.getAttribute("isKey") ? 4 : 1}.png`,
-            width: t.getAttribute("isKey") ? "55px" : "37px",
-            height: t.getAttribute("isKey") ? "85px" : "57px",
-            yoffset: t.getAttribute("isKey") ? "37px" : "25px"
-          });
+      (t, i) => {
+        t > this.crossScale && i <= this.crossScale ? (this.crossLayer.graphics.forEach((s) => {
+          s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
+            "marker"
+          );
+        }), this.highlightLayer.graphics.forEach((s) => {
+          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
+            "marker"
+          ));
+        })) : t <= this.crossScale && i > this.crossScale && (this.crossLayer.graphics.forEach((s) => {
+          s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
+            "picture"
+          );
+        }), this.highlightLayer.graphics.forEach((s) => {
+          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
+            s.attributes,
+            "picture"
+          ));
         }));
       }
     ), { status: 0, message: "ok" };
@@ -88,30 +71,30 @@ class C {
     return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.watchHandle) == null || e.remove(), this.view.closePopup(), { status: 0, message: "ok" };
   }
   async locateSignalControlArea(e) {
-    const i = this.findAreaGraphic(e.id);
-    return i ? (i.attributes.type === "cross" ? await this.view.goTo({
-      target: i.geometry,
+    const t = this.findAreaGraphic(e.id);
+    return t ? (t.attributes.type === "cross" ? await this.view.goTo({
+      target: t.geometry,
       scale: 1500
-    }) : await this.view.goTo(i.geometry), this.showPopup(i), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
+    }) : await this.view.goTo(t.geometry), this.showPopup(t), { status: 0, message: "ok" }) : { status: 1, message: "未找到" };
   }
   showPopup(e) {
-    const i = e.geometry.type === "point" ? e.geometry : e.geometry.centroid;
+    const t = e.geometry.type === "point" ? e.geometry : e.geometry.centroid;
     this.view.openPopup({
       features: [e],
-      location: i
+      location: t
     });
   }
   async highlightSignalControlArea(e) {
     this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !1, this.subDistrictControllerLayer.visible = !1, this.crossLayer.visible = !1;
-    const i = this.districtControllerLayer.graphics.filter((s) => s.getAttribute("id") === e.id).toArray().map((s) => s.clone()), r = this.subDistrictControllerLayer.graphics.filter(
-      (s) => s.getAttribute("id") === e.id || s.getAttribute("parentId") === e.id
-    ).toArray().map((s) => s.clone()), t = this.crossLayer.graphics.filter(
-      (s) => s.getAttribute("id") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
-    ).toArray().map((s) => s.clone());
-    return i.length > 0 && this.highlightLayer.addMany(i), r.length > 0 && (this.highlightLayer.addMany(r), this.showPopup(r[0])), t.length > 0 && this.highlightLayer.addMany(t), this.highlightLayer.graphics.length === 0 ? { status: 1, message: "未找到" } : (i.length > 0 ? (await this.view.goTo(i), this.showPopup(i[0])) : r.length > 0 ? (await this.view.goTo(r), this.showPopup(r[0])) : (t.length > 1 ? await this.view.goTo(t) : await this.view.goTo({
-      target: t[0].geometry,
+    const t = this.districtControllerLayer.graphics.filter((r) => r.getAttribute("id") === e.id).toArray().map((r) => r.clone()), i = this.subDistrictControllerLayer.graphics.filter(
+      (r) => r.getAttribute("id") === e.id || r.getAttribute("parentId") === e.id
+    ).toArray().map((r) => r.clone()), s = this.crossLayer.graphics.filter(
+      (r) => r.getAttribute("id") === e.id || r.getAttribute("districtId") === e.id || r.getAttribute("subDistrictId") === e.id
+    ).toArray().map((r) => r.clone());
+    return t.length > 0 && this.highlightLayer.addMany(t), i.length > 0 && (this.highlightLayer.addMany(i), this.showPopup(i[0])), s.length > 0 && this.highlightLayer.addMany(s), this.highlightLayer.graphics.length === 0 ? { status: 1, message: "未找到" } : (t.length > 0 ? (await this.view.goTo(t), this.showPopup(t[0])) : i.length > 0 ? (await this.view.goTo(i), this.showPopup(i[0])) : (s.length > 1 ? await this.view.goTo(s) : await this.view.goTo({
+      target: s[0].geometry,
       scale: 1500
-    }), this.showPopup(t[0])), { status: 0, message: "ok" });
+    }), this.showPopup(s[0])), { status: 0, message: "ok" });
   }
   resetHighlight() {
     return this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !0, this.subDistrictControllerLayer.visible = !0, this.crossLayer.visible = !0, { status: 0, message: "ok" };
@@ -122,12 +105,12 @@ class C {
    * @returns
    */
   findAreaGraphic(e) {
-    let i = this.districtControllerLayer.graphics.find(
-      (r) => r.attributes.id === e
+    let t = this.districtControllerLayer.graphics.find(
+      (i) => i.attributes.id === e
     );
-    return i || (i = this.subDistrictControllerLayer.graphics.find(
-      (r) => r.attributes.id === e
-    )), i || (i = this.crossLayer.graphics.find((r) => r.attributes.id === e)), i;
+    return t || (t = this.subDistrictControllerLayer.graphics.find(
+      (i) => i.attributes.id === e
+    )), t || (t = this.crossLayer.graphics.find((i) => i.attributes.id === e)), t;
   }
   /**
    * 绘制区控与子区
@@ -135,30 +118,32 @@ class C {
    * @param isDistrict 是否是区控
    * @returns
    */
-  drawArea(e, i) {
-    const r = e.getAllCrossCoordinates();
-    if (r.length >= 2) {
-      let s = null;
-      if (r.length === 2)
-        s = l.lineString(r);
-      else if (r.length > 2) {
-        const u = l.featureCollection(
-          r.map((c) => l.point(c))
+  drawArea(e, t) {
+    const i = e.getAllCrossCoordinates();
+    if (i.length >= 2) {
+      let r = null;
+      if (i.length === 2)
+        r = n.lineString(i);
+      else if (i.length > 2) {
+        const c = n.featureCollection(
+          i.map((u) => n.point(u))
         );
-        s = d(u);
+        r = d(c, { maxEdge: 400, units: "meters" }), r || (r = f(c));
       }
-      if (!s)
+      if (!r) {
+        console.log("生成区控面失败", e);
         return;
-      const y = m(
-        s.geometry,
+      }
+      const a = g(
+        r.geometry,
         // 区控面积更大，需要更大的缓冲半径
-        i ? 200 : 30,
+        t ? 200 : 30,
         {
           units: "meters"
         }
       );
-      let a;
-      i ? a = [
+      let l;
+      t ? l = [
         {
           fieldName: "id",
           label: "区控编号"
@@ -171,7 +156,7 @@ class C {
           fieldName: "subDistrictCount",
           label: "子区数量"
         }
-      ] : a = [
+      ] : l = [
         {
           fieldName: "parentName",
           label: "所属区控"
@@ -181,101 +166,207 @@ class C {
           label: "路口数量"
         }
       ];
-      const h = new n({
+      const m = {
+        type: "signalControlArea",
+        id: e.id,
+        name: e.name,
+        parentId: e.parentId,
+        parentName: e.parentName,
+        crossCount: e.crossCount,
+        subDistrictCount: e.subDistrictCount
+      }, h = new y({
         geometry: {
           type: "polygon",
-          rings: y.geometry.coordinates
+          rings: a.geometry.coordinates
         },
         symbol: {
           type: "simple-fill",
-          color: [...e.areaColor, i ? 0.6 : 0.8],
+          color: [...e.areaColor, t ? 0.6 : 0.8],
           outline: {
             color: e.areaColor,
             width: 2,
-            style: i ? "solid" : "long-dash"
+            style: t ? "solid" : "long-dash"
           }
         },
-        attributes: {
-          type: "signalControlArea",
-          id: e.id,
-          name: e.name,
-          parentId: e.parentId,
-          parentName: e.parentName,
-          crossCount: e.crossCount,
-          subDistrictCount: e.subDistrictCount
-        },
+        attributes: m,
         popupTemplate: {
-          title: `${i ? "区控" : "子区"}  ${e.name}`,
+          title: `${t ? "区控" : "子区"}  ${e.name}`,
           content: [
             {
               type: "fields",
-              fieldInfos: a
+              fieldInfos: l
             }
           ]
         }
       });
-      i ? this.districtControllerLayer.add(h) : this.subDistrictControllerLayer.add(h);
+      t ? this.districtControllerLayer.add(h) : this.subDistrictControllerLayer.add(h);
     }
-    for (const s of e.subDistricts)
-      this.drawArea(s, !1);
-    const t = e.crosses.map((s) => new n({
-      geometry: {
-        type: "point",
-        x: s.longitude,
-        y: s.latitude
-      },
-      symbol: {
-        type: "simple-marker",
-        style: s.isKey ? "diamond" : "circle",
+    for (const r of e.subDistricts)
+      this.drawArea(r, !1);
+    const s = e.crosses.map((r) => {
+      const a = {
+        type: "cross",
+        id: r.id,
+        name: r.name,
         color: e.areaColor,
-        size: s.isKey ? 16 : 8,
+        signalId: r.signalId,
+        districtId: t ? e.id : e.parentId,
+        districtName: t ? e.name : e.parentName,
+        subDistrictId: t ? "" : e.id,
+        subDistrictName: t ? "" : e.name,
+        isKey: r.isKey
+      };
+      return new y({
+        geometry: {
+          type: "point",
+          x: r.longitude,
+          y: r.latitude
+        },
+        symbol: this.getCrossGraphicSymbol(a, "marker"),
+        attributes: a,
+        popupTemplate: {
+          title: r.name,
+          content: [
+            {
+              type: "fields",
+              fieldInfos: [
+                {
+                  fieldName: "districtName",
+                  label: "区控名称"
+                },
+                {
+                  fieldName: "subDistrictName",
+                  label: "子区名称"
+                },
+                {
+                  fieldName: "id",
+                  label: "路口编号"
+                },
+                {
+                  fieldName: "signalId",
+                  label: "信号机编号"
+                }
+              ]
+            }
+          ]
+        }
+      });
+    });
+    this.crossLayer.addMany(s);
+  }
+  /**
+   * 生成路口点符号。在不同比例尺下，使用不同的符号
+   * @param attributes
+   * @param symbolType
+   * @returns
+   */
+  getCrossGraphicSymbol(e, t) {
+    const { isKey: i, color: s } = e;
+    if (t === "marker")
+      return {
+        type: "simple-marker",
+        style: i ? "diamond" : "circle",
+        color: s,
+        size: i ? 16 : 8,
         outline: {
-          color: s.isKey ? "red" : "white",
-          width: s.isKey ? 2 : 1
+          color: i ? "red" : "white",
+          width: i ? 2 : 1
         }
-      },
-      attributes: {
-        type: "cross",
-        id: s.id,
-        name: s.name,
-        color: e.areaColor,
-        signalId: s.signalId,
-        districtId: i ? e.id : e.parentId,
-        districtName: i ? e.name : e.parentName,
-        subDistrictId: i ? "" : e.id,
-        subDistrictName: i ? "" : e.name,
-        isKey: s.isKey
-      },
-      popupTemplate: {
-        title: s.name,
-        content: [
-          {
-            type: "fields",
-            fieldInfos: [
-              {
-                fieldName: "districtName",
-                label: "区控名称"
-              },
-              {
-                fieldName: "subDistrictName",
-                label: "子区名称"
-              },
+      };
+    if (t === "picture")
+      return {
+        // type: 'picture-marker',
+        // url: `/GisViewerAssets/Images/xhj_${isKey ? 4 : 1}.png`,
+        // width: isKey ? '55px' : '37px',
+        // height: isKey ? '85px' : '57px',
+        // yoffset: isKey ? '37px' : '25px'
+        type: "cim",
+        data: {
+          type: "CIMSymbolReference",
+          primitiveOverrides: [
+            {
+              // 将textGraphic的TextString替换为graphic.attributes.showName
+              type: "CIMPrimitiveOverride",
+              primitiveName: "textGraphic",
+              propertyName: "TextString",
+              valueExpressionInfo: {
+                type: "CIMExpressionInfo",
+                title: "Custom",
+                expression: 'Replace($feature.name, "与", "/") + "  " + $feature.signalId',
+                returnType: "Default"
+              }
+            }
+          ],
+          symbol: {
+            type: "CIMPointSymbol",
+            symbolLayers: [
+              // 车辆号牌
               {
-                fieldName: "id",
-                label: "路口编号"
+                type: "CIMVectorMarker",
+                size: 32,
+                colorLocked: !0,
+                anchorPointUnits: "Relative",
+                frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
+                markerGraphics: [
+                  {
+                    type: "CIMMarkerGraphic",
+                    primitiveName: "textGraphic",
+                    geometry: { x: 0, y: 0 },
+                    symbol: {
+                      type: "CIMTextSymbol",
+                      height: 12,
+                      horizontalAlignment: "Center",
+                      offsetX: 0,
+                      offsetY: i ? 30 : 22,
+                      haloSize: 1,
+                      haloSymbol: {
+                        type: "CIMPolygonSymbol",
+                        symbolLayers: [
+                          {
+                            type: "CIMSolidFill",
+                            enable: !0,
+                            color: [255, 255, 255, 255]
+                          }
+                        ]
+                      },
+                      symbol: {
+                        type: "CIMPolygonSymbol",
+                        symbolLayers: [
+                          {
+                            type: "CIMSolidFill",
+                            enable: !0,
+                            color: [0, 0, 0, 255]
+                          }
+                        ]
+                      },
+                      verticalAlignment: "Center"
+                    },
+                    textString: ""
+                  }
+                ],
+                scaleSymbolsProportionally: !0,
+                respectFrame: !0
               },
+              // 车辆图标
               {
-                fieldName: "signalId",
-                label: "信号机编号"
+                type: "CIMPictureMarker",
+                enable: !0,
+                anchorPoint: {
+                  x: 0,
+                  y: 0
+                },
+                anchorPointUnits: "Relative",
+                size: i ? 45 : 30,
+                rotateClockwise: !0,
+                textureFilter: "Picture",
+                url: `/GisViewerAssets/Images/xhj_${i ? 4 : 1}.png`
               }
             ]
           }
-        ]
-      }
-    }));
-    this.crossLayer.addMany(t);
+        }
+      };
   }
 }
 export {
-  C as default
+  x as default
 };

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

@@ -14,6 +14,7 @@ export default class OpenDriveRenderer {
     private allRefLineGraphics;
     private mouseMoveHandler;
     private mouseClickHandler;
+    private junctionNames;
     constructor(view: __esri.MapView | __esri.SceneView);
     private projectName;
     private openDriveServer;
@@ -49,7 +50,6 @@ export default class OpenDriveRenderer {
     private currentJunctionId;
     private hitGraphic;
     private highlightGraphic;
-    private monitorMouseDrag;
     /**
      * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
      */

package/lib/src/gis-map/utils/open-drive-renderer/index.js

@@ -1,4 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("@arcgis/core/Graphic"),$=require("@arcgis/core/core/promiseUtils"),M=require("@arcgis/core/geometry"),P=require("@arcgis/core/geometry/geometryEngine"),G=require("@arcgis/core/layers/FeatureLayer"),g=require("@arcgis/core/layers/GraphicsLayer"),y=require("axios"),J=require("md5"),A=require("pako"),C=require("../common-utils.js");function O(m){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(m){for(const t in m)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(m,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>m[t]})}}return e.default=m,Object.freeze(e)}const N=O($),L=O(P);class D{constructor(e){this.projectName="",this.openDriveServer="",this.currentSectionCode="",this.currentJunctionId="",this.view=e,this.view.popup.visibleElements={closeButton:!1,collapseButton:!1,actionBar:!1},this.laneLayer=new G({id:"OpenDriveLane",fields:[{name:"ObjectID",alias:"ObjectID",type:"oid"},{name:"id",alias:"编号",type:"string"},{name:"roadId",alias:"道路号",type:"string"},{name:"roadName",alias:"道路名称",type:"string"},{name:"sectionId",alias:"路段号",type:"string"},{name:"laneId",alias:"车道号",type:"string"},{name:"type",alias:"类型",type:"string"},{name:"sumoId",alias:"sumo编号",type:"string"}],objectIdField:"ObjectID",geometryType:"polygon",spatialReference:{wkid:4326},source:[],outFields:["*"],renderer:{type:"unique-value",field:"type",defaultSymbol:{type:"simple-fill",color:[100,100,100],style:"solid",outline:{color:"white",width:1}},uniqueValueInfos:[{value:"shoulder",label:"路肩",symbol:{type:"simple-fill",color:"#008000",style:"solid",outline:{color:"white",width:1}}},{value:"border",label:"路沿",symbol:{type:"simple-fill",color:"#DCDCDC",style:"solid",outline:{color:"white",width:1}}},{value:"driving",label:"机动车道",symbol:{type:"simple-fill",color:[47,79,79,.8],style:"solid",outline:{color:"white",width:1}}},{value:"none",label:"无",symbol:{type:"simple-fill",color:[111,120,135],style:"none",outline:{color:"white",width:1}}},{value:"restricted",label:"禁行区",symbol:{type:"simple-fill",color:"yellow",style:"solid",outline:{color:"yellow",width:2}}},{value:"parking",label:"停车区",symbol:{type:"simple-fill",color:[115,115,115],style:"solid",outline:{color:"white",width:1}}},{value:"median",label:"中央隔离带",symbol:{type:"simple-fill",color:"#008000",style:"solid",outline:{color:"white",width:1}}},{value:"biking",label:"非机动车道",symbol:{type:"simple-fill",color:"#D3D3D3",style:"solid",outline:{color:"white",width:1}}},{value:"sidewalk",label:"人行道",symbol:{type:"simple-fill",color:"#C0C0C0",style:"solid",outline:{color:"white",width:1}}},{value:"junction",label:"路口区域",symbol:{type:"simple-fill",color:"#2F4F4F",style:"solid",outline:{color:"white",width:1}}},{value:"selected",label:"选中车道",symbol:{type:"simple-fill",color:[141,168,211],style:"solid",outline:{color:"white",width:1}}}]}}),this.roadNameLayer=new G({id:"OpenDriveRoadName",fields:[{name:"ObjectID",alias:"ObjectID",type:"oid"},{name:"roadId",alias:"道路号",type:"string"},{name:"roadName",alias:"道路名称",type:"string"}],objectIdField:"ObjectID",geometryType:"polyline",spatialReference:{wkid:4326},source:[],renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[0,0,0,0],width:1}},labelingInfo:[{symbol:{type:"text",color:"black",haloColor:"white",haloSize:1,font:{size:12,family:"sans-serif"}},labelPlacement:this.view.type==="2d"?"center-along":void 0,labelExpressionInfo:{expression:"$feature.roadName"}}]}),this.junctionLayer=new g({id:"OpenDriveJunction"}),this.sectionLayer=new g({id:"OpenDriveSection"}),this.highlightLayer=new g({id:"OpenDriveHighlight"}),this.flashLayer=new g({id:"OpenDriveFlash"}),this.drawLayer=new g({id:"Draw"}),this.view.map.addMany([this.laneLayer,this.junctionLayer,this.sectionLayer,this.roadNameLayer,this.highlightLayer,this.flashLayer,this.drawLayer])}static getInstance(e){return this.instance||(this.instance=new D(e)),this.instance}async makeMd5FromFile(e){try{const i=await(await fetch(e)).text();return{status:0,message:"ok",result:J(i)}}catch(t){return{status:-1,message:t.message}}}async showOpenDriveFromFile(e){var h,b;this.openDriveClickCallback=e.selectedCallback,console.time("md5用时");const t=await this.makeMd5FromFile(e.file);if(t.status!==0)return t;this.projectName=t.result,console.timeEnd("md5用时"),this.openDriveServer=e.server,await this.makeMd5FromFile(e.file);const i=`http://${this.openDriveServer}/api/openDrive/uploadXodr`;let o;try{o=await y.post(i,{},{params:{url:e.file,projectName:this.projectName}})}catch(d){return{status:-1,message:d.message}}if(o.status!==200)return{status:-1,message:o.statusText};console.time("渲染用时");const s=o.data.result.geoSetting;C.default.setGeoData(s.geoReference,s.offsetX,s.offsetY);let l=o.data.result.json;l.startsWith(window.location.protocol)||(l=`${window.location.protocol}//${e.server}${l}`);const a=await(await fetch(l)).arrayBuffer(),r=A.inflate(a,{to:"string"}),c=JSON.parse(r);await this.showAllLanes(c,((h=e.options)==null?void 0:h.showJunctionLane)||!1,((b=e.options)==null?void 0:b.showRoadName)||!0);const u=o.data.result.junctions;if(this.showJunction(u),e.options&&e.options.centerMap!==!1){const d=C.default.transformPointProjection([0,0]);await this.view.goTo(d)}return this.mouseMoveHandler||this.monitorMouseMove(),this.mouseClickHandler||this.monitorMouseClick(),console.timeEnd("渲染用时"),{status:0,message:"ok"}}async showOpenDriveFromServer(e,t){const i=`http://${e}/api/openDrive/analyzeXodr`,o=await y.get(i,{headers:{projectName:t},params:{analyze:!1,compressed:!0}});if(o.status!==200)throw new Error(`OpenDriveRenderer: ${o.statusText}`);let s=o.data.result.json;s.startsWith(window.location.protocol)||(s=`${window.location.protocol}//${e}${s}`);const n=await(await fetch(s)).arrayBuffer(),a=A.inflate(n,{to:"string"}),r=JSON.parse(a);return await this.showAllLanes(r,!1,!1),{status:0,message:"ok"}}async showAllLanes(e,t,i){const o=await this.laneLayer.queryFeatures();return o.features.length>0&&this.laneLayer.applyEdits({deleteFeatures:o.features}),this.roadNameLayer.visible=i,new Promise(s=>{let l=0;this.allLaneGraphics=[],this.allRefLineGraphics=[];const n=[];for(const r of e){if(!t&&r.junction!=="-1")continue;const{id:c,refLine:u}=r;let h=r.name;h.includes("(")&&(h=h.slice(0,h.indexOf("("))),h=h.replace(/(.)/g,"$1 ");const b=new p({geometry:{type:"polyline",paths:[u]},attributes:{ObjectID:l++,roadId:c,roadName:h}});this.allRefLineGraphics.push(b),r.laneSections.sort((d,w)=>Number(d.id)-Number(w.id));for(let d=0;d<r.laneSections.length;d++){const w=r.laneSections[d],k=Number(w.id);for(const f of w.lanePaths){const v=Number(f.id);if(v===0)continue;const F=f.type,I=f.innerPath.concat(f.outerPath.reverse());if(I.length<=3){console.warn(`lane ${v} has less than 3 points`);continue}I.push(f.innerPath[0]);const j=new M.Polygon({rings:[I]});if(j){const S=new p({geometry:j,attributes:{ObjectID:l++,id:`${c}+${k}+${v}`,roadId:c,roadName:r.name,sectionId:k,sectionIndex:d,laneId:v,type:F,sumoId:""}});this.allLaneGraphics.push(S),n.push(S)}}}}const a=setInterval(()=>{if(n.length>0||this.allRefLineGraphics.length>0){if(n.length>0){const r=n.splice(0,100);this.laneLayer.applyEdits({addFeatures:r})}if(this.allRefLineGraphics.length>0){const r=this.allRefLineGraphics.splice(0,10);this.roadNameLayer.applyEdits({addFeatures:r})}}else clearInterval(a),s()},10)})}showJunction(e){const t=[];for(const i of e){if(!i)continue;i.nodeType=i.type;const o=new p({geometry:{type:"point",x:i.coordinates[0],y:i.coordinates[1]},attributes:{...i,selected:!1,type:"OpenDriveJunction"},symbol:{type:"picture-marker",url:i.crossId?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",width:30,height:30}});t.push(o)}this.junctionLayer.addMany(t)}monitorMouseDrag(){}monitorMouseMove(){const e=N.debounce(async t=>{var l;const o=(l=(await this.view.hitTest(t,{include:[this.laneLayer,this.junctionLayer]})).results)==null?void 0:l.filter(n=>n.type==="graphic");if(o.length===0){this.currentSectionCode!==""&&(this.currentSectionCode="",this.highlightGraphic=void 0,this.highlightLayer.removeAll()),this.currentJunctionId!==""&&(this.currentJunctionId="",this.view.closePopup());return}const s=o[0];if(this.hitGraphic=s.graphic,s.layer.id==="OpenDriveLane"){const n=`${this.hitGraphic.attributes.roadId}+${this.hitGraphic.attributes.sectionId}`;if(n===this.currentSectionCode||this.sectionLayer.graphics.findIndex(u=>u.getAttribute("id")===n)>=0)return;this.currentSectionCode=n;const r=this.allLaneGraphics.filter(u=>`${u.attributes.roadId}+${u.attributes.sectionId}`===n),c=L.union(r.map(u=>u.geometry));this.highlightGraphic=new p({geometry:c,symbol:{type:"simple-fill",color:[0,255,255,.5],style:"solid",outline:{color:[0,255,255],width:1}},attributes:{type:"OpenDriveSection",id:n,selected:!1}}),this.highlightLayer.removeAll(),this.highlightLayer.add(this.highlightGraphic)}else if(s.layer.id==="OpenDriveJunction"){const n=this.hitGraphic.getAttribute("id");if(n===this.currentJunctionId)return;this.currentJunctionId=n;const a=this.hitGraphic.getAttribute("name"),r=this.hitGraphic.getAttribute("crossId");this.view.openPopup({title:a,content:`<table>
-          <tr><td>路口编号</td><td>${n}</td></tr>
-          <tr><td>信号机编号</td><td>${r||"无信控"}</td></tr>
-          </table>`,location:this.hitGraphic.geometry})}});this.mouseMoveHandler=this.view.on("pointer-move",async t=>{e(t).catch(()=>{})})}monitorMouseClick(){const e=N.debounce(async t=>{var a;const o=(a=(await this.view.hitTest(t,{include:[this.highlightLayer,this.junctionLayer,this.sectionLayer]})).results)==null?void 0:a.filter(r=>r.type==="graphic");if(o.length===0)return;const s=o[0].graphic,l=s.getAttribute("type"),n=s.getAttribute("id");if(l==="OpenDriveJunction")if(s.getAttribute("selected")===!1){const r=`http://${this.openDriveServer}/api/sumo/getSumoJunction`,c=await y.get(r,{params:{id:n,projectName:this.projectName}});c.status===200&&c.data.status===0&&(this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveJunction",id:n,details:c.data.result}),s.setAttribute("selected",!0),s.symbol.url="/GisViewerAssets/Images/point_red.png",this.increasePictureMarkerSize(s,50))}else{this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveJunction",id:n,details:void 0}),s.setAttribute("selected",!1);const r=s.getAttribute("crossId");s.symbol.url=r?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",this.decreasePictureMarkerSize(s,30)}else if(l==="OpenDriveSection")if(s.getAttribute("selected"))this.sectionLayer.remove(s),this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveSection",id:n,details:void 0});else{this.highlightLayer.remove(s),this.sectionLayer.add(s),s.setAttribute("selected",!0);const r=`http://${this.openDriveServer}/api/sumo/getSumoEdge`,c=await y.get(r,{params:{id:n,projectName:this.projectName}});c.status===200&&c.data.status===0&&this.openDriveClickCallback&&(s.setAttribute("edgeId",c.data.result.obj_id),this.openDriveClickCallback({type:"OpenDriveSection",id:n,details:c.data.result}))}});this.mouseClickHandler=this.view.on("immediate-click",async t=>{e(t).catch(()=>{})})}increasePictureMarkerSize(e,t){const i=setInterval(()=>{const o=e.symbol,s=o.width;s<t?e.symbol={type:"picture-marker",url:o.url,width:s+1,height:s+1}:clearInterval(i)},20)}decreasePictureMarkerSize(e,t){const i=setInterval(()=>{const o=e.symbol,s=o.width;s>t?e.symbol={type:"picture-marker",url:o.url,width:s-1,height:s-1}:clearInterval(i)},20)}async getSumoInfo(e){switch(e.type){case"junction":{const t=`http://${this.openDriveServer}/api/sumo/getSumoJunction`,i=await y.get(t,{params:{id:e.id,projectName:this.projectName}});return i.status===200?i.data:{status:-1,message:`路口信息查询失败: ${e.id}`}}case"edge":{const t=e.id.split("#");let i=t[0];i.startsWith("-")&&(i=i.slice(1));let o=0;t.length===2&&(o=Number(t[1]));const s=this.allLaneGraphics.find(l=>l.getAttribute("roadId")===i&&l.getAttribute("sectionIndex")===o);if(s){const l=`${i}+${s.getAttribute("sectionId")}`,n=`http://${this.openDriveServer}/api/sumo/getSumoEdge`,a=await y.get(n,{params:{id:l,projectName:this.projectName}});return a.status===200?a.data:{status:-1,message:`路段信息查询失败: ${l}`}}else return{status:-1,message:"未知类型"}}default:return{status:-1,message:"未知类型"}}}async clearOpenDrive(){var t,i;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(),(t=this.mouseMoveHandler)==null||t.remove(),this.mouseMoveHandler=void 0,(i=this.mouseClickHandler)==null||i.remove(),this.mouseClickHandler=void 0}async findSumo(e){const{type:t,id:i}=e,o=e.flash===void 0?!0:e.flash;if(t==="junction")return await this.findJunction(i,o);if(t==="edge"){const s=i.split("+");if(s.length>2)return{status:-1,message:"id格式错误"};const l=s.length===2?Number(s[1]):void 0,n=s[0].split("#");if(n.length>2)return{status:-1,message:"id格式错误"};const a=n[0],r=n.length===2?Number(n[1]):void 0;return await this.findLane({roadsectId:a,segmentId:r,laneId:l,flash:o})}else return{status:-1,message:"未知类型"}}async findJunction(e,t){const i=this.junctionLayer.graphics.find(o=>o.attributes.id===e);if(!i)return{status:-1,message:"未找到。请检查路口编号"};if(t){const o=new p({geometry:i.geometry,symbol:{type:"simple-marker",style:"circle",size:30,color:[255,0,0,.6],outline:{color:"red",width:1}}});this.flashGraphic(o)}return await this.view.goTo(i.geometry,{duration:1e3}),{status:0,message:"ok"}}async findLane(e){let{roadsectId:t,segmentId:i,laneId:o}=e;t.startsWith("-")&&(t=t.slice(1));let s=this.allLaneGraphics.filter(a=>a.attributes.roadId===t);if(s.length===0)return{status:-1,message:"未找到。请检查路段编号"};if(i!==void 0){const a=[];if(s.forEach(r=>{const c=Number(r.attributes.sectionId);a.indexOf(c)===-1&&a.push(c)}),a.sort((r,c)=>r-c),i>a.length-1)return{status:-1,message:"未找到。请检查基本段编号"};i=a[i],s=s.filter(r=>Number(r.attributes.sectionId)===i)}if(o!==void 0){const a=[];if(s.forEach(r=>{const c=Number(r.attributes.laneId);a.indexOf(c)===-1&&a.push(c)}),a.sort((r,c)=>r-c),o>a.length-1)return{status:-1,message:"未找到。请检查车道编号"};o=a[o],s=s.filter(r=>Number(r.attributes.laneId)===o)}const l=s.map(a=>a.geometry),n=L.union(l);if(e.flash){const a=new p({geometry:n,symbol:{type:"simple-fill",color:[255,0,0,.5],style:"solid",outline:{color:"red",width:0}}});this.flashGraphic(a)}return await this.view.goTo(n,{duration:1e3}),{status:0,message:"ok"}}flashGraphic(e){this.flashLayer.removeAll(),this.flashLayer.add(e);let t=0,i=!0;const o=setInterval(()=>{i?(this.flashLayer.opacity-=.02,this.flashLayer.opacity<=.1&&(i=!1,t++)):(this.flashLayer.opacity+=.02,this.flashLayer.opacity>=1&&(i=!0)),t>=5&&(this.flashLayer.removeAll(),this.flashLayer.opacity=1,clearInterval(o))},10)}unselectSumo(e){if((!e||e.type==="junction")&&this.junctionLayer.graphics.forEach(t=>{if((!e||!e.id||e.id===""||e.id===t.getAttribute("id"))&&t.getAttribute("selected")){t.setAttribute("selected",!1);const i=t.getAttribute("crossId");t.symbol.url=i?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",this.decreasePictureMarkerSize(t,30)}}),!e||e.type==="edge")if(!e||!e.id||e.id==="")this.sectionLayer.removeAll();else{const t=this.sectionLayer.graphics.find(i=>i.getAttribute("edgeId")===e.id);t&&this.sectionLayer.remove(t)}return{status:0,message:"ok"}}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"}}),{status:-1,message:"未找到路口"};case"edge":{const t=e.id.split("#");let i=t[0];i.startsWith("-")&&(i=i.slice(1));let o=0;t.length===2&&(o=Number(t[1]));const s=this.allLaneGraphics.filter(l=>l.getAttribute("roadId")===i&&l.getAttribute("sectionIndex")===o);if(s.length>0){const l=L.union(s.map(a=>a.geometry)),n=new p({geometry:l,symbol:{type:"simple-fill",color:[0,255,255,.5],style:"solid",outline:{color:[0,255,255],width:1}},attributes:{type:"OpenDriveSection",edgeId:e.id,selected:!0}});return this.sectionLayer.add(n),{status:0,message:"ok"}}else return{status:-1,message:"未找到路段"}}default:return{status:-1,message:"未知类型"}}}async splitLane(e){return{status:0,message:"ok",result:e}}}exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("@arcgis/core/Graphic"),M=require("@arcgis/core/core/promiseUtils"),$=require("@arcgis/core/geometry"),P=require("@arcgis/core/geometry/geometryEngine"),S=require("@arcgis/core/layers/FeatureLayer"),v=require("@arcgis/core/layers/GraphicsLayer"),g=require("axios"),J=require("md5"),G=require("pako"),A=require("../common-utils.js");function O(b){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(b){for(const t in b)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(b,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>b[t]})}}return e.default=b,Object.freeze(e)}const C=O(M),N=O(P);class D{constructor(e){this.junctionNames=new Map,this.projectName="",this.openDriveServer="",this.currentSectionCode="",this.currentJunctionId="",this.view=e,this.view.popup.visibleElements={collapseButton:!1,actionBar:!1},this.laneLayer=new S({id:"OpenDriveLane",fields:[{name:"ObjectID",alias:"ObjectID",type:"oid"},{name:"id",alias:"编号",type:"string"},{name:"roadId",alias:"道路号",type:"string"},{name:"roadName",alias:"道路名称",type:"string"},{name:"sectionId",alias:"路段号",type:"string"},{name:"laneId",alias:"车道号",type:"string"},{name:"type",alias:"类型",type:"string"},{name:"sumoId",alias:"sumo编号",type:"string"},{name:"fromNode",alias:"起点路口",type:"string"},{name:"toNode",alias:"终点路口",type:"string"}],objectIdField:"ObjectID",geometryType:"polygon",spatialReference:{wkid:4326},source:[],outFields:["*"],renderer:{type:"unique-value",field:"type",defaultSymbol:{type:"simple-fill",color:[100,100,100],style:"solid",outline:{color:"white",width:1}},uniqueValueInfos:[{value:"shoulder",label:"路肩",symbol:{type:"simple-fill",color:"#008000",style:"solid",outline:{color:"white",width:1}}},{value:"border",label:"路沿",symbol:{type:"simple-fill",color:"#DCDCDC",style:"solid",outline:{color:"white",width:1}}},{value:"driving",label:"机动车道",symbol:{type:"simple-fill",color:[47,79,79,.8],style:"solid",outline:{color:"white",width:1}}},{value:"none",label:"无",symbol:{type:"simple-fill",color:[111,120,135],style:"none",outline:{color:"white",width:1}}},{value:"restricted",label:"禁行区",symbol:{type:"simple-fill",color:"yellow",style:"solid",outline:{color:"yellow",width:2}}},{value:"parking",label:"停车区",symbol:{type:"simple-fill",color:[115,115,115],style:"solid",outline:{color:"white",width:1}}},{value:"median",label:"中央隔离带",symbol:{type:"simple-fill",color:"#008000",style:"solid",outline:{color:"white",width:1}}},{value:"biking",label:"非机动车道",symbol:{type:"simple-fill",color:"#D3D3D3",style:"solid",outline:{color:"white",width:1}}},{value:"sidewalk",label:"人行道",symbol:{type:"simple-fill",color:"#C0C0C0",style:"solid",outline:{color:"white",width:1}}},{value:"junction",label:"路口区域",symbol:{type:"simple-fill",color:"#2F4F4F",style:"solid",outline:{color:"white",width:1}}},{value:"selected",label:"选中车道",symbol:{type:"simple-fill",color:[141,168,211],style:"solid",outline:{color:"white",width:1}}}]}}),this.roadNameLayer=new S({id:"OpenDriveRoadName",fields:[{name:"ObjectID",alias:"ObjectID",type:"oid"},{name:"roadId",alias:"道路号",type:"string"},{name:"roadName",alias:"道路名称",type:"string"}],objectIdField:"ObjectID",geometryType:"polyline",spatialReference:{wkid:4326},source:[],renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[0,0,0,0],width:1}},labelingInfo:[{symbol:{type:"text",color:"black",haloColor:"white",haloSize:1,font:{size:12,family:"sans-serif"}},labelPlacement:this.view.type==="2d"?"center-along":void 0,labelExpressionInfo:{expression:"$feature.roadName"}}]}),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.view.map.addMany([this.laneLayer,this.junctionLayer,this.sectionLayer,this.roadNameLayer,this.highlightLayer,this.flashLayer,this.drawLayer])}static getInstance(e){return this.instance||(this.instance=new D(e)),this.instance}async makeMd5FromFile(e){try{const i=await(await fetch(e)).text();return{status:0,message:"ok",result:J(i)}}catch(t){return{status:-1,message:t.message}}}async showOpenDriveFromFile(e){var h,y;this.openDriveClickCallback=e.selectedCallback,console.time("md5用时");const t=await this.makeMd5FromFile(e.file);if(t.status!==0)return t;this.projectName=t.result,console.timeEnd("md5用时"),this.openDriveServer=e.server,await this.makeMd5FromFile(e.file);const i=`http://${this.openDriveServer}/api/openDrive/uploadXodr`;let o;try{o=await g.post(i,{},{params:{url:e.file,projectName:this.projectName}})}catch(d){return{status:-1,message:d.message}}if(o.status!==200)return{status:-1,message:o.statusText};console.time("渲染用时");const s=o.data.result.geoSetting;A.default.setGeoData(s.geoReference,s.offsetX,s.offsetY);let l=o.data.result.json;l.startsWith(window.location.protocol)||(l=`${window.location.protocol}//${e.server}${l}`);const a=await(await fetch(l)).arrayBuffer(),r=G.inflate(a,{to:"string"}),c=JSON.parse(r);await this.showAllLanes(c,((h=e.options)==null?void 0:h.showJunctionLane)||!1,((y=e.options)==null?void 0:y.showRoadName)||!0);const m=o.data.result.junctions;if(this.showJunction(m),e.options&&e.options.centerMap!==!1){const d=A.default.transformPointProjection([0,0]);await this.view.goTo(d)}return this.mouseMoveHandler||this.monitorMouseMove(),this.mouseClickHandler||this.monitorMouseClick(),console.timeEnd("渲染用时"),{status:0,message:"ok"}}async showOpenDriveFromServer(e,t){const i=`http://${e}/api/openDrive/analyzeXodr`,o=await g.get(i,{headers:{projectName:t},params:{analyze:!1,compressed:!0}});if(o.status!==200)throw new Error(`OpenDriveRenderer: ${o.statusText}`);let s=o.data.result.json;s.startsWith(window.location.protocol)||(s=`${window.location.protocol}//${e}${s}`);const n=await(await fetch(s)).arrayBuffer(),a=G.inflate(n,{to:"string"}),r=JSON.parse(a);return await this.showAllLanes(r,!1,!1),{status:0,message:"ok"}}async showAllLanes(e,t,i){const o=await this.laneLayer.queryFeatures();return o.features.length>0&&this.laneLayer.applyEdits({deleteFeatures:o.features}),this.roadNameLayer.visible=i,new Promise(s=>{let l=0;this.allLaneGraphics=[],this.allRefLineGraphics=[];const n=[];for(const r of e){if(!t&&r.junction!=="-1")continue;const{id:c,refLine:m}=r;let h=r.name;h.includes("(")&&(h=h.slice(0,h.indexOf("("))),h=h.replace(/(.)/g,"$1 ");const y=new p({geometry:{type:"polyline",paths:[m]},attributes:{ObjectID:l++,roadId:c,roadName:h}});this.allRefLineGraphics.push(y),r.laneSections.sort((d,f)=>Number(d.id)-Number(f.id));for(let d=0;d<r.laneSections.length;d++){const f=r.laneSections[d],u=Number(f.id);for(const w of f.lanePaths){const I=Number(w.id);if(I===0)continue;const F=w.type,L=w.innerPath.concat(w.outerPath.reverse());if(L.length<=3){console.warn(`lane ${I} has less than 3 points`);continue}L.push(w.innerPath[0]);const j=new $.Polygon({rings:[L]});if(j){const k=new p({geometry:j,attributes:{ObjectID:l++,id:`${c}+${u}+${I}`,fromNode:r.fromNode,toNode:r.toNode,roadId:c,roadName:r.name,sectionId:u,sectionIndex:d,laneId:I,type:F,sumoId:""}});this.allLaneGraphics.push(k),n.push(k)}}}}const a=setInterval(()=>{if(n.length>0||this.allRefLineGraphics.length>0){if(n.length>0){const r=n.splice(0,100);this.laneLayer.applyEdits({addFeatures:r})}if(this.allRefLineGraphics.length>0){const r=this.allRefLineGraphics.splice(0,10);this.roadNameLayer.applyEdits({addFeatures:r})}}else clearInterval(a),s()},10)})}showJunction(e){const t=[];for(const i of e){if(!i)continue;this.junctionNames.set(i.id,i.name),i.nodeType=i.type;const o=new p({geometry:{type:"point",x:i.coordinates[0],y:i.coordinates[1]},attributes:{...i,selected:!1,type:"OpenDriveJunction"},symbol:{type:"picture-marker",url:i.crossId?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",width:30,height:30},popupTemplate:{title:i.name,content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"路口编号"},{fieldName:"crossId",label:"信号机编号"}]}]}});t.push(o)}this.junctionLayer.addMany(t)}monitorMouseMove(){const e=C.debounce(async t=>{var l;const o=(l=(await this.view.hitTest(t,{include:[this.laneLayer,this.junctionLayer]})).results)==null?void 0:l.filter(n=>n.type==="graphic");if(o.length===0){this.currentSectionCode!==""&&(this.currentSectionCode="",this.highlightGraphic=void 0,this.highlightLayer.removeAll()),this.currentJunctionId!==""&&(this.currentJunctionId="",this.view.closePopup());return}const s=o[0];if(this.hitGraphic=s.graphic,s.layer.id==="OpenDriveLane"){const n=`${this.hitGraphic.getAttribute("roadId")}+${this.hitGraphic.getAttribute("sectionId")}`;if(n===this.currentSectionCode||this.sectionLayer.graphics.findIndex(u=>u.getAttribute("id")===n)>=0)return;this.currentSectionCode=n;const r=this.allLaneGraphics.filter(u=>`${u.attributes.roadId}+${u.attributes.sectionId}`===n),c=N.union(r.map(u=>u.geometry)),m=this.hitGraphic.getAttribute("fromNode"),h=this.hitGraphic.getAttribute("toNode"),y=this.junctionNames.get(m)||m,d=this.junctionNames.get(h)||h;this.highlightGraphic=new p({geometry:c,symbol:{type:"simple-fill",color:[0,255,255,.5],style:"solid",outline:{color:[0,255,255],width:1}},attributes:{type:"OpenDriveSection",id:n,selected:!1,fromNodeName:y,toNodeName:d,laneCount:r.length},popupTemplate:{title:this.hitGraphic.getAttribute("roadName"),content:[{type:"fields",fieldInfos:[{fieldName:"fromNodeName",label:"起点路口"},{fieldName:"toNodeName",label:"终点路口"},{fieldName:"laneCount",label:"车道数量"}]}]}}),this.highlightLayer.removeAll(),this.highlightLayer.add(this.highlightGraphic);const f=this.view.toMap(t);this.view.openPopup({features:[this.highlightGraphic],location:f})}else if(s.layer.id==="OpenDriveJunction"){const n=this.hitGraphic.getAttribute("id");if(n===this.currentJunctionId)return;this.currentJunctionId=n,this.view.openPopup({features:[this.hitGraphic],location:this.hitGraphic.geometry})}});this.mouseMoveHandler=this.view.on("pointer-move",async t=>{e(t).catch(()=>{})})}monitorMouseClick(){const e=C.debounce(async t=>{var a;const o=(a=(await this.view.hitTest(t,{include:[this.highlightLayer,this.junctionLayer,this.sectionLayer]})).results)==null?void 0:a.filter(r=>r.type==="graphic");if(o.length===0)return;const s=o[0].graphic,l=s.getAttribute("type"),n=s.getAttribute("id");if(l==="OpenDriveJunction")if(s.getAttribute("selected")===!1){const r=`http://${this.openDriveServer}/api/sumo/getSumoJunction`,c=await g.get(r,{params:{id:n,projectName:this.projectName}});c.status===200&&c.data.status===0&&(this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveJunction",id:n,details:c.data.result}),s.setAttribute("selected",!0),s.symbol.url="/GisViewerAssets/Images/point_red.png",this.increasePictureMarkerSize(s,50))}else{this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveJunction",id:n,details:void 0}),s.setAttribute("selected",!1);const r=s.getAttribute("crossId");s.symbol.url=r?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",this.decreasePictureMarkerSize(s,30)}else if(l==="OpenDriveSection")if(s.getAttribute("selected"))this.sectionLayer.remove(s),this.openDriveClickCallback&&this.openDriveClickCallback({type:"OpenDriveSection",id:n,details:void 0});else{this.highlightLayer.remove(s),this.sectionLayer.add(s),s.setAttribute("selected",!0);const r=`http://${this.openDriveServer}/api/sumo/getSumoEdge`,c=await g.get(r,{params:{id:n,projectName:this.projectName}});c.status===200&&c.data.status===0&&this.openDriveClickCallback&&(s.setAttribute("edgeId",c.data.result.obj_id),this.openDriveClickCallback({type:"OpenDriveSection",id:n,details:c.data.result}))}});this.mouseClickHandler=this.view.on("immediate-click",async t=>{e(t).catch(()=>{})})}increasePictureMarkerSize(e,t){const i=setInterval(()=>{const o=e.symbol,s=o.width;s<t?e.symbol={type:"picture-marker",url:o.url,width:s+1,height:s+1}:clearInterval(i)},20)}decreasePictureMarkerSize(e,t){const i=setInterval(()=>{const o=e.symbol,s=o.width;s>t?e.symbol={type:"picture-marker",url:o.url,width:s-1,height:s-1}:clearInterval(i)},20)}async getSumoInfo(e){switch(e.type){case"junction":{const t=`http://${this.openDriveServer}/api/sumo/getSumoJunction`,i=await g.get(t,{params:{id:e.id,projectName:this.projectName}});return i.status===200?i.data:{status:-1,message:`路口信息查询失败: ${e.id}`}}case"edge":{const t=e.id.split("#");let i=t[0];i.startsWith("-")&&(i=i.slice(1));let o=0;t.length===2&&(o=Number(t[1]));const s=this.allLaneGraphics.find(l=>l.getAttribute("roadId")===i&&l.getAttribute("sectionIndex")===o);if(s){const l=`${i}+${s.getAttribute("sectionId")}`,n=`http://${this.openDriveServer}/api/sumo/getSumoEdge`,a=await g.get(n,{params:{id:l,projectName:this.projectName}});return a.status===200?a.data:{status:-1,message:`路段信息查询失败: ${l}`}}else return{status:-1,message:"未知类型"}}default:return{status:-1,message:"未知类型"}}}async clearOpenDrive(){var t,i;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(),(t=this.mouseMoveHandler)==null||t.remove(),this.mouseMoveHandler=void 0,(i=this.mouseClickHandler)==null||i.remove(),this.mouseClickHandler=void 0}async findSumo(e){const{type:t,id:i}=e,o=e.flash===void 0?!0:e.flash;if(t==="junction")return await this.findJunction(i,o);if(t==="edge"){const s=i.split("+");if(s.length>2)return{status:-1,message:"id格式错误"};const l=s.length===2?Number(s[1]):void 0,n=s[0].split("#");if(n.length>2)return{status:-1,message:"id格式错误"};const a=n[0],r=n.length===2?Number(n[1]):void 0;return await this.findLane({roadsectId:a,segmentId:r,laneId:l,flash:o})}else return{status:-1,message:"未知类型"}}async findJunction(e,t){const i=this.junctionLayer.graphics.find(o=>o.attributes.id===e);if(!i)return{status:-1,message:"未找到。请检查路口编号"};if(t){const o=new p({geometry:i.geometry,symbol:{type:"simple-marker",style:"circle",size:30,color:[255,0,0,.6],outline:{color:"red",width:1}}});this.flashGraphic(o)}return await this.view.goTo(i.geometry,{duration:1e3}),{status:0,message:"ok"}}async findLane(e){let{roadsectId:t,segmentId:i,laneId:o}=e;t.startsWith("-")&&(t=t.slice(1));let s=this.allLaneGraphics.filter(a=>a.attributes.roadId===t);if(s.length===0)return{status:-1,message:"未找到。请检查路段编号"};if(i!==void 0){const a=[];if(s.forEach(r=>{const c=Number(r.attributes.sectionId);a.indexOf(c)===-1&&a.push(c)}),a.sort((r,c)=>r-c),i>a.length-1)return{status:-1,message:"未找到。请检查基本段编号"};i=a[i],s=s.filter(r=>Number(r.attributes.sectionId)===i)}if(o!==void 0){const a=[];if(s.forEach(r=>{const c=Number(r.attributes.laneId);a.indexOf(c)===-1&&a.push(c)}),a.sort((r,c)=>r-c),o>a.length-1)return{status:-1,message:"未找到。请检查车道编号"};o=a[o],s=s.filter(r=>Number(r.attributes.laneId)===o)}const l=s.map(a=>a.geometry),n=N.union(l);if(e.flash){const a=new p({geometry:n,symbol:{type:"simple-fill",color:[255,0,0,.5],style:"solid",outline:{color:"red",width:0}}});this.flashGraphic(a)}return await this.view.goTo(n,{duration:1e3}),{status:0,message:"ok"}}flashGraphic(e){this.flashLayer.removeAll(),this.flashLayer.add(e);let t=0,i=!0;const o=setInterval(()=>{i?(this.flashLayer.opacity-=.02,this.flashLayer.opacity<=.1&&(i=!1,t++)):(this.flashLayer.opacity+=.02,this.flashLayer.opacity>=1&&(i=!0)),t>=5&&(this.flashLayer.removeAll(),this.flashLayer.opacity=1,clearInterval(o))},10)}unselectSumo(e){if((!e||e.type==="junction")&&this.junctionLayer.graphics.forEach(t=>{if((!e||!e.id||e.id===""||e.id===t.getAttribute("id"))&&t.getAttribute("selected")){t.setAttribute("selected",!1);const i=t.getAttribute("crossId");t.symbol.url=i?"/GisViewerAssets/Images/point_green.png":"/GisViewerAssets/Images/point_yellow.png",this.decreasePictureMarkerSize(t,30)}}),!e||e.type==="edge")if(!e||!e.id||e.id==="")this.sectionLayer.removeAll();else{const t=this.sectionLayer.graphics.find(i=>i.getAttribute("edgeId")===e.id);t&&this.sectionLayer.remove(t)}return{status:0,message:"ok"}}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"}}),{status:-1,message:"未找到路口"};case"edge":{const t=e.id.split("#");let i=t[0];i.startsWith("-")&&(i=i.slice(1));let o=0;t.length===2&&(o=Number(t[1]));const s=this.allLaneGraphics.filter(l=>l.getAttribute("roadId")===i&&l.getAttribute("sectionIndex")===o);if(s.length>0){const l=N.union(s.map(a=>a.geometry)),n=new p({geometry:l,symbol:{type:"simple-fill",color:[0,255,255,.5],style:"solid",outline:{color:[0,255,255],width:1}},attributes:{type:"OpenDriveSection",edgeId:e.id,selected:!0}});return this.sectionLayer.add(n),{status:0,message:"ok"}}else return{status:-1,message:"未找到路段"}}default:return{status:-1,message:"未知类型"}}}async splitLane(e){return{status:0,message:"ok",result:e}}}exports.default=D;

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

@@ -31,4 +31,11 @@ export default class SignalControlAreaController {
      * @returns
      */
     private drawArea;
+    /**
+     * 生成路口点符号。在不同比例尺下，使用不同的符号
+     * @param attributes
+     * @param symbolType
+     * @returns
+     */
+    private getCrossGraphicSymbol;
 }

package/lib/src/gis-map/utils/signal-control-area-controller/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const m=require("@arcgis/core/core/reactiveUtils.js"),u=require("@arcgis/core/Graphic"),o=require("@arcgis/core/layers/GraphicsLayer"),b=require("@turf/buffer"),p=require("@turf/convex"),f=require("@turf/helpers"),A=require("./district-controller.js");function c(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const r=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,r.get?r:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const w=c(m),n=c(f);class L{constructor(e){this.crossScale=3e3,this.view=e,this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!0},this.districtControllerLayer=new o({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new o({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new o({id:"crossLayer",maxScale:0,minScale:36112}),this.highlightLayer=new o({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}showSignalControlArea(e){this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0;for(const t of e){const r=new A.default(t);this.drawArea(r,!0)}return this.watchHandle=w.watch(()=>this.view.scale,(t,r)=>{t>this.crossScale&&r<=this.crossScale?(this.crossLayer.graphics.forEach(i=>{i.symbol={type:"simple-marker",style:i.getAttribute("isKey")?"diamond":"circle",color:i.getAttribute("color"),size:i.getAttribute("isKey")?16:8,outline:{color:i.getAttribute("isKey")?"red":"white",width:i.getAttribute("isKey")?2:1}}}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol={type:"simple-marker",style:i.getAttribute("isKey")?"diamond":"circle",color:i.getAttribute("color"),size:i.getAttribute("isKey")?16:8,outline:{color:i.getAttribute("isKey")?"red":"white",width:i.getAttribute("isKey")?2:1}})})):t<=this.crossScale&&r>this.crossScale&&(this.crossLayer.graphics.forEach(i=>{i.symbol={type:"picture-marker",url:`/GisViewerAssets/Images/xhj_${i.getAttribute("isKey")?4:1}.png`,width:i.getAttribute("isKey")?"55px":"37px",height:i.getAttribute("isKey")?"85px":"57px",yoffset:i.getAttribute("isKey")?"37px":"25px"}}),this.highlightLayer.graphics.forEach(i=>{i.getAttribute("type")==="cross"&&(i.symbol={type:"picture-marker",url:`/GisViewerAssets/Images/xhj_${i.getAttribute("isKey")?4:1}.png`,width:i.getAttribute("isKey")?"55px":"37px",height:i.getAttribute("isKey")?"85px":"57px",yoffset:i.getAttribute("isKey")?"37px":"25px"})}))}),{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.watchHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const t=this.findAreaGraphic(e.id);return t?(t.attributes.type==="cross"?await this.view.goTo({target:t.geometry,scale:1500}):await this.view.goTo(t.geometry),this.showPopup(t),{status:0,message:"ok"}):{status:1,message:"未找到"}}showPopup(e){const t=e.geometry.type==="point"?e.geometry:e.geometry.centroid;this.view.openPopup({features:[e],location:t})}async highlightSignalControlArea(e){this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id).toArray().map(s=>s.clone()),r=this.subDistrictControllerLayer.graphics.filter(s=>s.getAttribute("id")===e.id||s.getAttribute("parentId")===e.id).toArray().map(s=>s.clone()),i=this.crossLayer.graphics.filter(s=>s.getAttribute("id")===e.id||s.getAttribute("districtId")===e.id||s.getAttribute("subDistrictId")===e.id).toArray().map(s=>s.clone());return t.length>0&&this.highlightLayer.addMany(t),r.length>0&&(this.highlightLayer.addMany(r),this.showPopup(r[0])),i.length>0&&this.highlightLayer.addMany(i),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(t.length>0?(await this.view.goTo(t),this.showPopup(t[0])):r.length>0?(await this.view.goTo(r),this.showPopup(r[0])):(i.length>1?await this.view.goTo(i):await this.view.goTo({target:i[0].geometry,scale:1500}),this.showPopup(i[0])),{status:0,message:"ok"})}resetHighlight(){return this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0,this.crossLayer.visible=!0,{status:0,message:"ok"}}findAreaGraphic(e){let t=this.districtControllerLayer.graphics.find(r=>r.attributes.id===e);return t||(t=this.subDistrictControllerLayer.graphics.find(r=>r.attributes.id===e)),t||(t=this.crossLayer.graphics.find(r=>r.attributes.id===e)),t}drawArea(e,t){const r=e.getAllCrossCoordinates();if(r.length>=2){let s=null;if(r.length===2)s=n.lineString(r);else if(r.length>2){const g=n.featureCollection(r.map(d=>n.point(d)));s=p(g)}if(!s)return;const y=b(s.geometry,t?200:30,{units:"meters"});let l;t?l=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:l=[{fieldName:"parentName",label:"所属区控"},{fieldName:"crossCount",label:"路口数量"}];const h=new u({geometry:{type:"polygon",rings:y.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,t?.6:.8],outline:{color:e.areaColor,width:2,style:t?"solid":"long-dash"}},attributes:{type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},popupTemplate:{title:`${t?"区控":"子区"}  ${e.name}`,content:[{type:"fields",fieldInfos:l}]}});t?this.districtControllerLayer.add(h):this.subDistrictControllerLayer.add(h)}for(const s of e.subDistricts)this.drawArea(s,!1);const i=e.crosses.map(s=>new u({geometry:{type:"point",x:s.longitude,y:s.latitude},symbol:{type:"simple-marker",style:s.isKey?"diamond":"circle",color:e.areaColor,size:s.isKey?16:8,outline:{color:s.isKey?"red":"white",width:s.isKey?2:1}},attributes:{type:"cross",id:s.id,name:s.name,color:e.areaColor,signalId:s.signalId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,isKey:s.isKey},popupTemplate:{title:s.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}}));this.crossLayer.addMany(i)}}exports.default=L;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("@arcgis/core/core/reactiveUtils.js"),y=require("@arcgis/core/Graphic"),l=require("@arcgis/core/layers/GraphicsLayer"),b=require("@turf/buffer"),f=require("@turf/concave"),L=require("@turf/convex"),v=require("@turf/helpers"),C=require("./district-controller.js");function m(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const w=m(d),h=m(v);class S{constructor(e){this.crossScale=3e3,this.view=e,this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!0},this.districtControllerLayer=new l({id:"districtControllerLayer",maxScale:144447,minScale:1155582}),this.subDistrictControllerLayer=new l({id:"subDistrictControllerLayer",maxScale:0,minScale:144447}),this.crossLayer=new l({id:"crossLayer",maxScale:0,minScale:36112}),this.highlightLayer=new l({id:"highlightLayer"}),this.view.map.addMany([this.districtControllerLayer,this.subDistrictControllerLayer,this.crossLayer,this.highlightLayer])}showSignalControlArea(e){this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0;for(const t of e){const i=new C.default(t);this.drawArea(i,!0)}return this.watchHandle=w.watch(()=>this.view.scale,(t,i)=>{t>this.crossScale&&i<=this.crossScale?(this.crossLayer.graphics.forEach(s=>{s.symbol=this.getCrossGraphicSymbol(s.attributes,"marker")}),this.highlightLayer.graphics.forEach(s=>{s.getAttribute("type")==="cross"&&(s.symbol=this.getCrossGraphicSymbol(s.attributes,"marker"))})):t<=this.crossScale&&i>this.crossScale&&(this.crossLayer.graphics.forEach(s=>{s.symbol=this.getCrossGraphicSymbol(s.attributes,"picture")}),this.highlightLayer.graphics.forEach(s=>{s.getAttribute("type")==="cross"&&(s.symbol=this.getCrossGraphicSymbol(s.attributes,"picture"))}))}),{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.watchHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const t=this.findAreaGraphic(e.id);return t?(t.attributes.type==="cross"?await this.view.goTo({target:t.geometry,scale:1500}):await this.view.goTo(t.geometry),this.showPopup(t),{status:0,message:"ok"}):{status:1,message:"未找到"}}showPopup(e){const t=e.geometry.type==="point"?e.geometry:e.geometry.centroid;this.view.openPopup({features:[e],location:t})}async highlightSignalControlArea(e){this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(r=>r.getAttribute("id")===e.id).toArray().map(r=>r.clone()),i=this.subDistrictControllerLayer.graphics.filter(r=>r.getAttribute("id")===e.id||r.getAttribute("parentId")===e.id).toArray().map(r=>r.clone()),s=this.crossLayer.graphics.filter(r=>r.getAttribute("id")===e.id||r.getAttribute("districtId")===e.id||r.getAttribute("subDistrictId")===e.id).toArray().map(r=>r.clone());return t.length>0&&this.highlightLayer.addMany(t),i.length>0&&(this.highlightLayer.addMany(i),this.showPopup(i[0])),s.length>0&&this.highlightLayer.addMany(s),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(t.length>0?(await this.view.goTo(t),this.showPopup(t[0])):i.length>0?(await this.view.goTo(i),this.showPopup(i[0])):(s.length>1?await this.view.goTo(s):await this.view.goTo({target:s[0].geometry,scale:1500}),this.showPopup(s[0])),{status:0,message:"ok"})}resetHighlight(){return this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!0,this.subDistrictControllerLayer.visible=!0,this.crossLayer.visible=!0,{status:0,message:"ok"}}findAreaGraphic(e){let t=this.districtControllerLayer.graphics.find(i=>i.attributes.id===e);return t||(t=this.subDistrictControllerLayer.graphics.find(i=>i.attributes.id===e)),t||(t=this.crossLayer.graphics.find(i=>i.attributes.id===e)),t}drawArea(e,t){const i=e.getAllCrossCoordinates();if(i.length>=2){let r=null;if(i.length===2)r=h.lineString(i);else if(i.length>2){const u=h.featureCollection(i.map(p=>h.point(p)));r=f(u,{maxEdge:400,units:"meters"}),r||(r=L(u))}if(!r){console.log("生成区控面失败",e);return}const o=b(r.geometry,t?200:30,{units:"meters"});let n;t?n=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:n=[{fieldName:"parentName",label:"所属区控"},{fieldName:"crossCount",label:"路口数量"}];const g={type:"signalControlArea",id:e.id,name:e.name,parentId:e.parentId,parentName:e.parentName,crossCount:e.crossCount,subDistrictCount:e.subDistrictCount},c=new y({geometry:{type:"polygon",rings:o.geometry.coordinates},symbol:{type:"simple-fill",color:[...e.areaColor,t?.6:.8],outline:{color:e.areaColor,width:2,style:t?"solid":"long-dash"}},attributes:g,popupTemplate:{title:`${t?"区控":"子区"}  ${e.name}`,content:[{type:"fields",fieldInfos:n}]}});t?this.districtControllerLayer.add(c):this.subDistrictControllerLayer.add(c)}for(const r of e.subDistricts)this.drawArea(r,!1);const s=e.crosses.map(r=>{const o={type:"cross",id:r.id,name:r.name,color:e.areaColor,signalId:r.signalId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,isKey:r.isKey};return new y({geometry:{type:"point",x:r.longitude,y:r.latitude},symbol:this.getCrossGraphicSymbol(o,"marker"),attributes:o,popupTemplate:{title:r.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}})});this.crossLayer.addMany(s)}getCrossGraphicSymbol(e,t){const{isKey:i,color:s}=e;if(t==="marker")return{type:"simple-marker",style:i?"diamond":"circle",color:s,size:i?16:8,outline:{color:i?"red":"white",width:i?2:1}};if(t==="picture")return{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:32,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:i?30:22,haloSize:1,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:i?45:30,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/xhj_${i?4:1}.png`}]}}}}}exports.default=S;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [
@@ -25,6 +25,7 @@
     "@turf/bearing": "^6.5.0",
     "@turf/buffer": "^6.5.0",
     "@turf/destination": "^6.5.0",
+    "@turf/concave": "^7.0.0",
     "@turf/convex": "^7.0.0",
     "@turf/helpers": "^6.5.0",
     "@turf/intersect": "^6.5.0",