Include springs,passes,peaks with no ele tag

layers/mountain_peak/layer.sql

@@ -31,17 +31,19 @@ $$
       row_number() OVER (
           PARTITION BY LabelGrid(geometry, 100 * pixel_width)
           ORDER BY (
-            substring(ele from E'^(-?\\d+)(\\D|$)')::int +
+            (CASE WHEN ele is not null AND ele ~ E'^-?\\d{1,4}(\\D|$)' THEN substring(ele from E'^(-?\\d+)(\\D|$)')::int ELSE 0 END) +
             (CASE WHEN NULLIF(wikipedia, '') is not null THEN 10000 ELSE 0 END) +
             (CASE WHEN NULLIF(name, '') is not null THEN 10000 ELSE 0 END)
           ) DESC
       )::int AS "rank"
       FROM osm_peak_point
       WHERE geometry && bbox
-        AND ele is not null
-        AND ele ~ E'^-?\\d{1,4}(\\D|$)'
     ) AS ranked_peaks
-  WHERE zoom_level >= 7 AND (rank <= 5 OR zoom_level >= 14)
+  WHERE
+    (zoom_level >= 7 AND rank <= 1 AND ele is not null) OR
+    (zoom_level >= 9 AND rank <= 3 AND ele is not null) OR
+    (zoom_level >= 11 AND rank <= 5 AND ele is not null) OR
+    (zoom_level >= 14)
   ORDER BY "rank" ASC;
 
 $$ LANGUAGE SQL IMMUTABLE;

layers/poi/mapping.yaml

@@ -115,11 +115,6 @@ def_poi_mapping_leisure: &poi_mapping_leisure
   - swimming_pool
   - water_park
 
-# natural values: see http://taginfo.openstreetmap.org/keys/natural#values
-def_poi_mapping_natural: &poi_mapping_natural
-  - spring
-  - saddle
-
 # railway values , see http://taginfo.openstreetmap.org/keys/railway#values
 def_poi_mapping_railway: &poi_mapping_railway
   - halt
@@ -377,7 +372,6 @@ def_poi_mapping: &poi_mapping
   historic: *poi_mapping_historic
   landuse: *poi_mapping_landuse
   leisure: *poi_mapping_leisure
-  natural: *poi_mapping_natural
   railway: *poi_mapping_railway
   shop: *poi_mapping_shop
   sport: *poi_mapping_sport