From 5fa01313b436aeb634130cb949d2404278a01dbd Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 15 Aug 2023 10:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF=E5=BD=A2?=
 =?UTF-8?q?=E6=80=81=E6=B8=B2=E6=9F=93=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          |  3 +-
 .../src/main/assets/editormarker.xml          | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 325256e2..afeae85c 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -169,8 +169,7 @@
 			"code": 2205,
 			"name": "道路形态1",
 			"zoomMin": 15,
-			"zoomMax": 17,
-			"transformer2Code": ""
+			"zoomMax": 17
 		},
 		"2206":{
 			"table": "OMDB_LINK_FORM2",
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index fd6f0968..0f371ffa 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -178,6 +178,10 @@
     <style-line id="boundaryType" stipple-width="0.1" width="0.1" />
     <style-line dasharray="1,1" id="s2e" repeat-gap="3" repeat-start="0" stroke="#14582c"
         width="0.1" />
+
+    <!--道路形态-->
+    <style-line dasharray="8,2,2,2,2,2" id="road_morphology" repeat-gap="3" repeat-start="0" stroke="#fcba5a" width="0.2" />
+
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
@@ -1972,6 +1976,9 @@
             <m k="width" v="~">
                 <line stroke="#7A88A0" width="2.8" />
             </m>
+            <m k="width" v="~">
+                <line stroke="#4624FF" width="0.1" />
+            </m>
         </m>
 
         <!--隧道-->
@@ -2082,22 +2089,22 @@
 
                         <!--其他|实线-->
                         <m k="markColor" v="1">
-                            <line dasharray="5,5" repeat-start="0" stroke="#ffffff" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#ffffff" width="0.1"/>
                         </m>
                         <m k="markColor" v="2">
-                            <line dasharray="5,5" repeat-start="0" stroke="#eccc68" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#eccc68" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="6">
-                            <line dasharray="5,5" repeat-start="0" stroke="#0000ff" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#0000ff" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="7">
-                            <line dasharray="5,5" repeat-start="0" stroke="#00ff00" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#00ff00" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="0|9">
-                            <line dasharray="5,5" repeat-start="0" stroke="#8e44ad" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#8e44ad" width="0.1"/>
                         </m>
 
                     </m>
@@ -2123,43 +2130,43 @@
             </m>
 
             <m k="code" v="OMDB_LINK_ATTRIBUTE_FORNTAGE">
-                <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+                <line use="road_morphology" />
             </m>
 
             <m k="code" v="OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS">
-                <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+                <line use="road_morphology" />
             </m>
 
         </m>
 
         <!-- 匝道 -->
         <m v="OMDB_RAMP">
-             <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!-- 上下线分离 -->
         <m v="OMDB_MULTI_DIGITIZED">
-            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!-- 全封闭 -->
         <m v="OMDB_CON_ACESS">
-            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!-- 高架 -->
         <m v="OMDB_VIADUCT">
-            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!-- 道路形态1 -->
         <m v="OMDB_LINK_FORM1">
-            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!-- 道路形态2 -->
         <m v="OMDB_LINK_FORM2">
-            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            <line use="road_morphology" />
         </m>
 
         <!--常规点限速-->