From 75a99929b097cdb827a841b6b877adf7ce28a785 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 17 Aug 2023 17:51:29 +0800
Subject: [PATCH] merge code

---
 app/src/main/assets/omdb_config.json                      | 3 +--
 app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 5a0c499c..2448d824 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -404,8 +404,7 @@
 				"code": 2206,
 				"name": "道路形态2",
 				"zoomMin": 15,
-				"zoomMax": 17,
-				"transformer2Code": ""
+				"zoomMax": 17
 			}
 
 		}
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 3460f39c..e54d170f 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -347,6 +347,7 @@ class ImportOMDBHelper @AssistedInject constructor(
                                             }
                                         }
                                     }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
+                                        Log.e("qj","道路形态2${renderEntity.properties["formOfWay"]}")
                                         /*道路形态2*/
                                         var formWay = renderEntity.properties["formOfWay"]
                                         if(formWay!=null){