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

Improve doc of mountain_peak and water_name

Browse Source
This commit is contained in:
jirik 2017-03-27 08:20:39 +02:00
parent 3e6495a134
commit 74d8a2da1f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layers/mountain_peak/mountain_peak.yaml
View File

@ -8,7 +8,9 @@ layer:
name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak. name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak.
name_en: English name `name:en` if available, otherwise `name`. name_en: English name `name:en` if available, otherwise `name`.
name_de: German name `name:de` if available, otherwise `name` or `name:en`. name_de: German name `name:de` if available, otherwise `name` or `name:en`.
elev_m: Elevation (`ele`) in meters. ele: Elevation (`ele`) in meters.
ele_ft: Elevation (`ele`) in feets.
rank: Rank of the peak within one tile (starting at 1 that is the most important peak).
datasource: datasource:
geometry_field: geometry geometry_field: geometry
srid: 900913 srid: 900913

6
layers/water_name/layer.sql
View File

@ -1,6 +1,6 @@
-- etldoc: layer_water_name[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_water_name[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_water_name | <z9_13> z9_13 | <z14_> z14+" ] ; -- etldoc: label="layer_water_name | <z0_8> z0_8 | <z9_13> z9_13 | <z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer) CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer)
RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text) AS $$ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text) AS $$
@ -26,7 +26,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
(zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level)) (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level))
OR (zoom_level >= 14) OR (zoom_level >= 14)
) )
-- etldoc: osm_marine_point -> layer_water_name:z0_14_ -- etldoc: osm_marine_point -> layer_water_name:z0_8
-- etldoc: osm_marine_point -> layer_water_name:z9_13
-- etldoc: osm_marine_point -> layer_water_name:z14_
UNION ALL UNION ALL
SELECT osm_id, geometry, name, SELECT osm_id, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_en, ''), name) AS name_en,