Do not load all tags, use later imposm3 (#356)

Fix #266 #267

docker-compose.yml

@@ -28,7 +28,7 @@ services:
     networks:
     - postgres_conn
   import-osm:
-    image: "openmaptiles/import-osm:0.4"
+    image: "openmaptiles/import-osm:0.5"
     env_file: .env
     environment:
       DIFF_MODE: ${DIFF_MODE}
@@ -75,7 +75,7 @@ services:
     volumes:
      - ./build:/sql
   openmaptiles-tools:
-    image: "openmaptiles/openmaptiles-tools:0.6"
+    image: "openmaptiles/openmaptiles-tools:0.7"
     env_file: .env
     networks:
     - postgres_conn

layers/aerodrome_label/update.sql

@@ -9,7 +9,7 @@ BEGIN
   WHERE ST_GeometryType(geometry) <> 'ST_Point';
 
   UPDATE osm_aerodrome_label_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 END;
 $$ LANGUAGE plpgsql;

layers/building/mapping.yaml

@@ -1,6 +1,3 @@
-tags:
-  load_all: true
-
 generalized_tables:
   # etldoc: imposm3 -> osm_building_polygon_gen1
   building_polygon_gen1:

layers/mountain_peak/update_peak_point.sql

@@ -5,7 +5,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON mountain_peak_point.updates;
 CREATE OR REPLACE FUNCTION update_osm_peak_point() RETURNS VOID AS $$
 BEGIN
   UPDATE osm_peak_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/place/update_city_point.sql

@@ -41,7 +41,7 @@ BEGIN
   WHERE osm.osm_id = ne.osm_id;
 
   UPDATE osm_city_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/place/update_continent_point.sql

@@ -5,7 +5,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON place_continent_point.updates;
 CREATE OR REPLACE FUNCTION update_osm_continent_point() RETURNS VOID AS $$
 BEGIN
   UPDATE osm_continent_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/place/update_country_point.sql

@@ -37,7 +37,7 @@ BEGIN
   WHERE "rank" = 0;
 
   UPDATE osm_country_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/place/update_island_point.sql

@@ -5,7 +5,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON place_island_point.updates;
 CREATE OR REPLACE FUNCTION update_osm_island_point() RETURNS VOID AS $$
 BEGIN
   UPDATE osm_island_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/place/update_island_polygon.sql

@@ -7,7 +7,7 @@ BEGIN
   UPDATE osm_island_polygon  SET geometry=ST_PointOnSurface(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
 
   UPDATE osm_island_polygon
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
   ANALYZE osm_island_polygon;

layers/place/update_state_point.sql

@@ -33,7 +33,7 @@ BEGIN
   DELETE FROM osm_state_point WHERE "rank" IS NULL;
 
   UPDATE osm_state_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/poi/update_poi_point.sql

@@ -13,7 +13,7 @@ BEGIN
     WHERE funicular = 'yes' and subclass='station';
 
   UPDATE osm_poi_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/poi/update_poi_polygon.sql

@@ -22,7 +22,7 @@ BEGIN
     WHERE funicular = 'yes' and subclass='station';
 
   UPDATE osm_poi_polygon
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
   ANALYZE osm_poi_polygon;

layers/water_name/update_marine_point.sql

@@ -22,7 +22,7 @@ BEGIN
   WHERE osm.osm_id = ne.osm_id;
 
   UPDATE osm_marine_point
-  SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
+  SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
 
 END;

layers/water_name/update_water_lakeline.sql

@@ -9,7 +9,7 @@ CREATE MATERIALIZED VIEW osm_water_lakeline AS (
 	SELECT wp.osm_id,
 		ll.wkb_geometry AS geometry,
 		name, name_en, name_de,
-		slice_language_tags(tags) || get_basic_names(tags, ll.wkb_geometry) AS tags,
+		delete_empty_keys(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

layers/water_name/update_water_point.sql

@@ -9,7 +9,7 @@ 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,
-        slice_language_tags(wp.tags) || get_basic_names(wp.tags, ST_PointOnSurface(wp.geometry)) AS tags,
+        delete_empty_keys(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

layers/waterway/name.sql

@@ -1,7 +1,7 @@
 DO $$
 BEGIN
-  update osm_waterway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen1 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen2 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen3 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen1 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen2 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen3 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
 END $$;

layers/waterway/update_waterway_linestring.sql

@@ -2,10 +2,10 @@ DROP TRIGGER IF EXISTS trigger_refresh ON osm_waterway_linestring;
 
 DO $$
 BEGIN
-  update osm_waterway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen1 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen2 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
-  update osm_waterway_linestring_gen3 SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen1 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen2 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
+  update osm_waterway_linestring_gen3 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry);
 END $$;
 
 
@@ -15,8 +15,8 @@ CREATE SCHEMA IF NOT EXISTS waterway_linestring;
 CREATE OR REPLACE FUNCTION waterway_linestring.refresh() RETURNS trigger AS
   $BODY$
   BEGIN
-    RAISE NOTICE 'Refresh waterway_linestring %', NEW.osm_id;
-    NEW.tags = slice_language_tags(NEW.tags) || get_basic_names(NEW.tags, NEW.geometry);
+--     RAISE NOTICE 'Refresh waterway_linestring %', NEW.osm_id;
+    NEW.tags = delete_empty_keys(NEW.tags) || get_basic_names(NEW.tags, NEW.geometry);
     RETURN NEW;
   END;
   $BODY$