From 30ee1029f630ab5d77af11cac02948a75b85b6d6 Mon Sep 17 00:00:00 2001
From: Benjamin K <53038537+treee111@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:32:53 +0100
Subject: [PATCH] [FEAT] Add shop/bicycle POIs, show also "ways" POIs (#158)

* autoformat on save

* add bicycle POIs

* add landuse (only useful for Elemnt Bolt2 (color screen))

* change railway tags

based on other's tinkering

* show more POIs if they are ways / not POI tags

https://github.com/masc4ii/wahooMapsCreator/commit/da04cf9e13763bd073210162a55914a0ec2a2f00

* replace ' with "

* only show one symbol for ways-tags

situation found & suggestion given in #159

* include railway/stop in map and display via vtm
---
 .../vtm_theme_poi/icons/shop_bicycle.svg      |  15 +
 device_themes/vtm_theme_poi/vtm-elemnt.xml    | 453 +++++++++---------
 wahoomc/constants.py                          |   6 +-
 .../tag_wahoo_adjusted/tag-wahoo-poi.xml      |  76 +--
 4 files changed, 288 insertions(+), 262 deletions(-)
 create mode 100644 device_themes/vtm_theme_poi/icons/shop_bicycle.svg

diff --git a/device_themes/vtm_theme_poi/icons/shop_bicycle.svg b/device_themes/vtm_theme_poi/icons/shop_bicycle.svg
new file mode 100644
index 00000000..e3553032
--- /dev/null
+++ b/device_themes/vtm_theme_poi/icons/shop_bicycle.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>bicycle</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>bicycle</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m406 87h-87v87h-15.623c9.2314-12.99 8.0216-33.466-3.3651-45.006-10.55-12.13-21.91-12.3-39.01-12.99l-108.54 0.80469c-9.59 4.59-7.71 19.28-7.46 28.2-1.0114 20.234 10.667 46.451 29 58l-16.327 29c-60.976 9.3892-110.51 73.952-99.106 135 9.6021 56.311 64.62 101.72 122.07 97.828 59.533-2.8219 111.64-57.593 110.59-117.35l28.699-19.309c-7.8032 41.854 9.8081 87.408 44.492 112.36 34.743 26.584 85.271 33.062 124.03 11.336 46.148-24.106 74.124-81.235 59.998-132.13-11.272-43.776-49.522-79.385-94.131-87.059l-10.5-31.56c28.74-26.64 27.6-79.67-5.01-102.78-10.26-7.794-19.84-11.626-32.8-11.34z" fill="#fff"/>
+ <path fill="#5500AA" d="m347.98 116.16v29l42.53-0.16c15.49 0 26.99 10.62-0.25 20.7-11.49 4.25-13.26 22.16-13.26 37.3h-145v-29l22.26-5.66c28.09-7.14 35.72-23.34 6.74-23.34l-86.84 0.53c-0.16 10.71-0.16 28.47 14.35 28.47h14.49v29l-27 57.89c-0.61-0.01-1.2 0-1.81 0-46.73 0-86.956 40.22-86.956 86.95s40.226 86.96 86.956 86.96 86.95-40.23 86.95-86.96c0-10.02-2.08-19.89-5.43-28.98h12.68c21.73 0 28.74-11.16 36.42-18.83l84.79-67.87 9.22 37.04c-29.64 14.05-50.73 44.74-50.73 78.8 0 46.73 40.23 86.96 86.96 86.96s86.95-40.22 86.95-86.95c0-46.74-40.22-86.96-86.96-86.96-0.91 0-1.81-0.03-2.71 0l-20.09-57.88-6.24-14.9c40-10.27 36-66.77-0.02-72.11h-58zm0.02 115.84l-76.89 57.87h-34.42c-7.64-8.2-16.95-15.62-27.08-20.49l16.39-37.37 122-0.01zm-173.81 57.87c29.15 0 57.97 28.82 57.97 57.97s-28.82 57.97-57.97 57.97-57.97-28.82-57.97-57.97 28.82-57.97 57.97-57.97zm260.86 0.16c29.15 0 57.97 28.82 57.97 57.97s-28.82 57.97-57.97 57.97-57.97-28.82-57.97-57.97 28.82-57.97 57.97-57.97z"/>
+</svg>
diff --git a/device_themes/vtm_theme_poi/vtm-elemnt.xml b/device_themes/vtm_theme_poi/vtm-elemnt.xml
index b2ce0156..35feaac4 100644
--- a/device_themes/vtm_theme_poi/vtm-elemnt.xml
+++ b/device_themes/vtm_theme_poi/vtm-elemnt.xml
@@ -1,116 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" map-background="#FFFFFF"
-	version="1" xmlns="http://opensciencemap.org/rendertheme"
-	xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
+<rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" map-background="#FFFFFF" version="1"
+   xmlns="http://opensciencemap.org/rendertheme" xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
+
+   <stylemenu id="stylemenu" defaultvalue="BOLT" defaultlang="en">
 
-	<stylemenu id="stylemenu" defaultvalue="BOLT" defaultlang="en">
-   
       <layer id="ROAM">
          <name lang="en" value="Roam" />
          <cat id="roam" />
          <cat id="trails-osm" />
       </layer>
-	  
+
       <layer id="BOLT">
          <name lang="en" value="Bolt" />
          <cat id="bolt" />
          <cat id="trails-osm" />
       </layer>
-	  
+
       <layer id="BOLT_2">
          <name lang="en" value="Bolt2" />
          <cat id="bolt2" />
          <cat id="trails-osm" />
       </layer>
-	  
+
       <layer id="BOLT_2-DARK">
          <name lang="en" value="Bolt2" />
          <cat id="bolt2-dark" />
          <cat id="trails-osm" />
       </layer>
-	  
+
       <layer id="BOLT_2-TF">
          <name lang="en" value="TF" />
          <cat id="bolt2" />
          <cat id="trails-tf" />
       </layer>
-	  
+
       <layer id="BOLT_2-DARK-TF">
          <name lang="en" value="TF" />
          <cat id="bolt2-dark" />
          <cat id="trails-tf" />
       </layer>
-	  
+
    </stylemenu>
-   
-   
+
+
    <!-- region styles -->
-   
+
    <!-- Footpath -->
    <style-line id="roam-footpath" cat="roam" stroke="#000000" width="0.5" dasharray="9,3" cap="butt" />
    <style-line id="bolt-footpath" cat="bolt" stroke="#000000" width="0.5" dasharray="9,3" cap="butt" />
    <style-line id="bolt2-footpath" cat="bolt2" stroke="#AAAAAA" width="0.5" dasharray="9,3" cap="butt" />
    <style-line id="bolt2-footpath-dark" cat="bolt2-dark" stroke="#AAAAAA" width="0.5" dasharray="9,3" cap="butt" />
-   
+
    <!-- Steps -->
    <style-line id="roam-steps" cat="roam" stroke="#000000" width="0.5" dasharray="9,9" cap="butt" />
    <style-line id="bolt-steps" cat="bolt" stroke="#000000" width="0.5" dasharray="9,9" cap="butt" />
    <style-line id="bolt2-steps" cat="bolt2" stroke="#000000" width="0.5" dasharray="9,9" cap="butt" />
    <style-line id="bolt2-steps-dark" cat="bolt2-dark" stroke="#000000" width="0.5" dasharray="9,9" cap="butt" />
-   
+
    <!-- Cycle Trails (like MTB) -->
    <style-line id="roam-trail" cat="roam" stroke="#0000FF" width="1.0" />
    <style-line id="bolt-trail" cat="bolt" stroke="#000000" width="1.0" />
    <style-line id="bolt2-trail" cat="bolt2" stroke="#ff00AA" width="1.3"/>
    <style-line id="bolt2-trail-dark" cat="bolt2-dark" stroke="#00AAFF" width="1.1" />
-   
+
    <!-- Paved Tracks -->
    <style-line id="roam-track-paved" cat="roam" stroke="#000000" width="1.0" />
    <style-line id="bolt-track-paved" cat="bolt" stroke="#000000" width="1.0" />
    <style-line id="bolt2-track-paved" cat="bolt2" stroke="#000000" width="1.3" />
    <style-line id="bolt2-track-paved-dark" cat="bolt2-dark" stroke="#000000" width="1.1" />
-   
+
    <style-line id="roam-track-paved-cycle" use="roam-track-paved" stroke="#0000FF" />
    <style-line id="bolt-track-paved-cycle" use="bolt-track-paved" />
    <style-line id="bolt2-track-paved-cycle" use="bolt2-track-paved" />
    <style-line id="bolt2-track-paved-cycle-dark" use="bolt2-track-paved-dark" stroke="#0000FF" />
-   
+
    <!-- Non-paved tracks -->
    <style-line id="roam-track-raw" cat="roam" width="1.0" />
    <style-line id="bolt-track-raw" cat="bolt" stroke="#000000" width="1.0" />
    <style-line id="bolt2-track-raw" cat="bolt2" stroke="#555555" width="1.1" dasharray="3,3" />
    <style-line id="bolt2-track-raw-dark" cat="bolt2-dark" stroke="#555555" width="1.1" dasharray="2,2" />
-   
+
    <style-line id="roam-track-raw-cycle" use="roam-track-raw" stroke="#0000FF" />
    <style-line id="bolt-track-raw-cycle" use="bolt-track-raw" />
    <style-line id="bolt2-track-raw-cycle" cat="bolt2" stroke="#CCCCCC" dasharray="6,3"/>
    <style-line id="bolt2-track-raw-cycle-dark" use="bolt2-track-raw-dark" stroke="#00AAFF" />
-   
+
    <!-- Tracks that don't have other info -->
    <style-line id="roam-track-other" cat="roam" stroke="#000000" width="1.0" dasharray="10,10" />
    <style-line id="bolt-track-other" cat="bolt" stroke="#000000" width="1.0" dasharray="10,10" />
    <style-line id="bolt2-track-other" cat="bolt2" stroke="#555555" width="1.1" dasharray="5,5" />
    <style-line id="bolt2-track-other-dark" cat="bolt2-dark" stroke="#555555" width="1.1" dasharray="10,10" />
-   
+
    <style-line id="roam-track-other-cycle" use="roam-track-other" stroke="#0000FF" />
    <style-line id="bolt-track-other-cycle" use="bolt-track-other" />
-   <style-line id="bolt2-track-other-cycle" use="bolt2-track-other" stroke="#ff00AA" />						   
+   <style-line id="bolt2-track-other-cycle" use="bolt2-track-other" stroke="#ff00AA" />
    <style-line id="bolt2-track-other-cycle-dark" use="bolt2-track-other-dark" stroke="#00AAFF" />
-   
+
    <!-- Paved Cycleways-->
    <style-line id="roam-cycle" cat="roam" stroke="#0000FF" width="1.0" />
    <style-line id="bolt-cycle" cat="bolt" stroke="#000000" width="1.0" />
    <style-line id="bolt2-cycle" cat="bolt2" stroke="#ff00AA" width="1.3" />
    <style-line id="bolt2-cycle-dark" cat="bolt2-dark" stroke="#0000FF" width="2.0" />
-   
+
    <!-- end region -->
-   
+
    <!-- region land/sea/waterways -->
 
-   <m e="way" k="natural" v="sea" >
+   <m e="way" k="natural" v="sea">
       <area cat="bolt" src="patterns/gray.png" />
       <area cat="roam" fill="#00FFFF" />
-	  <area cat="bolt2" fill="#00FFFF" /> 
+      <area cat="bolt2" fill="#00FFFF" />
       <area cat="bolt2-dark" fill="#005555" />
    </m>
 
@@ -120,41 +119,41 @@
       <area cat="bolt2" fill="#ffffff" mesh="true" />
       <area cat="bolt2-dark" fill="#000000" mesh="true" />
    </m>
-   
+
    <m e="way" k="natural|landcover|landuse" v="wood|trees|scrub|forest">
-	  <area cat="bolt2" fill="#55FF55" fade="8" blend="12" blend-fill="#AAFFAA" />
+      <area cat="bolt2" fill="#55FF55" fade="8" blend="12" blend-fill="#AAFFAA" />
    </m>
-   
+
    <m e="way" k="landuse" v="building">
-	  <area cat="bolt2" fill="#AAAAAA" fade="8" blend="13" blend-fill="#FFAAFF" />
+      <area cat="bolt2" fill="#AAAAAA" fade="8" blend="13" blend-fill="#FFAAFF" />
    </m>
-  
+
    <m e="way" k="leisure" v="park|nature_reserve">
       <area cat="bolt2" fill="#AAFF55" />
       <area cat="bolt2-dark" fill="#55AA55" />
    </m>
-   
+
    <m e="way" k="natural" v="wetland">
       <area cat="bolt2" fill="#55FFFF" />
       <area cat="bolt2-dark" fill="#66EECC" />
    </m>
-   
+
    <m e="way" k="natural" v="beach" zoom-min="12">
       <area cat="bolt2" fill="#FFFF00" />
       <area cat="bolt2-dark" fill="#66EECC" />
    </m>
-   
-	<m e="way" k="natural" v="water">
-		<area cat="bolt" src="patterns/gray.png"/>
-		<area cat="roam" fill="#00FFFF"/>
-		<area cat="bolt2" fill="#00AAFF"/>
-		<area cat="bolt2-dark" fill="#005555"/>
-	</m>
+
+   <m e="way" k="natural" v="water">
+      <area cat="bolt" src="patterns/gray.png"/>
+      <area cat="roam" fill="#00FFFF"/>
+      <area cat="bolt2" fill="#00AAFF"/>
+      <area cat="bolt2-dark" fill="#005555"/>
+   </m>
 
    <m e="way" k="waterway" v="river|canal">
       <line cat="bolt" fix="true" width="1" dasharray="2,2" />
       <line cat="roam" width="1" stroke="#00FFFF" />
-      <line cat="bolt2" width="1" stroke="#00AAFF" />	 
+      <line cat="bolt2" width="1" stroke="#00AAFF" />
       <pathText display="always" cat="bolt2" fill="#0000AA" k="name" font-family="sans_serif" font-style="bold" priority="2" size="16" stroke="#ffffff" stroke-width="3.0" zoom-min="14" />
       <line cat="bolt2-dark" width="1" stroke="#005555" />
    </m>
@@ -166,18 +165,18 @@
       <line cat="bolt2-dark" width="1" stroke="#005555" />
    </m>
 
-   	<m e="way" k="waterway" v="river|riverbank|canal" closed="yes">
-		<area cat="bolt" src="patterns/gray.png"/>
-		<area cat="roam" fill="#00FFFF"/>
-		<area cat="bolt2" fill="#00AAFF"/>
-		<area cat="bolt2-dark" fill="#005555"/>
-	</m>
+   <m e="way" k="waterway" v="river|riverbank|canal" closed="yes">
+      <area cat="bolt" src="patterns/gray.png"/>
+      <area cat="roam" fill="#00FFFF"/>
+      <area cat="bolt2" fill="#00AAFF"/>
+      <area cat="bolt2-dark" fill="#005555"/>
+   </m>
 
    <!-- endregion land/sea/waterways -->
-   
+
    <!-- region highways -->
    <m e="way" k="tunnel" v="~|no|false" zoom-min="8">
-   
+
       <!-- highway outlines -->
       <outline-layer cat="roam" id="highway-roam" stroke="#000000" width="1.5" />
       <outline-layer cat="bolt" id="highway-bolt" stroke="#000000" width="0.5" />
@@ -187,13 +186,13 @@
       <outline-layer cat="bolt2" id="bolt2-bikepath" stroke="#000000" width="0.3" zoom-min="12"/>
       <outline-layer cat="bolt2-dark" id="bolt2-major-roads-dark" stroke="#000000" width="0.75" />
       <outline-layer id="tf:tfd_2" stroke="#46b414" width="1.05" />
-	  
+
       <!-- the outline of bridges -->
       <outline-layer id="bridge" stroke="#000000" width="1" />
       <outline-layer id="bridge_small" stroke="#666666" width="0.6" />
-	  
+
       <m e="way" k="area" v="~|no|false">
-	  
+
          <!-- region paths & tracks -->
          <m k="access" v="private" zoom-min="16">
             <m e="way" k="highway" v="path" zoom-min="12">
@@ -211,10 +210,10 @@
             </m>
          </m>
          <!-- endregion -->
-		 
+
          <!-- region not bridges -->
          <m k="bridge" v="~|no|false">
-		 
+
             <m e="way" k="highway" v="bridleway" zoom-min="14">
                <line cat="bolt" outline="highway-bolt" stroke="#FFFFFF" width="1.2" dasharray="10,12" cap="round" />
                <line cat="roam" outline="highway-roam" stroke="#FFFFFF" width="1.2" dasharray="10,12" cap="round" />
@@ -279,10 +278,10 @@
             </m>
          </m>
          <!-- endregion -->
-		 
+
          <!-- region tracks -->
-         <m cat="trails-osm" k="access" v="-|private" >
-		 
+         <m cat="trails-osm" k="access" v="-|private">
+
             <m e="way" k="highway" v="footway|pedestrian" zoom-min="14">
                <line use="bolt-footpath" />
                <line use="roam-footpath" />
@@ -295,9 +294,9 @@
                <line use="bolt2-steps" />
                <line use="bolt2-steps-dark" />
             </m>
-			
+
             <m cat="trails-osm" e="way" k="highway" v="cycleway" zoom-min="12" select="first">
-			
+
                <!-- cycleways can be paved or raw -->
                <m k="surface" v="bic_unpaved">
                   <line use="bolt-track-raw-cycle" />
@@ -312,46 +311,46 @@
                   <line use="bolt2-cycle-dark" />
                </m>
             </m>
-			
+
             <m e="way" k="highway" v="path" zoom-min="12" select="first">
-					<m k="bicycle" v="bic_yes|bic_designated">
-						<!-- specifically for cycle -->
-						<m k="surface" v="bic_paved">
-							<line use="bolt-trail" />
-							<line use="roam-trail" />
-							<line use="bolt2-trail"  outline="bolt2-bikepath"/>
-							<line use="bolt2-trail-dark" />
-						</m>
-					</m>
-					
-					<m k="surface" v="bic_paved">
-						<line use="bolt2-track-paved" />
-					</m>
-
-					<m k="foot" v="ft_yes|foot_designated" zoom-min="13">
-						<!-- specifically for foot -->
-						<line use="bolt-footpath" />
-						<line use="roam-footpath" />
-						<line use="bolt2-footpath" />
-						<line use="bolt2-footpath-dark" />
-					</m>
-
-					<m k="highway" v="path" zoom-min="14">
-						<!-- remainder -->
-						<line use="bolt-footpath" />
-						<line use="roam-footpath" />
-						<line use="bolt2-footpath" />
-						<line use="bolt2-footpath-dark" />
-					</m>
-            </m>
-			
-			
+               <m k="bicycle" v="bic_yes|bic_designated">
+                  <!-- specifically for cycle -->
+                  <m k="surface" v="bic_paved">
+                     <line use="bolt-trail" />
+                     <line use="roam-trail" />
+                     <line use="bolt2-trail" outline="bolt2-bikepath"/>
+                     <line use="bolt2-trail-dark" />
+                  </m>
+               </m>
+
+               <m k="surface" v="bic_paved">
+                  <line use="bolt2-track-paved" />
+               </m>
+
+               <m k="foot" v="ft_yes|foot_designated" zoom-min="13">
+                  <!-- specifically for foot -->
+                  <line use="bolt-footpath" />
+                  <line use="roam-footpath" />
+                  <line use="bolt2-footpath" />
+                  <line use="bolt2-footpath-dark" />
+               </m>
+
+               <m k="highway" v="path" zoom-min="14">
+                  <!-- remainder -->
+                  <line use="bolt-footpath" />
+                  <line use="roam-footpath" />
+                  <line use="bolt2-footpath" />
+                  <line use="bolt2-footpath-dark" />
+               </m>
+            </m>
+
+
             <m e="way" k="highway" v="track|byway" zoom-min="13" select="first">
-			
-												  
 
 
-			   
+
+
+
                <m k="tracktype" v="grade1">
                   <!-- Solid. Usually a paved or sealed surface-->
                   <m k="bicycle" v="bic_yes|bic_designated">
@@ -367,118 +366,118 @@
                      <line use="bolt2-track-paved-dark" />
                   </m>
                </m>
-			   <m zoom-min="14">
-               <m k="tracktype" v="grade2">
-                  <!-- Solid but unpaved. Usually an unpaved track with surface of gravel. -->
-                  <m k="bicycle" v="bic_yes|bic_designated">
-                     <line use="bolt-track-raw-cycle" dasharray="50,3,5,3,5,3" />
-                     <line use="roam-track-raw-cycle" dasharray="50,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle" dasharray="50,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle-dark" dasharray="50,3,5,3,5,3" />
+               <m zoom-min="14">
+                  <m k="tracktype" v="grade2">
+                     <!-- Solid but unpaved. Usually an unpaved track with surface of gravel. -->
+                     <m k="bicycle" v="bic_yes|bic_designated">
+                        <line use="bolt-track-raw-cycle" dasharray="50,3,5,3,5,3" />
+                        <line use="roam-track-raw-cycle" dasharray="50,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle" dasharray="50,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle-dark" dasharray="50,3,5,3,5,3" />
+                     </m>
+                     <m k="bicycle" v="~">
+                        <line use="bolt-track-raw" dasharray="50,3,5,3,5,3" />
+                        <line use="roam-track-raw" dasharray="50,3,5,3,5,3" />
+                        <line use="bolt2-track-raw" dasharray="50,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-dark" dasharray="50,3,5,3,5,3" />
+                     </m>
                   </m>
-                  <m k="bicycle" v="~">
-                     <line use="bolt-track-raw" dasharray="50,3,5,3,5,3" />
-                     <line use="roam-track-raw" dasharray="50,3,5,3,5,3" />
-                     <line use="bolt2-track-raw" dasharray="50,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-dark" dasharray="50,3,5,3,5,3" />
-                  </m>
-               </m>
-			   
-               <m k="tracktype" v="grade3">
-			   
-                  <!-- Mostly solid. Even mixture of hard and soft materials. -->
-                  <m k="bicycle" v="bic_yes|bic_designated">
-                     <line use="bolt-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle-dark" dasharray="45,3,5,3,5,3,5,3" />
-                  </m>
-                  <m k="bicycle" v="~">
-                     <line use="bolt-track-raw" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw" dasharray="45,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-dark" dasharray="45,3,5,3,5,3,5,3" />
+
+                  <m k="tracktype" v="grade3">
+
+                     <!-- Mostly solid. Even mixture of hard and soft materials. -->
+                     <m k="bicycle" v="bic_yes|bic_designated">
+                        <line use="bolt-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle-dark" dasharray="45,3,5,3,5,3,5,3" />
+                     </m>
+                     <m k="bicycle" v="~">
+                        <line use="bolt-track-raw" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw" dasharray="45,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-dark" dasharray="45,3,5,3,5,3,5,3" />
+                     </m>
                   </m>
-               </m>
-			   
-               <m k="tracktype" v="grade4">
-                  <!-- Mostly soft. Almost always an unpaved track prominently with soil/sand/grass,
+
+                  <m k="tracktype" v="grade4">
+                     <!-- Mostly soft. Almost always an unpaved track prominently with soil/sand/grass,
 						but with some hard or compacted materials mixed in. -->
-                  <m k="bicycle" v="bic_yes|bic_designated">
-                     <line use="bolt-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle-dark" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                     <m k="bicycle" v="bic_yes|bic_designated">
+                        <line use="bolt-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle-dark" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                     </m>
+                     <m k="bicycle" v="~">
+                        <line use="bolt-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-dark" dasharray="40,3,5,3,5,3,5,3,5,3" />
+                     </m>
                   </m>
-                  <m k="bicycle" v="~">
-                     <line use="bolt-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-dark" dasharray="40,3,5,3,5,3,5,3,5,3" />
-                  </m>
-               </m>
-			   
-               <m k="tracktype" v="grade5">
-                  <!-- Soft. Almost always an unimproved track lacking hard materials,
+
+                  <m k="tracktype" v="grade5">
+                     <!-- Soft. Almost always an unimproved track lacking hard materials,
 						same as surrounding soil.
 						eg. -27.611406,153.165486 -->
-                  <m k="bicycle" v="bic_yes|bic_designated">
-                     <line use="bolt-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-cycle-dark" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                  </m>
-                  <m k="bicycle" v="~">
-                     <line use="bolt-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="roam-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                     <line use="bolt2-track-raw-dark" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
-                  </m>
-               </m>
-			   
-               <m k="highway" v="path">
-                  <!--  other paths that haven't already matched -->
-                  <line use="bolt-footpath" />
-                  <line use="roam-footpath" />
-                  <line use="bolt2-footpath" />
-                  <line use="bolt2-footpath-dark" />
-               </m>
-			   
-               <m e="way" k="tracktype" v="~" select="first">
-                  <!--  other tracks that haven't already matched -->
-                  <m k="bicycle" v="bic_yes|bic_designated">
-                     <line use="bolt-track-other-cycle" cap="butt" />
-                     <line use="roam-track-other-cycle" cap="butt" />
-                     <line use="bolt2-track-other-cycle" cap="butt" />
-                     <line use="bolt2-track-other-cycle-dark" cap="butt" />
-                     <line stroke="#FFFFFF" width="0.5" cap="butt" />
+                     <m k="bicycle" v="bic_yes|bic_designated">
+                        <line use="bolt-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-cycle-dark" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                     </m>
+                     <m k="bicycle" v="~">
+                        <line use="bolt-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="roam-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                        <line use="bolt2-track-raw-dark" dasharray="35,3,5,3,5,3,5,3,5,3,5,3" />
+                     </m>
                   </m>
-				  
-                  <m k="bicycle" v="~">
-                     <line use="bolt-track-other" cap="butt" />
-                     <line use="roam-track-other" cap="butt" />
-                     <line use="bolt2-track-other" cap="butt" />
-                     <line use="bolt2-track-other-dark" cap="butt" />
-                     <line stroke="#FFFFFF" width="0.5" cap="butt" />
-                  </m>
-				  
-                  <m k="foot" v="ft_yes|foot_designated">
-                     <!-- specifically for foot -->
+
+                  <m k="highway" v="path">
+                     <!--  other paths that haven't already matched -->
                      <line use="bolt-footpath" />
                      <line use="roam-footpath" />
                      <line use="bolt2-footpath" />
                      <line use="bolt2-footpath-dark" />
                   </m>
-				  
+
+                  <m e="way" k="tracktype" v="~" select="first">
+                     <!--  other tracks that haven't already matched -->
+                     <m k="bicycle" v="bic_yes|bic_designated">
+                        <line use="bolt-track-other-cycle" cap="butt" />
+                        <line use="roam-track-other-cycle" cap="butt" />
+                        <line use="bolt2-track-other-cycle" cap="butt" />
+                        <line use="bolt2-track-other-cycle-dark" cap="butt" />
+                        <line stroke="#FFFFFF" width="0.5" cap="butt" />
+                     </m>
+
+                     <m k="bicycle" v="~">
+                        <line use="bolt-track-other" cap="butt" />
+                        <line use="roam-track-other" cap="butt" />
+                        <line use="bolt2-track-other" cap="butt" />
+                        <line use="bolt2-track-other-dark" cap="butt" />
+                        <line stroke="#FFFFFF" width="0.5" cap="butt" />
+                     </m>
+
+                     <m k="foot" v="ft_yes|foot_designated">
+                        <!-- specifically for foot -->
+                        <line use="bolt-footpath" />
+                        <line use="roam-footpath" />
+                        <line use="bolt2-footpath" />
+                        <line use="bolt2-footpath-dark" />
+                     </m>
+
+                  </m>
                </m>
             </m>
-            </m>
          </m>
          <!-- endregion -->
-		 
+
          <!-- region tf -->
          <m cat="trails-tf" k="access" v="-|private">
-		 
+
             <m e="way" k="highway" v="track|byway" zoom-min="10" zoom-max="11">
                <line stroke="#854e85" width="1.2" dasharray="10,10" cap="butt" />
             </m>
@@ -502,7 +501,7 @@
                   <line stroke="#854e85" width="1.0" />
                </m>
             </m>
-			
+
             <!-- value="1" style="background-color: #854e85">Access Road/Trail -->
             <!-- value="2" style="background-color: #ffffff">White-->
             <!-- value="3" style="background-color: #46b414">Green-->
@@ -512,7 +511,7 @@
             <!-- value="7" style="background-color: #9a8b9a">Secondary Access Road/Trail-->
             <!-- value="8" style="background-color: #ff8500">Proline-->
             <!-- value="12" style="background-color: #999999">Lift-->
-			
+
             <m e="way" k="tf:difficulty" v="tfd_1">
                <line stroke="#854e85" width="1.0" />
             </m>
@@ -540,13 +539,13 @@
             <m e="way" k="tf:difficulty" v="tfd_12">
                <line stroke="#999999" width="1.0" />
             </m>
-			
+
          </m>
          <!-- endregion -->
-		 
+
          <!-- region bridges -->
          <m k="bridge" v="yes|true">
-		 
+
             <m e="way" k="highway" v="bridleway" zoom-min="12">
                <line outline="bridge_small" cap="butt" stroke="#FFFFFF" width="1.2" />
             </m>
@@ -559,15 +558,13 @@
             <m e="way" k="highway" v="unclassified|residential|living_street|road" zoom-min="12">
                <line outline="bridge" cap="butt" stroke="#FFFFFF" width="2" />
             </m>
-				<m e="way" k="highway"
-					v="tertiary|tertiary_link|secondary_link|secondary" zoom-min="12">
+            <m e="way" k="highway" v="tertiary|tertiary_link|secondary_link|secondary" zoom-min="12">
                <line cat="bolt" outline="bridge" cap="butt" stroke="#FFFFFF" width="3.5" />
                <line cat="roam" outline="bridge" cap="butt" stroke="#FFFF00" width="3.5" />
                <line cat="bolt2" outline="bridge" cap="butt" stroke="#FFFF00" width="2.5" />
                <line cat="bolt2-dark" outline="bridge_small" cap="butt" stroke="#FFFF00" width="2.5" />
             </m>
-				<m e="way" k="highway"
-					v="primary_link|trunk_link|primary|trunk" zoom-min="12">
+            <m e="way" k="highway" v="primary_link|trunk_link|primary|trunk" zoom-min="12">
                <line cat="bolt" outline="bridge" cap="butt" stroke="#FFFFFF" width="3.5" />
                <line cat="roam" outline="bridge" cap="butt" stroke="#FFFF00" width="3.5" />
                <line cat="bolt2" outline="bridge" cap="butt" stroke="#FFAA00" width="2.5" />
@@ -605,8 +602,8 @@
             </m>
          </m>
          <!-- endregion -->
-		 
-		 
+
+
       </m>
    </m>
    <!-- endregion highway -->
@@ -615,12 +612,12 @@
    <m k="railway" zoom-min="11">
       <m k="tunnel" v="~|false|no">
          <m v="rail">
-            <line cap="butt" fade="12" fix="true" stipple="15" stipple-stroke="#ffffff" stipple-width="0.7" stroke="#000000"  width="3" />
+            <line cap="butt" fade="12" fix="true" stipple="15" stipple-stroke="#ffffff" stipple-width="0.7" stroke="#000000" width="3" />
          </m>
       </m>
    </m>
    <!-- endregion railway -->
-   
+
    <!-- region place captions -->
    <m k="place">
       <m v="suburb" zoom-max="14">
@@ -649,25 +646,29 @@
    </m>
    <!-- endregion place -->
    <m zoom-min="14">
-	   <m k="amenity" >
-		  <m v="fuel">
-			<symbol src="icons/fuel.svg" symbol-percent="150"/>
-		  </m>
-		  <m v="cafe" zoom-min="15">
-			<symbol src="icons/cafe.svg" symbol-percent="150"/>
-		  </m>
-        <m v="drinking_water">
-			<symbol src="icons/drinking_water.svg" symbol-percent="150"/>
-		  </m>
-		</m>
-		<m k="shop" >
-		  <m v="bakery">
-			<symbol src="icons/bakery.svg" symbol-percent="150"/>
-		  </m>
-		</m>
-
-    </m>
-	<m k="railway" v="station|halt|stop" zoom-min="13">
-			<symbol src="icons/train_station.svg" symbol-percent="130"/>
-	</m>
-</rendertheme>
\ No newline at end of file
+      <m k="amenity">
+         <m v="fuel">
+            <symbol src="icons/fuel.svg" symbol-percent="150"/>
+         </m>
+         <m v="cafe" zoom-min="15">
+            <symbol src="icons/cafe.svg" symbol-percent="150"/>
+         </m>
+         <m v="drinking_water">
+            <symbol src="icons/drinking_water.svg" symbol-percent="150"/>
+         </m>
+      </m>
+
+      <m k="shop">
+         <m v="bakery">
+            <symbol src="icons/bakery.svg"/>
+         </m>
+         <m v="bicycle">
+            <symbol src="icons/shop_bicycle.svg" symbol-percent="150"/>
+         </m>
+      </m>
+   </m>
+
+   <m k="railway" v="station|stop" zoom-min="13">
+      <symbol src="icons/train_station.svg" symbol-percent="130"/>
+   </m>
+</rendertheme>
diff --git a/wahoomc/constants.py b/wahoomc/constants.py
index 80673af1..1e06fe97 100644
--- a/wahoomc/constants.py
+++ b/wahoomc/constants.py
@@ -252,12 +252,12 @@
     'bridge': '',
     'foot': ['ft_yes', 'foot_designated'],
     'amenity': ['fuel', 'cafe', 'drinking_water'],
-    'shop': 'bakery',
+    'shop': ['bakery', 'bicycle'],
     'highway': ['abandoned', 'bus_guideway', 'disused', 'bridleway', 'byway', 'construction', 'cycleway', 'footway', 'living_street', 'motorway', 'motorway_link', 'path', 'pedestrian', 'primary', 'primary_link', 'residential', 'road', 'secondary', 'secondary_link', 'service', 'steps', 'tertiary', 'tertiary_link', 'track', 'trunk', 'trunk_link', 'unclassified'],
     'natural': ['coastline', 'nosea', 'sea', 'beach', 'land', 'scrub', 'water', 'wetland', 'wood'],
-    'landuse': 'forest',
+    'landuse': ['forest', 'commercial', 'industrial', 'residential', 'retail'],
     'leisure': ['park', 'nature_reserve'],
-    'railway': ['abandoned', 'bus_guideway', 'disused', 'funicular', 'light_rail', 'miniature', 'narrow_gauge', 'preserved', 'rail', 'subway', 'tram'],
+    'railway': ['rail', 'tram', 'station', 'stop'],
     'surface': '',
     'tracktype': '',
     'tunnel': '',
diff --git a/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-poi.xml b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-poi.xml
index 366747af..7293efb9 100644
--- a/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-poi.xml
+++ b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-poi.xml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tag-mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-zoom-appear="16"
-             profile-name="default-profile" xmlns="http://mapsforge.org/tag-mapping"
-             xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/tag-mapping.xsd">
+<tag-mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-zoom-appear="16" profile-name="default-profile"
+  xmlns="http://mapsforge.org/tag-mapping" xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/tag-mapping.xsd">
 
-  <!-- ************* POIS *************** --> 
+  <!-- ************* POIS *************** -->
   <pois>
-        <osm-tag key="amenity" value="fuel" zoom-appear="14" /> 
-        <osm-tag key="amenity" value="cafe" zoom-appear="14" /> 
-        <osm-tag key="amenity" value="drinking_water" zoom-appear="14" /> 
-        <osm-tag key="shop" value="bakery" zoom-appear="14" /> 
-		<osm-tag key="shop" value="bicycle" zoom-appear="14" />
-		
-		<osm-tag key="railway" value="station" zoom-appear="13" /> 
-		<osm-tag key="railway" value="halt" zoom-appear="13" /> 
-		<osm-tag key="railway" value="stop" zoom-appear="13" /> 
-		
-		
+    <osm-tag key="amenity" value="fuel" zoom-appear="14" />
+    <osm-tag key="amenity" value="cafe" zoom-appear="14" />
+    <osm-tag key="amenity" value="drinking_water" zoom-appear="14" />
+    <osm-tag key="shop" value="bakery" zoom-appear="14" />
+    <osm-tag key="shop" value="bicycle" zoom-appear="14" />
+
+    <osm-tag key="railway" value="station" zoom-appear="13" />
+    <osm-tag key="railway" value="stop" zoom-appear="13" />
+
   </pois>
+
+  <ways>
+    <osm-tag key="amenity" label-position="true" value="fuel" zoom-appear="14" />
+    <osm-tag key="amenity" label-position="true" value="cafe" zoom-appear="14" />
+    <osm-tag key="amenity" label-position="true" value="drinking_water" zoom-appear="14" />
+    <osm-tag key="shop" label-position="true" value="bakery" zoom-appear="14" />
+    <osm-tag key="shop" label-position="true" value="bicycle" zoom-appear="14" />
+
+    <osm-tag key="railway" label-position="true" value="station" zoom-appear="13" />
+    <osm-tag key="railway" label-position="true" value="stop" zoom-appear="13" />
+  </ways>
+
   <!-- PLACES TAGS -->
   <pois>
     <osm-tag key="place" value="city" zoom-appear="6" />
@@ -55,22 +64,22 @@
     <osm-tag key="highway" value="trunk" zoom-appear="8" />
     <osm-tag key="highway" value="trunk_link" zoom-appear="10" />
     <osm-tag key="highway" value="unclassified" zoom-appear="10" />
-	
+
   </ways>
 
   <!-- NATURAL / WATERWAY TAGS -->
   <ways>
     <osm-tag key="natural" value="nosea" zoom-appear="3" />
     <osm-tag key="natural" value="sea" zoom-appear="3" />
-    
+
     <osm-tag key="natural" value="beach" zoom-appear="10" />
     <osm-tag key="natural" value="scrub" zoom-appear="8" />
     <osm-tag key="natural" value="water" zoom-appear="8" />
     <osm-tag key="natural" value="wetland" zoom-appear="8" />
     <osm-tag key="natural" value="wood" zoom-appear="9" />
-	
+
     <osm-tag key="landuse" value="forest" zoom-appear="8" />
-    
+
     <osm-tag key="waterway" value="stream" zoom-appear="8"/>
     <osm-tag key="waterway" value="river" zoom-appear="8"/>
     <osm-tag key="waterway" value="riverbank" zoom-appear="8"/>
@@ -81,15 +90,16 @@
     <osm-tag key="leisure" value="nature_reserve" zoom-appear="8" />
     <osm-tag key="leisure" value="park" zoom-appear="8" />
   </ways>
-  
-    <!-- BUILDINGS -->
+
+  <!-- BUILDINGS -->
   <ways>
-    <osm-tag key='landuse' value='building' equivalent-values='commercial,industrial,residential,retail' zoom-appear="10"  />
+    <osm-tag key="landuse" value="building" equivalent-values="commercial,industrial,residential,retail" zoom-appear="10" />
   </ways>
 
   <!-- PUBLIC TRANSPORT -->
   <ways>
     <osm-tag key="railway" value="rail" zoom-appear="10" />
+    <osm-tag key="railway" value="tram" zoom-appear="12"/>
   </ways>
 
   <!-- OTHER TAGS -->
@@ -100,13 +110,13 @@
   <!-- NOT TO RENDER -->
   <ways>
     <osm-tag key="id" renderable="false" value="%f" />
-	
+
     <osm-tag key="ref" renderable="false" value="%s" />
     <osm-tag key="name" renderable="false" value="%s" />
-  
+
     <osm-tag key="access" value="destination" renderable="false"/>
     <osm-tag key="access" value="private" renderable="false"/>
-    
+
     <osm-tag key="bridge" value="yes" renderable="false"/>
 
     <osm-tag key="tracktype" value="grade1" renderable="false"/>
@@ -115,16 +125,16 @@
     <osm-tag key="tracktype" value="grade4" renderable="false"/>
     <osm-tag key="tracktype" value="grade5" renderable="false"/>
 
-    <osm-tag key='surface' value='bic_paved' equivalent-values='paved,asphalt,concrete' renderable='false' />
-    <osm-tag key='surface' value='bic_unpaved' equivalent-values='raw,gravel,rock,pebblestone,ground,dirt,earth,mud' renderable='false' />
-	  
+    <osm-tag key="surface" value="bic_paved" equivalent-values="paved,asphalt,concrete" renderable="false" />
+    <osm-tag key="surface" value="bic_unpaved" equivalent-values="raw,gravel,rock,pebblestone,ground,dirt,earth,mud" renderable="false" />
+
     <osm-tag key="tunnel" value="yes" renderable="false"/>
     <osm-tag key="tunnel" value="no" renderable="false"/>
 
-    <osm-tag key='bicycle' value='bic_yes' equivalent-values='yes,public,allowed' renderable='false' />
-    <osm-tag key='bicycle' value='bic_designated' equivalent-values='designated,official' renderable='false' />
-	
-    <osm-tag key='foot' value='ft_yes' equivalent-values='yes,public,allowed' renderable='false' />
-    <osm-tag key='foot' value='ft_designated' equivalent-values='designated,official' renderable='false' />
+    <osm-tag key="bicycle" value="bic_yes" equivalent-values="yes,public,allowed" renderable="false" />
+    <osm-tag key="bicycle" value="bic_designated" equivalent-values="designated,official" renderable="false" />
+
+    <osm-tag key="foot" value="ft_yes" equivalent-values="yes,public,allowed" renderable="false" />
+    <osm-tag key="foot" value="ft_designated" equivalent-values="designated,official" renderable="false" />
   </ways>
 </tag-mapping>