From 2e0712ed2b208ce31d15a1c1ae1d2c987c7d418d Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 21 Nov 2023 17:06:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=A6=E4=BF=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt     | 17 +++++++++++++++--
 .../src/main/assets/editormarker.xml            |  6 ++++--
 2 files changed, 19 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 41ec9cee..366115a7 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -626,8 +626,19 @@ class ImportPreProcess {
                 // 分别获取两个数组中的数据，取第一个作为主数据，另外两个作为辅助渲染数据
                 val laneInfoDirectArray = JSONArray(laneinfoGroup[0].toString())
                 val laneInfoTypeArray = JSONArray(laneinfoGroup[1].toString())
-                val listResult = mutableListOf<ReferenceEntity>()
 
+                val referenceEntity = ReferenceEntity()
+                referenceEntity.name = "${renderEntity.name}参考方向"
+                referenceEntity.table = renderEntity.table
+                referenceEntity.enable = renderEntity.enable
+                referenceEntity.code = renderEntity.code
+                referenceEntity.taskId = renderEntity.taskId
+                referenceEntity.zoomMin = renderEntity.zoomMin
+                referenceEntity.zoomMax = renderEntity.zoomMax
+                // 与原数据使用相同的geometry
+                referenceEntity.geometry = renderEntity.geometry
+                referenceEntity.properties["qi_table"] = renderEntity.table
+                referenceEntity.properties["symbol"] = "true"
                 for (i in 0 until laneInfoDirectArray.length()) {
                     val currentDirect =
                         laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_")
@@ -637,7 +648,7 @@ class ImportPreProcess {
                         if (currentType == "0") "normal" else if (currentType == "1") "extend" else "bus"
                     val symbol =
                         "assets:omdb/4601/${type}/1301_${currentDirect}.svg"
-                    renderEntity.properties["src"] = if(renderEntity.properties["src"].isNullOrEmpty()) symbol else "${renderEntity.properties["src"]}|${symbol}"
+                    referenceEntity.properties["img-src"] = if(referenceEntity.properties["img-src"].isNullOrEmpty()) symbol else "${referenceEntity.properties["img-src"]}|${symbol}"
 
 //                    // 根据后续的数据生成辅助表数据
 //                    val referenceEntity = ReferenceEntity()
@@ -665,6 +676,8 @@ class ImportPreProcess {
 //                    renderEntity.referenceEntitys?.add(referenceEntity)
                    //listResult.add(referenceEntity)
                 }
+                referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
+                renderEntity.referenceEntitys?.add(referenceEntity)
                 //insertData(listResult)
             }
             //将主表线转化为单个点，按点要素实现捕捉
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 4152c484..548dc8b9 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1555,8 +1555,10 @@
 
         <!-- 车信 -->
         <m v="OMDB_LANEINFO" >
-            <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                src="@src" symbol-height="24" degree="90"></symbol>
+            <m k="symbol" v="true">
+                <symbol repeat="false" repeat-start="0" repeat-gap="2000"
+                    src="@img-src" symbol-height="24" degree="90"></symbol>
+            </m>
         </m>
         <!-- 杆状物 -->
         <m v="OMDB_POLE">