From 2584489ad7345469cde4839691434f9457b1cfb4 Mon Sep 17 00:00:00 2001 From: zstadler Date: Sat, 4 Apr 2020 13:16:59 +0300 Subject: [PATCH] Continue conflict resolution --- layers/park/layer.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/park/layer.sql b/layers/park/layer.sql index 2d3e4f11..bb8162a0 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -50,12 +50,12 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, name text, name_en t WHERE zoom_level = 12 AND geometry && bbox UNION ALL -- etldoc: osm_park_polygon_gen1 -> layer_park:z13 - SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title, NULL::int as scalerank + SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title FROM osm_park_polygon_gen1 WHERE zoom_level = 13 AND geometry && bbox UNION ALL -- etldoc: osm_park_polygon -> layer_park:z14 - SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title, NULL::int as scalerank + SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title FROM osm_park_polygon WHERE zoom_level >= 14 AND geometry && bbox ) AS park_polygon