Add building centroids adn points in a sigle layer

Author: Rub21

images/tiler-server/config/providers/buildings.centroids.toml

@@ -1,6 +1,6 @@
 # Layer configuration for buildings
 [[providers.layers]]
-name = "buildings_14"
+name = "buildings_centroids_z14"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -27,7 +27,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_15"
+name = "buildings_centroids_z15"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -54,7 +54,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_16"
+name = "buildings_centroids_z16"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -81,7 +81,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_17"
+name = "buildings_centroids_z17"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -109,7 +109,7 @@ WHERE
 
 
 [[providers.layers]]
-name = "buildings_18"
+name = "buildings_centroids_z18"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -136,7 +136,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_19"
+name = "buildings_centroids_z19"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -163,7 +163,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_20"
+name = "buildings_centroids_z20"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "id"
@@ -191,42 +191,42 @@ WHERE
 # Buildings
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_14"
+provider_layer = "osm.buildings_centroids_z14"
 min_zoom = 14
 max_zoom = 14
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_15"
+provider_layer = "osm.buildings_centroids_z15"
 min_zoom = 15
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_16"
+provider_layer = "osm.buildings_centroids_z16"
 min_zoom = 16
 max_zoom = 16
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_17"
+provider_layer = "osm.buildings_centroids_z17"
 min_zoom = 17
 max_zoom = 17
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_18"
+provider_layer = "osm.buildings_centroids_z18"
 min_zoom = 18
 max_zoom = 18
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_19"
+provider_layer = "osm.buildings_centroids_z19"
 min_zoom = 19
 max_zoom = 19
 
 [[maps.layers]]
 name = "buildings_centroids"
-provider_layer = "osm.buildings_20"
+provider_layer = "osm.buildings_centroids_z20"
 min_zoom = 20
 max_zoom = 20

images/tiler-server/config/providers/buildings_points_centroids.toml

@@ -10,7 +10,6 @@ SELECT
     name, 
     type, 
     height,
-    area,
     source,
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
@@ -35,7 +34,6 @@ SELECT
     name, 
     type, 
     height,
-    area,
     source,
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
@@ -49,7 +47,7 @@ WHERE
 """
 
 [[providers.layers]]
-name = "buildings_points_centroids_z16_20"
+name = "buildings_points_centroids_z16"
 geometry_fieldname = "geometry"
 geometry_type = "point"
 id_fieldname = "osm_id"
@@ -60,15 +58,62 @@ SELECT
     name, 
     type, 
     height,
-    area,
     source,
     NULLIF(start_date, '') AS start_date, 
     NULLIF(end_date, '') AS end_date, 
     isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
     isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
     {{LENGUAGES}}
 FROM 
-    mview_buildings_points_centroids_z16_20
+    mview_buildings_points_centroids_z16
+WHERE 
+    geometry && !BBOX!
+"""
+
+[[providers.layers]]
+name = "buildings_points_centroids_z17"
+geometry_fieldname = "geometry"
+geometry_type = "point"
+id_fieldname = "osm_id"
+sql = """
+SELECT 
+    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    osm_id, 
+    name, 
+    type, 
+    height,
+    source,
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
+    isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
+    isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
+    {{LENGUAGES}}
+FROM 
+    mview_buildings_points_centroids_z17
+WHERE 
+    geometry && !BBOX!
+"""
+
+[[providers.layers]]
+name = "buildings_points_centroids_z18_20"
+geometry_fieldname = "geometry"
+geometry_type = "point"
+id_fieldname = "osm_id"
+sql = """
+SELECT 
+    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    osm_id, 
+    name, 
+    type, 
+    height,
+    source,
+    NULLIF(start_date, '') AS start_date, 
+    NULLIF(end_date, '') AS end_date, 
+    isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, 
+    isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate,
+    {{LENGUAGES}}
+FROM 
+    mview_buildings_points_centroids_z18_20
 WHERE 
     geometry && !BBOX!
 """
@@ -88,6 +133,18 @@ max_zoom = 15
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z16_20"
+provider_layer = "osm.buildings_points_centroids_z16"
 min_zoom = 16
+max_zoom = 16
+
+[[maps.layers]]
+name = "buildings_points_centroids"
+provider_layer = "osm.buildings_points_centroids_z17"
+min_zoom = 17
+max_zoom = 17
+
+[[maps.layers]]
+name = "buildings_points_centroids"
+provider_layer = "osm.buildings_points_centroids_z18_20"
+min_zoom = 18
 max_zoom = 20

images/tiler-server/start.sh

@@ -4,9 +4,9 @@ set -euo pipefail
 echo "Starting tile server setup..."
 
 # Configurable paths
-UTILS_DIR="/opt/utils"
-CONFIG_DIR="/opt/config"
-TEGOLA_CONFIG_DIR="/opt/tegola_config"
+UTILS_DIR="/app/utils"
+CONFIG_DIR="/app/config"
+TEGOLA_CONFIG_DIR="/app/tegola_config"
 
 TAGINFO_URL="https://taginfo.openhistoricalmap.org/api/4/keys/all"
 LANGUAGE_SQL_FILE="${CONFIG_DIR}/languages.sql"
@@ -41,6 +41,7 @@ amenity_areas,
 amenity_areas.centroids,
 amenity_points,
 buildings,
+buildings_points_centroids,
 buildings.centroids,
 buildings_points,
 landuse_areas,