kopia lustrzana https://github.com/openmaptiles/openmaptiles
Fallback to name for name_en
rodzic
a3f138ecff
commit
67be896e0a
|
@ -1,13 +1,17 @@
|
||||||
CREATE OR REPLACE FUNCTION layer_city(bbox geometry, zoom_level int, pixel_width numeric)
|
CREATE OR REPLACE FUNCTION layer_city(bbox geometry, zoom_level int, pixel_width numeric)
|
||||||
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class city_class, "rank" int) AS $$
|
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class city_class, "rank" int) AS $$
|
||||||
SELECT osm_id, geometry, name, name_en, place, "rank"
|
SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place AS class, "rank"
|
||||||
FROM osm_city_point
|
FROM osm_city_point
|
||||||
WHERE geometry && bbox
|
WHERE geometry && bbox
|
||||||
AND ((zoom_level = 2 AND "rank" = 1)
|
AND ((zoom_level = 2 AND "rank" = 1)
|
||||||
OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level)
|
OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level)
|
||||||
)
|
)
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT osm_id, geometry, name, name_en, place, COALESCE("rank", gridrank + 10) FROM (
|
SELECT osm_id, geometry, name,
|
||||||
|
COALESCE(NULLIF(name_en, ''), name) AS name_en,
|
||||||
|
place AS class,
|
||||||
|
COALESCE("rank", gridrank + 10)
|
||||||
|
FROM (
|
||||||
SELECT osm_id, geometry, name, name_en, place, "rank",
|
SELECT osm_id, geometry, name, name_en, place, "rank",
|
||||||
row_number() OVER (
|
row_number() OVER (
|
||||||
PARTITION BY LabelGrid(geometry, 150 * pixel_width)
|
PARTITION BY LabelGrid(geometry, 150 * pixel_width)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
CREATE OR REPLACE FUNCTION layer_country(bbox geometry, zoom_level int)
|
CREATE OR REPLACE FUNCTION layer_country(bbox geometry, zoom_level int)
|
||||||
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, "rank" int) AS $$
|
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, "rank" int) AS $$
|
||||||
SELECT osm_id, geometry, name, name_en, "rank" FROM osm_country_point
|
SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, "rank" FROM osm_country_point
|
||||||
WHERE geometry && bbox AND "rank" <= zoom_level
|
WHERE geometry && bbox AND "rank" <= zoom_level AND name <> ''
|
||||||
ORDER BY "rank" ASC, length(name) ASC;
|
ORDER BY "rank" ASC, length(name) ASC;
|
||||||
$$ LANGUAGE SQL IMMUTABLE;
|
$$ LANGUAGE SQL IMMUTABLE;
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
CREATE OR REPLACE FUNCTION layer_state(bbox geometry, zoom_level int)
|
CREATE OR REPLACE FUNCTION layer_state(bbox geometry, zoom_level int)
|
||||||
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, "rank" int) AS $$
|
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, "rank" int) AS $$
|
||||||
SELECT osm_id, geometry, name, name_en, "rank"
|
SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, "rank"
|
||||||
FROM osm_state_point
|
FROM osm_state_point
|
||||||
WHERE geometry && bbox AND
|
WHERE geometry && bbox AND
|
||||||
|
name <> '' AND
|
||||||
("rank" + 2 <= zoom_level) AND (
|
("rank" + 2 <= zoom_level) AND (
|
||||||
zoom_level >= 5 OR
|
zoom_level >= 5 OR
|
||||||
is_in_country IN ('United Kingdom', 'USA', 'Россия', 'Brasil', 'China', 'India') OR
|
is_in_country IN ('United Kingdom', 'USA', 'Россия', 'Brasil', 'China', 'India') OR
|
||||||
|
|
Ładowanie…
Reference in New Issue