natural=volcano (fix #162)

diff --git a/hdm.mml b/hdm.mml
index 982d6f273653433a53ded30c71d25cf6e03022ed..1d40695c61498d3902fc4ccbc286a16ca9495ef2 100644 (file)
--- a/hdm.mml
+++ b/hdm.mml
@@ -1258,7 +1258,7 @@
         "port": "5432",
         "project": "hdm",
         "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
-        "table": "( SELECT way, \"natural\" AS type, name, CASE WHEN ele ~ E'^\\\\d+$' THEN ele::integer ELSE null END as ele FROM planet_osm_point WHERE \"natural\" IS NOT NULL AND \"natural\" IN ('peak', 'bay') ORDER BY ele DESC NULLS LAST) AS data",
+        "table": "( SELECT way, \"natural\" AS type, name, CASE WHEN ele ~ E'^\\\\d+$' THEN ele::integer ELSE null END as ele FROM planet_osm_point WHERE \"natural\" IS NOT NULL AND \"natural\" IN ('peak', 'bay', 'volcano') ORDER BY ele DESC NULLS LAST) AS data",
         "type": "postgis",
         "extent": "-20037508,-19929239,20037508,19929239",
         "user": "osm"

diff --git a/labels.mss b/labels.mss
index 5be10a362a5918d86b99176004b6fbe827efd1aa..f38479202bbce0941d3351df44ea6c44c1fcaaa5 100644 (file)
--- a/labels.mss
+++ b/labels.mss
@@ -595,6 +595,7 @@
   text-size: 11;
 }
 
+#natural_point_label[type='volcano'][zoom>=13],
 #natural_point_label[type='peak'][zoom>=13] {
   shield-file: url('icons/natural/peak-6.png');
   shield-name: '[name]';
@@ -612,4 +613,4 @@
   [ele!=null] {
     shield-name: '[name] + " (" + [ele] + ")"';
   }
-}
\ No newline at end of file
+}