Fix SQL update logic (patch from 3.6.2)

layers/water_name/name.sql

@@ -1,5 +0,0 @@
-DO $$
-BEGIN
-  update osm_marine_point SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_water_polygon SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-END $$;

layers/water_name/update_marine_point.sql

@@ -5,7 +5,7 @@ CREATE EXTENSION IF NOT EXISTS unaccent;
 
 CREATE OR REPLACE FUNCTION update_osm_marine_point() RETURNS VOID AS $$
 BEGIN
-  -- etldoc: osm_marine_point          -> osm_marine_point 
+  -- etldoc: osm_marine_point          -> osm_marine_point
   UPDATE osm_marine_point AS osm SET "rank" = NULL WHERE "rank" IS NOT NULL;
 
   -- etldoc: ne_10m_geography_marine_polys -> osm_marine_point
@@ -20,6 +20,11 @@ BEGIN
   SET "rank" = scalerank
   FROM important_marine_point AS ne
   WHERE osm.osm_id = ne.osm_id;
+
+  UPDATE osm_marine_point
+  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
+
 END;
 $$ LANGUAGE plpgsql;
 
@@ -35,7 +40,7 @@ CREATE OR REPLACE FUNCTION water_name_marine.flag() RETURNS trigger AS $$
 BEGIN
     INSERT INTO water_name_marine.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
     RETURN null;
-END;    
+END;
 $$ language plpgsql;
 
 CREATE OR REPLACE FUNCTION water_name_marine.refresh() RETURNS trigger AS

layers/water_name/update_water_lakeline.sql

@@ -8,7 +8,9 @@ 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, name_de, tags, ST_Area(wp.geometry) AS area
+		name, name_en, name_de,
+		slice_language_tags(tags) || get_basic_names(tags, ll.wkb_geometry) AS tags,
+		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 <> ''

layers/water_name/update_water_point.sql

@@ -8,7 +8,9 @@ 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, wp.name_de, wp.tags, ST_Area(wp.geometry) AS area
+        wp.name, wp.name_en, wp.name_de,
+        slice_language_tags(wp.tags) || get_basic_names(wp.tags, ST_PointOnSurface(wp.geometry)) AS tags,
+        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 <> ''

layers/water_name/water_name.yaml

@@ -20,10 +20,9 @@ layer:
     srid: 900913
     query: (SELECT geometry, name, name_en, name_de, {name_languages}, class FROM layer_water_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
-  - ./name.sql
-  - ./merge_marine_rank.sql
-  - ./water_lakeline.sql
-  - ./water_point.sql
+  - ./update_marine_point.sql
+  - ./update_water_lakeline.sql
+  - ./update_water_point.sql
   - ./layer.sql
 datasources:
   - type: imposm3