From 4c6d30066d59567acc49cd01836c69e9a9eeea40 Mon Sep 17 00:00:00 2001 From: jirik Date: Fri, 17 Mar 2017 12:56:54 +0100 Subject: [PATCH] Add German names (name_de), unify English names (name_en) --- layers/mountain_peak/layer.sql | 8 ++++--- layers/mountain_peak/mapping.yaml | 3 +++ layers/mountain_peak/mountain_peak.yaml | 2 +- layers/place/city.sql | 13 +++++++--- layers/place/layer.sql | 24 +++++++++++++------ layers/place/mapping.yaml | 1 + layers/place/place.yaml | 2 +- layers/poi/layer.sql | 7 ++++-- layers/poi/mapping.yaml | 12 +++++++--- layers/poi/poi.yaml | 4 ++-- layers/transportation/mapping.yaml | 6 +++++ layers/transportation_name/layer.sql | 5 ++-- layers/transportation_name/merge_highways.sql | 15 +++++++----- .../transportation_name.yaml | 2 +- layers/water/mapping.yaml | 3 +++ layers/water_name/layer.sql | 17 +++++++++---- layers/water_name/mapping.yaml | 3 +++ layers/water_name/water_lakeline.sql | 4 ++-- layers/water_name/water_name.yaml | 2 +- layers/water_name/water_point.sql | 6 ++--- layers/waterway/mapping.yaml | 3 +++ layers/waterway/merge_waterway.sql | 15 +++++------- layers/waterway/waterway.sql | 23 +++++++++--------- layers/waterway/waterway.yaml | 2 +- 24 files changed, 120 insertions(+), 62 deletions(-) diff --git a/layers/mountain_peak/layer.sql b/layers/mountain_peak/layer.sql index 7c6c5dd..303af77 100644 --- a/layers/mountain_peak/layer.sql +++ b/layers/mountain_peak/layer.sql @@ -3,11 +3,13 @@ -- etldoc: style="rounded,filled", label="layer_mountain_peak | z7+" ] ; CREATE OR REPLACE FUNCTION layer_mountain_peak(bbox geometry, zoom_level integer, pixel_width numeric) -RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, ele int, ele_ft int, "rank" int) AS $$ +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, ele int, ele_ft int, "rank" int) AS $$ -- etldoc: osm_peak_point -> layer_mountain_peak:z7_ - SELECT osm_id, geometry, name, name_en, ele::int, ele_ft::int, rank::int + SELECT osm_id, geometry, name, name_en, name_de, ele::int, ele_ft::int, rank::int FROM ( - SELECT osm_id, geometry, name, name_en, + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, substring(ele from E'^(-?\\d+)(\\D|$)')::int AS ele, round(substring(ele from E'^(-?\\d+)(\\D|$)')::int*3.2808399)::int AS ele_ft, row_number() OVER ( diff --git a/layers/mountain_peak/mapping.yaml b/layers/mountain_peak/mapping.yaml index ae63950..14da838 100644 --- a/layers/mountain_peak/mapping.yaml +++ b/layers/mountain_peak/mapping.yaml @@ -15,6 +15,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string - name: ele key: ele type: string diff --git a/layers/mountain_peak/mountain_peak.yaml b/layers/mountain_peak/mountain_peak.yaml index c1932f5..98aae6f 100644 --- a/layers/mountain_peak/mountain_peak.yaml +++ b/layers/mountain_peak/mountain_peak.yaml @@ -11,7 +11,7 @@ layer: datasource: geometry_field: geometry srid: 900913 - query: (SELECT osm_id, geometry, name, name_en, ele, ele_ft, rank FROM layer_mountain_peak(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t + query: (SELECT osm_id, geometry, name, name_en, name_de, ele, ele_ft, rank FROM layer_mountain_peak(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t schema: - ./layer.sql datasources: diff --git a/layers/place/city.sql b/layers/place/city.sql index 79c47df..eb19a60 100644 --- a/layers/place/city.sql +++ b/layers/place/city.sql @@ -4,8 +4,11 @@ -- 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 $$ - SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place, "rank", normalize_capital_level(capital) AS capital +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, place city_place, "rank" int, capital int) AS $$ + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + place, "rank", normalize_capital_level(capital) AS capital FROM osm_city_point WHERE geometry && bbox AND ((zoom_level = 2 AND "rank" = 1) @@ -14,11 +17,15 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, place c UNION ALL SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, place, COALESCE("rank", gridrank + 10), normalize_capital_level(capital) AS capital FROM ( - SELECT osm_id, geometry, name, name_en, place, "rank", capital, + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + place, "rank", capital, row_number() OVER ( PARTITION BY LabelGrid(geometry, 128 * pixel_width) ORDER BY "rank" ASC NULLS LAST, diff --git a/layers/place/layer.sql b/layers/place/layer.sql index 247d93b..22fc3d4 100644 --- a/layers/place/layer.sql +++ b/layers/place/layer.sql @@ -3,11 +3,13 @@ -- etldoc: label="layer_place | z0-3| z4-7| z8-11| z12-z14+" ] ; CREATE OR REPLACE FUNCTION layer_place(bbox geometry, zoom_level int, pixel_width numeric) -RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, "rank" int, capital INT) AS $$ +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text, "rank" int, capital INT) AS $$ -- etldoc: osm_continent_point -> layer_place:z0_3 SELECT - osm_id, geometry, name, name_en, + osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, 'continent' AS class, 1 AS "rank", NULL::int AS capital FROM osm_continent_point WHERE geometry && bbox AND zoom_level < 4 @@ -18,7 +20,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: osm_country_point -> layer_place:z8_11 -- etldoc: osm_country_point -> layer_place:z12_14 SELECT - osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, + osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, 'country' AS class, "rank", NULL::int AS capital FROM osm_country_point WHERE geometry && bbox AND "rank" <= zoom_level + 1 AND name <> '' @@ -29,7 +33,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: osm_state_point -> layer_place:z8_11 -- etldoc: osm_state_point -> layer_place:z12_14 SELECT - osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, + osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, 'state' AS class, "rank", NULL::int AS capital FROM osm_state_point WHERE geometry && bbox AND @@ -42,7 +48,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: osm_island_point -> layer_place:z12_14 SELECT - osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, + osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, 'island' AS class, 7 AS "rank", NULL::int AS capital FROM osm_island_point WHERE zoom_level >= 12 @@ -52,7 +60,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: osm_island_polygon -> layer_place:z8_11 -- etldoc: osm_island_polygon -> layer_place:z12_14 SELECT - osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, + osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, 'island' AS class, island_rank(area) AS "rank", NULL::int AS capital FROM osm_island_polygon WHERE geometry && bbox AND @@ -66,7 +76,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: layer_city -> layer_place:z8_11 -- etldoc: layer_city -> layer_place:z12_14 SELECT - osm_id, geometry, name, name_en, + osm_id, geometry, name, name_en, name_de, place::text AS class, "rank", capital FROM layer_city(bbox, zoom_level, pixel_width) ORDER BY "rank" ASC diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index 5c7afa1..4177002 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -55,6 +55,7 @@ tables: type: geometry - *name - *name_en + - *name_de filters: require: name: ["__any__"] diff --git a/layers/place/place.yaml b/layers/place/place.yaml index 8596651..b140db4 100644 --- a/layers/place/place.yaml +++ b/layers/place/place.yaml @@ -52,7 +52,7 @@ layer: buffer_size: 128 datasource: geometry_field: geometry - query: (SELECT geometry, name, name_en, class, rank, capital FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t + query: (SELECT geometry, name, name_en, name_de, class, rank, capital FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t schema: - ./types.sql - ./capital.sql diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index a76ae10..6532bf6 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -3,8 +3,11 @@ -- etldoc: label="layer_poi | z14+" ] ; CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_width numeric) -RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, subclass text, "rank" int) AS $$ - SELECT osm_id, geometry, NULLIF(name, '') AS name, NULLIF(name_en, '') AS name_en, poi_class(subclass) AS class, subclass, +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text, subclass text, "rank" int) AS $$ + SELECT osm_id, geometry, NULLIF(name, '') AS name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + poi_class(subclass) AS class, subclass, row_number() OVER ( PARTITION BY LabelGrid(geometry, 100 * pixel_width) ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass)) END ASC diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml index 7505313..16effd9 100644 --- a/layers/poi/mapping.yaml +++ b/layers/poi/mapping.yaml @@ -1,6 +1,6 @@ -# imposm3 mapping file for https://github.com/osm2vectortiles/imposm3 -# Warning: this is not the official imposm3 +# imposm3 mapping file for https://github.com/osm2vectortiles/imposm3 +# Warning: this is not the official imposm3 # aerialway values , see http://taginfo.openstreetmap.org/keys/aerialway#values def_poi_mapping_aerialway: &poi_mapping_aerialway @@ -306,6 +306,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string - name: subclass type: mapping_value mapping: @@ -336,6 +339,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string - name: subclass type: mapping_value mapping: @@ -349,4 +355,4 @@ tables: shop: *poi_mapping_shop sport: *poi_mapping_sport tourism: *poi_mapping_tourism - waterway: *poi_mapping_waterway \ No newline at end of file + waterway: *poi_mapping_waterway diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml index bc27291..995723c 100644 --- a/layers/poi/poi.yaml +++ b/layers/poi/poi.yaml @@ -31,9 +31,9 @@ layer: datasource: geometry_field: geometry srid: 900913 - query: (SELECT geometry, name, name_en, class, subclass, rank FROM layer_poi(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t + query: (SELECT geometry, name, name_en, name_de, class, subclass, rank FROM layer_poi(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t schema: - - ./poi_polygon_update.sql + - ./poi_polygon_update.sql - ./class.sql - ./layer.sql datasources: diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml index 59b02a8..bc82b8a 100644 --- a/layers/transportation/mapping.yaml +++ b/layers/transportation/mapping.yaml @@ -55,6 +55,10 @@ name_en_field: &name_en name: name_en key: name:en type: string +name_de_field: &name_de + name: name_de + key: name:de + type: string short_name_field: &short_name key: short_name name: short_name @@ -125,6 +129,7 @@ tables: - *layer - *name - *name_en + - *name_de - *short_name - *tunnel - *bridge @@ -178,6 +183,7 @@ tables: - *layer - *name - *name_en + - *name_de - *short_name - *tunnel - *bridge diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql index 513981d..79da062 100644 --- a/layers/transportation_name/layer.sql +++ b/layers/transportation_name/layer.sql @@ -3,10 +3,11 @@ -- etldoc: label="layer_transportation_name | z6 | z7 | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer) -RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, ref text, ref_length int, network text, class text) AS $$ +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, ref text, ref_length int, network text, class text) AS $$ SELECT osm_id, geometry, NULLIF(name, '') AS name, - COALESCE(NULLIF(name_en, ''), NULLIF(name, '')) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length, --TODO: The road network of the road is not yet implemented case diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql index c5cd3d3..3bac6a8 100644 --- a/layers/transportation_name/merge_highways.sql +++ b/layers/transportation_name/merge_highways.sql @@ -14,7 +14,8 @@ CREATE MATERIALIZED VIEW osm_transportation_name_network AS ( hl.geometry, hl.osm_id, hl.name, - COALESCE(NULLIF(hl.name_en, ''), hl.name) AS name_en, + hl.name_en, + hl.name_de, rm.network_type, CASE WHEN (rm.network_type is not null AND nullif(rm.ref::text, '') is not null) @@ -41,6 +42,7 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( member_osm_ids, name, name_en, + name_de, ref, highway, network_type AS network, @@ -50,6 +52,7 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( ST_LineMerge(ST_Collect(geometry)) AS geometry, name, name_en, + name_de, ref, highway, network_type, @@ -59,14 +62,14 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( WHERE ("rank"=1 OR "rank" is null) AND (name <> '' OR ref <> '') AND NULLIF(highway, '') IS NOT NULL - group by name, name_en, ref, highway, network_type + group by name, name_en, name_de, ref, highway, network_type ) AS highway_union ); CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_geometry_idx ON osm_transportation_name_linestring USING gist(geometry); -- etldoc: osm_transportation_name_linestring -> osm_transportation_name_linestring_gen1 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen1 AS ( - SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, member_osm_ids, name, name_en, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring WHERE highway IN ('motorway','trunk') AND ST_Length(geometry) > 8000 ); @@ -74,7 +77,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen1_geometry_idx -- etldoc: osm_transportation_name_linestring_gen1 -> osm_transportation_name_linestring_gen2 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen2 AS ( - SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, name_en, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen1 WHERE highway IN ('motorway','trunk') AND ST_Length(geometry) > 14000 ); @@ -82,7 +85,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen2_geometry_idx -- etldoc: osm_transportation_name_linestring_gen2 -> osm_transportation_name_linestring_gen3 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen3 AS ( - SELECT ST_Simplify(geometry, 200) AS geometry, osm_id, member_osm_ids, name, name_en, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 200) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen2 WHERE highway = 'motorway' AND ST_Length(geometry) > 20000 ); @@ -90,7 +93,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen3_geometry_idx -- etldoc: osm_transportation_name_linestring_gen3 -> osm_transportation_name_linestring_gen4 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen4 AS ( - SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, member_osm_ids, name, name_en, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen3 WHERE highway = 'motorway' AND ST_Length(geometry) > 20000 ); diff --git a/layers/transportation_name/transportation_name.yaml b/layers/transportation_name/transportation_name.yaml index a292af7..89302f5 100644 --- a/layers/transportation_name/transportation_name.yaml +++ b/layers/transportation_name/transportation_name.yaml @@ -45,7 +45,7 @@ layer: datasource: geometry_field: geometry srid: 900913 - query: (SELECT geometry, name, name_en, ref, ref_length, network::text, class::text FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, name, name_en, name_de, ref, ref_length, network::text, class::text FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t schema: - ./network_type.sql - ./merge_highways.sql diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index e44b19a..2f81b92 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -53,6 +53,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string - name: natural key: natural type: string diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql index c79e70d..a4ffca2 100644 --- a/layers/water_name/layer.sql +++ b/layers/water_name/layer.sql @@ -3,10 +3,13 @@ -- etldoc: label="layer_water_name | z9_13 | z14+" ] ; CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer) -RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text) AS $$ +RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text) AS $$ -- etldoc: osm_water_lakeline -> layer_water_name:z9_13 -- etldoc: osm_water_lakeline -> layer_water_name:z14_ - SELECT osm_id, geometry, name, name_en, 'lake'::text AS class + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + 'lake'::text AS class FROM osm_water_lakeline WHERE geometry && bbox AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry)) @@ -14,7 +17,10 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t -- etldoc: osm_water_point -> layer_water_name:z9_13 -- etldoc: osm_water_point -> layer_water_name:z14_ UNION ALL - SELECT osm_id, geometry, name, name_en, 'lake'::text AS class + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + 'lake'::text AS class FROM osm_water_point WHERE geometry && bbox AND ( (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level)) @@ -22,7 +28,10 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t ) -- etldoc: osm_marine_point -> layer_water_name:z0_14_ UNION ALL - SELECT osm_id, geometry, name, name_en, place::text AS class + SELECT osm_id, geometry, name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + place::text AS class FROM osm_marine_point WHERE geometry && bbox AND ( place = 'ocean' diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml index ecab8bf..75532dd 100644 --- a/layers/water_name/mapping.yaml +++ b/layers/water_name/mapping.yaml @@ -13,6 +13,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string - name: place key: place type: string diff --git a/layers/water_name/water_lakeline.sql b/layers/water_name/water_lakeline.sql index d9c58ea..7a81fc6 100644 --- a/layers/water_name/water_lakeline.sql +++ b/layers/water_name/water_lakeline.sql @@ -8,7 +8,7 @@ DROP MATERIALIZED VIEW IF EXISTS osm_water_lakeline CASCADE; CREATE MATERIALIZED VIEW osm_water_lakeline AS ( SELECT wp.osm_id, ll.wkb_geometry AS geometry, - name, name_en, ST_Area(wp.geometry) AS area + name, name_en, name_de, ST_Area(wp.geometry) AS area FROM osm_water_polygon AS wp INNER JOIN lake_centerline ll ON wp.osm_id = ll.osm_id WHERE wp.name <> '' @@ -24,7 +24,7 @@ CREATE OR REPLACE FUNCTION water_lakeline.flag() RETURNS trigger AS $$ BEGIN INSERT INTO water_lakeline.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING; RETURN null; -END; +END; $$ language plpgsql; CREATE OR REPLACE FUNCTION water_lakeline.refresh() RETURNS trigger AS diff --git a/layers/water_name/water_name.yaml b/layers/water_name/water_name.yaml index ab9da59..1ba66df 100644 --- a/layers/water_name/water_name.yaml +++ b/layers/water_name/water_name.yaml @@ -17,7 +17,7 @@ layer: datasource: geometry_field: geometry srid: 900913 - query: (SELECT geometry, name, name_en, class FROM layer_water_name(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, name, name_en, name_de, class FROM layer_water_name(!bbox!, z(!scale_denominator!))) AS t schema: - ./merge_marine_rank.sql - ./water_lakeline.sql diff --git a/layers/water_name/water_point.sql b/layers/water_name/water_point.sql index 9c46e7f..895bf4d 100644 --- a/layers/water_name/water_point.sql +++ b/layers/water_name/water_point.sql @@ -8,13 +8,13 @@ DROP MATERIALIZED VIEW IF EXISTS osm_water_point CASCADE; CREATE MATERIALIZED VIEW osm_water_point AS ( SELECT wp.osm_id, ST_PointOnSurface(wp.geometry) AS geometry, - wp.name, wp.name_en, ST_Area(wp.geometry) AS area + wp.name, wp.name_en, wp.name_de, ST_Area(wp.geometry) AS area FROM osm_water_polygon AS wp LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id WHERE ll.osm_id IS NULL AND wp.name <> '' ); CREATE INDEX IF NOT EXISTS osm_water_point_geometry_idx ON osm_water_point USING gist (geometry); - + -- Handle updates CREATE SCHEMA IF NOT EXISTS water_point; @@ -24,7 +24,7 @@ CREATE OR REPLACE FUNCTION water_point.flag() RETURNS trigger AS $$ BEGIN INSERT INTO water_point.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING; RETURN null; -END; +END; $$ language plpgsql; CREATE OR REPLACE FUNCTION water_point.refresh() RETURNS trigger AS diff --git a/layers/waterway/mapping.yaml b/layers/waterway/mapping.yaml index a69a9e8..daefcc5 100644 --- a/layers/waterway/mapping.yaml +++ b/layers/waterway/mapping.yaml @@ -32,6 +32,9 @@ tables: - name: name_en key: name:en type: string + - name: name_de + key: name:de + type: string mapping: waterway: - stream diff --git a/layers/waterway/merge_waterway.sql b/layers/waterway/merge_waterway.sql index 5185355..7b27abb 100644 --- a/layers/waterway/merge_waterway.sql +++ b/layers/waterway/merge_waterway.sql @@ -14,21 +14,21 @@ DROP MATERIALIZED VIEW IF EXISTS osm_important_waterway_linestring_gen3 CASCADE; CREATE MATERIALIZED VIEW osm_important_waterway_linestring AS ( SELECT (ST_Dump(geometry)).geom AS geometry, - name, name_en + name, name_en, name_de FROM ( SELECT ST_LineMerge(ST_Union(geometry)) AS geometry, - name, COALESCE(NULLIF(name_en, ''), name) AS name_en + name, name_en, name_de FROM osm_waterway_linestring WHERE name <> '' AND waterway = 'river' - GROUP BY name, name_en + GROUP BY name, name_en, name_de ) AS waterway_union ); CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_geometry_idx ON osm_important_waterway_linestring USING gist(geometry); -- etldoc: osm_important_waterway_linestring -> osm_important_waterway_linestring_gen1 CREATE MATERIALIZED VIEW osm_important_waterway_linestring_gen1 AS ( - SELECT ST_Simplify(geometry, 60) AS geometry, name, name_en + SELECT ST_Simplify(geometry, 60) AS geometry, name, name_en, name_de FROM osm_important_waterway_linestring WHERE ST_Length(geometry) > 1000 ); @@ -36,7 +36,7 @@ CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen1_geometry_idx O -- etldoc: osm_important_waterway_linestring_gen1 -> osm_important_waterway_linestring_gen2 CREATE MATERIALIZED VIEW osm_important_waterway_linestring_gen2 AS ( - SELECT ST_Simplify(geometry, 100) AS geometry, name, name_en + SELECT ST_Simplify(geometry, 100) AS geometry, name, name_en, name_de FROM osm_important_waterway_linestring_gen1 WHERE ST_Length(geometry) > 4000 ); @@ -44,7 +44,7 @@ CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen2_geometry_idx O -- etldoc: osm_important_waterway_linestring_gen2 -> osm_important_waterway_linestring_gen3 CREATE MATERIALIZED VIEW osm_important_waterway_linestring_gen3 AS ( - SELECT ST_Simplify(geometry, 200) AS geometry, name, name_en + SELECT ST_Simplify(geometry, 200) AS geometry, name, name_en, name_de FROM osm_important_waterway_linestring_gen2 WHERE ST_Length(geometry) > 8000 ); @@ -86,6 +86,3 @@ CREATE CONSTRAINT TRIGGER trigger_refresh INITIALLY DEFERRED FOR EACH ROW EXECUTE PROCEDURE waterway.refresh(); - - - diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 7ed137a..919340e 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -1,65 +1,66 @@ -- etldoc: ne_110m_rivers_lake_centerlines -> waterway_z3 CREATE OR REPLACE VIEW waterway_z3 AS ( - SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en + SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en, NULL::text AS name_de FROM ne_110m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_50m_rivers_lake_centerlines -> waterway_z4 CREATE OR REPLACE VIEW waterway_z4 AS ( - SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en + SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en, NULL::text AS name_de FROM ne_50m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_10m_rivers_lake_centerlines -> waterway_z6 CREATE OR REPLACE VIEW waterway_z6 AS ( - SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en + SELECT geometry, 'river'::text AS class, NULL::text AS name, NULL::text AS name_en, NULL::text AS name_de FROM ne_10m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: osm_important_waterway_linestring_gen3 -> waterway_z9 CREATE OR REPLACE VIEW waterway_z9 AS ( - SELECT geometry, 'river'::text AS class, name, name_en FROM osm_important_waterway_linestring_gen3 + SELECT geometry, 'river'::text AS class, name, name_en, name_de FROM osm_important_waterway_linestring_gen3 ); -- etldoc: osm_important_waterway_linestring_gen2 -> waterway_z10 CREATE OR REPLACE VIEW waterway_z10 AS ( - SELECT geometry, 'river'::text AS class, name, name_en FROM osm_important_waterway_linestring_gen2 + SELECT geometry, 'river'::text AS class, name, name_en, name_de FROM osm_important_waterway_linestring_gen2 ); -- etldoc:osm_important_waterway_linestring_gen1 -> waterway_z11 CREATE OR REPLACE VIEW waterway_z11 AS ( - SELECT geometry, 'river'::text AS class, name, name_en FROM osm_important_waterway_linestring_gen1 + SELECT geometry, 'river'::text AS class, name, name_en, name_de FROM osm_important_waterway_linestring_gen1 ); -- etldoc: osm_waterway_linestring -> waterway_z12 CREATE OR REPLACE VIEW waterway_z12 AS ( - SELECT geometry, waterway AS class, name, name_en FROM osm_waterway_linestring + SELECT geometry, waterway AS class, name, name_en, name_de FROM osm_waterway_linestring WHERE waterway IN ('river', 'canal') ); -- etldoc: osm_waterway_linestring -> waterway_z13 CREATE OR REPLACE VIEW waterway_z13 AS ( - SELECT geometry, waterway::text AS class, name, name_en FROM osm_waterway_linestring + SELECT geometry, waterway::text AS class, name, name_en, name_de FROM osm_waterway_linestring WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch') ); -- etldoc: osm_waterway_linestring -> waterway_z14 CREATE OR REPLACE VIEW waterway_z14 AS ( - SELECT geometry, waterway::text AS class, name, name_en FROM osm_waterway_linestring + SELECT geometry, waterway::text AS class, name, name_en, name_de FROM osm_waterway_linestring ); -- etldoc: layer_waterway[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: label="layer_waterway | z3 | z4-z5 | z6-8 | z9 | z10 | z11 | z12| z13| z14+" ]; CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) -RETURNS TABLE(geometry geometry, class text, name text, name_en text) AS $$ +RETURNS TABLE(geometry geometry, class text, name text, name_en text, name_de text) AS $$ SELECT geometry, class, NULLIF(name, '') AS name, - COALESCE(NULLIF(name_en, ''), name) AS name_en + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de FROM ( -- etldoc: waterway_z3 -> layer_waterway:z3 SELECT * FROM waterway_z3 WHERE zoom_level = 3 diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml index 0b5b471..a5a30d9 100644 --- a/layers/waterway/waterway.yaml +++ b/layers/waterway/waterway.yaml @@ -22,7 +22,7 @@ layer: - ditch datasource: geometry_field: geometry - query: (SELECT geometry, name, name_en, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, name, name_en, name_de, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t schema: - ./merge_waterway.sql - ./waterway.sql