From 7400b552c2f1cf0fd8e051d5e5b59b12f5615f07 Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Mon, 16 Jan 2017 16:00:45 +0100
Subject: [PATCH] Add seas and oceans to water_name

---
 layers/water_name/layer.sql       | 8 ++++++++
 layers/water_name/water_name.yaml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql
index 0bfac8b6..143a00df 100644
--- a/layers/water_name/layer.sql
+++ b/layers/water_name/layer.sql
@@ -19,5 +19,13 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t
     WHERE geometry && bbox AND (
         (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level))
         OR (zoom_level >= 14)
+    )
+    -- etldoc: osm_marine_point ->  layer_water_name:z14
+    UNION ALL
+    SELECT osm_id, geometry, name, name_en, place::text AS class
+    FROM osm_marine_point
+    WHERE geometry && bbox AND (
+        (zoom_level <= 4 AND place = 'ocean')
+        OR (zoom_level >= 5)
     );
 $$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/water_name/water_name.yaml b/layers/water_name/water_name.yaml
index a1bd76b9..33bff0b1 100644
--- a/layers/water_name/water_name.yaml
+++ b/layers/water_name/water_name.yaml
@@ -12,7 +12,7 @@ layer:
           At the moment only `lake` since no ocean parts are labelled. *Reserved for future use*.
       values:
       - lake
-  buffer_size: 8
+  buffer_size: 64
   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
   datasource:
     geometry_field: geometry