From 27cbd1a9cf0613fbe191e8f17ab0f4e0d2f56c08 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 4 Dec 2023 15:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E9=81=93=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C=E7=B1=BB=E5=9E=8B=E6=B8=B2=E6=9F=93=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          |   1 +
 .../src/main/assets/editormarker.xml          | 107 ++++++++++--------
 .../src/main/assets/omdb/icon_2013_4_2.svg    |  79 +++++++++++++
 .../src/main/assets/omdb/icon_2013_4_3.svg    |  79 +++++++++++++
 4 files changed, 216 insertions(+), 50 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_2013_4_2.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2013_4_3.svg

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 3e26a745..7855648a 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -614,6 +614,7 @@
         "zoomMin": 18,
         "zoomMax": 20,
         "filterData": true,
+        "checkLinkId": false,
         "catch": true,
         "transformer": [
           {
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 91aff4fc..2c698fb6 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -179,6 +179,13 @@
     <!-- oneway -->
     <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
 
+    <!-- 护栏 -->
+    <style-symbol id="guardrail" gland="true" repeat="true" repeat-gap="10" repeat-start="1" symbol-width="24" symbol-height="14" src="assets:omdb/icon_2013_4_3.svg" />
+    <!-- 路牙 -->
+    <style-symbol id="curb" repeat="true" gland="true" repeat-gap="10" repeat-start="1" src="assets:omdb/icon_2013_3.svg" symbol-width="16" />
+    <!-- 墙 -->
+    <style-symbol id="wall" repeat="true" gland="true" repeat-gap="10" repeat-start="1" src="assets:omdb/icon_2013_5.svg" symbol-width="16" />
+
     <!-- omdb -->
     <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"
@@ -1623,60 +1630,20 @@
             </m>
         </m>
 
-        <!-- 中央隔离带 -->
-        <m v="OMDB_LINK_MEDIAN">
-            <m k="medianSurface" v="0">
-                <line stroke="#889b86" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
--->
-            </m>
-            <m k="medianSurface" v="1">
-                <line stroke="#45aa04" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
--->
-            </m>
-            <m k="medianSurface" v="2">
-                <line stroke="#134c05" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
--->
-            </m>
-            <m k="medianSurface" v="3">
-                <line stroke="#889b86" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
--->
-            </m>
-            <m k="medianSurface" v="4">
-                <line stroke="#45aa04" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
--->
-            </m>
-            <m k="medianSurface" v="5">
-                <line stroke="#134c05" width="0.5"/>
-<!--
-                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
--->
-            </m>
-        </m>
-
         <!-- 道路边界类型 -->
         <m v="OMDB_RDBOUND_BOUNDARYTYPE">
             <outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
             <!--护栏-->
             <m k="boundaryType" v="4">
-                <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
+                <symbol use="guardrail" ></symbol>
             </m>
             <!--路牙-->
             <m k="boundaryType" v="3">
-                <symbol repeat="true" repeat-gap="12" gland="true" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol use="curb" ></symbol>
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol use="wall"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1695,15 +1662,15 @@
 
             <!--护栏-->
             <m k="boundaryType" v="4">
-                <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
+                <symbol use="guardrail" ></symbol>
             </m>
             <!--路牙-->
             <m k="boundaryType" v="3">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol use="curb" ></symbol>
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol use="wall"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1810,21 +1777,61 @@
 
         <!-- 路牙 -->
         <m v="OMDB_OBJECT_CURB">
-            <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
+            <symbol use="curb" ></symbol>
         </m>
 
         <!-- 护栏 -->
         <m v="OMDB_OBJECT_BARRIER">
-          <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
+            <symbol use="guardrail" ></symbol>
         </m>
 
         <!-- 平行墙 -->
         <m v="OMDB_OBJECT_WALL">
             <m k="type" v="-|1">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_3010_0.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="1" src="assets:omdb/icon_3010_0.svg" symbol-width="16" symbol-height="10"></symbol>
             </m>
             <m k="type" v="1">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_3010_1.svg" symbol-width="16" symbol-height="10"></symbol>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="1" src="assets:omdb/icon_3010_1.svg" symbol-width="16" symbol-height="10"></symbol>
+            </m>
+        </m>
+
+        <!-- 中央隔离带 -->
+        <m v="OMDB_LINK_MEDIAN">
+            <m k="medianSurface" v="0">
+                <line stroke="#889b86" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
+                -->
+            </m>
+            <m k="medianSurface" v="1">
+                <line stroke="#45aa04" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
+                -->
+            </m>
+            <m k="medianSurface" v="2">
+                <line stroke="#134c05" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
+                -->
+            </m>
+            <m k="medianSurface" v="3">
+                <line stroke="#889b86" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
+                -->
+            </m>
+            <m k="medianSurface" v="4">
+                <line stroke="#45aa04" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
+                -->
+            </m>
+            <m k="medianSurface" v="5">
+                <line stroke="#134c05" width="0.6"/>
+                <!--
+                                <area use="obj-area" hasDirect="true" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
+                -->
             </m>
         </m>
 
diff --git a/collect-library/src/main/assets/omdb/icon_2013_4_2.svg b/collect-library/src/main/assets/omdb/icon_2013_4_2.svg
new file mode 100644
index 00000000..112a2794
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_4_2.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="100" height="100"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100">
+    <defs>
+        <style>
+            .k{fill:none;}.k,.l,.m,.n,.o,.p,.q,.r{stroke-width:0px;}.l{fill:url(#e);}.m{fill:url(#f);}.n{fill:url(#d);}.o{fill:url(#j);}.p{fill:url(#i);}.q{fill:url(#h);}.r{fill:url(#g);}
+        </style>
+        <linearGradient id="d" x1="88.8" y1="49.9" x2="91" y2="49.9" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#231815" />
+            <stop offset="0" stop-color="#372d2a" />
+            <stop offset="0" stop-color="#655d5b" />
+            <stop offset=".1" stop-color="#8e8987" />
+            <stop offset=".2" stop-color="#b1adac" />
+            <stop offset=".2" stop-color="#cdcbca" />
+            <stop offset=".3" stop-color="#e3e2e1" />
+            <stop offset=".3" stop-color="#f2f2f2" />
+            <stop offset=".4" stop-color="#fcfbfb" />
+            <stop offset=".5" stop-color="#fff" />
+            <stop offset=".7" stop-color="#fcfcfc" />
+            <stop offset=".7" stop-color="#f5f5f5" />
+            <stop offset=".8" stop-color="#e9e8e8" />
+            <stop offset=".8" stop-color="#d8d6d6" />
+            <stop offset=".9" stop-color="#c2bfbe" />
+            <stop offset=".9" stop-color="#a6a2a1" />
+            <stop offset=".9" stop-color="#85807e" />
+            <stop offset="1" stop-color="#605957" />
+            <stop offset="1" stop-color="#3a312f" />
+            <stop offset="1" stop-color="#453d3b" />
+            <stop offset="1" stop-color="#65605f" />
+            <stop offset="1" stop-color="#7f7c7b" />
+            <stop offset="1" stop-color="#91908f" />
+            <stop offset="1" stop-color="#9c9c9b" />
+            <stop offset="1" stop-color="#a0a0a0" />
+        </linearGradient>
+        <linearGradient id="e" x1="68.7" y1="49.9" x2="71" y2="49.9" xlink:href="#d" />
+        <linearGradient id="f" x1="28.6" y1="49.9" x2="30.8" y2="49.9" xlink:href="#d" />
+        <linearGradient id="g" x1="8.5" y1="49.9" x2="10.7" y2="49.9" xlink:href="#d" />
+        <linearGradient id="h" x1="-1250.2" y1="57.9" x2="-1244.5" y2="57.9"
+            gradientTransform="translate(1297.3 -39.3)" xlink:href="#d" />
+        <linearGradient id="i" x1="-1313" y1="57.9" x2="-1307.4" y2="57.9"
+            gradientTransform="translate(1360.2 23.6)" xlink:href="#d" />
+        <linearGradient id="j" x1="-1331.5" y1="-1287.4" x2="-1323.6" y2="-1287.4"
+            gradientTransform="translate(1377.5 1337.4)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#989898" />
+            <stop offset="0" stop-color="#a3a3a3" />
+            <stop offset=".1" stop-color="#c4c5c5" />
+            <stop offset=".2" stop-color="#d8d9d9" />
+            <stop offset=".3" stop-color="#e0e1e1" />
+            <stop offset=".4" stop-color="#dbdcdc" />
+            <stop offset=".5" stop-color="#cccece" />
+            <stop offset=".6" stop-color="#b5b6b7" />
+            <stop offset=".7" stop-color="#949697" />
+            <stop offset=".8" stop-color="#6a6c6f" />
+            <stop offset=".8" stop-color="#3f4246" />
+            <stop offset="1" stop-color="#404247" />
+            <stop offset="1" stop-color="#43434a" />
+        </linearGradient>
+    </defs>
+    <g id="c">
+        <rect class="k" width="100" height="100" />
+        <path class="n"
+            d="m89,18h1.8c.1,0,.2.1.2.2v63.6c0,0,0,.1-.1.1h-2.1s0,0,0,0V18.2c0-.1.1-.2.2-.2Z" />
+        <path class="l"
+            d="m68.9,18h1.8c.1,0,.2.1.2.2v63.6c0,0,0,.1-.1.1h-2.1s0,0,0,0V18.2c0-.1.1-.2.2-.2Z" />
+        <path class="m"
+            d="m28.8,18h1.8c.1,0,.2.1.2.2v63.6c0,0,0,.1-.1.1h-2.1s0,0,0,0V18.2c0-.1.1-.2.2-.2Z" />
+        <path class="r"
+            d="m8.7,18h1.8c.1,0,.2.1.2.2v63.6c0,0,0,.1-.1.1h-2.1s0,0,0,0V18.2c0-.1.1-.2.2-.2Z" />
+        <path class="q"
+            d="m47.4-31.4h5.2c.1,0,.2.1.2.2v99.7c0,0,0,.1-.1.1h-5.4s0,0,0,0V-31.2c0-.1.1-.2.2-.2Z"
+            transform="translate(31.4 68.6) rotate(-90)" />
+        <path class="p"
+            d="m47.4,31.4h5.2c.1,0,.2.1.2.2v99.7c0,0,0,.1-.1.1h-5.4s0,0,0,0V31.7c0-.1.1-.2.2-.2Z"
+            transform="translate(-31.4 131.4) rotate(-90)" />
+        <path class="o"
+            d="m46.5,0h6.5c.6,0,1.1.5,1.1,1.1v98c0,.5-.4,1-1,1h-6.8c-.5,0-.9-.4-.9-.9V1.1c0-.6.5-1.1,1.1-1.1Z"
+            transform="translate(99.5 100) rotate(180)" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_4_3.svg b/collect-library/src/main/assets/omdb/icon_2013_4_3.svg
new file mode 100644
index 00000000..3b26287d
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_4_3.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+    <defs>
+        <style>
+            .k{fill:none;}.k,.l,.m,.n,.o,.p,.q,.r{stroke-width:0px;}.l{fill:url(#e);}.m{fill:url(#f);}.n{fill:url(#d);}.o{fill:url(#j);}.p{fill:url(#i);}.q{fill:url(#h);}.r{fill:url(#g);}
+        </style>
+        <linearGradient id="d" x1="21.1" y1="12" x2="22.1" y2="12" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#231815" />
+            <stop offset="0" stop-color="#372d2a" />
+            <stop offset="0" stop-color="#655d5b" />
+            <stop offset=".1" stop-color="#8e8987" />
+            <stop offset=".2" stop-color="#b1adac" />
+            <stop offset=".2" stop-color="#cdcbca" />
+            <stop offset=".3" stop-color="#e3e2e1" />
+            <stop offset=".3" stop-color="#f2f2f2" />
+            <stop offset=".4" stop-color="#fcfbfb" />
+            <stop offset=".5" stop-color="#fff" />
+            <stop offset=".7" stop-color="#fcfcfc" />
+            <stop offset=".7" stop-color="#f5f5f5" />
+            <stop offset=".8" stop-color="#e9e8e8" />
+            <stop offset=".8" stop-color="#d8d6d6" />
+            <stop offset=".9" stop-color="#c2bfbe" />
+            <stop offset=".9" stop-color="#a6a2a1" />
+            <stop offset=".9" stop-color="#85807e" />
+            <stop offset="1" stop-color="#605957" />
+            <stop offset="1" stop-color="#3a312f" />
+            <stop offset="1" stop-color="#453d3b" />
+            <stop offset="1" stop-color="#65605f" />
+            <stop offset="1" stop-color="#7f7c7b" />
+            <stop offset="1" stop-color="#91908f" />
+            <stop offset="1" stop-color="#9c9c9b" />
+            <stop offset="1" stop-color="#a0a0a0" />
+        </linearGradient>
+        <linearGradient id="e" x1="16.3" y1="12" x2="17.3" y2="12" xlink:href="#d" />
+        <linearGradient id="f" x1="6.6" y1="12" x2="7.6" y2="12" xlink:href="#d" />
+        <linearGradient id="g" x1="1.8" y1="12" x2="2.8" y2="12" xlink:href="#d" />
+        <linearGradient id="h" x1="-1310.2" y1="19.9" x2="-1308.2" y2="19.9"
+            gradientTransform="translate(1321.2 -15.4)" xlink:href="#d" />
+        <linearGradient id="i" x1="-1325.3" y1="19.9" x2="-1323.3" y2="19.9"
+            gradientTransform="translate(1336.3 -.3)" xlink:href="#d" />
+        <linearGradient id="j" x1="-1367.1" y1="-1325.4" x2="-1364.7" y2="-1325.4"
+            gradientTransform="translate(1377.9 1337.4)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#989898" />
+            <stop offset="0" stop-color="#a3a3a3" />
+            <stop offset=".1" stop-color="#c4c5c5" />
+            <stop offset=".2" stop-color="#d8d9d9" />
+            <stop offset=".3" stop-color="#e0e1e1" />
+            <stop offset=".4" stop-color="#dbdcdc" />
+            <stop offset=".5" stop-color="#cccece" />
+            <stop offset=".6" stop-color="#b5b6b7" />
+            <stop offset=".7" stop-color="#949697" />
+            <stop offset=".8" stop-color="#6a6c6f" />
+            <stop offset=".8" stop-color="#3f4246" />
+            <stop offset="1" stop-color="#404247" />
+            <stop offset="1" stop-color="#43434a" />
+        </linearGradient>
+    </defs>
+    <g id="c">
+        <rect class="k" width="24" height="24" />
+        <path class="n"
+            d="m21.3,4.3h.5c.1,0,.2.1.2.2v15c0,0,0,.1-.1.1h-.8s0,0,0,0V4.5c0-.1.1-.2.2-.2Z" />
+        <path class="l"
+            d="m16.5,4.3h.5c.1,0,.2.1.2.2v15c0,0,0,.1-.1.1h-.8s0,0,0,0V4.5c0-.1.1-.2.2-.2Z" />
+        <path class="m"
+            d="m6.9,4.3h.5c.1,0,.2.1.2.2v15c0,0,0,.1-.1.1h-.8s0,0,0,0V4.5c0-.1.1-.2.2-.2Z" />
+        <path class="r"
+            d="m2,4.3h.5c.1,0,.2.1.2.2v15c0,0,0,.1-.1.1h-.8s0,0,0,0V4.5c0-.1.1-.2.2-.2Z" />
+        <path class="q"
+            d="m11.2-7.5h1.5c.1,0,.2.1.2.2v23.7c0,0,0,.1-.1.1h-1.8s0,0,0,0V-7.3c0-.1.1-.2.2-.2Z"
+            transform="translate(7.5 16.5) rotate(-90)" />
+        <path class="p"
+            d="m11.2,7.5h1.5c.1,0,.2.1.2.2v23.7c0,0,0,.1-.1.1h-1.8s0,0,0,0V7.8c0-.1.1-.2.2-.2Z"
+            transform="translate(-7.5 31.5) rotate(-90)" />
+        <path class="o"
+            d="m11.2,0h1.5c.3,0,.5.2.5.5v23.1c0,.2-.2.4-.4.4h-1.8c-.2,0-.4-.2-.4-.4V.5c0-.3.2-.5.5-.5Z"
+            transform="translate(23.9 24) rotate(180)" />
+    </g>
+</svg>
\ No newline at end of file