From 2b574da6d40a2239a877e6e24578883d95ef4133 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 20 Sep 2023 13:41:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=9D=A2=E7=BA=B9=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=AE=9E=E9=99=85=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=BE=E7=BD=AE=E7=BA=B9=E7=90=86=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?repeat=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                            | 1 +
 .../omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index ed45859f..a037ed16 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -258,6 +258,7 @@
 				"code": 3014,
 				"name": "人行横道",
 				"catch":true,
+				"checkLinkId": false,
 				"zoomMin": 18,
 				"zoomMax": 20
 			},
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 c09ca51a..855790d8 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
@@ -166,7 +166,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint(40.09848700000006, 116.53088699999999))
+                        .animateTo(GeoPoint(40.09819324139729,116.53123207733361 ))
                 }
 
                 R.id.personal_center_menu_open_all_layer -> {

From 3dc346f29df5cba89800a10d0108d3124725e61b Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 20 Sep 2023 15:35:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20symbol=E5=A2=9E=E5=8A=A0y=E6=96=B9?=
 =?UTF-8?q?=E5=90=91=E7=9A=84=E5=81=8F=E7=A7=BB=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 5 +++--
 collect-library/resources/rendertheme.xsd                 | 2 ++
 collect-library/src/main/assets/editormarker.xml          | 2 +-
 vtm                                                       | 2 +-
 4 files changed, 7 insertions(+), 4 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 9dc13333..0a211e9f 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -845,8 +845,9 @@ class ImportPreProcess {
         val listResult = mutableListOf<ReferenceEntity>()
 
         val coorEnd = Coordinate(pointStart.getX() + dx, pointStart.getY() + dy, pointStart.z)
-        renderEntity.geometry =
-            WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
+        renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(centerPoint!!.y, centerPoint.x)).toString()
+//        renderEntity.geometry =
+//            WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
 
         val code = renderEntity.properties["signType"]
         renderEntity.properties["src"] = "assets:omdb/appendix/1105_${code}_0.svg"
diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd
index 656b3da1..fa7348c9 100644
--- a/collect-library/resources/rendertheme.xsd
+++ b/collect-library/resources/rendertheme.xsd
@@ -260,6 +260,8 @@
         <xs:attribute name="gland" default="true" type="xs:boolean" use="optional"/>
         <!-- 原图标旋转角度，默认情况下应该使用以X轴为正方向的图标，此处可设置原图标的旋转角度，在渲染时自动对图标进行旋转，仅支持线要素 -->
         <xs:attribute name="degree" default="0" type="xs:float" use="optional"/>
+        <!-- 图标在y轴方向上的偏移量 -->
+        <xs:attribute name="dy" default="0" type="xs:float" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="extrusion">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index ba0119c7..b418918f 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1568,7 +1568,7 @@
         <!-- 交通标牌 -->
         <m v="OMDB_TRAFFIC_SIGN">
             <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
-                src="@src" symbol-height="24" symbol-width="24" degree="-90"></symbol>
+                src="@src" symbol-height="24" symbol-width="24" degree="-90" dy="-30"></symbol>
         </m>
 
         <m v="OMDB_AREA">
diff --git a/vtm b/vtm
index f2af87c6..719c44b6 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit f2af87c6a012ac41d6f22a77d6b45853b250ed3e
+Subproject commit 719c44b65d3ed26d725b24b3a5366b281c9e4fad