Merge pull request #7 from HSLdevcom/24912-default-finnish-language

24912: Use Finnish as a default language
HSLdevcom · Oct 6, 2023 · 8686516 · 8686516
2 parents c4a7117 + 3d85b25
commit 8686516
Show file tree

Hide file tree

Showing 32 changed files with 158 additions and 55 deletions.
diff --git a/layers/aerodrome_label/aerodrome_label.sql b/layers/aerodrome_label/aerodrome_label.sql
@@ -25,7 +25,7 @@ SELECT
     -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z9
     ABS(osm_id) AS id, -- mvt feature IDs can't be negative
     geometry,
-    name,
+    COALESCE(NULLIF(name_fi, ''), name) as name,
     COALESCE(NULLIF(name_en, ''), name) AS name_en,
     COALESCE(NULLIF(name_sv, ''), name, name_en) AS name_sv,
     NULLIF(name_sv, name) as name_sv_nodefault,
@@ -47,7 +47,7 @@ SELECT
     -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z10_
     ABS(osm_id) AS id, -- mvt feature IDs can't be negative
     geometry,
-    name,
+    COALESCE(NULLIF(name_fi, ''), name) as name,
     COALESCE(NULLIF(name_en, ''), name) AS name_en,
     COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
     NULLIF(name_sv, name) as name_sv_nodefault,

diff --git a/layers/aerodrome_label/aerodrome_label.yaml b/layers/aerodrome_label/aerodrome_label.yaml
@@ -5,7 +5,7 @@ layer:
   buffer_size: 64
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the aerodrome.
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the aerodrome. Prefer Finnish name:fi if available.
     name_en: English name `name:en` if available, otherwise `name`.
     name_sv: Swedish name `name:sv` if available, otherwise `name`.
     name_sv_nodefault: Swedish name `name:sv` if available.

diff --git a/layers/aerodrome_label/mapping.yaml b/layers/aerodrome_label/mapping.yaml
@@ -11,6 +11,9 @@ tables:
     - name: name
       key: name
       type: string
+    - name: name_fi
+      key: name:fi
+      type: string
     - name: name_en
       key: name:en
       type: string

diff --git a/layers/mountain_peak/mapping.yaml b/layers/mountain_peak/mapping.yaml
@@ -11,6 +11,9 @@ tables:
     - name: name
       key: name
       type: string
+    - name: name_fi
+      key: name:fi
+      type: string
     - name: name_en
       key: name:en
       type: string
@@ -42,6 +45,9 @@ tables:
     - name: name
       key: name
       type: string
+    - name: name_fi
+      key: name:fi
+      type: string
     - name: name_en
       key: name:en
       type: string

diff --git a/layers/mountain_peak/mountain_peak.sql b/layers/mountain_peak/mountain_peak.sql
@@ -5,6 +5,7 @@ CREATE OR REPLACE VIEW peak_point AS
 SELECT pp.osm_id,
        pp.geometry,
        pp.name,
+       pp.name_fi,
        pp.name_en,
        pp.name_sv,
        pp.tags,
@@ -57,7 +58,7 @@ SELECT
 FROM (
          SELECT osm_id,
                 geometry,
-                name,
+                COALESCE(NULLIF(name_fi, ''), name) as name,
                 COALESCE(NULLIF(name_en, ''), name) AS name_en,
                 COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
                 NULLIF(name_sv, name) as name_sv_nodefault,
@@ -100,7 +101,7 @@ SELECT
 FROM (
          SELECT osm_id,
                 geometry,
-                name,
+                COALESCE(NULLIF(name_fi, ''), name) as name,
                 COALESCE(NULLIF(name_en, ''), name) AS name_en,
                 COALESCE(NULLIF(name_sv, ''), name, name_en) AS name_sv,
                 NULLIF(name_sv, name) as name_sv_nodefault,

diff --git a/layers/mountain_peak/mountain_peak.yaml b/layers/mountain_peak/mountain_peak.yaml
@@ -8,7 +8,7 @@ layer:
   buffer_size: 64
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    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. Prefer Finnish name:fi if available.
     name_en: English name `name:en` if available, otherwise `name`.
     name_sv: Swedish name `name:sv` if available, otherwise `name`.
     name_sv_nodefault: Swedish name `name:sv` if available.

diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml
@@ -73,6 +73,9 @@ tables:
     - name: name
       key: name
       type: string
+    - name: name_fi
+      key: name:fi
+      type: string
     - name: name_en
       key: name:en
       type: string

diff --git a/layers/park/park.sql b/layers/park/park.sql
@@ -19,7 +19,7 @@ $$
 SELECT osm_id,
        geometry,
        class,
-       NULLIF(name, '') AS name,
+       NULLIF(COALESCE(NULLIF(name_fi, ''), name), '') as name,
        COALESCE(NULLIF(name_en, ''), name) AS name_en,
        COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
        NULLIF(name_sv, name) as name_sv_nodefault,
@@ -34,6 +34,7 @@ FROM (
                         NULLIF(leisure, '')
                     ) AS class,
                 name,
+                name_fi,
                 name_en,
                 name_sv,
                 tags,
@@ -43,6 +44,7 @@ FROM (
                   SELECT NULL::int AS osm_id,
                          geometry,
                          NULL AS name,
+                         NULL AS name_fi,
                          NULL AS name_en,
                          NULL AS name_sv,
                          NULL AS tags,
@@ -57,6 +59,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -71,6 +74,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -85,6 +89,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -99,6 +104,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -113,6 +119,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -127,6 +134,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -141,6 +149,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -155,6 +164,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -169,6 +179,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -183,6 +194,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -203,6 +215,7 @@ FROM (
                         NULLIF(leisure, '')
                     ) AS class,
                 name,
+                name_fi,
                 name_en,
                 name_sv,
                 tags,
@@ -218,6 +231,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -235,6 +249,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -252,6 +267,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -269,6 +285,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -286,6 +303,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -303,6 +321,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -320,6 +339,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -337,6 +357,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -354,6 +375,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,
@@ -371,6 +393,7 @@ FROM (
                   SELECT osm_id,
                          geometry_point,
                          name,
+                         name_fi,
                          name_en,
                          name_sv,
                          tags,

diff --git a/layers/park/park.yaml b/layers/park/park.yaml
@@ -15,9 +15,9 @@ layer:
           value with blanks replaced by `_`.
           `national_park` is the class of `protection_title=National Park` and `boundary=national_park`.
           `nature_reserve` is the class of `protection_title=Nature Reserve` and `leisure=nature_reserve`.
-          The class for other [`protection_title`](http://wiki.openstreetmap.org/wiki/key:protection_title) 
+          The class for other [`protection_title`](http://wiki.openstreetmap.org/wiki/key:protection_title)
           values is similarly assigned.
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the park (point features only).
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the park (point features only). Prefer Finnish name:fi if available.
     name_en: English name `name:en` if available, otherwise `name` (point features only).
     name_sv: Swedish name `name:sv` if available, otherwise `name` (point features only).
     name_sv_nodefault: Swedish name `name:sv` if available (point features only).

diff --git a/layers/place/city.sql b/layers/place/city.sql
@@ -22,7 +22,7 @@ SELECT *
 FROM (
          SELECT osm_id,
                 geometry,
-                name,
+                COALESCE(NULLIF(name_fi, ''), name) as name,
                 COALESCE(NULLIF(name_en, ''), name) AS name_en,
                 COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
                 NULLIF(name_sv, name) as name_sv_nodefault,
@@ -38,7 +38,7 @@ FROM (
          UNION ALL
          SELECT osm_id,
                 geometry,
-                name,
+                COALESCE(NULLIF(name_fi, ''), name) as name,
                 COALESCE(NULLIF(name_en, ''), name) AS name_en,
                 COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
                 NULLIF(name_sv, name) as name_sv_nodefault,
@@ -50,6 +50,7 @@ FROM (
                   SELECT osm_id,
                          geometry,
                          name,
+                         COALESCE(NULLIF(name_fi, ''), name) as name_fi,
                          COALESCE(NULLIF(name_en, ''), name) AS name_en,
                          COALESCE(NULLIF(name_sv, ''), name) AS name_sv,
                          NULLIF(name_sv, name) as name_sv_nodefault,

diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
@@ -2,6 +2,10 @@ name_field: &name
   name: name
   key: name
   type: string
+name_fi_field: &name_fi
+  name: name_fi
+  key: name:fi
+  type: string
 name_en_field: &name_en
   name: name_en
   key: name:en
@@ -26,6 +30,7 @@ tables:
     - name: geometry
       type: geometry
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - name: tags
@@ -46,6 +51,7 @@ tables:
     - name: geometry
       type: geometry
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - *rank
@@ -78,6 +84,7 @@ tables:
     - name: area
       type: area
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - name: tags
@@ -99,6 +106,7 @@ tables:
     - name: geometry
       type: geometry
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - name: tags
@@ -120,6 +128,7 @@ tables:
     - name: geometry
       type: geometry
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - name: tags
@@ -154,6 +163,7 @@ tables:
     - name: geometry
       type: geometry
     - *name
+    - *name_fi
     - *name_en
     - *name_sv
     - name: tags