Rename provider from osm -> ohm

hetzner/traefik/traefik.template.yml

@@ -74,15 +74,15 @@ http:
         replacement: "https://${1}/ui/search.html"
         permanent: true
 
-    # replace-osm-to-ohm:
-    #   replacePathRegex:
-    #     regex: "^/capabilities/osm\\.json$"
-    #     replacement: "/capabilities/ohm.json"
+    replace-osm-to-ohm:
+      replacePathRegex:
+        regex: "^/capabilities/osm\\.json$"
+        replacement: "/capabilities/ohm.json"
 
-    # replace-osm-tiles-to-ohm:
-    #   replacePathRegex:
-    #     regex: "^/maps/osm/(.*)$"
-    #     replacement: "/maps/ohm/${1}"
+    replace-osm-tiles-to-ohm:
+      replacePathRegex:
+        regex: "^/maps/osm/(.*)$"
+        replacement: "/maps/ohm/${1}"
 
   routers:
     vtiles-router:
@@ -93,8 +93,8 @@ http:
       middlewares:
         - secure-headers-allow-iframe
         # Note: Removed replace-osm-to-ohm middleware because Tegola map is named "osm"
-        # - replace-osm-to-ohm
-        # - replace-osm-tiles-to-ohm
+        - replace-osm-to-ohm
+        - replace-osm-tiles-to-ohm
 
     nominatim-router:
       rule: Host(`nominatim.{{OHM_DOMAIN}}`) && !PathPrefix(`/ui`)

images/tiler-server/config/config.template.toml

@@ -23,7 +23,7 @@ type = "prometheus"
 ## OpenHistoricalMap providers
 ####################################
 [[providers]]
-name = "osm"
+name = "ohm"
 type = "mvt_postgis"
 uri = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 max_connections = 120
@@ -45,7 +45,7 @@ max_connections = 25
 ####################################
 
 [[providers]]
-name = "non_admin"
+name = "ohm_non_admin"
 type = "mvt_postgis"
 uri = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 max_connections = 25
@@ -129,7 +129,7 @@ max_connections = 25
 ## OpenHistoricalMap maps
 ####################################
 [[maps]]
-name = "osm"
+name = "ohm"
 attribution = "OpenHistoricalMap"
 center = [-42.31214, 70.00455, 10.0]
 	###### MAPS_OSM
@@ -147,7 +147,7 @@ center = [0.0, 0.0, 0.0]
 ## OHM non admin boundaries areas maps
 ####################################
 [[maps]]
-name = "non_admin"
+name = "ohm_non_admin"
 attribution = "OpenHistoricalMap"
 center = [0.0, 0.0, 0.0]
 	###### MAPS_NON_ADMIN_BOUNDARIES_AREAS

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

@@ -175,42 +175,42 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z0_2"
+provider_layer = "ohm.admin_boundaries_centroid_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z3_5"
+provider_layer = "ohm.admin_boundaries_centroid_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z6_7"
+provider_layer = "ohm.admin_boundaries_centroid_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z8_9"
+provider_layer = "ohm.admin_boundaries_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z10_12"
+provider_layer = "ohm.admin_boundaries_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z13_15"
+provider_layer = "ohm.admin_boundaries_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z16_20"
+provider_layer = "ohm.admin_boundaries_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -148,42 +148,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z0_2"
+provider_layer = "ohm.admin_boundaries_lines_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z3_5"
+provider_layer = "ohm.admin_boundaries_lines_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z6_7"
+provider_layer = "ohm.admin_boundaries_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z8_9"
+provider_layer = "ohm.admin_boundaries_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z10_12"
+provider_layer = "ohm.admin_boundaries_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z13_15"
+provider_layer = "ohm.admin_boundaries_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z16_20"
+provider_layer = "ohm.admin_boundaries_lines_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -76,18 +76,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z0_5"
+provider_layer = "ohm.admin_lines_z0_5"
 min_zoom = 0
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z6_9"
+provider_layer = "ohm.admin_lines_z6_9"
 min_zoom = 6
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z10_15"
+provider_layer = "ohm.admin_lines_z10_15"
 min_zoom = 10
 max_zoom = 12

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

@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z14_15"
+provider_layer = "ohm.amenity_areas_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z16_20"
+provider_layer = "ohm.amenity_areas_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z14_15"
+provider_layer = "ohm.amenity_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z16_20"
+provider_layer = "ohm.amenity_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -49,12 +49,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z14_15"
+provider_layer = "ohm.buildings_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z16_20"
+provider_layer = "ohm.buildings_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -48,12 +48,12 @@ WHERE
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z14_15"
+provider_layer = "ohm.buildings_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z16_20"
+provider_layer = "ohm.buildings_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -128,30 +128,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z6_7"
+provider_layer = "ohm.landuse_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z8_9"
+provider_layer = "ohm.landuse_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z10_12"
+provider_layer = "ohm.landuse_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z13_15"
+provider_layer = "ohm.landuse_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z16_20"
+provider_layer = "ohm.landuse_areas_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -47,13 +47,13 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z14_15"
+provider_layer = "ohm.landuse_lines_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z16_20"
+provider_layer = "ohm.landuse_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
 

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

@@ -124,30 +124,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z6_7"
+provider_layer = "ohm.landuse_points_centroids_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z8_9"
+provider_layer = "ohm.landuse_points_centroids_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z10_12"
+provider_layer = "ohm.landuse_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z13_15"
+provider_layer = "ohm.landuse_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z16_20"
+provider_layer = "ohm.landuse_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20

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

@@ -223,42 +223,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z0_2"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z3_5"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z6_7"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z8_9"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z10_12"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z10_12"
 min_zoom = 9
 max_zoom = 10
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z13_15"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z13_15"
 min_zoom = 11
 max_zoom = 15
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z16_20"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z16_20"
 min_zoom = 16
 max_zoom = 20