From 02a65100c8c6b1780992c6521628765678337326 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Mon, 5 Jun 2023 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=81=93?=
 =?UTF-8?q?=E8=BE=B9=E7=BA=BF=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E5=8F=96=E5=8E=9F=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 20 ++++++++++++++++---
 .../src/main/assets/editormarker.xml          | 10 +++++-----
 vtm                                           |  2 +-
 3 files changed, 23 insertions(+), 9 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 99abeeb1..1aab1841 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -119,14 +119,28 @@ class ImportPreProcess {
      * 解析车道边线数据二级属性
      * */
     fun unpackingLaneBoundary(renderEntity: RenderEntity) {
+        var shape:JSONObject = JSONObject(mapOf(
+            "lateralOffset" to 0,
+            "markType" to 1,
+            "markColor" to 0,
+            "markMaterial" to 1,
+            "markSeqNum" to 1,
+            "markWidth" to 10,
+            "markingCount" to 1
+        ))
         if (renderEntity.code == 2013&&!renderEntity.properties["shapeList"].isNullOrEmpty()&&renderEntity.properties["shapeList"]!="null") {
             // 解析shapeList，将数组中的属性放会properties
             val shapeList = JSONArray(renderEntity.properties["shapeList"])
-            val shape = shapeList.getJSONObject(0)
-            for (key in shape.keys()) {
-                renderEntity.properties[key] = shape[key].toString()
+            for (i in 0 until shapeList.length()) {
+                shape = shapeList.getJSONObject(i)
+                if (shape.optInt("lateralOffset", 0) == 0) {
+                    break
+                }
             }
         }
+        for (key in shape.keys()) {
+            renderEntity.properties[key] = shape[key].toString()
+        }
     }
 
     /**
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 3c3395da..0729b68a 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1743,19 +1743,19 @@
                         <m v="2">
                             <m k="markColor">
                                 <m v="0|1">
-                                    <line stroke="#ffffff" use="boundaryType" dasharray="3,13"/>
+                                    <line stroke="#ffffff" stipple-stroke="#000000" stipple="5" use="boundaryType" dasharray="13,135"/>
                                 </m>
                                 <m v="2">
-                                    <line stroke="#eccc68" use="boundaryType" dasharray="3,3"/>
+                                    <line stroke="#eccc68" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
                                 </m>
                                 <m v="6">
-                                    <line stroke="#0000ff" use="boundaryType" dasharray="3,3"/>
+                                    <line stroke="#0000ff" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
                                 </m>
                                 <m v="7">
-                                    <line stroke="#00ff00" use="boundaryType" dasharray="3,3"/>
+                                    <line stroke="#00ff00" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
                                 </m>
                                 <m v="9">
-                                    <line stroke="#8e44ad" use="boundaryType" dasharray="3,3"/>
+                                    <line stroke="#8e44ad" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
                                 </m>
                             </m>
                         </m>
diff --git a/vtm b/vtm
index 1ee201a4..fb0b88e9 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a
+Subproject commit fb0b88e916c51754baedfb7c5b42aa86b9dc337d