From 290aee9a8bf06ececbcab23979133fa1884bd651 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 6 Sep 2016 14:34:45 +0300
Subject: [PATCH] Render themes: symbol improvements, #41

---
 vtm-themes/resources/assets/styles/default.xml    |  8 ++++----
 vtm-themes/resources/assets/styles/newtron.xml    |  8 ++++----
 vtm-themes/resources/assets/styles/osmarender.xml |  8 ++++----
 vtm-themes/resources/assets/styles/tronrender.xml |  8 ++++----
 vtm-themes/resources/assets/symbols/dot_black.svg |  2 +-
 vtm-themes/resources/assets/symbols/dot_blue.svg  | 15 +++++++++++++++
 6 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100755 vtm-themes/resources/assets/symbols/dot_blue.svg

diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml
index 3c45ff70..81934ba6 100644
--- a/vtm-themes/resources/assets/styles/default.xml
+++ b/vtm-themes/resources/assets/styles/default.xml
@@ -956,11 +956,11 @@
         </m>
 
         <m k="highway">
-            <m v="traffic_signals">
-                <symbol src="assets:symbols/traffic_signal.svg" />
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
             </m>
-            <m v="bus_stop">
-                <symbol src="assets:symbols/transport/bus_stop.svg" />
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/traffic_signal.svg" />
             </m>
             <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/styles/newtron.xml
index 74c0c044..046be80c 100644
--- a/vtm-themes/resources/assets/styles/newtron.xml
+++ b/vtm-themes/resources/assets/styles/newtron.xml
@@ -1157,13 +1157,13 @@
 
 
         <m k="highway">
-            <m k="highway" v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/transport/bus_stop.svg" />
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
             </m>
-            <m k="highway" v="traffic_signals" zoom-min="17">
+            <m v="traffic_signals" zoom-min="17">
                 <symbol src="assets:symbols/traffic_signal.svg" />
             </m>
-            <m k="highway" v="turning_circle">
+            <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml
index ddec64d7..9d5969c8 100644
--- a/vtm-themes/resources/assets/styles/osmarender.xml
+++ b/vtm-themes/resources/assets/styles/osmarender.xml
@@ -1181,13 +1181,13 @@
 
 
         <m k="highway">
-            <m k="highway" v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/transport/bus_stop.svg" />
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
             </m>
-            <m k="highway" v="traffic_signals" zoom-min="17">
+            <m v="traffic_signals" zoom-min="17">
                 <symbol src="assets:symbols/traffic_signal.svg" />
             </m>
-            <m k="highway" v="turning_circle">
+            <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml
index b6f617a0..bb51150d 100644
--- a/vtm-themes/resources/assets/styles/tronrender.xml
+++ b/vtm-themes/resources/assets/styles/tronrender.xml
@@ -1150,13 +1150,13 @@
 
 
         <m k="highway">
-            <m k="highway" v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/transport/bus_stop.svg" />
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
             </m>
-            <m k="highway" v="traffic_signals" zoom-min="17">
+            <m v="traffic_signals" zoom-min="17">
                 <symbol src="assets:symbols/traffic_signal.svg" />
             </m>
-            <m k="highway" v="turning_circle">
+            <m v="turning_circle">
                 <circle fill="#ffffff" radius="1.4" scale-radius="true" />
             </m>
         </m>
diff --git a/vtm-themes/resources/assets/symbols/dot_black.svg b/vtm-themes/resources/assets/symbols/dot_black.svg
index ed5f9306..5d0a287d 100644
--- a/vtm-themes/resources/assets/symbols/dot_black.svg
+++ b/vtm-themes/resources/assets/symbols/dot_black.svg
@@ -9,5 +9,5 @@
    <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
   </marker>
  </defs>
- <circle id="path4175" cx="290" cy="290" r="91.4" fill="#333" stroke="#fff" stroke-linejoin="bevel" stroke-linecap="square" stroke-width="36"/>
+ <circle id="path4175" cx="290" cy="290" r="91.4" fill="#111" stroke="#fff" stroke-linejoin="bevel" stroke-linecap="square" stroke-width="16"/>
 </svg>
diff --git a/vtm-themes/resources/assets/symbols/dot_blue.svg b/vtm-themes/resources/assets/symbols/dot_blue.svg
new file mode 100755
index 00000000..bca149b5
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/dot_blue.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="580" width="580" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <title>other</title>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>other</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <circle opacity=".8" cx="290" cy="290" r="145" fill="#fff"/>
+ <circle cy="290" cx="290" r="116" fill="#0092DA"/>
+</svg>