diff --git a/layers/place/city.sql b/layers/place/city.sql index 1695f31..5e21bca 100644 --- a/layers/place/city.sql +++ b/layers/place/city.sql @@ -1,10 +1,10 @@ --- etldoc: layer_city[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_city | z2-z7 | z8_z14_ " ] ; +-- etldoc: layer_city[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: label="layer_city | z2-z14" ] ; +-- etldoc: osm_city_point -> layer_city:z2_14 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, place city_place, "rank" int, capital int) AS $$ - -- etldoc: osm_city_point -> layer_city:z2_7 SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place, "rank", normalize_capital_level(capital) AS capital FROM osm_city_point WHERE geometry && bbox @@ -26,7 +26,6 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, place c population DESC NULLS LAST, length(name) ASC )::int AS gridrank - -- etldoc: osm_city_point -> layer_city:z8_14_ FROM osm_city_point WHERE geometry && bbox AND ((zoom_level = 8 AND place <= 'town'::city_place diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index aa3b148..1cd4333 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -47,7 +47,7 @@ tables: place: - country - # etldoc: imposm3 -> osm_state_point + # etldoc: imposm3 -> osm_state_point state_point: type: point fields: @@ -74,7 +74,7 @@ tables: place: - state - # etldoc: imposm3 -> osm_city_point + # etldoc: imposm3 -> osm_city_point city_point: type: point fields: