From 00515cfe3774db2f16ddd84c9ba4dc2d38cb401c Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 19 Oct 2023 16:30:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5=E9=80=9A=E8=A1=8C?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8BLane=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=8E=9F=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          | 18 +++++++++
 .../com/navinfo/omqs/db/ImportOMDBHelper.kt   |  6 +--
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 37 +++++++++++++++++++
 .../personalcenter/PersonalCenterFragment.kt  |  2 +-
 .../src/main/assets/editormarker.xml          |  5 +++
 5 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 1adbb1ba..472d2651 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -182,6 +182,24 @@
 					}
 				]
 			},
+			"2638":{
+				"table": "OMDB_LANE_ACCESS",
+				"code": 2638,
+				"name": "通行车辆类型Lane",
+				"zoomMin": 15,
+				"zoomMax": 20,
+				"catch":true,
+				"filterData": false,
+				"checkLinkId": false,
+				"transformer": [
+					{
+						"k": "geometry",
+						"v": "~",
+						"klib": "geometry",
+						"vlib": "generateLaneAccessType()"
+					}
+				]
+			},
 			"3001":{
 				"table": "OMDB_OBJECT_OH_STRUCT",
 				"code": 3001,
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 24cc8c0f..8d871e61 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -752,9 +752,9 @@ class ImportOMDBHelper @AssistedInject constructor(
                                             Realm.getInstance(currentInstallTaskConfig)
                                                 .insert(renderEntity)
                                             Log.d("ImportOMDBHelper", "解析===2insert")
-                                        }
-                                        if (currentConfig.code == DataCodeEnum.OMDB_RD_LINK.code.toInt()) {
-                                            listResult.add(renderEntity)
+                                            if (currentConfig.code == DataCodeEnum.OMDB_RD_LINK.code.toInt()) {
+                                                listResult.add(renderEntity)
+                                            }
                                         }
                                     }
                                 }
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 438319c8..e26e2f2e 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -895,4 +895,41 @@ class ImportPreProcess {
             renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(centerPoint!!.y, centerPoint.x)).toString()
         }
     }
+
+    /**
+     * 生成通行车辆类型Lane的渲染名称字段
+     * */
+    fun generateLaneAccessType(renderEntity: RenderEntity): Boolean {
+        if (renderEntity.properties.containsKey("accessCharacteristic")) {
+            // 解析accessCharacteristic，判断是否存在指定属性
+            val accessCharacteristic = renderEntity.properties["accessCharacteristic"].toString().toInt()
+            var str = ""
+            if (accessCharacteristic.and(4)>0) {
+                str += "公"
+            }
+            if (accessCharacteristic.and(8)>0) {
+                if (str.isNotEmpty()) {
+                    str += "|"
+                }
+                str += "多"
+            }
+            if (accessCharacteristic.and(64)>0) {
+                if (str.isNotEmpty()) {
+                    str += "|"
+                }
+                str += "行"
+            }
+            if (accessCharacteristic.and(128)>0) {
+                if (str.isNotEmpty()) {
+                    str += "|"
+                }
+                str += "自"
+            }
+            if (str.isNotEmpty()) {
+                renderEntity.properties["name"] = str
+                return true
+            }
+        }
+        return false
+    }
 }
\ No newline at end of file
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 ddf80f33..f5f262c8 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
@@ -182,7 +182,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint(40.0882756, 116.3033581))
+                        .animateTo(GeoPoint(39.617824808620675, 115.52374142452308))
                 }
 
                 R.id.personal_center_menu_open_all_layer -> {
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 47974f40..5ab044da 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -2029,6 +2029,11 @@
             <symbol repeat="true" repeat-start="0"  src="assets:omdb/icon_2017_1.svg"></symbol>
         </m>
 
+        <!-- 通行车辆类型Lane -->
+        <m v="OMDB_LANE_ACCESS">
+            <text use="road" size="14" stroke="#ffffff" fill="#e7a32d"></text>
+        </m>
+
         <!-- 车道施工 -->
         <m v="OMDB_LANE_CONSTRUCTION">
             <line stroke="#eccc68" width="0.1" />