From 6563a413896d5b719e511bea71e9dd10e396cc22 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 24 Nov 2023 13:40:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
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 | 6 ++----
 collect-library/src/main/assets/editormarker.xml          | 4 ++--
 2 files changed, 4 insertions(+), 6 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 6537bf27..58f877ab 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -830,15 +830,13 @@ class ImportPreProcess {
                     0,1,2->{
                         if (medianWidth != null) {
                             angleReference.geometry =
-                                GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry)
-                            Log.e("qj","width==${medianWidth/100000000}")
+                                GeometryTools.computeLine(0.000012, 0.0, renderEntity.geometry)
                         }
                     }
                     3->{
                         if (medianWidth != null) {
                             angleReference.geometry =
-                                GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry)
-                            Log.e("qj","width==${medianWidth/100000000}")
+                                GeometryTools.computeLine(0.0, 0.000012, renderEntity.geometry)
                         }
                     }
                 }
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index c5b33766..558f62de 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1651,7 +1651,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <line stroke="#495462" use="boundaryType" width="0.2"/>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1678,7 +1678,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <line stroke="#495462" use="boundaryType" width="0.2"/>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">

From 559f55f4989d22d0d7d56ec7be0b1ac0fff08de5 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 27 Nov 2023 09:36:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A6=81=E7=B4=A0=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                          | 4 ++--
 collect-library/src/main/assets/editormarker.xml              | 4 ++--
 .../navinfo/collect/library/map/source/OMDBDataDecoder.java   | 2 +-
 vtm                                                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 5a274375..d7c5d125 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -362,7 +362,7 @@
         "zoomMax": 20,
         "is3D": true,
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": [
           {
             "k": "geometry",
@@ -712,7 +712,7 @@
         "name": "车信",
         "catch": true,
         "isDependOnOtherTable": false,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 15,
         "zoomMax": 17,
         "transformer": [
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 8618f0a7..09903d8e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1939,12 +1939,12 @@
             <m k="speedFlag" v="0">
 <!--                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"-->
 <!--                    stroke-width="1.0"></caption>-->
-                <symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol>
+                <symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="speedFlag" v="1">
 <!--                <caption fill="#000000" k="maxSpeed" priority="0" size="10" stroke="#ffffff"-->
 <!--                    stroke-width="1.0"></caption>-->
-                <symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol>
+                <symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
index 1e7c1472..824e0b09 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
@@ -91,7 +91,7 @@ public class OMDBDataDecoder extends TileDecoder {
             }
         });
         //增加交通标牌聚合显示
-        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0);
+        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
         if (list1 != null && list1.size() > 0) {
             Log.e("qj", "聚合交通标牌转换开始" + list.size());
             list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
diff --git a/vtm b/vtm
index 3eb80a33..0596b02c 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 3eb80a33c6b54609a47083c38fe35fd4916edba9
+Subproject commit 0596b02c53f3dad6dba98441820eb63667d9bd88