From edf98fe6247f26aee3d7917a9b9fe78fc73346af Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 5 Sep 2023 16:58:34 +0800
Subject: [PATCH] merge code

---
 app/src/main/assets/omdb_config.json                 | 12 +++++++++---
 .../java/com/navinfo/omqs/db/ImportOMDBHelper.kt     |  7 ++++++-
 collect-library/src/main/assets/editormarker.xml     |  9 +++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 4e325a3d..aec0edc4 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -527,17 +527,23 @@
 			"2022": {
 				"table": "OMDB_CON_ACCESS",
 				"code": 2022,
-				"name": "全封闭"
+				"name": "全封闭",
+				"zoomMin": 15,
+				"zoomMax": 17
 			},
 			"2037": {
 				"table": "OMDB_RAMP",
 				"code": 2037,
-				"name": "匝道"
+				"name": "匝道",
+				"zoomMin": 15,
+				"zoomMax": 17
 			},
 			"2040": {
 				"table": "OMDB_MULTI_DIGITIZED",
 				"code": 2040,
-				"name": "上下线分离"
+				"name": "上下线分离",
+				"zoomMin": 15,
+				"zoomMax": 17
 			},
 			"2204":{
 				"table": "OMDB_ROUNDABOUT",
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index f1c962cc..b9256afb 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -437,7 +437,6 @@ class ImportOMDBHelper @AssistedInject constructor(
                                             Log.e("qj", "${renderEntity.name}==不包括任务linkPid")
                                         }
 
-
                                         // 对renderEntity做预处理后再保存
                                         val resultEntity =
                                             importConfig.transformProperties(renderEntity)
@@ -471,6 +470,8 @@ class ImportOMDBHelper @AssistedInject constructor(
                                                         if (type != null && type == "1") {
                                                             renderEntity.code =
                                                                 DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code
+                                                            renderEntity.zoomMin = 15
+                                                            renderEntity.zoomMax = 17
                                                             Log.e("qj", "道路属性===3")
                                                         } else {
                                                             type =
@@ -478,9 +479,13 @@ class ImportOMDBHelper @AssistedInject constructor(
                                                             if (type != null && type == "1") {
                                                                 renderEntity.code =
                                                                     DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code
+                                                                renderEntity.zoomMin = 15
+                                                                renderEntity.zoomMax = 17
                                                                 Log.e("qj", "道路属性===4")
                                                             } else {
                                                                 renderEntity.enable = 0
+                                                                renderEntity.zoomMin = 15
+                                                                renderEntity.zoomMax = 17
                                                                 Log.e(
                                                                     "qj",
                                                                     "过滤不显示数据${renderEntity.table}"
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 576ebaf2..4b93b883 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1491,10 +1491,6 @@
     </m>
 
     <m k="qi_table">
-        <!-- 道路线 -->
-        <m v="OMDB_RD_LINK">
-            <line stroke="#9c9c9c" width="1" />
-        </m>
 
         <!--道路种别-->
         <m v="OMDB_RD_LINK_KIND">
@@ -1529,6 +1525,11 @@
             </m>
         </m>
 
+        <!-- 道路线 -->
+        <m v="OMDB_RD_LINK">
+            <line stroke="#9c9c9c" width="0.5" />
+        </m>
+
         <!--道路方向-->
         <m v="OMDB_LINK_DIRECT">
             <m k="direct">