Merge pull request #661 from OpenHistoricalMap/tiler_refresh

Vtiles improvements

Author: Rub21

.github/workflows/chartpress.yaml

@@ -5,6 +5,7 @@ on:
       - 'main'
       - 'staging'
       - 'staging_deploy'
+      - 'tiler_refresh'
 jobs:
   build:
     runs-on: ubuntu-22.04

hetzner/tiler/tiler.production.yml

@@ -26,7 +26,7 @@ services:
   # imposm3
   imposm_production:
     container_name: tiler_imposm_production
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3060.h27bc0c6
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3175.hbdd6021
     volumes:
       - tiler_production_imposmdata:/mnt/data
     command:
@@ -49,7 +49,7 @@ services:
   # Tiler server
   tiler_server_production:
     container_name: tiler_server_production
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3061.h8fd5171
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3175.hbdd6021
     ports:
       - "9090:9090"
     env_file:
@@ -148,10 +148,10 @@ services:
 volumes:
   tiler_production_pgdata:
     driver: local
-    name: tiler_db_07_11_v1
+    name: tiler_db_1212_v2
   tiler_production_imposmdata:
     driver: local
-    name: tiler_imposm_07_11_v1
+    name: tiler_imposm_1212_v2
 
 networks:
   ohm_network:

hetzner/tiler/tiler.staging.yml

@@ -21,7 +21,7 @@ services:
 
   imposm_staging:
     container_name: tiler_imposm_staging
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3060.h27bc0c6
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3175.hbdd6021
     volumes:
       - tiler_staging_imposmdata:/mnt/data
     command:
@@ -38,7 +38,7 @@ services:
 
   tiler_server_staging:
     container_name: tiler_server_staging
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3061.h8fd5171
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3175.hbdd6021
     ports:
       - "9091:9090"
     env_file:
@@ -106,10 +106,10 @@ services:
 volumes:
   tiler_staging_pgdata:
     driver: local
-    name: tiler_db_07_11_v1
+    name: tiler_db_1512
   tiler_staging_imposmdata:
     driver: local
-    name: tiler_imposm_07_11_v1
+    name: tiler_imposm_11512
 
 networks:
   ohm_network:

images/tiler-imposm/liveness.sh

@@ -20,4 +20,4 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "All good: imposm and DB are healthy."
-exit 0
+exit 0

images/tiler-imposm/queries/utils/utils.sql

@@ -105,6 +105,13 @@ BEGIN
     INTO result
     FROM languages;
 
+    -- Add short_name and official_name columns
+    IF result IS NOT NULL AND result <> '' THEN
+        result := result || ', tags -> ''short_name'' AS short_name, tags -> ''official_name'' AS official_name';
+    ELSE
+        result := 'tags -> ''short_name'' AS short_name, tags -> ''official_name'' AS official_name';
+    END IF;
+
     RETURN COALESCE(result, '');
 END;
 $$ LANGUAGE plpgsql;

images/tiler-imposm/scripts/create_mviews.sh

@@ -56,17 +56,22 @@ fi
 
 ##################### OHM #####################
 log_message "Creating materialized views for OSM data"
-execute_sql_file queries/ohm_mviews/admin_boundaries_centroids.sql
-execute_sql_file queries/ohm_mviews/landuse.sql
+
+execute_sql_file queries/ohm_mviews/admin_boundaries_centroids.sql &
+execute_sql_file queries/ohm_mviews/landuse.sql &
 execute_sql_file queries/ohm_mviews/admin_boundaries_maritime.sql
-execute_sql_file queries/ohm_mviews/amenity.sql
-execute_sql_file queries/ohm_mviews/buildings.sql
-execute_sql_file queries/ohm_mviews/others.sql
-execute_sql_file queries/ohm_mviews/places.sql
-execute_sql_file queries/ohm_mviews/transport_areas.sql
-execute_sql_file queries/ohm_mviews/transport_lines.sql
-execute_sql_file queries/ohm_mviews/water.sql
+
+execute_sql_file queries/ohm_mviews/amenity.sql &
+execute_sql_file queries/ohm_mviews/buildings.sql &
+execute_sql_file queries/ohm_mviews/others.sql 
+
+execute_sql_file queries/ohm_mviews/places.sql &
+execute_sql_file queries/ohm_mviews/transport_areas.sql  &
+execute_sql_file queries/ohm_mviews/transport_lines.sql 
+
+execute_sql_file queries/ohm_mviews/water.sql &
 execute_sql_file queries/ohm_mviews/admin_boundaries_areas.sql
+
 ## routes
 execute_sql_file queries/ohm_mviews/routes_01_merge_by_date.sql
 execute_sql_file queries/ohm_mviews/routes_02_indexed.sql