From 29a90b5555e2062023c51ea0c1ce4ab0014ccbbc Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 12 Jul 2023 13:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=9A=A7=E9=81=93=E8=B5=B7?=
 =?UTF-8?q?=E7=BB=88=E7=82=B9=E5=9D=90=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omqs/ui/activity/map/MainActivity.kt      |  2 +-
 .../src/main/assets/editormarker.xml          |  4 +--
 .../src/main/assets/omdb/icon_2083_7.svg      | 12 ++++----
 .../src/main/assets/omdb/icon_2083_7_1.svg    |  8 +++++
 .../src/main/assets/omdb/icon_2202_0.svg      | 29 +++++++++++--------
 .../src/main/assets/omdb/icon_2202_1.svg      |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_2083_7_1.svg

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
index d6f34263..acf33336 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -512,7 +512,7 @@ class MainActivity : BaseActivity() {
             mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
         }
         mapController.mMapView.vtmMap.animator()
-            .animateTo(GeoPoint( mapController.mMapView.vtmMap.mapPosition.latitude,mapController.mMapView.vtmMap.mapPosition.latitude))
+            .animateTo(GeoPoint( mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude))
     }
 
     private fun voiceOnTouchStart() {
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 00864bf8..06448ea1 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1742,7 +1742,7 @@
             <m k="boundaryType" v="7">
                 <!--虚拟三角岛-->
                 <line stroke="#fcba5a" use="boundaryType"/>
-                <line src="assets:omdb/icon_2083_7.svg" symbol-height="12" symbol-width="12" symbol-percent="20" width="1" />
+                <line src="assets:omdb/icon_2083_7_1.svg" symbol-height="12" symbol-width="12" symbol-percent="20" width="1" />
             </m>
             <m k="boundaryType" v="9">
                 <!--杆状障碍物-->
@@ -1820,7 +1820,7 @@
         <!--隧道-->
         <m v="OMDB_TUNNEL">
             <m k="formOfWay">
-                <line dasharray="0.3,0.3"  stroke="#d4237a" width="0.4" />
+                <line dasharray="0.2,0.2"  stroke="#d4237a" width="0.2" />
             </m>
             <m k="type" v="s_2_p">
                 <symbol repeat="false" repeat-start="0" rotate="false"
diff --git a/collect-library/src/main/assets/omdb/icon_2083_7.svg b/collect-library/src/main/assets/omdb/icon_2083_7.svg
index 934314e6..9924fb43 100644
--- a/collect-library/src/main/assets/omdb/icon_2083_7.svg
+++ b/collect-library/src/main/assets/omdb/icon_2083_7.svg
@@ -1,8 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="69.82" height="37.822" viewBox="0 0 69.82 37.822">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
     <defs>
-        <style>.a{fill:#ebb972;}</style>
+        <style>.e{fill:#fcba5a;}</style>
     </defs>
-    <path class="a"
-        d="M8597.151,19460.063a2.98,2.98,0,0,1-2.208-.877l-31.823-31.824a3,3,0,0,1,4.244-4.238l29.787,29.787,29.792-29.787a3,3,0,1,1,4.239,4.238l-31.819,31.824a2.991,2.991,0,0,1-2.122.879C8597.212,19460.064,8597.182,19460.064,8597.151,19460.063Z"
-        transform="translate(-8562.241 -19422.242)" />
+    <g id="c">
+        <path id="d" class="e"
+            d="M31.9,0l-14.3,23.2-1.6,2.6-1.6-2.6L0,0h0V6.1L14.1,28.9l1.9,3.1h0s1.9-3.1,1.9-3.1L32,6V0h0Z" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2083_7_1.svg b/collect-library/src/main/assets/omdb/icon_2083_7_1.svg
new file mode 100644
index 00000000..6a3b8956
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2083_7_1.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+    <defs>
+        <style>.a{fill:#fcba5a;}</style>
+    </defs>
+    <path class="a"
+        d="M31.94,0,17.6,23.21l-1.62,2.622L14.4,23.274.021,0H0V6.084L14.09,28.891l1.869,3.094.024.015,1.888-3.109L32,6.021V0Z"
+        transform="translate(0 0)" />
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2202_0.svg b/collect-library/src/main/assets/omdb/icon_2202_0.svg
index 51a69b01..2fb600b5 100644
--- a/collect-library/src/main/assets/omdb/icon_2202_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_2202_0.svg
@@ -1,13 +1,18 @@
-<?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="1688716256005" class="icon" viewBox="0 0 1024 1024" version="1.1"
-    xmlns="http://www.w3.org/2000/svg" p-id="3069" width="32" height="32"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path
-        d="M512 192c-140.8 0-256 115.2-256 256v512l128-224V448c0-70.4 57.6-128 128-128s128 57.6 128 128v288l128 224V448c0-140.8-115.2-256-256-256z"
-        fill="#FFB43E" p-id="3070"></path>
-    <path d="M448 736l-128 224h384L576 736z" fill="#FFB43E" p-id="3071"></path>
-    <path
-        d="M512 64C300 64 128 236 128 448v512h64V448c0-176.8 143.2-320 320-320s320 143.2 320 320v512h64V448c0-212-172-384-384-384z"
-        fill="#FFB43E" p-id="3072"></path>
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80">
+    <defs>
+        <style>
+            .a{fill:#fceaa0;stroke:#1b23b4;stroke-width:3px;}.b{fill:#1b23b4;}.c{stroke:none;}.d{fill:none;}
+        </style>
+    </defs>
+    <g transform="translate(-126 -381)">
+        <g transform="translate(9304 7585)">
+            <g class="a" transform="translate(-9178 -7204)">
+                <circle class="c" cx="40" cy="40" r="40" />
+                <circle class="d" cx="40" cy="40" r="38.5" />
+            </g>
+        </g>
+        <path class="b"
+            d="M257.043,173.635V146.2c0-9.344-8.378-16.918-18.708-16.918s-18.712,7.574-18.712,16.918v27.436H214.94V145.378c0-11.808,10.6-21.378,23.684-21.378s23.683,9.57,23.683,21.378v28.257Zm-18.13-42.773c13.594-.133,16.377,13.195,16.377,13.195v29.579H254.7l-9.934-14.271V144.584s-.436-4.223-5.851-4.223-6.431,4.223-6.431,4.223v14.779l-10.2,14.271h-.913V144.06S223.714,131.009,238.913,130.861Zm5.049,28.5,10.159,14.271h-31.21l10.159-14.272h10.893Zm0,0"
+            transform="translate(-72.624 269.184)" />
+    </g>
 </svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2202_1.svg b/collect-library/src/main/assets/omdb/icon_2202_1.svg
index ed7be254..db0fef8a 100644
--- a/collect-library/src/main/assets/omdb/icon_2202_1.svg
+++ b/collect-library/src/main/assets/omdb/icon_2202_1.svg
@@ -1 +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="1688716265636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3278" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M512 192c-140.8 0-256 115.2-256 256v512l128-224V448c0-70.4 57.6-128 128-128s128 57.6 128 128v288l128 224V448c0-140.8-115.2-256-256-256z" fill="#3BC568" p-id="3279"></path><path d="M448 736l-128 224h384L576 736z" fill="#3BC568" p-id="3280"></path><path d="M512 64C300 64 128 236 128 448v512h64V448c0-176.8 143.2-320 320-320s320 143.2 320 320v512h64V448c0-212-172-384-384-384z" fill="#3BC568" p-id="3281"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80"><defs><style>.a{fill:#1b23b4;stroke:#fceaa0;stroke-width:3px;}.b{fill:#fceaa0;}.c{stroke:none;}.d{fill:none;}</style></defs><g transform="translate(-268 -381)"><g transform="translate(9446 7585)"><g class="a" transform="translate(-9178 -7204)"><circle class="c" cx="40" cy="40" r="40"/><circle class="d" cx="40" cy="40" r="38.5"/></g></g><path class="b" d="M257.043,173.635V146.2c0-9.344-8.378-16.918-18.708-16.918s-18.712,7.574-18.712,16.918v27.436H214.94V145.378c0-11.808,10.6-21.378,23.684-21.378s23.683,9.57,23.683,21.378v28.257Zm-18.13-42.773c13.594-.133,16.377,13.195,16.377,13.195v29.579H254.7l-9.934-14.271V144.584s-.436-4.223-5.851-4.223-6.431,4.223-6.431,4.223v14.779l-10.2,14.271h-.913V144.06S223.714,131.009,238.913,130.861Zm5.049,28.5,10.159,14.271h-31.21l10.159-14.272h10.893Zm0,0" transform="translate(69.376 269.184)"/></g></svg>
\ No newline at end of file