From 9bc3560647fef84dbb15bef9eb0c12b046b1c577 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 8 Aug 2023 15:55:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=99=AE=E9=80=9Amarker=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 21 +++++--------------
 .../personalcenter/PersonalCenterFragment.kt  |  2 +-
 .../src/main/assets/editormarker.xml          | 17 ++++++++-------
 3 files changed, 16 insertions(+), 24 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 779e5059..767d31d0 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -454,22 +454,11 @@ class ImportPreProcess {
      * */
     fun generateIntersectionReference(renderEntity: RenderEntity) {
         // 路口数据的其他点位，是保存在nodeList对应的数组下
-        if (renderEntity.properties.containsKey("nodeList")) {
-            val nodeListJsonArray: JSONArray = JSONArray(renderEntity.properties["nodeList"])
-            for (i in 0 until nodeListJsonArray.length()) {
-                val nodeJSONObject = nodeListJsonArray.getJSONObject(i)
-                val intersectionReference = ReferenceEntity()
-                intersectionReference.renderEntityId = renderEntity.id
-                intersectionReference.name = "${renderEntity.name}参考点"
-                intersectionReference.table = renderEntity.table
-                intersectionReference.zoomMin = renderEntity.zoomMin
-                intersectionReference.zoomMax = renderEntity.zoomMax
-                intersectionReference.taskId = renderEntity.taskId
-                // 与原有方向指向平行的线
-                intersectionReference.geometry = GeometryTools.createGeometry(nodeJSONObject["geometry"].toString()).toString()
-                intersectionReference.properties["qi_table"] = renderEntity.table
-                intersectionReference.properties["type"] = "node"
-                Realm.getDefaultInstance().insert(intersectionReference)
+        if (renderEntity.properties.containsKey("type")) {
+            if (renderEntity.properties["type"] == "0") {
+                renderEntity.properties["typesrc"] = "assets:symbols/dot_blue_dark.svg"
+            } else {
+                renderEntity.properties["typesrc"] = "assets:symbols/volcano.svg"
             }
         }
     }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
index 6183ee8c..0309351b 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -126,7 +126,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     //116.25017070328308 40.061730653134696
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint( 39.91831047339841,116.36009639042146   ))
+                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
                 }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index d268713f..fff26fcb 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1483,9 +1483,9 @@
 
     <m k="qi_table">
         <!-- 道路线 -->
-<!--        <m v="OMDB_RD_LINK">
+        <m v="OMDB_RD_LINK">
             <line stroke="#9c9c9c" width="1" />
-        </m>-->
+        </m>
 
         <!--道路种别-->
         <m v="OMDB_RD_LINK_KIND">
@@ -1955,11 +1955,14 @@
         </m>
         <!-- 路口 -->
         <m v="OMDB_INTERSECTION">
-            <m k="type" v="node">
-                <symbol src="assets:symbols/dot_blue_dark.svg"></symbol>
-            </m>
-            <m k="intersectionPid">
-                <symbol src="assets:symbols/dot_magenta.svg"></symbol>
+<!--            <m k="type" v="node">-->
+<!--                <symbol src="assets:symbols/dot_blue_dark.svg"></symbol>-->
+<!--            </m>-->
+<!--            <m k="intersectionPid">-->
+<!--                <symbol src="assets:symbols/dot_magenta.svg"></symbol>-->
+<!--            </m>-->
+            <m k="geometry">
+                <symbol src="@typesrc"></symbol>
             </m>
         </m>