Fix SQL update logic (patch from 3.6.2)

layers/poi/name.sql

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

layers/poi/poi.yaml

@@ -36,9 +36,8 @@ layer:
     srid: 900913
     query: (SELECT geometry, name, name_en, name_de, {name_languages}, class, subclass, rank FROM layer_poi(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
 schema:
-  - ./poi_update.sql
-  - ./name.sql
-  - ./poi_polygon_update.sql
+  - ./update_poi_polygon.sql
+  - ./update_poi_point.sql
   - ./class.sql
   - ./layer.sql
 datasources:

layers/poi/poi_polygon_update.sql

@@ -1,53 +0,0 @@
-DROP TRIGGER IF EXISTS trigger_flag ON osm_poi_polygon;
-DROP TRIGGER IF EXISTS trigger_refresh ON poi.updates;
-
--- etldoc:  osm_poi_polygon ->  osm_poi_polygon
-
-CREATE OR REPLACE FUNCTION convert_poi_point() RETURNS VOID AS $$
-BEGIN
-  UPDATE osm_poi_polygon
-  SET geometry =
-           CASE WHEN ST_NPoints(ST_ConvexHull(geometry))=ST_NPoints(geometry)
-           THEN ST_Centroid(geometry)
-           ELSE ST_PointOnSurface(geometry)
-    END
-  WHERE ST_GeometryType(geometry) <> 'ST_Point';
-  ANALYZE osm_poi_polygon;
-END;
-$$ LANGUAGE plpgsql;
-
-SELECT convert_poi_point();
-
--- Handle updates
-
-CREATE SCHEMA IF NOT EXISTS poi;
-
-CREATE TABLE IF NOT EXISTS poi.updates(id serial primary key, t text, unique (t));
-CREATE OR REPLACE FUNCTION poi.flag() RETURNS trigger AS $$
-BEGIN
-    INSERT INTO poi.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
-    RETURN null;
-END;    
-$$ language plpgsql;
-
-CREATE OR REPLACE FUNCTION poi.refresh() RETURNS trigger AS
-  $BODY$
-  BEGIN
-    RAISE LOG 'Refresh poi';
-    PERFORM convert_poi_point();
-    DELETE FROM poi.updates;
-    RETURN null;
-  END;
-  $BODY$
-language plpgsql;
-
-CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE ON osm_poi_polygon
-    FOR EACH STATEMENT
-    EXECUTE PROCEDURE poi.flag();
-
-CREATE CONSTRAINT TRIGGER trigger_refresh
-    AFTER INSERT ON poi.updates
-    INITIALLY DEFERRED
-    FOR EACH ROW
-    EXECUTE PROCEDURE poi.refresh();

layers/poi/poi_update.sql

@@ -1,6 +0,0 @@
-UPDATE osm_poi_point
-  SET subclass = 'subway'
-  WHERE station = 'subway' and subclass='station';
-UPDATE osm_poi_polygon
-  SET subclass = 'subway'
-  WHERE station = 'subway' and subclass='station';

layers/poi/update_poi_point.sql

@@ -0,0 +1,52 @@
+DROP TRIGGER IF EXISTS trigger_flag ON osm_poi_point;
+DROP TRIGGER IF EXISTS trigger_refresh ON poi_point.updates;
+
+-- etldoc:  osm_poi_point ->  osm_poi_point
+CREATE OR REPLACE FUNCTION update_osm_poi_point() RETURNS VOID AS $$
+BEGIN
+  UPDATE osm_poi_point
+    SET subclass = 'subway'
+    WHERE station = 'subway' and subclass='station';
+
+  UPDATE osm_poi_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;
+
+SELECT update_osm_poi_point();
+
+-- Handle updates
+
+CREATE SCHEMA IF NOT EXISTS poi_point;
+
+CREATE TABLE IF NOT EXISTS poi_point.updates(id serial primary key, t text, unique (t));
+CREATE OR REPLACE FUNCTION poi_point.flag() RETURNS trigger AS $$
+BEGIN
+    INSERT INTO poi_point.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
+    RETURN null;
+END;
+$$ language plpgsql;
+
+CREATE OR REPLACE FUNCTION poi_point.refresh() RETURNS trigger AS
+  $BODY$
+  BEGIN
+    RAISE LOG 'Refresh poi_point';
+    PERFORM update_osm_poi_point();
+    DELETE FROM poi_point.updates;
+    RETURN null;
+  END;
+  $BODY$
+language plpgsql;
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE ON osm_poi_point
+    FOR EACH STATEMENT
+    EXECUTE PROCEDURE poi_point.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT ON poi_point.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+    EXECUTE PROCEDURE poi_point.refresh();

layers/poi/update_poi_polygon.sql

@@ -0,0 +1,62 @@
+DROP TRIGGER IF EXISTS trigger_flag ON osm_poi_polygon;
+DROP TRIGGER IF EXISTS trigger_refresh ON poi_polygon.updates;
+
+-- etldoc:  osm_poi_polygon ->  osm_poi_polygon
+
+CREATE OR REPLACE FUNCTION update_poi_polygon() RETURNS VOID AS $$
+BEGIN
+  UPDATE osm_poi_polygon
+  SET geometry =
+           CASE WHEN ST_NPoints(ST_ConvexHull(geometry))=ST_NPoints(geometry)
+           THEN ST_Centroid(geometry)
+           ELSE ST_PointOnSurface(geometry)
+    END
+  WHERE ST_GeometryType(geometry) <> 'ST_Point';
+
+  UPDATE osm_poi_polygon
+  SET subclass = 'subway'
+  WHERE station = 'subway' and subclass='station';
+
+  UPDATE osm_poi_polygon
+  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
+
+  ANALYZE osm_poi_polygon;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT update_poi_polygon();
+
+-- Handle updates
+
+CREATE SCHEMA IF NOT EXISTS poi_polygon;
+
+CREATE TABLE IF NOT EXISTS poi_polygon.updates(id serial primary key, t text, unique (t));
+CREATE OR REPLACE FUNCTION poi_polygon.flag() RETURNS trigger AS $$
+BEGIN
+    INSERT INTO poi_polygon.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
+    RETURN null;
+END;
+$$ language plpgsql;
+
+CREATE OR REPLACE FUNCTION poi_polygon.refresh() RETURNS trigger AS
+  $BODY$
+  BEGIN
+    RAISE LOG 'Refresh poi_polygon';
+    PERFORM update_poi_polygon();
+    DELETE FROM poi_polygon.updates;
+    RETURN null;
+  END;
+  $BODY$
+language plpgsql;
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE ON osm_poi_polygon
+    FOR EACH STATEMENT
+    EXECUTE PROCEDURE poi_polygon.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT ON poi_polygon.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+    EXECUTE PROCEDURE poi_polygon.refresh();