Move geometry && bbox check in park layer

pull/543/head
jirik 2018-11-23 16:56:20 +01:00 zatwierdzone przez Jiri Kozel
rodzic 7cd29e2622
commit fe057eede1
1 zmienionych plików z 10 dodań i 12 usunięć

Wyświetl plik

@ -13,47 +13,47 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, name text, name_en t
-- etldoc: osm_park_polygon_gen8 -> layer_park:z6 -- etldoc: osm_park_polygon_gen8 -> layer_park:z6
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen8 FROM osm_park_polygon_gen8
WHERE zoom_level = 6 WHERE zoom_level = 6 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen7 -> layer_park:z7 -- etldoc: osm_park_polygon_gen7 -> layer_park:z7
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen7 FROM osm_park_polygon_gen7
WHERE zoom_level = 7 WHERE zoom_level = 7 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen6 -> layer_park:z8 -- etldoc: osm_park_polygon_gen6 -> layer_park:z8
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen6 FROM osm_park_polygon_gen6
WHERE zoom_level = 8 WHERE zoom_level = 8 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen5 -> layer_park:z9 -- etldoc: osm_park_polygon_gen5 -> layer_park:z9
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen5 FROM osm_park_polygon_gen5
WHERE zoom_level = 9 WHERE zoom_level = 9 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen4 -> layer_park:z10 -- etldoc: osm_park_polygon_gen4 -> layer_park:z10
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen4 FROM osm_park_polygon_gen4
WHERE zoom_level = 10 WHERE zoom_level = 10 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen3 -> layer_park:z11 -- etldoc: osm_park_polygon_gen3 -> layer_park:z11
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen3 FROM osm_park_polygon_gen3
WHERE zoom_level = 11 WHERE zoom_level = 11 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen2 -> layer_park:z12 -- etldoc: osm_park_polygon_gen2 -> layer_park:z12
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen2 FROM osm_park_polygon_gen2
WHERE zoom_level = 12 WHERE zoom_level = 12 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen1 -> layer_park:z13 -- etldoc: osm_park_polygon_gen1 -> layer_park:z13
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen1 FROM osm_park_polygon_gen1
WHERE zoom_level = 13 WHERE zoom_level = 13 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: osm_park_polygon -> layer_park:z14 -- etldoc: osm_park_polygon -> layer_park:z14
SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon FROM osm_park_polygon
WHERE zoom_level >= 14 WHERE zoom_level >= 14 AND geometry && bbox
) AS park_polygon ) AS park_polygon
UNION ALL UNION ALL
@ -121,7 +121,5 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, name text, name_en t
FROM osm_park_polygon FROM osm_park_polygon
WHERE zoom_level >= 14 AND geometry_point && bbox WHERE zoom_level >= 14 AND geometry_point && bbox
) AS park_point ) AS park_point
) AS park_all ) AS park_all;
WHERE geometry && bbox;
$$ LANGUAGE SQL IMMUTABLE; $$ LANGUAGE SQL IMMUTABLE;