From 49f1198d1f2da71f6213270dfe94be9b34ebf235 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 07 Apr 2025 20:41:50 +0800
Subject: [PATCH] feat: 量尺

---
 src/views/Home/useMapAggregation/useMapAggregation.js |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index d41f71f..f28e071 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -50,7 +50,7 @@
 
   // 确定缩放比例
   const determineScaling = () => {
-    console.log('确定缩放比例');
+    // console.log('确定缩放比例');
     if (!viewer) return;
     let height = viewer.camera.positionCartographic.height;
     // 根据高度展示对应的 gJson
@@ -61,9 +61,9 @@
         active = item.name;
         removeEntities();
         removeLabel();
+        renderOutline(item);
         if (!item.gJson && !item.splashedList?.length) return;
         item.gJson ? aggregation(item) : splashed(item);
-        renderOutline(item);
         break;
       }
     }
@@ -160,8 +160,6 @@
     const splashedList = type === 'device'
       ? await getDeviceList(areaCode)
       : eventList.map(i=>({eventId:i.id,latitude:Number(i.latitude),longitude:Number(i.longitude),type:'event'}))
-    console.log(list, 'list');
-    console.log(splashedList, 'splashedList');
     const hierarchy = convertToHierarchy(areaCode.slice(0, 6));
     const jsonPath = hierarchy.join('/');
     const jsonPathPre = hierarchy.slice(0, hierarchy.length - 1).join('/');
@@ -169,14 +167,10 @@
     scalingJudgment[0].gJson = null;
     scalingJudgment[0].splashedList = splashedList;
     active = null;
-    // 轮廓
-    const outlineGJson = await getOutLine(jsonPathPre, hierarchy);
-    scalingJudgment.forEach(item => item.show && (item.outline = outlineGJson));
     // 省
     if (hierarchy.length === 1) {
       const gJson1 = await getFiler(`${defaultDir}${jsonPath}/indexDistrict.json`);
       const gJson2 = await getFiler(`${defaultDir}${jsonPath}/index.json`);
-
       scalingJudgment[1].gJson = {
         ...gJson1,
         features: gJson1.features.map(item => {
@@ -184,10 +178,7 @@
           return { ...item, data: {...findData,type: type + 'Aggregation'} }
         }),
       };
-      console.log(injectData(gJson2, list));
       scalingJudgment[2].gJson = injectData(gJson2, list);
-      const { lng, lat } = getCenterPoint(gJson2.features.map(item => item.properties.center));
-      flyTo({ longitude: lng, latitude: lat }, 0, scalingJudgment[2].height);
     }
     // 市
     if (hierarchy.length === 2) {
@@ -195,8 +186,6 @@
       scalingJudgment[2].show = false;
       const gJson1 = await getFiler(`${defaultDir}${jsonPath}/index.json`);
       scalingJudgment[1].gJson = injectData(gJson1, list);
-      const center = getCenterPoint(gJson1.features.map(item => item.properties.center));
-      flyTo({ longitude: center.lng, latitude: center.lat }, 0, scalingJudgment[1].height);
     }
     // 区县
     if (hierarchy.length === 3) {
@@ -204,16 +193,18 @@
       scalingJudgment[1].show = false;
       scalingJudgment[2].gJson = null;
       scalingJudgment[2].show = false;
-      const outlineGJson = await getOutLine(jsonPathPre, hierarchy);
-      const center = outlineGJson.features[0].properties.center;
-      flyTo({ longitude: center[0], latitude: center[1] }, 0, scalingJudgment[0].height);
     }
-    determineScaling()
+    // 轮廓
+    const outlineGJson = await getOutLine(jsonPathPre, hierarchy);
+    scalingJudgment.forEach(item => item.show && (item.outline = outlineGJson));
+    const [longitude,latitude] = outlineGJson.features[0].properties.centroid
+    flyTo({ longitude, latitude }, 0, scalingJudgment[(hierarchy.length-3) * (-1)].height);
   };
 
   watch(
     selectedAreaCode,
     async (newValue, oldValue) => {
+      if (!viewer) return
       viewer.scene.postRender.removeEventListener(determineScaling)
       initMapData(newValue).then(()=>{
         viewer.scene.postRender.addEventListener(determineScaling)
@@ -286,7 +277,7 @@
       // const {lng,lat} = getCenterPoint(item1.geometry.coordinates[0][0])
       return {
         name: item1.properties.name,
-        position: item1.properties.center,
+        position: item1.properties.centroid,
         data: item1.data,
         id: item1.region_code,
       }
@@ -312,9 +303,10 @@
         id: feature.id,
         position: position,
         label: {
-          text: feature.data.total_device_count.toString(),
+          text: (feature.data.total_device_count || 0).toString(),
           font: '12pt Source Han Sans CN',
           fillColor: Cesium.Color.BLACK,
+          outlineColor: Cesium.Color.BLACK,
           style: Cesium.LabelStyle.FILL_AND_OUTLINE,
           eyeOffset: new Cesium.Cartesian3(0, 0, -10), // 让label "浮" 在广告牌前面
         },
@@ -433,6 +425,7 @@
 
   // 移除所有监听事件，变量置空
   const removeAll = () => {
+    if (!viewer) return
     removeEntities();
     removeLabel();
     // viewer.camera.moveEnd.removeEventListener(determineScaling);

--
Gitblit v1.9.3