gisviewer-vue3-arcgis 1.0.134 → 1.0.135

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

@@ -4,6 +4,7 @@ interface ICross {
     parentId: string;
     latitude: number;
     longitude: number;
+    signalId: string;
 }
 export default class DistrictController {
     id: string;

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

@@ -1,4 +1,4 @@
-class r {
+class i {
   constructor(t) {
     this.parentName = "", this.crosses = [], this.subDistricts = [], this.areaColor = [
       Math.floor(Math.random() * 255),
@@ -7,7 +7,7 @@ class r {
     ], this.crossCount = 0, this.subDistrictCount = 0, this.id = t.id, this.name = t.name, this.parentId = t.parentId;
     for (const s of t.children)
       if (s.children) {
-        const o = new r(s);
+        const o = new i(s);
         o.parentName = this.name, o.areaColor = this.areaColor, this.subDistricts.push(o), this.subDistrictCount++, this.crossCount += o.crossCount;
       } else {
         const o = {
@@ -15,7 +15,8 @@ class r {
           name: s.name,
           parentId: s.parentId,
           latitude: Number(s.latitude),
-          longitude: Number(s.longitude)
+          longitude: Number(s.longitude),
+          signalId: s.signalId
         };
         this.crosses.push(o), this.crossCount++;
       }
@@ -30,5 +31,5 @@ class r {
   }
 }
 export {
-  r as default
+  i as default
 };

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

@@ -5,7 +5,8 @@ export default class SignalControlAreaController {
     private subDistrictControllerLayer;
     private crossLayer;
     private highlightLayer;
-    private eventHandle?;
+    private watchHandle?;
+    private readonly crossScale;
     constructor(view: __esri.MapView | __esri.SceneView);
     showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;

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

@@ -1,12 +1,13 @@
-import h from "@arcgis/core/Graphic";
+import * as y from "@arcgis/core/core/reactiveUtils.js";
+import n from "@arcgis/core/Graphic";
 import a from "@arcgis/core/layers/GraphicsLayer";
-import y from "@turf/buffer";
-import g from "@turf/convex";
+import g from "@turf/buffer";
+import d from "@turf/convex";
 import * as c from "@turf/helpers";
-import m from "./district-controller.mjs";
+import p from "./district-controller.mjs";
 class C {
   constructor(e) {
-    this.view = e, this.view.popup.visibleElements = {
+    this.crossScale = 1500, this.view = e, this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
       actionBar: !0
@@ -34,19 +35,42 @@ 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 t of e) {
-      const r = new m(t);
+      const r = new p(t);
       this.drawArea(r, !0);
     }
-    return { status: 0, message: "ok" };
+    return this.watchHandle = y.watch(
+      () => this.view.scale,
+      (t, r) => {
+        t > this.crossScale && r <= this.crossScale ? this.crossLayer.graphics.forEach((s) => {
+          s.symbol = {
+            type: "simple-marker",
+            color: s.getAttribute("color"),
+            size: 8,
+            outline: {
+              color: "white",
+              width: 1
+            }
+          };
+        }) : t <= this.crossScale && r > this.crossScale && this.crossLayer.graphics.forEach((s) => {
+          s.symbol = {
+            type: "picture-marker",
+            url: "/GisViewerAssets/images/xhj_1.png",
+            width: "37px",
+            height: "57px",
+            yoffset: "25px"
+          };
+        });
+      }
+    ), { status: 0, message: "ok" };
   }
   clearSignalControlArea() {
     var e;
-    return this.districtControllerLayer.removeAll(), this.subDistrictControllerLayer.removeAll(), this.crossLayer.removeAll(), this.highlightLayer.removeAll(), (e = this.eventHandle) == null || e.remove(), this.view.closePopup(), { status: 0, message: "ok" };
+    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);
     if (t) {
-      await this.view.goTo(t.geometry);
+      t.attributes.type === "cross" ? await this.view.goTo({ target: t.geometry, scale: 3e3 }) : await this.view.goTo(t.geometry);
       const r = t.geometry.type === "point" ? t.geometry : t.geometry.centroid;
       return this.view.openPopup({
         features: [t],
@@ -92,11 +116,11 @@ class C {
     const r = e.getAllCrossCoordinates();
     if (r.length > 2) {
       const i = c.featureCollection(
-        r.map((d) => c.point(d))
-      ), l = g(i);
+        r.map((u) => c.point(u))
+      ), l = d(i);
       if (!l)
         return;
-      const u = y(
+      const m = g(
         l.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
@@ -132,10 +156,10 @@ class C {
           label: "路口数量"
         }
       ];
-      const n = new h({
+      const h = new n({
         geometry: {
           type: "polygon",
-          rings: u.geometry.coordinates
+          rings: m.geometry.coordinates
         },
         symbol: {
           type: "simple-fill",
@@ -165,11 +189,11 @@ class C {
           ]
         }
       });
-      t ? this.districtControllerLayer.add(n) : this.subDistrictControllerLayer.add(n);
+      t ? this.districtControllerLayer.add(h) : this.subDistrictControllerLayer.add(h);
     }
     for (const i of e.subDistricts)
       this.drawArea(i, !1);
-    const s = e.crosses.map((i) => new h({
+    const s = e.crosses.map((i) => new n({
       geometry: {
         type: "point",
         x: i.longitude,
@@ -188,8 +212,12 @@ class C {
         type: "cross",
         id: i.id,
         name: i.name,
+        color: e.areaColor,
+        signalId: i.signalId,
         districtId: t ? e.id : e.parentId,
-        subDistrictId: t ? "" : e.id
+        districtName: t ? e.name : e.parentName,
+        subDistrictId: t ? "" : e.id,
+        subDistrictName: t ? "" : e.name
       },
       popupTemplate: {
         title: i.name,
@@ -198,16 +226,20 @@ class C {
             type: "fields",
             fieldInfos: [
               {
-                fieldName: "districtId",
-                label: "区控编号"
+                fieldName: "districtName",
+                label: "区控名称"
               },
               {
-                fieldName: "subDistrictId",
-                label: "子区编号"
+                fieldName: "subDistrictName",
+                label: "子区名称"
               },
               {
                 fieldName: "id",
                 label: "路口编号"
+              },
+              {
+                fieldName: "signalId",
+                label: "信号机编号"
               }
             ]
           }

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

@@ -4,6 +4,7 @@ interface ICross {
     parentId: string;
     latitude: number;
     longitude: number;
+    signalId: string;
 }
 export default class DistrictController {
     id: string;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});class e{constructor(s){this.parentName="",this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new e(t);o.parentName=this.name,o.areaColor=this.areaColor,this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else{const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude)};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});class e{constructor(s){this.parentName="",this.crosses=[],this.subDistricts=[],this.areaColor=[Math.floor(Math.random()*255),Math.floor(Math.random()*255),Math.floor(Math.random()*255)],this.crossCount=0,this.subDistrictCount=0,this.id=s.id,this.name=s.name,this.parentId=s.parentId;for(const t of s.children)if(t.children){const o=new e(t);o.parentName=this.name,o.areaColor=this.areaColor,this.subDistricts.push(o),this.subDistrictCount++,this.crossCount+=o.crossCount}else{const o={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId};this.crosses.push(o),this.crossCount++}}getAllCrossCoordinates(){const s=[];for(const t of this.crosses)s.push([t.longitude,t.latitude]);for(const t of this.subDistricts)s.push(...t.getAllCrossCoordinates());return s}}exports.default=e;

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

@@ -5,7 +5,8 @@ export default class SignalControlAreaController {
     private subDistrictControllerLayer;
     private crossLayer;
     private highlightLayer;
-    private eventHandle?;
+    private watchHandle?;
+    private readonly crossScale;
     constructor(view: __esri.MapView | __esri.SceneView);
     showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;

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 c=require("@arcgis/core/Graphic"),o=require("@arcgis/core/layers/GraphicsLayer"),y=require("@turf/buffer"),p=require("@turf/convex"),m=require("@turf/helpers"),f=require("./district-controller.js");function b(s){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(s){for(const t in s)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(s,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>s[t]})}}return e.default=s,Object.freeze(e)}const u=b(m);class L{constructor(e){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 i=new f.default(t);this.drawArea(i,!0)}return{status:0,message:"ok"}}clearSignalControlArea(){var e;return this.districtControllerLayer.removeAll(),this.subDistrictControllerLayer.removeAll(),this.crossLayer.removeAll(),this.highlightLayer.removeAll(),(e=this.eventHandle)==null||e.remove(),this.view.closePopup(),{status:0,message:"ok"}}async locateSignalControlArea(e){const t=this.findAreaGraphic(e.id);if(t){await this.view.goTo(t.geometry);const i=t.geometry.type==="point"?t.geometry:t.geometry.centroid;return this.view.openPopup({features:[t],location:i}),{status:0,message:"ok"}}else return{status:1,message:"未找到"}}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()),a=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),a.length>0&&this.highlightLayer.addMany(a),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(await this.view.goTo(t.length>0?t:i.length>0?i:a),{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){const r=u.featureCollection(i.map(g=>u.point(g))),n=p(r);if(!n)return;const d=y(n.geometry,t?200:30,{units:"meters"});let l;t?l=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:l=[{fieldName:"parentName",label:"区控名称"},{fieldName:"id",label:"子区编号"},{fieldName:"crossCount",label:"路口数量"}];const h=new c({geometry:{type:"polygon",rings:d.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:e.name,content:[{type:"fields",fieldInfos:l}]}});t?this.districtControllerLayer.add(h):this.subDistrictControllerLayer.add(h)}for(const r of e.subDistricts)this.drawArea(r,!1);const a=e.crosses.map(r=>new c({geometry:{type:"point",x:r.longitude,y:r.latitude},symbol:{type:"simple-marker",color:e.areaColor,size:8,outline:{color:"white",width:1}},attributes:{type:"cross",id:r.id,name:r.name,districtId:t?e.id:e.parentId,subDistrictId:t?"":e.id},popupTemplate:{title:r.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtId",label:"区控编号"},{fieldName:"subDistrictId",label:"子区编号"},{fieldName:"id",label:"路口编号"}]}]}}));this.crossLayer.addMany(a)}}exports.default=L;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const m=require("@arcgis/core/core/reactiveUtils.js"),h=require("@arcgis/core/Graphic"),o=require("@arcgis/core/layers/GraphicsLayer"),p=require("@turf/buffer"),f=require("@turf/convex"),b=require("@turf/helpers"),L=require("./district-controller.js");function g(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 v=g(m),u=g(b);class w{constructor(e){this.crossScale=1500,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 L.default(t);this.drawArea(r,!0)}return this.watchHandle=v.watch(()=>this.view.scale,(t,r)=>{t>this.crossScale&&r<=this.crossScale?this.crossLayer.graphics.forEach(s=>{s.symbol={type:"simple-marker",color:s.getAttribute("color"),size:8,outline:{color:"white",width:1}}}):t<=this.crossScale&&r>this.crossScale&&this.crossLayer.graphics.forEach(s=>{s.symbol={type:"picture-marker",url:"/GisViewerAssets/images/xhj_1.png",width:"37px",height:"57px",yoffset:"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);if(t){t.attributes.type==="cross"?await this.view.goTo({target:t.geometry,scale:3e3}):await this.view.goTo(t.geometry);const r=t.geometry.type==="point"?t.geometry:t.geometry.centroid;return this.view.openPopup({features:[t],location:r}),{status:0,message:"ok"}}else return{status:1,message:"未找到"}}async highlightSignalControlArea(e){this.highlightLayer.removeAll(),this.districtControllerLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.crossLayer.visible=!1;const t=this.districtControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id).toArray().map(i=>i.clone()),r=this.subDistrictControllerLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("parentId")===e.id).toArray().map(i=>i.clone()),s=this.crossLayer.graphics.filter(i=>i.getAttribute("id")===e.id||i.getAttribute("districtId")===e.id||i.getAttribute("subDistrictId")===e.id).toArray().map(i=>i.clone());return t.length>0&&this.highlightLayer.addMany(t),r.length>0&&this.highlightLayer.addMany(r),s.length>0&&this.highlightLayer.addMany(s),this.highlightLayer.graphics.length===0?{status:1,message:"未找到"}:(await this.view.goTo(t.length>0?t:r.length>0?r:s),{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){const i=u.featureCollection(r.map(y=>u.point(y))),n=f(i);if(!n)return;const d=p(n.geometry,t?200:30,{units:"meters"});let l;t?l=[{fieldName:"id",label:"区控编号"},{fieldName:"crossCount",label:"路口数量"},{fieldName:"subDistrictCount",label:"子区数量"}]:l=[{fieldName:"parentName",label:"区控名称"},{fieldName:"id",label:"子区编号"},{fieldName:"crossCount",label:"路口数量"}];const c=new h({geometry:{type:"polygon",rings:d.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:e.name,content:[{type:"fields",fieldInfos:l}]}});t?this.districtControllerLayer.add(c):this.subDistrictControllerLayer.add(c)}for(const i of e.subDistricts)this.drawArea(i,!1);const s=e.crosses.map(i=>new h({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:{type:"simple-marker",color:e.areaColor,size:8,outline:{color:"white",width:1}},attributes:{type:"cross",id:i.id,name:i.name,color:e.areaColor,signalId:i.signalId,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name},popupTemplate:{title:i.name,content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"id",label:"路口编号"},{fieldName:"signalId",label:"信号机编号"}]}]}}));this.crossLayer.addMany(s)}}exports.default=w;

package/package.json

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