From e636c1da69af4bd234c1a87291aeda56d6427456 Mon Sep 17 00:00:00 2001
From: Rub21 <rub2106@gmail.com>
Date: Mon, 25 Mar 2024 17:22:09 -0500
Subject: [PATCH] Update water lines - start from zoom 6

---
 .gitignore                                    |  3 ++-
 .../tiler-server/config/config.template.toml  |  7 +----
 .../config/providers/water_lines.toml         | 27 ++-----------------
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 418eec33..847d2c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ values.dev.yaml
 secrets
 tegola
 envs/.env.tiler
-envs/.env.web
\ No newline at end of file
+envs/.env.web
+config.toml
\ No newline at end of file
diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml
index 657b7704..3d2f9b89 100644
--- a/images/tiler-server/config/config.template.toml
+++ b/images/tiler-server/config/config.template.toml
@@ -256,11 +256,6 @@ center = [-74.275329586789, -12.153492567373, 8.0]
 	max_zoom = 20
 
 	# Water Lines
-	[[maps.layers]]
-	name = "water_lines"
-	provider_layer = "osm.water_lines_gen0_5-5"
-	min_zoom = 5
-	max_zoom = 5
 
 	[[maps.layers]]
 	name = "water_lines"
@@ -288,7 +283,7 @@ center = [-74.275329586789, -12.153492567373, 8.0]
 
 	[[maps.layers]]
 	name = "water_lines"
-	provider_layer = "osm.water_lines_gen1"
+	provider_layer = "osm.water_lines_gen1_10-11"
 	min_zoom = 10
 	max_zoom = 11
 
diff --git a/images/tiler-server/config/providers/water_lines.toml b/images/tiler-server/config/providers/water_lines.toml
index db5d73db..13003bf4 100644
--- a/images/tiler-server/config/providers/water_lines.toml
+++ b/images/tiler-server/config/providers/water_lines.toml
@@ -1,28 +1,5 @@
 # Simplification for geometries
 
-[[providers.layers]]
-geometry_fieldname = "geometry"
-geometry_type = "linestring"
-id_fieldname = "osm_id"
-name = "water_lines_gen0_5-5"
-sql = """
-SELECT 
-    ST_AsMVTGeom(ST_Simplify(geometry, 2000), !BBOX!) AS geometry, 
-    ABS(osm_id) AS osm_id, 
-    name, 
-    type, 
-    tags->'bridge' AS bridge, 
-    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_lines_gen0 
-WHERE 
-    type IN ('river', 'canal') 
-    AND geometry && !BBOX!
-"""
-
 [[providers.layers]]
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
@@ -120,10 +97,10 @@ WHERE
 geometry_fieldname = "geometry"
 geometry_type = "linestring"
 id_fieldname = "osm_id"
-name = "water_lines_gen1"
+name = "water_lines_gen1_10-11"
 sql = """
 SELECT 
-    ST_AsMVTGeom(geometry, !BBOX!) AS geometry, 
+    ST_AsMVTGeom(ST_Simplify(geometry, 20), !BBOX!) AS geometry, 
     ABS(osm_id) AS osm_id, 
     name, 
     type,