ui: add optional layers controls (waterways, forests, coastline)

app.py

@@ -1,6 +1,7 @@
 import subprocess
 from pathlib import Path
 import gradio as gr
+import re
 
 ROOT = Path(__file__).resolve().parent
 THEMES_DIR = ROOT / "themes"
@@ -16,6 +17,14 @@ APP_CSS = """
 }
 """
 
+# ---- ANSI cleanup (prevents weird \x1b[A logs from tqdm) ----
+ANSI_ESCAPE = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
+
+
+def strip_ansi(s: str) -> str:
+    return ANSI_ESCAPE.sub("", s)
+
+
 # Preset distances (meters)
 PRESET_DIST = {
     "Small town": 3000,
@@ -111,9 +120,9 @@ def on_preset_change(preset, distance_m, buildings_enabled):
     hint = format_distance_hint(preset, distance_m)
 
     return (
-        gr.update(value=int(distance_m)),             # distance slider
+        gr.update(value=int(distance_m)),  # distance slider
         gr.update(interactive=allowed, value=buildings_enabled),  # buildings checkbox
-        gr.update(value=hint),                       # hint markdown
+        gr.update(value=hint),  # hint markdown
     )
 
 
@@ -134,9 +143,9 @@ def on_distance_change(distance_m, preset, buildings_enabled):
     hint = format_distance_hint(preset, distance_m)
 
     return (
-        gr.update(value=preset),                     # preset dropdown
+        gr.update(value=preset),  # preset dropdown
         gr.update(interactive=allowed, value=buildings_enabled),  # buildings checkbox
-        gr.update(value=hint),                       # hint markdown
+        gr.update(value=hint),  # hint markdown
     )
 
 
@@ -154,6 +163,9 @@ def generate(
     orientation,
     buildings_enabled,
     railroads_enabled,
+    waterways_enabled,
+    forests_enabled,
+    coastline_enabled,
     text_fade,
     margins_enabled,
 ):
@@ -176,25 +188,40 @@ def generate(
         orientation = "portrait"
 
     cmd = [
-        "python", "create_map_poster.py",
-        "--theme", theme,
-        "--distance", str(int(distance_m)),
-        "--format", map_format,
-        "--orientation", orientation,
+        "python",
+        "create_map_poster.py",
+        "--theme",
+        theme,
+        "--distance",
+        str(int(distance_m)),
+        "--format",
+        map_format,
+        "--orientation",
+        orientation,
     ]
 
     # Buildings flag (only if allowed + enabled)
     if buildings_enabled and buildings_allowed(preset, distance_m):
         cmd += ["--buildings"]
 
-    # Railroads flag (NEW)
+    # Railroads flag
     if railroads_enabled:
         cmd += ["--railroads"]
 
+    # Optional layers
+    if waterways_enabled:
+        cmd += ["--waterways"]
+
+    if forests_enabled:
+        cmd += ["--forests"]
+
+    # Coastline detection (ocean fill + coastal frame logic in script)
+    if coastline_enabled:
+        cmd += ["--coastline"]
+
     if text_fade:
         cmd += ["--text-fade"]
 
-    # Margins/fading logic (NEW)
     if not margins_enabled:
         cmd += ["--no-margins"]
 
@@ -240,7 +267,7 @@ def generate(
 
     try:
         for line in proc.stdout:
-            line = line.rstrip()
+            line = strip_ansi(line).rstrip()
             if not line:
                 continue
             status_lines.append(line)
@@ -291,15 +318,14 @@ def on_center_mode_change(mode):
 
 with gr.Blocks(css=APP_CSS) as demo:
     gr.Markdown(
-    """
-    # MapToPoster – Gradio
-    Original project by Ankur (MapToPoster)  
-    Based on the open-source repository: https://github.com/originalankur/maptoposter  
-    Many thanks for the original work and inspiration.
-    """
+        """
+# MapToPoster – Gradio
+Original project by Ankur (MapToPoster)  
+Based on the open-source repository: https://github.com/originalankur/maptoposter  
+Many thanks for the original work and inspiration.
+"""
     )
 
-
     center_mode = gr.Radio(
         label="Center",
         choices=["City", "Coordinates"],
@@ -318,7 +344,7 @@ with gr.Blocks(css=APP_CSS) as demo:
         on_center_mode_change,
         inputs=[center_mode],
         outputs=[city, country, lat, lon],
-        queue=False,  # <- UI interaction: do NOT queue
+        queue=False,  # UI interaction: do NOT queue
     )
 
     theme = gr.Dropdown(
@@ -347,26 +373,41 @@ with gr.Blocks(css=APP_CSS) as demo:
         interactive=False,  # will be enabled automatically when allowed
     )
 
-    # NEW: railroads option
     railroads = gr.Checkbox(
         label="Railroads layer",
         value=False,
     )
 
+    # Optional layers
+    waterways = gr.Checkbox(
+        label="Waterways (rivers/streams/brooks…)",
+        value=True,
+    )
+
+    forests = gr.Checkbox(
+        label="Forests (wood/forest only)",
+        value=True,
+    )
+
+    coastline = gr.Checkbox(
+        label="Coastline detection (ocean fill + coastal frame)",
+        value=True,
+    )
+
     distance_hint = gr.Markdown(format_distance_hint("City", PRESET_DIST["City"]))
 
     preset.change(
         on_preset_change,
         inputs=[preset, distance, buildings],
         outputs=[distance, buildings, distance_hint],
-        queue=False,  # <- UI interaction: do NOT queue
+        queue=False,
     )
 
     distance.change(
         on_distance_change,
         inputs=[distance, preset, buildings],
         outputs=[preset, buildings, distance_hint],
-        queue=False,  # <- UI interaction: do NOT queue
+        queue=False,
     )
 
     with gr.Row():
@@ -381,24 +422,28 @@ with gr.Blocks(css=APP_CSS) as demo:
             value="portrait",
         )
 
+    map_format.change(
+        on_format_change,
+        inputs=[map_format],
+        outputs=[orientation],
+        queue=False,
+    )
+
+    with gr.Row():
         text_fade = gr.Checkbox(
             label="Fade under text (improves readability)",
-            value=True
+            value=True,
         )
 
         margins = gr.Checkbox(
             label="Margins & edge fading (coastal frame + inland fade)",
-            value=True
+            value=True,
         )
 
-    map_format.change(
-        on_format_change,
-        inputs=[map_format],
-        outputs=[orientation],
-        queue=False,  # <- UI interaction: do NOT queue
-    )
-
-    fast_mode = gr.Checkbox(label="Fast mode (cap ~12km)", value=True)
+        fast_mode = gr.Checkbox(
+            label="Fast mode (cap ~12km)",
+            value=True,
+        )
 
     btn = gr.Button("Generate")
     status = gr.Textbox(label="Logs / Status", lines=18)
@@ -407,16 +452,26 @@ with gr.Blocks(css=APP_CSS) as demo:
     btn.click(
         generate,
         inputs=[
-            center_mode, city, country, lat, lon,
-            theme, preset, distance, fast_mode,
-            map_format, orientation,
+            center_mode,
+            city,
+            country,
+            lat,
+            lon,
+            theme,
+            preset,
+            distance,
+            fast_mode,
+            map_format,
+            orientation,
             buildings,
             railroads,
+            waterways,
+            forests,
+            coastline,
             text_fade,
             margins,
         ],
         outputs=[status, out],
-        # leave default queuing behavior for the heavy job
     )
 
 demo.launch()