Add German names (name_de), unify English names (name_en)

layers/mountain_peak/layer.sql

@@ -3,11 +3,13 @@
 -- etldoc:     style="rounded,filled", label="layer_mountain_peak | <z7_> 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 (

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

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: