From af9481d0844fc025810791182d3f0c49995c374e Mon Sep 17 00:00:00 2001 From: Emux <devemux86@gmail.com> Date: Sat, 25 Jun 2016 16:50:33 +0300 Subject: [PATCH] Mapsforge render themes: add sea & nosea tags with tessellation, remove coastline, remove water tile outline, closes #38 --- .../resources/assets/styles/default.xml | 10 +++++++++- .../resources/assets/styles/newtron.xml | 10 +++++++++- .../resources/assets/styles/osmarender.xml | 20 +++++++++++++------ .../resources/assets/styles/tronrender.xml | 10 +++++++++- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml index 32c143c9..12a4a4b0 100644 --- a/vtm-themes/resources/assets/styles/default.xml +++ b/vtm-themes/resources/assets/styles/default.xml @@ -148,6 +148,14 @@ <rect id="windmill" pos="55 23 10 15" /> </atlas> + <m e="way" k="natural" v="issea|sea"> + <area use="water" /> + </m> + + <m e="way" k="natural" v="nosea"> + <area fill="#f8f8f8" mesh="true" /> + </m> + <!-- all closed ways that are not 'highway' or 'building' --> <m e="way" k="highway|building" v="~" closed="yes"> @@ -431,7 +439,7 @@ <m e="way"> <m k="natural" v="water" closed="yes"> <area use="water" /> - <line use="water:outline" /> + <!--<line use="water:outline" />--> </m> <!-- sport --> diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/styles/newtron.xml index 5a94b645..cd5f3142 100644 --- a/vtm-themes/resources/assets/styles/newtron.xml +++ b/vtm-themes/resources/assets/styles/newtron.xml @@ -137,6 +137,14 @@ <rect id="windmill" pos="310 2 13 19" /> </atlas> + <m e="way" k="natural" v="issea|sea"> + <area use="water" /> + </m> + + <m e="way" k="natural" v="nosea"> + <area fill="#080808" mesh="true" /> + </m> + <!-- ways --> <m e="way"> @@ -384,7 +392,7 @@ <m k="natural" v="water"> <area use="water" /> - <line use="water:outline" width="0.5" fix="true" /> + <!--<line use="water:outline" width="0.5" fix="true" />--> </m> diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml index 98854835..86c56bce 100644 --- a/vtm-themes/resources/assets/styles/osmarender.xml +++ b/vtm-themes/resources/assets/styles/osmarender.xml @@ -78,6 +78,14 @@ <rect id="windmill" pos="310 2 13 19" /> </atlas> + <m e="way" k="natural" v="issea|sea"> + <area fill="#b5d6f1" /> + </m> + + <m e="way" k="natural" v="nosea"> + <area fill="#f8f8f8" mesh="true" /> + </m> + <!-- ways --> <m e="way"> <!-- landuse --> @@ -192,14 +200,14 @@ <!-- natural --> <m k="natural"> <m select="first"> - <m v="coastline"> - <!-- <m closed="no"> + <!--<m v="coastline"> + <!– <m closed="no"> <line stroke="#708599" fix="true" cap="butt" width="2.0" /> - </m> --> + </m> –> <m closed="yes"> <area fill="#b5d6f1" stroke="#b5d6f1" stroke-width="0.4" /> </m> - </m> + </m>--> <m v="glacier"> <area fill="#fafaff" stroke="#add8e6" stroke-width="0.8" /> </m> @@ -349,9 +357,9 @@ <area fill="#b5d6f1" /> </m> - <m k="natural" v="coastline" closed="no"> + <!--<m k="natural" v="coastline" closed="no"> <line stroke="#708599" fix="true" cap="butt" width="2.0" /> - </m> + </m>--> <!-- tunnel --> <m k="tunnel" v="true|yes"> diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml index 28386d8c..d4bf0124 100644 --- a/vtm-themes/resources/assets/styles/tronrender.xml +++ b/vtm-themes/resources/assets/styles/tronrender.xml @@ -137,6 +137,14 @@ <rect id="windmill" pos="310 2 13 19" /> </atlas> + <m e="way" k="natural" v="issea|sea"> + <area use="water" /> + </m> + + <m e="way" k="natural" v="nosea"> + <area fill="#080808" mesh="true" /> + </m> + <!-- ways --> <m e="way"> @@ -384,7 +392,7 @@ <m k="natural" v="water"> <area use="water" /> - <line use="water:outline" width="0.5" fix="true" /> + <!--<line use="water:outline" width="0.5" fix="true" />--> </m>