Add osm_id as key of places

pull/326/merge
jirik 2017-12-04 10:49:50 +01:00 zatwierdzone przez Jiri Kozel
rodzic 63f6915fab
commit a380f358fe
2 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -9,7 +9,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: osm_continent_point -> layer_place:z0_3
SELECT
osm_id, geometry, name,
osm_id*10, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
tags,
@ -24,7 +24,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: osm_country_point -> layer_place:z8_11
-- etldoc: osm_country_point -> layer_place:z12_14
SELECT
osm_id, geometry, name,
osm_id*10, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
tags,
@ -39,7 +39,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: osm_state_point -> layer_place:z8_11
-- etldoc: osm_state_point -> layer_place:z12_14
SELECT
osm_id, geometry, name,
osm_id*10, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
tags,
@ -56,7 +56,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: osm_island_point -> layer_place:z12_14
SELECT
osm_id, geometry, name,
osm_id*10, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
tags,
@ -70,7 +70,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: osm_island_polygon -> layer_place:z8_11
-- etldoc: osm_island_polygon -> layer_place:z12_14
SELECT
osm_id, geometry, name,
osm_id*10, geometry, name,
COALESCE(NULLIF(name_en, ''), name) AS name_en,
COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
tags,
@ -88,7 +88,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
-- etldoc: layer_city -> layer_place:z8_11
-- etldoc: layer_city -> layer_place:z12_14
SELECT
osm_id, geometry, name, name_en, name_de,
osm_id*10, geometry, name, name_en, name_de,
tags,
place::text AS class, "rank", capital,
NULL::text AS iso_a2

Wyświetl plik

@ -58,7 +58,9 @@ layer:
buffer_size: 256
datasource:
geometry_field: geometry
query: (SELECT geometry, name, name_en, name_de, {name_languages}, class, rank, capital, iso_a2 FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
key_field: osm_id
key_field_as_attribute: no
query: (SELECT osm_id, geometry, name, name_en, name_de, {name_languages}, class, rank, capital, iso_a2 FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
schema:
- ./types.sql
- ./capital.sql