cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #283 from openmaptiles/issue_210

Browse Source 
Issue 210 - Add more detail at z7
This commit is contained in:
stirringhalo 2017-06-18 20:28:34 -04:00 committed by GitHub
commit 7ea8d1a018
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layers/landcover/landcover.sql
View File

@ -41,6 +41,11 @@ CREATE OR REPLACE VIEW landcover_z5 AS (
SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys
); );
CREATE OR REPLACE VIEW landcover_z7 AS (
-- etldoc: osm_landcover_polygon_gen7 -> landcover_z7
SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen7
);
CREATE OR REPLACE VIEW landcover_z8 AS ( CREATE OR REPLACE VIEW landcover_z8 AS (
-- etldoc: osm_landcover_polygon_gen6 -> landcover_z8 -- etldoc: osm_landcover_polygon_gen6 -> landcover_z8
SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6
@ -96,9 +101,13 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
SELECT * FROM landcover_z2 SELECT * FROM landcover_z2
WHERE zoom_level BETWEEN 2 AND 4 AND geometry && bbox WHERE zoom_level BETWEEN 2 AND 4 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: landcover_z5 -> layer_landcover:z5_7 -- etldoc: landcover_z5 -> layer_landcover:z5_6
SELECT * FROM landcover_z5 SELECT * FROM landcover_z5
WHERE zoom_level BETWEEN 5 AND 7 AND geometry && bbox WHERE zoom_level BETWEEN 5 AND 6 AND geometry && bbox
UNION ALL
-- etldoc: landcover_z7 -> layer_landcover:z7
SELECT *
FROM landcover_z7 WHERE zoom_level = 7 AND geometry && bbox
UNION ALL UNION ALL
-- etldoc: landcover_z8 -> layer_landcover:z8 -- etldoc: landcover_z8 -> layer_landcover:z8
SELECT * SELECT *

6
layers/landcover/mapping.yaml
View File

@ -1,6 +1,12 @@
generalized_tables: generalized_tables:
# etldoc: imposm3 -> osm_landcover_polygon_gen7
landcover_polygon_gen7:
source: landcover_polygon_gen6
sql_filter: area>power(ZRES5,2)
tolerance: ZRES7
# etldoc: imposm3 -> osm_landcover_polygon_gen6 # etldoc: imposm3 -> osm_landcover_polygon_gen6
landcover_polygon_gen6: landcover_polygon_gen6:
source: landcover_polygon_gen5 source: landcover_polygon_gen5

6
layers/place/city.sql
View File

@ -38,14 +38,14 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
)::int AS gridrank )::int AS gridrank
FROM osm_city_point FROM osm_city_point
WHERE geometry && bbox WHERE geometry && bbox
AND ((zoom_level = 8 AND place <= 'town'::city_place AND ((zoom_level = 7 AND place <= 'town'::city_place
OR (zoom_level BETWEEN 9 AND 10 AND place <= 'village'::city_place) OR (zoom_level BETWEEN 8 AND 10 AND place <= 'village'::city_place)
OR (zoom_level BETWEEN 11 AND 13 AND place <= 'suburb'::city_place) OR (zoom_level BETWEEN 11 AND 13 AND place <= 'suburb'::city_place)
OR (zoom_level >= 14) OR (zoom_level >= 14)
)) ))
) AS ranked_places ) AS ranked_places
WHERE (zoom_level = 8 AND (gridrank <= 4 OR "rank" IS NOT NULL)) WHERE (zoom_level BETWEEN 7 AND 8 AND (gridrank <= 4 OR "rank" IS NOT NULL))
OR (zoom_level = 9 AND (gridrank <= 8 OR "rank" IS NOT NULL)) OR (zoom_level = 9 AND (gridrank <= 8 OR "rank" IS NOT NULL))
OR (zoom_level = 10 AND (gridrank <= 12 OR "rank" IS NOT NULL)) OR (zoom_level = 10 AND (gridrank <= 12 OR "rank" IS NOT NULL))
OR (zoom_level BETWEEN 11 AND 12 AND (gridrank <= 14 OR "rank" IS NOT NULL)) OR (zoom_level BETWEEN 11 AND 12 AND (gridrank <= 14 OR "rank" IS NOT NULL))