gisviewer-vue3-arcgis 1.0.224 → 1.0.226

package/es/src/gis-map/utils/holo-flow/signal-holo-flow-lsr.mjs

@@ -1,12 +1,12 @@
-import * as g from "@arcgis/core/core/reactiveUtils";
-import { Point as d } from "@arcgis/core/geometry";
-import * as u from "@arcgis/core/geometry/support/webMercatorUtils.js";
-import w from "@arcgis/core/layers/GraphicsLayer";
+import * as w from "@arcgis/core/core/reactiveUtils";
+import { Point as u } from "@arcgis/core/geometry";
+import * as d from "@arcgis/core/geometry/support/webMercatorUtils.js";
+import g from "@arcgis/core/layers/GraphicsLayer";
 import P from "./signal-holo-flow.mjs";
 class M extends P {
   constructor(e, s) {
     var l, i;
-    super(e), this.stopLineLayer = new w(), this.watchHandle = null, this.trajectoryDelayTime = 2, this.stopLineMap = /* @__PURE__ */ new Map(), this.lampGroupMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = s, this.view.map.add(this.stopLineLayer), this.trajectoryDelayTime = ((i = (l = this.mapConfig.holoFlow) == null ? void 0 : l.signal) == null ? void 0 : i.delay) || 2;
+    super(e), this.stopLineLayer = new g(), this.watchHandle = null, this.trajectoryDelayTime = 2, this.stopLineMap = /* @__PURE__ */ new Map(), this.lampGroupMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = s, this.view.map.add(this.stopLineLayer), this.trajectoryDelayTime = ((i = (l = this.mapConfig.holoFlow) == null ? void 0 : l.signal) == null ? void 0 : i.delay) || 2;
   }
   /**
    * 读取停止线图层，将灯组面板沿着停止线放置
@@ -52,29 +52,33 @@ class M extends P {
     const { sigId: s, lampGroupList: l } = e, i = [];
     l.forEach((t) => {
       const { lampGroupNo: n, lampGroupType: a, crossFlowList: o, pedList: r } = t;
-      o.length > 0 && o.forEach((c) => {
-        const h = c.upSectionId;
-        let p = "s";
-        switch (c.turn) {
-          case 1:
-            p = "s";
-            break;
-          case 2:
-            p = "l";
-            break;
-          case 4:
-            p = "r";
-            break;
-          case 8:
-            p = "u";
-            break;
+      if (o.length > 0)
+        for (const c of o) {
+          if (a === 81)
+            continue;
+          const h = c.upSectionId;
+          let p = "s";
+          switch (c.turn) {
+            case 1:
+              p = "s";
+              break;
+            case 2:
+              p = "l";
+              break;
+            case 4:
+              p = "r";
+              break;
+            case 8:
+              p = "u";
+              break;
+          }
+          i.push({
+            lampGroupId: n,
+            roadId: h,
+            dir: p
+          });
         }
-        a === 81 && (p = "bl"), i.push({
-          lampGroupId: n,
-          roadId: h,
-          dir: p
-        });
-      }), r.length > 0;
+      r.length > 0;
     }), this.lampGroupMap.set(s, i);
   }
   /**
@@ -82,7 +86,7 @@ class M extends P {
    * @param data
    */
   handleUniSignalData(e) {
-    this.watchHandle || (this.watchHandle = g.watch(
+    this.watchHandle || (this.watchHandle = w.watch(
       () => this.view.extent,
       () => this.updatePanelPosition()
     ));
@@ -151,7 +155,7 @@ class M extends P {
   getPanelScale() {
     const e = this.view.scale;
     let s = 1;
-    return e < 1e3 ? s = 1 : e < 2e3 ? s = 0.8 : e < 4e3 ? s = 0.4 : s = 0, s;
+    return e < 500 ? s = 1.2 : e < 1e3 ? s = 1 : e < 2e3 ? s = 0.8 : e < 4e3 ? s = 0.4 : s = 0, s;
   }
   /**
    * 地图移动时更新灯组面板位置
@@ -161,11 +165,11 @@ class M extends P {
     for (const s of this.countdownPanelProps) {
       e !== this.currentPanelScale && (s.scale = e);
       const { mapPoint: l } = s;
-      let i = new d({
+      let i = new u({
         x: l[0],
         y: l[1]
       });
-      this.view.spatialReference.isWebMercator && (i = u.geographicToWebMercator(
+      this.view.spatialReference.isWebMercator && (i = d.geographicToWebMercator(
         i
       ));
       const t = this.view.toScreen(i);
@@ -208,11 +212,11 @@ class M extends P {
       if (a)
         a.lampStatus = i, a.flash = l;
       else {
-        let o = new d({
+        let o = new u({
           x: n.panelPoint[0],
           y: n.panelPoint[1]
         });
-        this.view.spatialReference.isWebMercator && (o = u.geographicToWebMercator(
+        this.view.spatialReference.isWebMercator && (o = d.geographicToWebMercator(
           o
         ));
         const r = this.view.toScreen(o), c = this.getPanelRotation(n.coord);
@@ -242,7 +246,7 @@ class M extends P {
    * @returns
    */
   async handleHoloSignalData(e) {
-    this.watchHandle || (this.watchHandle = g.watch(
+    this.watchHandle || (this.watchHandle = w.watch(
       () => this.view.extent,
       () => this.updatePanelPosition()
     )), this.trajectoryDelayTime === 0 ? this.doHoloSignalData(e) : setTimeout(
@@ -261,19 +265,19 @@ class M extends P {
    */
   getPanelRotation(e) {
     const s = e[0];
-    let l = new d({
+    let l = new u({
       x: s[0],
       y: s[1]
     });
-    this.view.spatialReference.isWebMercator && (l = u.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (l = d.geographicToWebMercator(
       l
     ));
     const i = this.view.toScreen(l), t = e[e.length - 1];
-    let n = new d({
+    let n = new u({
       x: t[0],
       y: t[1]
     });
-    this.view.spatialReference.isWebMercator && (n = u.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (n = d.geographicToWebMercator(
       n
     ));
     const a = this.view.toScreen(n), o = a.x - i.x, r = a.y - i.y;

package/lib/src/gis-map/utils/holo-flow/signal-holo-flow-lsr.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const y=require("@arcgis/core/core/reactiveUtils"),d=require("@arcgis/core/geometry"),S=require("@arcgis/core/geometry/support/webMercatorUtils.js"),b=require("@arcgis/core/layers/GraphicsLayer"),L=require("./signal-holo-flow.js");function P(u){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(u){for(const a in u)if(a!=="default"){const l=Object.getOwnPropertyDescriptor(u,a);Object.defineProperty(e,a,l.get?l:{enumerable:!0,get:()=>u[a]})}}return e.default=u,Object.freeze(e)}const w=P(y),m=P(S);class M extends L.default{constructor(e,a){var l,i;super(e),this.stopLineLayer=new b,this.watchHandle=null,this.trajectoryDelayTime=2,this.stopLineMap=new Map,this.lampGroupMap=new Map,this.countdownPanelProps=a,this.view.map.add(this.stopLineLayer),this.trajectoryDelayTime=((i=(l=this.mapConfig.holoFlow)==null?void 0:l.signal)==null?void 0:i.delay)||2}async initializeLayer(){var i,t;if(this.stopLineMap.size>0)return;console.time("初始化停止线图层");let e=(t=(i=this.mapConfig.holoFlow)==null?void 0:i.signal)==null?void 0:t.stopLineLayer;if(!e)return;e=this.mapConfig.assetsRoot+"/"+e;const l=await(await fetch(e)).json();for(const n of l.features){const{roadId:s}=n.properties;let{destinationPoint:o}=n.properties;const{coordinates:r}=n.geometry;if(o){if(typeof o=="string")try{o=JSON.parse(o)}catch(c){console.error("解析面板基准点失败",c);continue}}else{const c=r[0],h=r[r.length-1],p=(c[0]+h[0])/2,f=(c[1]+h[1])/2;o=[p,f]}this.stopLineMap.set(s,{coord:r,panelPoint:o})}console.timeEnd("初始化停止线图层")}initializeLampGroup(e){const{sigId:a,lampGroupList:l}=e,i=[];l.forEach(t=>{const{lampGroupNo:n,lampGroupType:s,crossFlowList:o,pedList:r}=t;o.length>0&&o.forEach(c=>{const h=c.upSectionId;let p="s";switch(c.turn){case 1:p="s";break;case 2:p="l";break;case 4:p="r";break;case 8:p="u";break}s===81&&(p="bl"),i.push({lampGroupId:n,roadId:h,dir:p})}),r.length>0}),this.lampGroupMap.set(a,i)}handleUniSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition()));const{sigId:a,runningStatus:l}=e.data.basicInfo,i=this.lampGroupMap.get(a);if(!i)return{status:-1,message:"灯组未初始化"};const t=new Map;let n=!1;switch(String(l)){case"4":{n=!0,i.forEach(s=>{const{roadId:o,dir:r}=s;t.set(o,{...t.get(o)||{},[`${r}Number`]:"",[`${r}Color`]:"yellow"})});break}case"5":{i.forEach(s=>{const{roadId:o,dir:r}=s;t.set(o,{...t.get(o)||{},[`${r}Number`]:"",[`${r}Color`]:"red"})});break}case"6":case"9":{i.forEach(s=>{const{roadId:o,dir:r}=s;t.set(o,{...t.get(o)||{},[`${r}Number`]:"",[`${r}Color`]:"off"})});break}default:{const{curSigColorInfo:s}=e.data;s.forEach(o=>{const r=String(o.lamgroupId),{color:c,leftTime:h}=o,p=i.find(f=>f.lampGroupId===r);if(p){const{roadId:f,dir:g}=p;t.set(f,{...t.get(f)||{},[`${g}Number`]:h,[`${g}Color`]:c===1?"red":c===2?"yellow":"green"})}})}}return this.updateLampGroupPanelStatus(a,t,n),{status:0,message:"ok"}}getPanelScale(){const e=this.view.scale;let a=1;return e<1e3?a=1:e<2e3?a=.8:e<4e3?a=.4:a=0,a}updatePanelPosition(){const e=this.getPanelScale();for(const a of this.countdownPanelProps){e!==this.currentPanelScale&&(a.scale=e);const{mapPoint:l}=a;let i=new d.Point({x:l[0],y:l[1]});this.view.spatialReference.isWebMercator&&(i=m.geographicToWebMercator(i));const t=this.view.toScreen(i);if(a.position.left=t.x,a.position.top=t.y,this.view.type==="3d"){const n=this.getPanelRotation(a.stopLine);a.rotation=n}}this.currentPanelScale=e}doHoloSignalData(e){const a=e.crossId,l=e.phaseCountDownList,i=new Map;for(const t of l){let n="";for(let c of t.roadIdList)if(c.startsWith("-")&&(c=c.slice(1)),this.stopLineMap.has(c)){n=c;break}if(!n){console.log(`没有找到对应的进口道${a}--${n}`);continue}let s=i.get(n);if(s||(s={},i.set(n,s)),!t.direction)continue;const o=t.direction.toLowerCase(),r=t.color===1?"red":t.color===2?"yellow":"green";o==="u"?(s.uNumber=t.leftTime,s.uColor=r):o==="l"?(s.lNumber=t.leftTime,s.lColor=r):o==="s"?(s.sNumber=t.leftTime,s.sColor=r):o==="r"&&(s.rNumber=t.leftTime,s.rColor=r)}this.updateLampGroupPanelStatus(a,i)}updateLampGroupPanelStatus(e,a,l=!1){a.forEach((i,t)=>{const n=this.stopLineMap.get(t);if(!n)return;const s=this.countdownPanelProps.find(o=>o.roadId===t);if(s)s.lampStatus=i,s.flash=l;else{let o=new d.Point({x:n.panelPoint[0],y:n.panelPoint[1]});this.view.spatialReference.isWebMercator&&(o=m.geographicToWebMercator(o));const r=this.view.toScreen(o),c=this.getPanelRotation(n.coord);this.countdownPanelProps.push({displayMode:"complex",flash:l,crossId:e,roadId:t,mapPoint:n.panelPoint,stopLine:n.coord,position:{left:r.x,top:r.y},rotation:c,scale:this.getPanelScale(),lampStatus:i})}})}async handleHoloSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition())),this.trajectoryDelayTime===0?this.doHoloSignalData(e):setTimeout(()=>this.doHoloSignalData(e),this.trajectoryDelayTime*1e3)}clearSignal(){var e;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(e=this.watchHandle)==null||e.remove(),this.watchHandle=null}getPanelRotation(e){const a=e[0];let l=new d.Point({x:a[0],y:a[1]});this.view.spatialReference.isWebMercator&&(l=m.geographicToWebMercator(l));const i=this.view.toScreen(l),t=e[e.length-1];let n=new d.Point({x:t[0],y:t[1]});this.view.spatialReference.isWebMercator&&(n=m.geographicToWebMercator(n));const s=this.view.toScreen(n),o=s.x-i.x,r=s.y-i.y;return Math.atan2(r,o)*(180/Math.PI)}}exports.default=M;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const y=require("@arcgis/core/core/reactiveUtils"),d=require("@arcgis/core/geometry"),S=require("@arcgis/core/geometry/support/webMercatorUtils.js"),b=require("@arcgis/core/layers/GraphicsLayer"),L=require("./signal-holo-flow.js");function P(u){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(u){for(const t in u)if(t!=="default"){const l=Object.getOwnPropertyDescriptor(u,t);Object.defineProperty(e,t,l.get?l:{enumerable:!0,get:()=>u[t]})}}return e.default=u,Object.freeze(e)}const w=P(y),m=P(S);class M extends L.default{constructor(e,t){var l,i;super(e),this.stopLineLayer=new b,this.watchHandle=null,this.trajectoryDelayTime=2,this.stopLineMap=new Map,this.lampGroupMap=new Map,this.countdownPanelProps=t,this.view.map.add(this.stopLineLayer),this.trajectoryDelayTime=((i=(l=this.mapConfig.holoFlow)==null?void 0:l.signal)==null?void 0:i.delay)||2}async initializeLayer(){var i,o;if(this.stopLineMap.size>0)return;console.time("初始化停止线图层");let e=(o=(i=this.mapConfig.holoFlow)==null?void 0:i.signal)==null?void 0:o.stopLineLayer;if(!e)return;e=this.mapConfig.assetsRoot+"/"+e;const l=await(await fetch(e)).json();for(const n of l.features){const{roadId:a}=n.properties;let{destinationPoint:s}=n.properties;const{coordinates:r}=n.geometry;if(s){if(typeof s=="string")try{s=JSON.parse(s)}catch(c){console.error("解析面板基准点失败",c);continue}}else{const c=r[0],f=r[r.length-1],p=(c[0]+f[0])/2,h=(c[1]+f[1])/2;s=[p,h]}this.stopLineMap.set(a,{coord:r,panelPoint:s})}console.timeEnd("初始化停止线图层")}initializeLampGroup(e){const{sigId:t,lampGroupList:l}=e,i=[];l.forEach(o=>{const{lampGroupNo:n,lampGroupType:a,crossFlowList:s,pedList:r}=o;if(s.length>0)for(const c of s){if(a===81)continue;const f=c.upSectionId;let p="s";switch(c.turn){case 1:p="s";break;case 2:p="l";break;case 4:p="r";break;case 8:p="u";break}i.push({lampGroupId:n,roadId:f,dir:p})}r.length>0}),this.lampGroupMap.set(t,i)}handleUniSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition()));const{sigId:t,runningStatus:l}=e.data.basicInfo,i=this.lampGroupMap.get(t);if(!i)return{status:-1,message:"灯组未初始化"};const o=new Map;let n=!1;switch(String(l)){case"4":{n=!0,i.forEach(a=>{const{roadId:s,dir:r}=a;o.set(s,{...o.get(s)||{},[`${r}Number`]:"",[`${r}Color`]:"yellow"})});break}case"5":{i.forEach(a=>{const{roadId:s,dir:r}=a;o.set(s,{...o.get(s)||{},[`${r}Number`]:"",[`${r}Color`]:"red"})});break}case"6":case"9":{i.forEach(a=>{const{roadId:s,dir:r}=a;o.set(s,{...o.get(s)||{},[`${r}Number`]:"",[`${r}Color`]:"off"})});break}default:{const{curSigColorInfo:a}=e.data;a.forEach(s=>{const r=String(s.lamgroupId),{color:c,leftTime:f}=s,p=i.find(h=>h.lampGroupId===r);if(p){const{roadId:h,dir:g}=p;o.set(h,{...o.get(h)||{},[`${g}Number`]:f,[`${g}Color`]:c===1?"red":c===2?"yellow":"green"})}})}}return this.updateLampGroupPanelStatus(t,o,n),{status:0,message:"ok"}}getPanelScale(){const e=this.view.scale;let t=1;return e<500?t=1.2:e<1e3?t=1:e<2e3?t=.8:e<4e3?t=.4:t=0,t}updatePanelPosition(){const e=this.getPanelScale();for(const t of this.countdownPanelProps){e!==this.currentPanelScale&&(t.scale=e);const{mapPoint:l}=t;let i=new d.Point({x:l[0],y:l[1]});this.view.spatialReference.isWebMercator&&(i=m.geographicToWebMercator(i));const o=this.view.toScreen(i);if(t.position.left=o.x,t.position.top=o.y,this.view.type==="3d"){const n=this.getPanelRotation(t.stopLine);t.rotation=n}}this.currentPanelScale=e}doHoloSignalData(e){const t=e.crossId,l=e.phaseCountDownList,i=new Map;for(const o of l){let n="";for(let c of o.roadIdList)if(c.startsWith("-")&&(c=c.slice(1)),this.stopLineMap.has(c)){n=c;break}if(!n){console.log(`没有找到对应的进口道${t}--${n}`);continue}let a=i.get(n);if(a||(a={},i.set(n,a)),!o.direction)continue;const s=o.direction.toLowerCase(),r=o.color===1?"red":o.color===2?"yellow":"green";s==="u"?(a.uNumber=o.leftTime,a.uColor=r):s==="l"?(a.lNumber=o.leftTime,a.lColor=r):s==="s"?(a.sNumber=o.leftTime,a.sColor=r):s==="r"&&(a.rNumber=o.leftTime,a.rColor=r)}this.updateLampGroupPanelStatus(t,i)}updateLampGroupPanelStatus(e,t,l=!1){t.forEach((i,o)=>{const n=this.stopLineMap.get(o);if(!n)return;const a=this.countdownPanelProps.find(s=>s.roadId===o);if(a)a.lampStatus=i,a.flash=l;else{let s=new d.Point({x:n.panelPoint[0],y:n.panelPoint[1]});this.view.spatialReference.isWebMercator&&(s=m.geographicToWebMercator(s));const r=this.view.toScreen(s),c=this.getPanelRotation(n.coord);this.countdownPanelProps.push({displayMode:"complex",flash:l,crossId:e,roadId:o,mapPoint:n.panelPoint,stopLine:n.coord,position:{left:r.x,top:r.y},rotation:c,scale:this.getPanelScale(),lampStatus:i})}})}async handleHoloSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition())),this.trajectoryDelayTime===0?this.doHoloSignalData(e):setTimeout(()=>this.doHoloSignalData(e),this.trajectoryDelayTime*1e3)}clearSignal(){var e;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(e=this.watchHandle)==null||e.remove(),this.watchHandle=null}getPanelRotation(e){const t=e[0];let l=new d.Point({x:t[0],y:t[1]});this.view.spatialReference.isWebMercator&&(l=m.geographicToWebMercator(l));const i=this.view.toScreen(l),o=e[e.length-1];let n=new d.Point({x:o[0],y:o[1]});this.view.spatialReference.isWebMercator&&(n=m.geographicToWebMercator(n));const a=this.view.toScreen(n),s=a.x-i.x,r=a.y-i.y;return Math.atan2(r,s)*(180/Math.PI)}}exports.default=M;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.224",
+  "version": "1.0.226",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [