mirror
/
osm2vectortiles
kopia lustrzana https://github.com/osm2vectortiles/osm2vectortiles
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #399 from osm2vectortiles/feature/better-low-zoom-levels 

Improved low zoom levels (show country_label earlier)
pull/405/head
Lukas Martinelli 2016-08-12 20:30:09 +02:00 zatwierdzone przez GitHub
rodzic e0e18779a4 b6531baac5
commit 16a7237338
2 zmienionych plików z 8 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
osm2vectortiles.tm2source/data.yml
Wyświetl plik

@ -431,12 +431,8 @@ Layer:
WHERE z(!scale_denominator!) = 0
UNION ALL
SELECT osm_id, geometry, admin_level, disputed, maritime
FROM admin_z1
WHERE z(!scale_denominator!) = 1
UNION ALL
SELECT osm_id, geometry, admin_level, disputed, maritime
FROM admin_z2
WHERE z(!scale_denominator!) = 2
FROM admin_z1toz2
WHERE z(!scale_denominator!) BETWEEN 1 AND 2
UNION ALL
SELECT osm_id, geometry, admin_level, disputed, maritime
FROM admin_z3
@ -489,17 +485,17 @@ Layer:
coalesce(NULLIF(name_fr, ''), name) AS name_fr,
coalesce(NULLIF(name_de, ''), name) AS name_de,
coalesce(NULLIF(name_ru, ''), name) AS name_ru,
coalesce(NULLIF(name_zh, ''), name) AS name_zh,
coalesce(NULLIF(name_zh, ''), name) AS name_zh,
rank AS scalerank
FROM custom_countries
WHERE (
(
rank <= 1
rank <= 2
AND z(!scale_denominator!) = 1 AND wkb_geometry && !bbox!
)
OR
(
rank <= 2
rank <= 3
AND z(!scale_denominator!) >= 2 AND wkb_geometry && !bbox!
)
OR

20
src/import-sql/layers/admin.sql
Wyświetl plik

@ -2,26 +2,14 @@ CREATE OR REPLACE VIEW admin_z0 AS
SELECT 0 AS osm_id, geom AS geometry, 2 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_110m_admin_0_boundary_lines_land;
CREATE OR REPLACE VIEW admin_z1 AS
CREATE OR REPLACE VIEW admin_z1toz2 AS
SELECT 0 AS osm_id, geom AS geometry, 2 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_110m_admin_0_boundary_lines_land
FROM ne_50m_admin_0_boundary_lines_land
UNION ALL
SELECT 0 AS osm_id, geom AS geometry, 4 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_50m_admin_1_states_provinces_lines
WHERE scalerank = 2;
CREATE OR REPLACE VIEW admin_z2 AS
SELECT 0 AS osm_id, geom AS geometry, 2 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_110m_admin_0_boundary_lines_land
UNION ALL
SELECT id AS osm_id, geometry, admin_level, 0 AS disputed, maritime
FROM osm_admin_linestring
WHERE maritime = 1 AND admin_level = 2
UNION ALL
SELECT 0 AS osm_id, geom AS geometry, 4 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_10m_admin_1_states_provinces_lines_shp
WHERE scalerank = 2;
CREATE OR REPLACE VIEW admin_z3 AS
SELECT 0 AS osm_id, geom AS geometry, 2 AS admin_level, 0 AS disputed, 0 AS maritime
FROM ne_50m_admin_0_boundary_lines_land
@ -69,9 +57,7 @@ CREATE OR REPLACE VIEW admin_z7toz14 AS
CREATE OR REPLACE VIEW admin_layer AS (
SELECT osm_id FROM admin_z0
UNION
SELECT osm_id FROM admin_z1
UNION
SELECT osm_id FROM admin_z2
SELECT osm_id FROM admin_z1toz2
UNION
SELECT osm_id FROM admin_z3
UNION