From 80b8b60556fc6515043c5575790c534d27582e2c Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 24 May 2023 17:12:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
index 1ce234b4..5091a0ab 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -51,18 +51,21 @@ class ImportPreProcess {
     }
 
     fun addAngleFromGeometry(renderEntity: RenderEntity): String {
-        renderEntity.properties.put("angle", "0")
-        if (renderEntity.wkt!=null) {
-            val geometry = renderEntity.wkt
-            if (geometry?.numPoints!!>=2) {
-                val p1: Coordinate = geometry?.coordinates?.get(geometry.coordinates.size - 2)!!
-                val p2: Coordinate = geometry?.coordinates?.get(geometry.coordinates.size - 1)!!
-                val angle = Angle.angle(p1, p2).toString()
+        if (!renderEntity.properties.containsKey("angle")) {
+            if (renderEntity.wkt!=null) {
+                val geometry = renderEntity.wkt
+                var angle: String = "90"
+                if (geometry?.numPoints!!>=2) {
+                    val p1: Coordinate = geometry?.coordinates?.get(geometry.coordinates.size - 2)!!
+                    val p2: Coordinate = geometry?.coordinates?.get(geometry.coordinates.size - 1)!!
+                    // 弧度转角度
+                    angle = Math.toDegrees(Angle.angle(p1, p2)).toString()
+                } else {
+                    angle = "90"
+                }
                 // 计算线段的方向
                 renderEntity.properties["angle"] = angle
                 return angle
-            } else {
-                renderEntity.properties["angle"] = "90"
             }
         }
         return "0"