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

Include mountain peaks without elevation, but with name tag (#1682) 

Fixes #761, Fixes #1328

According to the https://github.com/openmaptiles/openmaptiles/issues/1328#issuecomment-1463800079 I included peaks without elevation, but with a name.

---------

Co-authored-by: Tomas Pohanka <TomPohys@gmail.com>
pull/1665/head^2
Michał Gwóźdź 2024-12-18 16:53:00 +01:00 zatwierdzone przez GitHub
rodzic 7cf98a6293
commit 22cd373f66
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 8 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
layers/mountain_peak/mountain_peak.sql
Wyświetl plik

@ -55,9 +55,9 @@ SELECT
FROM ( FROM (
SELECT osm_id, SELECT osm_id,
geometry, geometry,
name, NULLIF(name, '') as name,
COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_en, ''), NULLIF(name, '')) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, COALESCE(NULLIF(name_de, ''), NULLIF(name, ''), NULLIF(name_en, '')) AS name_de,
tags, tags,
substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele, substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele,
round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft, round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft,
@ -65,15 +65,17 @@ FROM (
row_number() OVER ( row_number() OVER (
PARTITION BY LabelGrid(geometry, 100 * pixel_width) PARTITION BY LabelGrid(geometry, 100 * pixel_width)
ORDER BY ( ORDER BY (
substring(ele FROM E'^(-?\\d+)(\\D|$)')::int + (CASE WHEN ele <> '' THEN substring(ele FROM E'^(-?\\d+)(\\D|$)')::int ELSE 0 END) +
(CASE WHEN wikipedia <> '' THEN 10000 ELSE 0 END) + (CASE WHEN wikipedia <> '' THEN 10000 ELSE 0 END) +
(CASE WHEN name <> '' THEN 10000 ELSE 0 END) (CASE WHEN name <> '' THEN 10000 ELSE 0 END)
) DESC ) DESC
)::int AS "rank" )::int AS "rank"
FROM peak_point FROM peak_point
WHERE geometry && bbox WHERE geometry && bbox
AND ele IS NOT NULL AND (
AND ele ~ E'^-?\\d{1,4}(\\D|$)' (ele <> '' AND ele ~ E'^-?\\d{1,4}(\\D|$)')
OR name <> ''
)
) AS ranked_peaks ) AS ranked_peaks
WHERE zoom_level >= 7 WHERE zoom_level >= 7
AND (rank <= 5 OR zoom_level >= 14) AND (rank <= 5 OR zoom_level >= 14)