From 7abf0e9e15c338b1717d02b6380d32718af56fd2 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 15 Aug 2023 17:17:45 +0800
Subject: [PATCH] merge code

---
 .../src/main/assets/editormarker.xml          | 32 ++++++++++---------
 .../src/main/assets/omdb/icon_2004_1.svg      |  1 +
 .../src/main/assets/omdb/icon_2004_2.svg      |  1 +
 .../src/main/assets/omdb/icon_2204_0.svg      | 14 +-------
 4 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_2004_1.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2004_2.svg

diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index fc1166d2..6db7fa7e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -2075,13 +2075,13 @@
         <m v="OMDB_LINK_ATTRIBUTE">
 
             <m k="type" v="1">
-                <text use="road" size="12"></text>
                 <line stroke="#1afa29" width="0.5" />
+                <lineSymbol repeat-gap="240" src="assets:omdb/icon_2004_1.svg"></lineSymbol>
             </m>
 
             <m k="type" v="2">
-                <text use="road" size="12"></text>
                 <line stroke="#1afa29" width="0.5" />
+                <lineSymbol repeat-gap="240" src="assets:omdb/icon_2004_2.svg"></lineSymbol>
             </m>
 
             <m k="type" v="3">
@@ -2124,19 +2124,6 @@
             <line use="road_morphology" />
         </m>
 
-        <!-- 环岛 -->
-        <m v="OMDB_ROUNDABOUT">
-            <line stroke="#fcba5a" width="0.5" />
-            <m k="type" v="s_2_p">
-                <symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
-                    src="assets:omdb/icon_2201_0.svg" symbol-height="24" symbol-width="24"></symbol>
-            </m>
-            <m k="type" v="e_2_p">
-                <symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
-                    src="assets:omdb/icon_2204_0.svg" symbol-height="24" symbol-width="24"></symbol>
-            </m>
-        </m>
-
         <!--隧道-->
         <m v="OMDB_TUNNEL">
             <m k="formOfWay">
@@ -2184,6 +2171,21 @@
             </m>
         </m>
 
+        <!-- 环岛 -->
+        <m v="OMDB_ROUNDABOUT">
+            <line stroke="#fcba5a" width="0.5" />
+
+            <m k="type" v="s_2_p">
+                <symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
+                    src="assets:omdb/icon_2204_0.svg" symbol-height="24" symbol-width="24"></symbol>
+            </m>
+
+            <m k="type" v="e_2_p">
+                <symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
+                    src="assets:omdb/icon_2204_0.svg" symbol-height="12" symbol-width="12"></symbol>
+            </m>
+        </m>
+
         <!--常规点限速-->
         <m v="OMDB_SPEEDLIMIT">
             <m k="speedFlag" v="0">
diff --git a/collect-library/src/main/assets/omdb/icon_2004_1.svg b/collect-library/src/main/assets/omdb/icon_2004_1.svg
new file mode 100644
index 00000000..a7e3d727
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2004_1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="49" height="36" viewBox="0 0 49 36"><defs><style>.a,.b{fill:#fff;}.a{stroke:#f8831e;}.b{stroke:#661ac7;stroke-width:2px;}.c{fill:#661ac7;font-size:26px;font-family:ArialMT, Arial;}.d{stroke:none;}.e{fill:none;}</style></defs><g transform="translate(-213 -1485)"><g class="a" transform="translate(213 1485)"><rect class="d" width="49" height="36" rx="5"/><rect class="e" x="0.5" y="0.5" width="48" height="35" rx="4.5"/></g><g class="b" transform="translate(215 1487)"><rect class="d" width="45" height="32" rx="5"/><rect class="e" x="1" y="1" width="43" height="30" rx="4"/></g><text class="c" transform="translate(220 1512)"><tspan x="0" y="0">SA</tspan></text></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2004_2.svg b/collect-library/src/main/assets/omdb/icon_2004_2.svg
new file mode 100644
index 00000000..fbea81b8
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2004_2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="49" height="36" viewBox="0 0 49 36"><defs><style>.a,.b{fill:#fff;}.a{stroke:#661ac7;}.b{stroke:#f8831e;stroke-width:2px;}.c{fill:#661ac7;font-size:26px;font-family:ArialMT, Arial;}.d{stroke:none;}.e{fill:none;}</style></defs><g transform="translate(-301 -1485)"><g class="a" transform="translate(301 1485)"><rect class="d" width="49" height="36" rx="5"/><rect class="e" x="0.5" y="0.5" width="48" height="35" rx="4.5"/></g><g class="b" transform="translate(303 1487)"><rect class="d" width="45" height="32" rx="5"/><rect class="e" x="1" y="1" width="43" height="30" rx="4"/></g><text class="c" transform="translate(309 1512)"><tspan x="0" y="0">PA</tspan></text></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2204_0.svg b/collect-library/src/main/assets/omdb/icon_2204_0.svg
index 0473894b..e31dd649 100644
--- a/collect-library/src/main/assets/omdb/icon_2204_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_2204_0.svg
@@ -1,13 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg t="1692082615557" class="icon" viewBox="0 0 1024 1024" version="1.1"
-    xmlns="http://www.w3.org/2000/svg" p-id="5694" width="80" height="80"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path
-        d="M512 512m-469.333333 0a469.333333 469.333333 0 1 0 938.666666 0 469.333333 469.333333 0 1 0-938.666666 0Z"
-        fill="#1b23b4" p-id="5695" data-spm-anchor-id="a313x.search_index.0.i5.4d923a81SJBtt2"
-        class="selected"></path>
-    <path
-        d="M307.029333 499.84a215.722667 215.722667 0 0 0 85.76 191.317333l6.229334 3.84-12.202667-72.533333 82.688 50.432 42.026667 133.077333-138.666667 22.869334L290.133333 778.453333l70.741334-21.973333-2.645334-2.517333a286.421333 286.421333 0 0 1-123.221333-250.24l71.978667-3.882667z m426.453334-180.48l116.352 78.250667 24.832 93.056-66.474667-32.512 0.128 3.669333c30.250667 147.925333-60.8 295.424-209.792 334.506667-6.485333 1.706667-12.928 3.157333-19.413333 4.394666l-21.717334-68.266666a221.44 221.44 0 0 0 22.784-4.693334c109.653333-28.757333 177.578667-135.381333 159.488-244.096l-1.877333-7.04-41.557333 60.842667-24.832-93.013333 62.08-125.098667z m-52.352-48.554667l-31.914667 64.213334a219.733333 219.733333 0 0 0-262.784 9.898666l-5.205333 5.12 73.941333 5.333334-68.949333 67.754666-140.288 9.088 10.325333-139.093333 68.906667-67.712 4.821333 73.344 3.072-1.962667c98.261333-85.845333 240.981333-94.421333 348.074667-26.026666z"
-        fill="#FFFFFF" p-id="5696"></path>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="131.3" height="131.3" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 131.3 131.3"><defs><style>.h{fill:url(#f);}.i{fill:#fff;}.j{fill:#1566e8;}.k{fill:#535a60;}.l{fill:#262d34;isolation:isolate;opacity:.2;}.m{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1.1px;}</style><linearGradient id="f" x1="63.4" y1="54.8" x2="68.2" y2="54.8" 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><linearGradient id="g" x1="41.1" y1="26.7" x2="90.2" y2="26.7" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afbacb"/><stop offset=".1" stop-color="#c1ccda"/><stop offset=".4" stop-color="#d9e6f0"/><stop offset=".5" stop-color="#e3f0f8"/><stop offset=".6" stop-color="#dde9f2"/><stop offset=".8" stop-color="#ccd8e4"/><stop offset="1" stop-color="#b1bbcc"/><stop offset="1" stop-color="#aeb8c9"/></linearGradient></defs><g id="c"><g><rect class="i" width="131.3" height="131.3"/><g><ellipse id="d" class="l" cx="65.7" cy="66.2" rx="14.4" ry="3.7"/><ellipse id="e" class="k" cx="65.7" cy="66.2" rx="7.5" ry="3"/><path class="h" d="M65.7,42.6h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="m" x="41.1" y="1" width="49" height="51.4" rx="24.5" ry="24.5"/><rect class="j" x="41.7" y="3.3" width="48" height="48.5" rx="24" ry="24"/><g><path class="i" d="M55,10.3l3.5-1.7-1.4,3.9,.3,.8c8.4-3.6,15-2.4,21,3.9l-2.3,1.8c-4.8-5.2-10.8-6.1-17.4-3l.4,1,4.2,.9-3.5,2.1-7.9-2.6,3-7.1Z"/><path class="i" d="M55.2,46l-3.2-2.2,4.1-.7,.5-.7c-7.2-5.4-9.5-11.7-7-19.9l2.7,1c-2.1,6.8,0,12.3,6.1,16.4l.6-.8-1.2-4.1,3.6,1.9,1.7,8.1-7.7,.9Z"/><path class="i" d="M86.5,27.8l-.3,3.9-2.7-3.2h-.8c-1,8.9-5.2,14-13.7,16l-.5-2.8c7-1.7,10.8-6.3,11.2-13.6h-1c0,0-2.8,3.1-2.8,3.1l-.2-4.1,6.1-5.5,4.8,6.1Z"/></g><g><path class="i" d="M60.6,30.4v.4c-.5,0-2.6,.4-3.1,.5v-1.1s.5-.1,1-.2v-1.8h-.8v-1.1h.8v-1.5h-.9v-1.1h2.9v1.1h-.9v1.5h.8v1.1h-.8v1.6l.9-.2v.7Zm4.3-.2c-.5-.7-1.2-1.6-1.7-2.2v4h-1.1v-3.5c-.3,.5-.7,1-1.2,1.4l-.8-.9c1-1,1.7-2.2,2.3-3.5h-1.6v-1.2h4.4v1.2h-1.6c-.2,.5-.4,1-.6,1.4h.3v.3l.3-.3c.6,.5,1.6,1.6,2.1,2.3l-.7,.9Z"/><path class="i" d="M71.8,31.2h-5.1v-2.2h1.1v1.2h1v-1.4h1.1v1.4h.9v-1.2h1.1v2.2Zm2-3.4c0,0-.1,2.8-.1,3,0,1-.3,1.3-1.1,1.3h-.9c0,0-.3-.8-.3-.8h.7c.4,0,.4-.3,.4-.8,0-.2,0-1.6,0-1.9h-5.4v-4h1.7c0-.2,.2-.5,.3-.7h1.2c0,.3-.1,.5-.2,.7h2.8c0,.4,0,1.4,0,1.7,0,1-.4,1.1-1.2,1.2h-.6c0,0-.3-.8-.3-.8h.5c.4,0,.5-.2,.5-.4s0-.5,0-.7h-2.4c.4,.3,.8,.6,1.1,.9l-.6,.8c-.4-.4-.9-.8-1.3-1.1l.5-.6h-.8v2.1h5.4Z"/></g></g></g></g></svg>
\ No newline at end of file