From 3acf77c102f9badd2fabc52dfa00089e545e6d7c Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Thu, 10 Nov 2016 12:42:59 +0200
Subject: [PATCH] Render themes improvements #41
---
vtm-themes/icons/osmarender.xml | 2 +-
.../resources/assets/styles/default.xml | 19 +++++--
vtm-themes/resources/assets/styles/mapzen.xml | 19 +++++--
.../resources/assets/styles/newtron.xml | 55 +++++++++++--------
.../resources/assets/styles/osmarender.xml | 44 ++++++++-------
.../resources/assets/styles/tronrender.xml | 25 ++++++---
vtm-themes/resources/assets/symbols/peak.svg | 6 +-
vtm-themes/resources/assets/symbols/peak1.svg | 5 --
8 files changed, 109 insertions(+), 66 deletions(-)
mode change 100644 => 100755 vtm-themes/resources/assets/symbols/peak.svg
delete mode 100755 vtm-themes/resources/assets/symbols/peak1.svg
diff --git a/vtm-themes/icons/osmarender.xml b/vtm-themes/icons/osmarender.xml
index c350c6cd..07e3e8f3 100644
--- a/vtm-themes/icons/osmarender.xml
+++ b/vtm-themes/icons/osmarender.xml
@@ -55,6 +55,6 @@
<rect id="tree" pos="145 2 4 4" />
<rect id="university" pos="302 35 19 9" />
<rect id="viewpoint" pos="279 20 16 16" />
- <rect id="vulcan" pos="315 25 9 8" />
+ <rect id="volcano" pos="315 25 9 8" />
<rect id="windmill" pos="310 2 13 19" />
</atlas>
diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml
index 2e30a6e2..edaed999 100644
--- a/vtm-themes/resources/assets/styles/default.xml
+++ b/vtm-themes/resources/assets/styles/default.xml
@@ -12,7 +12,7 @@
<style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
stroke="#eeeeee" stroke-width="2.0" />
- <style-text caption="true" dy="20" fill="#777744" id="poi" k="name" size="16" stroke="#aaffffff"
+ <style-text caption="true" dy="20" fill="#808000" id="poi" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<style-area fade="11" fill="#e8e7e3" id="residential" />
@@ -62,7 +62,7 @@
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="square" id="residential:bridge" use="residential" />
- <!-- when inheriting another style with 'from' then 'witdth' is relative to the parent -->
+ <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
@@ -404,7 +404,7 @@
<m e="way">
<m closed="yes" k="natural" v="water">
<area use="water" />
- <caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
+ <caption area-size="0.4" fill="#808000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" />-->
</m>
@@ -1001,8 +1001,12 @@
<!-- place -->
<m k="place">
<circle fill="#ff0000" radius="5.0" />
+ <m v="locality" zoom-min="13">
+ <caption style="bold" fill="#606060" k="name" priority="5" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
+ </m>
<m v="suburb" zoom-max="14">
- <caption style="italic" fill="#606060" k="name" priority="4" size="17"
+ <caption style="bold_italic" fill="#404040" k="name" priority="4" size="17"
stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="village" zoom-max="14">
@@ -1253,6 +1257,13 @@
<m k="natural" v="tree" zoom-min="15">
<circle radius="10" />
</m>
+ <m k="natural" v="peak" zoom-min="12">
+ <symbol src="assets:symbols/peak.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+ stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
</m>
</rendertheme>
diff --git a/vtm-themes/resources/assets/styles/mapzen.xml b/vtm-themes/resources/assets/styles/mapzen.xml
index e400b254..adb6920d 100644
--- a/vtm-themes/resources/assets/styles/mapzen.xml
+++ b/vtm-themes/resources/assets/styles/mapzen.xml
@@ -12,7 +12,7 @@
<style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
stroke="#eeeeee" stroke-width="2.0" />
- <style-text caption="true" dy="20" fill="#777744" id="poi" k="name" size="16" stroke="#aaffffff"
+ <style-text caption="true" dy="20" fill="#808000" id="poi" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<style-area fade="11" fill="#e8e7e3" id="residential" />
@@ -62,7 +62,7 @@
<style-line id="residential" stroke="#ffffff" width="1.3" />
<style-line cap="square" id="residential:bridge" use="residential" />
- <!-- when inheriting another style with 'from' then 'witdth' is relative to the parent -->
+ <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
<style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
@@ -404,7 +404,7 @@
<m e="way">
<m closed="yes" k="natural" v="water">
<area use="water" />
- <caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
+ <caption area-size="0.4" fill="#808000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" />-->
</m>
@@ -1001,8 +1001,12 @@
<!-- place -->
<m k="place">
<circle fill="#ff0000" radius="5.0" />
+ <m v="locality" zoom-min="13">
+ <caption style="bold" fill="#606060" k="name" priority="5" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
+ </m>
<m v="suburb" zoom-max="14">
- <caption style="italic" fill="#606060" k="name" priority="4" size="17"
+ <caption style="bold_italic" fill="#404040" k="name" priority="4" size="17"
stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="village" zoom-max="14">
@@ -1253,6 +1257,13 @@
<m k="natural" v="tree" zoom-min="15">
<circle radius="10" />
</m>
+ <m k="natural" v="peak" zoom-min="12">
+ <symbol src="assets:symbols/peak.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+ stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
</m>
</rendertheme>
diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/styles/newtron.xml
index 295dc5a8..1d6dca74 100644
--- a/vtm-themes/resources/assets/styles/newtron.xml
+++ b/vtm-themes/resources/assets/styles/newtron.xml
@@ -41,7 +41,7 @@
<style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
<style-line cap="square" id="residential:bridge" use="residential" />
- <!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
+ <!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
@@ -334,7 +334,7 @@
<m k="natural" v="water">
<area use="water" />
- <caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
+ <caption area-size="0.4" fill="#808000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" width="0.5" fix="true" />-->
</m>
@@ -1210,30 +1210,41 @@
</m>
- <!-- <m k="natural">
- <m select="first">
- <m v="cave_entrance" zoom-min="15">
- <symbol src="assets:symbols/poi/cave.svg" />
- </m>
- <m v="peak" zoom-min="12">
- <symbol src="assets:symbols/peak1.svg" />
- <caption k="ele" dy="12" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
- </m>
- <m v="tree" zoom-min="16">
- <circle radius="10" />
- </m>
- <m v="volcano" zoom-min="12">
- <symbol src="assets:symbols/volcano.svg" />
- </m>
- </m>
- <m zoom-min="17">
- <caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
- </m>
- </m>-->
+ <!--<m k="natural">
+ <m select="first">
+ <m v="cave_entrance" zoom-min="15">
+ <symbol src="assets:symbols/poi/cave.svg" />
+ <m zoom-min="17">
+ <text use="caption-small-blue" />
+ </m>
+ </m>
+ <m v="peak" zoom-min="12">
+ <symbol src="assets:symbols/peak.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+ stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
+ </m>
+ <m v="tree" zoom-min="16">
+ <circle radius="10" />
+ </m>
+ <m v="volcano" zoom-min="12">
+ <symbol src="assets:symbols/volcano.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+ stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
+ </m>
+ </m>
+ </m>-->
<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
+ <m v="locality" zoom-min="13">
+ <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml
index 01259bee..89c797bb 100644
--- a/vtm-themes/resources/assets/styles/osmarender.xml
+++ b/vtm-themes/resources/assets/styles/osmarender.xml
@@ -295,7 +295,7 @@
<m k="natural" v="water">
<area fill="#b5d6f1" />
- <caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
+ <caption area-size="0.4" fill="#808000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>
@@ -948,7 +948,7 @@
<m k="aerialway">
<line cap="butt" stroke="#202020" width="0.4" />
<line cap="butt" dasharray="2,200" stroke="#202020" width="4.0" />
- <m k="aerialway" v="cable_car">
+ <!--<m k="aerialway" v="cable_car">
<lineSymbol src="assets:symbols/cable_car.svg" />
</m>
<m k="aerialway" v="chair_lift">
@@ -956,7 +956,7 @@
</m>
<m k="aerialway" v="gondola">
<lineSymbol src="assets:symbols/gondola.svg" />
- </m>
+ </m>-->
<m zoom-min="14">
<text style="bold" fill="#606060" k="name" size="16" stroke="#ffffff"
stroke-width="2.0" />
@@ -1060,17 +1060,15 @@
</m>
</m>
+ <!--<m k="historic" v="ruins" zoom-min="17">
+ <caption style="bold" fill="#4040ff" k="name" size="16" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>-->
- <!-- <m k="historic" v="ruins" zoom-min="17">
- <caption k="name" style="bold" size="16" fill="#4040ff"
- stroke="#ffffff" width="2.0" />
- </m>
-
-
- <m k="place" v="locality" zoom-min="17">
- <caption k="name" style="bold" size="16" fill="#000000"
- stroke="#ffffff" width="2.0" />
- </m> -->
+ <m k="place" v="locality" zoom-min="17">
+ <caption style="bold" fill="#000000" k="name" size="16" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
</m>
@@ -1235,22 +1233,26 @@
<m select="first">
<m v="cave_entrance" zoom-min="15">
<symbol src="assets:symbols/poi/cave.svg" />
+ <m zoom-min="17">
+ <text use="caption-small-blue" />
+ </m>
</m>
<m v="peak" zoom-min="12">
- <symbol src="assets:symbols/peak1.svg" />
- <caption style="bold" dy="12" fill="#000000" k="ele" size="12" stroke="#ffffff"
+ <symbol src="assets:symbols/peak.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="tree" zoom-min="16">
<circle radius="10" />
</m>
<m v="volcano" zoom-min="12">
<symbol src="assets:symbols/volcano.svg" />
- </m>
-
- <m select="when-matched" zoom-min="17">
- <caption style="bold" fill="#000000" k="name" size="12" stroke="#ffffff"
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
</m>
@@ -1258,6 +1260,10 @@
<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
+ <m v="locality" zoom-min="13">
+ <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml
index 6ccd57d6..64ab4bcf 100644
--- a/vtm-themes/resources/assets/styles/tronrender.xml
+++ b/vtm-themes/resources/assets/styles/tronrender.xml
@@ -41,7 +41,7 @@
<style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
<style-line cap="square" id="residential:bridge" use="residential" />
- <!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
+ <!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
<style-line id="pedestrian" use="residential" width="-0.4" />
<style-line cap="square" id="pedestrian:bridge" use="pedestrian" />
@@ -334,7 +334,7 @@
<m k="natural" v="water">
<area use="water" />
- <caption area-size="0.4" fill="#777744" k="name" size="16" stroke="#aaffffff"
+ <caption area-size="0.4" fill="#808000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
<!--<line use="water:outline" width="0.5" fix="true" />-->
</m>
@@ -1207,28 +1207,37 @@
<m select="first">
<m v="cave_entrance" zoom-min="15">
<symbol src="assets:symbols/poi/cave.svg" />
+ <m zoom-min="17">
+ <text use="caption-small-blue" />
+ </m>
</m>
<m v="peak" zoom-min="12">
- <symbol src="assets:symbols/peak1.svg" />
- <caption style="bold" dy="12" fill="#000000" k="ele" size="12" stroke="#ffffff"
+ <symbol src="assets:symbols/peak.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="tree" zoom-min="16">
<circle radius="10" />
</m>
<m v="volcano" zoom-min="12">
<symbol src="assets:symbols/volcano.svg" />
+ <caption style="bold" dy="12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+ stroke-width="2.0" />
+ <caption style="bold" dy="-12" fill="#4D2F08" k="name" size="14"
+ stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
- <m zoom-min="17">
- <caption style="bold" fill="#000000" k="name" size="12" stroke="#ffffff"
- stroke-width="2.0" />
- </m>
</m>
<m k="place" select="first">
<circle fill="#ff0000" radius="5.0" />
+ <m v="locality" zoom-min="13">
+ <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
+ stroke-width="2.0" />
+ </m>
<m v="hamlet" zoom-min="13">
<caption style="bold" fill="#000000" k="name" size="13" stroke="#ffffff"
stroke-width="2.0" />
diff --git a/vtm-themes/resources/assets/symbols/peak.svg b/vtm-themes/resources/assets/symbols/peak.svg
old mode 100644
new mode 100755
index 65872f06..f7f36b39
--- a/vtm-themes/resources/assets/symbols/peak.svg
+++ b/vtm-themes/resources/assets/symbols/peak.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="41" height="37">
- <metadata id="metadata10"/>
- <path d="m 10.5,26.5 10,-16 10,16 z" id="path4" inkscape:connector-curvature="0" fill="#d3d3d3" stroke="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="580" viewBox="0 0 6444.4444 6444.4444" height="580">
+ <metadata id="metadata9"/>
+ <path d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" id="path3-9" inkscape:connector-curvature="0" fill="#aaaaaa" stroke="#000000" stroke-width="266.67"/>
</svg>
diff --git a/vtm-themes/resources/assets/symbols/peak1.svg b/vtm-themes/resources/assets/symbols/peak1.svg
deleted file mode 100755
index f7f36b39..00000000
--- a/vtm-themes/resources/assets/symbols/peak1.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="580" viewBox="0 0 6444.4444 6444.4444" height="580">
- <metadata id="metadata9"/>
- <path d="m 2126.6284,4166.6666 1228.927,-2010.9689 1228.927,2010.9689 z" id="path3-9" inkscape:connector-curvature="0" fill="#aaaaaa" stroke="#000000" stroke-width="266.67"/>
-</svg>