From b86a27a11fc31be73465e1655ad7be363b073ee2 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Mon, 28 Nov 2016 14:24:50 +0000 Subject: [PATCH] Remove trailing space and commented out code --- docker-compose.yml | 4 +--- layers/poi/layer.sql | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b67e483..8e3e8ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,9 @@ version: "2" -volumes: - pgdata: services: postgres: image: "openmaptiles/postgis:2.2" volumes: - - pgdata:/var/lib/postgresql/data + - ./pgdata:/var/lib/postgresql/data ports: - "5432" env_file: .env diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index 25772e3..78e61b3 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -1,5 +1,5 @@ --- etldoc: layer_poi[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: layer_poi[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: label="layer_poi | z14_" ] ; CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_width numeric) @@ -10,19 +10,17 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t ORDER BY poi_class_rank(poi_class(subclass)) ASC, length(name) DESC NULLS LAST )::int AS "rank" - FROM ( - -- etldoc: osm_poi_point -> layer_poi:z14_ + FROM ( + -- etldoc: osm_poi_point -> layer_poi:z14 SELECT * FROM osm_poi_point WHERE geometry && bbox AND zoom_level >= 14 - -- AND name <> '' UNION ALL - -- etldoc: osm_poi_polygon -> layer_poi:z14_ + -- etldoc: osm_poi_polygon -> layer_poi:z14 SELECT * FROM osm_poi_polygon WHERE geometry && bbox AND zoom_level >= 14 - -- AND name <> '' - ) as poi_union + ) as poi_union ORDER BY "rank" ; $$ LANGUAGE SQL IMMUTABLE;