Add support for natural POIs: Trees and Peaks.

Since there are currently +3M trees and +1M peaks in the OSM DB,
it's about time these are supported as nice icons and directly create-able in Potlatch2.

Icons have been derived from the Maki icon set (https://github.com/mapbox/maki)
natural_tree.n.24.png is copied from park2-24.png
natural_peak.n.24.png is from triangle-24.png
 (with the colour changed to that of the peak symbol in the standard mapnik rendering)
The n.16 versions are simply scaled down versions of the n.24 images.

diff --git a/resources/features/pois/natural_peak.n.24.png b/resources/features/pois/natural_peak.n.24.png
new file mode 100644 (file)
index 0000000..a7aa0e0
Binary files /dev/null and b/resources/features/pois/natural_peak.n.24.png differ

diff --git a/resources/features/pois/natural_tree.n.24.png b/resources/features/pois/natural_tree.n.24.png
new file mode 100644 (file)
index 0000000..9c1db62
Binary files /dev/null and b/resources/features/pois/natural_tree.n.24.png differ

diff --git a/resources/icons/natural_peak.n.16.png b/resources/icons/natural_peak.n.16.png
new file mode 100644 (file)
index 0000000..44234b3
Binary files /dev/null and b/resources/icons/natural_peak.n.16.png differ

diff --git a/resources/icons/natural_tree.n.16.png b/resources/icons/natural_tree.n.16.png
new file mode 100644 (file)
index 0000000..09a6b22
Binary files /dev/null and b/resources/icons/natural_tree.n.16.png differ

diff --git a/resources/map_features/landuse.xml b/resources/map_features/landuse.xml
index 31ed92eca403a1297d923a9692822f2f248168a2..85aef6809e46fc4ab08090af772a379699ede2f7 100644 (file)
--- a/resources/map_features/landuse.xml
+++ b/resources/map_features/landuse.xml
@@ -292,7 +292,27 @@
 
 <!-- ************************************************************************
        Natural
-       ************************************************************************ -->
+     ************************************************************************ -->
+
+  <feature name="Peak">
+    <help>http://wiki.openstreetmap.org/wiki/Tag:natural%3Dpeak</help>
+    <category>natural</category>
+    <icon image="features/pois/natural_peak.n.24.png"/>
+    <point/>
+    <tag k="natural" v="peak"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Tree">
+    <help>http://wiki.openstreetmap.org/wiki/Tag:natural%3Dtree</help>
+    <category>natural</category>
+    <icon image="features/pois/natural_tree.n.24.png"/>
+    <point/>
+    <tag k="natural" v="tree"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <feature name="Park">
     <category>natural</category>

diff --git a/resources/stylesheets/core_pois.css b/resources/stylesheets/core_pois.css
index 4f070cacfb83a1b1a75c6c0eac51cf081423fe1e..387c68251621b30b6e9dd00b66a19e96983894f8 100644 (file)
--- a/resources/stylesheets/core_pois.css
+++ b/resources/stylesheets/core_pois.css
@@ -130,6 +130,9 @@ node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-o
 node[power=tower] { icon-image: cross; icon-width: 7; width: 3; color: #F44; z-index: 20; }
 node[power=pole] { icon-image: cross; icon-width: 7; width: 3; color: #444; z-index: 20; }
 node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
+/* Natural */
+node[natural=peak] { icon-image: icons/natural_peak.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
+node[natural=tree] { icon-image: icons/natural_tree.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
 
 /* Addressing */