From d19a9b94ec3caa44bc406c4a11c772d06bbd5381 Mon Sep 17 00:00:00 2001
From: zhaipx <zhaipeixiu@htsdfp.com>
Date: Tue, 2 Apr 2024 16:08:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BB=8F=E5=BA=A6?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=EF=BC=8C=E5=BA=A6=E5=88=86=E7=A7=92=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E8=87=B3=E6=AF=AB=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/BottomBar.vue | 29 +++++++++----------------
 src/utils/map/TDTProvider.ts     |  2 +-
 src/utils/map/angle.ts           | 30 ++++++++++++++++++++++++++
 src/utils/map/coordinate.ts      | 36 +-------------------------------
 4 files changed, 42 insertions(+), 55 deletions(-)
 create mode 100644 src/utils/map/angle.ts

diff --git a/src/components/map/BottomBar.vue b/src/components/map/BottomBar.vue
index ca22766..2a2324a 100644
--- a/src/components/map/BottomBar.vue
+++ b/src/components/map/BottomBar.vue
@@ -4,48 +4,40 @@
   创建人：Zhaipeixiu
 -->
 <script setup lang="ts">
-import { DecimalDegree2DMS_Point} from '@/utils/map/coordinate.ts'
+import { Angle } from '@/utils/map/angle.ts'
 import {ScreenSpaceEventHandler, Math, ScreenSpaceEventType} from 'cesium'
-import {coordPoint} from "@/utils/map/geometry.ts";
 import {onMounted, ref} from "vue";
 let nowLatStr: string, nowLonStr: string
 let lonlatStr = ref('')
 let isDecimal = ref(true)
 
-let coord_dms : coordPoint = {
-  lon: '',
-  lat: ''
-}
 onMounted(()=>{
-  let _viewer = window.Viewer
+  let _viewer = window.viewer
   let canvas =  _viewer.scene.canvas
   let handler = new ScreenSpaceEventHandler(canvas)
   handler.setInputAction((e:any)=> {
     //捕获椭球体，将笛卡尔二维平面坐标转为椭球体的笛卡尔三维坐标，返回球体表面的点
     let position: any = _viewer.scene.pickPosition(e.endPosition)
     if (!position) {
-      position = _viewer.scene.camera.pickEllipsoid(
-          e.startPosition,
-          _viewer.scene.globe.ellipsoid);
+      position = _viewer.scene.camera.pickEllipsoid(e.startPosition, _viewer.scene.globe.ellipsoid)
     }
     if (position) {
       //将笛卡尔三维坐标转为地图坐标（弧度）
       let cartographic =  _viewer.scene.globe.ellipsoid.cartesianToCartographic(position);
       try{
         // 将地图坐标（弧度）转为十进制的度数
-        nowLatStr = Math.toDegrees(cartographic.latitude).toFixed(3) // 纬度
-        nowLonStr = Math.toDegrees(cartographic.longitude).toFixed(3) // 经度
+        nowLatStr = Math.toDegrees(cartographic.latitude).toFixed(7) // 纬度
+        nowLonStr = Math.toDegrees(cartographic.longitude).toFixed(7) // 经度
         let camera_alt = (_viewer.camera.positionCartographic.height / 1000) // 视高
         // 相机低于250、俯仰角小于-80度时才计算海拔高度（否则误差大）
         let needElevation: boolean = camera_alt < 250 && (_viewer.camera.pitch < -(Math.PI/180)*80)
-        let elevStr = needElevation? _viewer.scene.globe.getHeight(cartographic)?.toFixed(2)?? '-' : '-' // 海拔
+        let elevStr = needElevation? _viewer.scene.globe.getHeight(cartographic)?.toFixed(2)?? '' : '' // 海拔
 
         if(isDecimal.value) {   //如果是十进制度
-          lonlatStr.value = `经度：${nowLonStr} , 纬度：${nowLatStr} , 海拔：${elevStr} + m`
+          lonlatStr.value = `经度：${nowLonStr} , 纬度：${nowLatStr} , 海拔(m)：${elevStr}`
         }
         else {
-          coord_dms = DecimalDegree2DMS_Point(Number(nowLonStr), Number(nowLatStr))
-          lonlatStr.value = `经度：${coord_dms.lon} , 纬度：${coord_dms.lat} , 海拔：${elevStr} + m`
+          lonlatStr.value = `经度：${Angle.DecimalDegree2DMS(nowLonStr)} , 纬度：${Angle.DecimalDegree2DMS(nowLatStr)} , 海拔(m)：${elevStr}`
         }
       } catch (e) {}
     }
@@ -55,11 +47,10 @@ onMounted(()=>{
 function lonlatClick() {
   let elevStr = lonlatStr.value.split('海拔')[1]
   if(isDecimal.value){
-    coord_dms = DecimalDegree2DMS_Point(Number(nowLonStr), Number(nowLatStr))
-    lonlatStr.value = `经度：${coord_dms.lon} , 纬度：${coord_dms.lat} , 海拔` + elevStr
+    lonlatStr.value = `经度：${Angle.DecimalDegree2DMS(nowLonStr)} , 纬度：${Angle.DecimalDegree2DMS(nowLatStr)} , 海拔(m)` + elevStr
   }
   else {
-    lonlatStr.value = `经度：${nowLonStr} , 纬度：${nowLatStr} , 海拔` + elevStr
+    lonlatStr.value = `经度：${nowLonStr} , 纬度：${nowLatStr} , 海拔(m)` + elevStr
   }
   isDecimal.value = !isDecimal.value
 }
diff --git a/src/utils/map/TDTProvider.ts b/src/utils/map/TDTProvider.ts
index 6b1af24..a5cfd82 100644
--- a/src/utils/map/TDTProvider.ts
+++ b/src/utils/map/TDTProvider.ts
@@ -88,7 +88,7 @@ export function getTDTTerrainProvider() {
     terrainUrls.push(url)
   }
 
-  const provider = new window.cesium.GeoTerrainProvider({
+  const provider = new Cesium.GeoTerrainProvider({
     urls: terrainUrls,
   })
   return provider
diff --git a/src/utils/map/angle.ts b/src/utils/map/angle.ts
new file mode 100644
index 0000000..c3d48e6
--- /dev/null
+++ b/src/utils/map/angle.ts
@@ -0,0 +1,30 @@
+class Angle {
+    constructor() {}
+
+    /**
+     * 十进制经纬度转度分秒，精确至毫秒
+     * @param decimal_var 十进制经纬度
+     * @constructor
+     */
+    static DecimalDegree2DMS(decimal_var: number|string){
+        if(!decimal_var.toString().includes('.'))
+            return decimal_var.toString() + '°0\'0\'\''
+        let decimalStr = decimal_var.toString().split('.')
+        let degreeStr = decimalStr[0]
+        if (decimalStr[1]){
+            let minutes = Number(decimalStr[1]) / Math.pow(10,decimalStr[1].length) * 60
+            if(!minutes.toString().includes('.'))
+                return degreeStr + '°'+ minutes.toString() +'\'0\'\''
+            let minuteSecondsStr = minutes.toString().split('.')
+            if (minuteSecondsStr[1]){
+                let secondStr = Number(minuteSecondsStr[1]) / Math.pow(10,minuteSecondsStr[1].length) * 60
+                return degreeStr + '°'+ minuteSecondsStr[0] +'\'' + secondStr.toFixed(3) + '\'\''
+            }
+        }
+        return ''
+    }
+}
+
+
+
+export { Angle }
diff --git a/src/utils/map/coordinate.ts b/src/utils/map/coordinate.ts
index 7ab216e..d9a8ebc 100644
--- a/src/utils/map/coordinate.ts
+++ b/src/utils/map/coordinate.ts
@@ -6,7 +6,6 @@
  * @Description: 坐标系转化
  */
 import { Cartesian2, Viewer, Math, Cartographic, Cartesian3 } from 'cesium'
-import type {coordPoint} from '@/utils/map/geometry.ts'
 
 /**
  * 屏幕坐标转笛卡尔坐标
@@ -48,37 +47,4 @@ function cartesian3ToWGS84(pos: Cartesian3) {
   return []
 }
 
-/**
- * 十进制经纬度转度分秒。
- * @param lon 经度
- * @param lat 纬度
- * @constructor
- */
-function DecimalDegree2DMS_Point(lon: number, lat: number): coordPoint {
-  let coord_dms : coordPoint = {
-    lon: '',
-    lat: ''
-  }
-  coord_dms.lon = DecimalDegree2DMS(lon)
-  coord_dms.lat = DecimalDegree2DMS(lat)
-  return coord_dms
-}
-
-function DecimalDegree2DMS(decimal_var: number|string): string {
-  if(!decimal_var.toString().includes('.'))
-    return decimal_var.toString() + '°0\'0\'\''
-  let decimalStr = decimal_var.toString().split('.')
-  let degreeStr = decimalStr[0]
-  if (decimalStr[1]){
-    let minutes = Number(decimalStr[1]) * 60 / 1000   //十进制度默认显示小数点后3位
-    if(!minutes.toString().includes('.'))
-      return degreeStr + '°'+ minutes.toString() +'\'0\'\''
-    let minuteSecondsStr = minutes.toString().split('.')
-    if (minuteSecondsStr[1]){
-      let secondStr = (Number(minuteSecondsStr[1]) * 60).toFixed(0)
-      return degreeStr + '°'+ minuteSecondsStr[0] +'\'' + secondStr.slice(0,2) + '\'\''
-    }
-  }
-  return ''
-}
-export { cartesian2ToCartesian3, cartesian2ToWGS84, DecimalDegree2DMS_Point,cartesian3ToWGS84  }
+export { cartesian2ToCartesian3, cartesian2ToWGS84, cartesian3ToWGS84  }