Simplification of water areas and reduction of filtering areas

OpenHistoricalMap · Mar 25, 2024 · da8824b · da8824b
1 parent e901c63
commit da8824b
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 23 deletions.
diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml
@@ -227,20 +227,32 @@ center = [-74.275329586789, -12.153492567373, 8.0]
 
 	[[maps.layers]]
 	name = "water_areas"
-	provider_layer = "osm.water_areas_gen0_6-9"
+	provider_layer = "osm.water_areas_gen0_6-7"
 	min_zoom = 6
+	max_zoom = 7
+
+	[[maps.layers]]
+	name = "water_areas"
+	provider_layer = "osm.water_areas_gen0_8-9"
+	min_zoom = 8
 	max_zoom = 9
 
 	[[maps.layers]]
 	name = "water_areas"
 	provider_layer = "osm.water_areas_gen1_10-12"
 	min_zoom = 10
-	max_zoom = 11
+	max_zoom = 12
 
 	[[maps.layers]]
 	name = "water_areas"
-	provider_layer = "osm.water_areas_12-20"
-	min_zoom = 12
+	provider_layer = "osm.water_areas_13-15"
+	min_zoom = 13
+	max_zoom = 15
+
+	[[maps.layers]]
+	name = "water_areas"
+	provider_layer = "osm.water_areas_16-20"
+	min_zoom = 16
 	max_zoom = 20
 
 	# Water Lines
@@ -293,18 +305,18 @@ center = [-74.275329586789, -12.153492567373, 8.0]
 	min_zoom = 14
 	max_zoom = 20
 
-	# Transport Lines from relations
-	[[maps.layers]]
-	name = "transport_lines_relation"
-	provider_layer = "osm.transport_lines_5_10_relation"
-	min_zoom = 5
-	max_zoom = 10
+	# # Transport Lines from relations
+	# [[maps.layers]]
+	# name = "transport_lines_relation"
+	# provider_layer = "osm.transport_lines_5_10_relation"
+	# min_zoom = 5
+	# max_zoom = 10
 
-	[[maps.layers]]
-	name = "transport_lines_relation"
-	provider_layer = "osm.transport_lines_11_20_relation"
-	min_zoom = 11
-	max_zoom = 20
+	# [[maps.layers]]
+	# name = "transport_lines_relation"
+	# provider_layer = "osm.transport_lines_11_20_relation"
+	# min_zoom = 11
+	# max_zoom = 20
 
 	# Transport Areas
 	[[maps.layers]]

diff --git a/images/tiler-server/config/providers/water_areas.toml b/images/tiler-server/config/providers/water_areas.toml
@@ -1,11 +1,19 @@
+# Simplification for geometries
+# Zoom levels 3-5,Tolerance=1000
+# Zoom levels 6-7,Tolerance=500
+# Zoom levels 8-9,Tolerance=200
+# Zoom levels 10-12,Tolerance=50
+# Zoom levels 13-15,Tolerance=5
+# Zoom levels 16-20,Tolerance=0
+# Water bodies > 50,000,000 sqm
 [[providers.layers]]
 geometry_fieldname = "geometry"
 geometry_type = "multipolygon"
 id_fieldname = "osm_id"
 name = "water_areas_gen0_3-5"
 sql = """
 SELECT 
-    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    ST_AsMVTGeom(ST_Simplify(geometry, 1000), !BBOX!) AS geometry, 
     ABS(osm_id) as osm_id, 
     name, 
     type, 
@@ -18,18 +26,44 @@ FROM
     osm_water_areas_gen0 
 WHERE 
     type IN ('water', 'pond', 'basin', 'canal', 'mill_pond', 'riverbank') 
-    AND area > 500000000 
+    AND area > 50000000 
     AND geometry && !BBOX!
 """
 
+# Water bodies > 1,000,000 sqm
 [[providers.layers]]
 geometry_fieldname = "geometry"
 geometry_type = "multipolygon"
 id_fieldname = "osm_id"
-name = "water_areas_gen0_6-9"
+name = "water_areas_gen0_6-7"
 sql = """
 SELECT 
-    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    ST_AsMVTGeom(ST_Simplify(geometry, 500), !BBOX!) AS geometry, 
+    ABS(osm_id) as osm_id, 
+    name, 
+    type, 
+    area, 
+    tags->'start_date' as start_date, 
+    tags->'end_date' as end_date, 
+    isodatetodecimaldate(pad_date(tags->'start_date', 'start'), FALSE) AS start_decdate, 
+    isodatetodecimaldate(pad_date(tags->'end_date', 'end'), FALSE) AS end_decdate 
+FROM 
+    osm_water_areas_gen0 
+WHERE 
+    type IN ('water', 'pond', 'basin', 'canal', 'mill_pond', 'riverbank') 
+    AND area > 1000000 
+    AND geometry && !BBOX!
+"""
+
+# Water bodies > 10,000 sqm
+[[providers.layers]]
+geometry_fieldname = "geometry"
+geometry_type = "multipolygon"
+id_fieldname = "osm_id"
+name = "water_areas_gen0_8-9"
+sql = """
+SELECT 
+    ST_AsMVTGeom(ST_Simplify(geometry, 100), !BBOX!) AS geometry, 
     ABS(osm_id) as osm_id, 
     name, 
     type, 
@@ -42,7 +76,7 @@ FROM
     osm_water_areas_gen0 
 WHERE 
     type IN ('water', 'pond', 'basin', 'canal', 'mill_pond', 'riverbank') 
-    AND area > 100000000 
+    AND area > 10000 
     AND geometry && !BBOX!
 """
 
@@ -53,7 +87,7 @@ id_fieldname = "osm_id"
 name = "water_areas_gen1_10-12"
 sql = """
 SELECT 
-    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    ST_AsMVTGeom(ST_Simplify(geometry, 50), !BBOX!) AS geometry, 
     ABS(osm_id) as osm_id, 
     name, 
     type, 
@@ -66,15 +100,38 @@ FROM
     osm_water_areas_gen1 
 WHERE 
     type IN ('water', 'pond', 'basin', 'canal', 'mill_pond', 'riverbank') 
-    AND area > 1000 
     AND geometry && !BBOX!
 """
 
 [[providers.layers]]
 geometry_fieldname = "geometry"
 geometry_type = "multipolygon"
 id_fieldname = "id"
-name = "water_areas_12-20"
+name = "water_areas_13-15"
+sql = """
+SELECT 
+    ST_AsMVTGeom(ST_Simplify(geometry, 5), !BBOX!) AS geometry, 
+    id, 
+    osm_id, 
+    name, 
+    type, 
+    area, 
+    tags->'start_date' as start_date, 
+    tags->'end_date' as end_date, 
+    isodatetodecimaldate(pad_date(tags->'start_date', 'start'), FALSE) AS start_decdate, 
+    isodatetodecimaldate(pad_date(tags->'end_date', 'end'), FALSE) AS end_decdate 
+FROM 
+    osm_water_areas 
+WHERE 
+    type IN ('water', 'pond', 'basin', 'canal', 'mill_pond', 'riverbank', 'dock') 
+    AND geometry && !BBOX!
+"""
+
+[[providers.layers]]
+geometry_fieldname = "geometry"
+geometry_type = "multipolygon"
+id_fieldname = "id"
+name = "water_areas_16-20"
 sql = """
 SELECT 
     ST_AsMVTGeom(geometry, !BBOX!) AS geometry,