Remove trailing space and commented out code

pull/58/head
Lukas Martinelli 2016-11-28 14:24:50 +00:00
rodzic 09d3f0c2c1
commit b86a27a11f
2 zmienionych plików z 6 dodań i 10 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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_> 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;