preparing UI for major features upgrade

app.py

@@ -8,7 +8,6 @@ POSTERS_DIR = ROOT / "posters"
 
 # ---- UI CSS (mobile/tablet friendly width) ----
 APP_CSS = """
-/* Center the app and limit its width (iPhone + iPad friendly) */
 .gradio-container {
   max-width: 768px !important;
   margin: 0 auto !important;
@@ -17,6 +16,17 @@ APP_CSS = """
 }
 """
 
+# Preset distances (meters)
+PRESET_DIST = {
+    "Small town": 3000,
+    "Town": 5000,
+    "City": 8000,
+    "Big city": 10000,
+    "Major metro": 12000,
+    "Custom": None,
+}
+TOWN_DIST = PRESET_DIST["Town"]  # threshold for enabling buildings in Custom mode
+
 
 def list_themes():
     if THEMES_DIR.exists():
@@ -44,14 +54,90 @@ def latest_new_png(before_paths):
 
 
 def preset_to_distance(preset):
-    return {
-        "Small town": 3000,
-        "Town": 5000,
-        "City": 8000,
-        "Big city": 10000,
-        "Major metro": 12000,
-        "Custom": None,
-    }.get(preset, None)
+    return PRESET_DIST.get(preset, None)
+
+
+def distance_to_preset(distance_m: int):
+    """If distance matches a preset exactly, return that preset name; else Custom."""
+    for name, val in PRESET_DIST.items():
+        if name == "Custom":
+            continue
+        if val is not None and int(distance_m) == int(val):
+            return name
+    return "Custom"
+
+
+def buildings_allowed(preset: str, distance_m: int):
+    """
+    Buildings can be enabled only when:
+    - preset is Small town or Town
+    - OR preset is Custom and distance <= Town distance
+    """
+    if preset in ("Small town", "Town"):
+        return True
+    if preset == "Custom" and int(distance_m) <= int(TOWN_DIST):
+        return True
+    return False
+
+
+def format_distance_hint(preset: str, distance_m: int):
+    preset_line = (
+        f"**Preset guide** — Small town: {PRESET_DIST['Small town']}m · "
+        f"Town: {PRESET_DIST['Town']}m · City: {PRESET_DIST['City']}m · "
+        f"Big city: {PRESET_DIST['Big city']}m · Major metro: {PRESET_DIST['Major metro']}m"
+    )
+    current = f"**Current** — Preset: `{preset}` · Distance: `{int(distance_m)}m`"
+    buildings_note = (
+        f"**Buildings layer** is available for `Small town`/`Town`, "
+        f"or `Custom` when distance ≤ `{TOWN_DIST}m`."
+    )
+    return f"{current}\n\n{preset_line}\n\n{buildings_note}"
+
+
+def on_preset_change(preset, distance_m, buildings_enabled):
+    """
+    When preset changes:
+    - If not Custom, force distance slider to preset value
+    - Update buildings availability accordingly
+    """
+    preset_dist = preset_to_distance(preset)
+    if preset_dist is not None:
+        distance_m = preset_dist
+
+    allowed = buildings_allowed(preset, distance_m)
+    if not allowed:
+        buildings_enabled = False
+
+    hint = format_distance_hint(preset, distance_m)
+
+    return (
+        gr.update(value=int(distance_m)),             # distance slider
+        gr.update(interactive=allowed, value=buildings_enabled),  # buildings checkbox
+        gr.update(value=hint),                       # hint markdown
+    )
+
+
+def on_distance_change(distance_m, preset, buildings_enabled):
+    """
+    When distance slider changes:
+    - If it matches a preset exactly => set preset accordingly
+    - Else => set preset to Custom
+    - Update buildings availability accordingly
+    """
+    new_preset = distance_to_preset(distance_m)
+    preset = new_preset
+
+    allowed = buildings_allowed(preset, distance_m)
+    if not allowed:
+        buildings_enabled = False
+
+    hint = format_distance_hint(preset, distance_m)
+
+    return (
+        gr.update(value=preset),                     # preset dropdown
+        gr.update(interactive=allowed, value=buildings_enabled),  # buildings checkbox
+        gr.update(value=hint),                       # hint markdown
+    )
 
 
 def generate(
@@ -66,6 +152,8 @@ def generate(
     fast_mode,
     map_format,
     orientation,
+    buildings_enabled,
+    railroads_enabled,  # <-- NEW
 ):
     """
     Run the poster script and stream logs into the UI.
@@ -81,7 +169,7 @@ def generate(
     if fast_mode:
         distance_m = min(int(distance_m), 12000)
 
-    # If format is Plan, orientation is ignored by the script, but keep it stable
+    # Plan format is always square (orientation ignored)
     if map_format == "plan":
         orientation = "portrait"
 
@@ -93,15 +181,23 @@ def generate(
         "--orientation", orientation,
     ]
 
+    # Buildings flag (only if allowed + enabled)
+    if buildings_enabled and buildings_allowed(preset, distance_m):
+        cmd += ["--buildings"]
+
+    # Railroads flag (NEW)
+    if railroads_enabled:
+        cmd += ["--railroads"]
+
     # Center selection
     if center_mode == "Coordinates":
-        # Basic validation to avoid cryptic script errors
         if lat is None or lon is None:
             yield "❌ Please provide both latitude and longitude.", None
             return
+
         cmd += ["--lat", str(float(lat)), "--lon", str(float(lon))]
 
-        # City/Country become labels (optional but helpful)
+        # City/Country become labels (optional)
         if city:
             cmd += ["--city", city]
         if country:
@@ -109,10 +205,10 @@ def generate(
 
         cmd_note = f"Center: Coordinates (lat={lat}, lon={lon})"
     else:
-        # City mode requires city/country
         if not city or not country:
             yield "❌ Please provide both City and Country (or switch to Coordinates).", None
             return
+
         cmd += ["--city", city, "--country", country]
         cmd_note = f"Center: City ({city}, {country})"
 
@@ -122,7 +218,7 @@ def generate(
     status_lines.append("🚀 Starting… (OSM downloads can be slow on shared Spaces)")
     status_lines.append(cmd_note)
     status_lines.append(f"Command: {' '.join(cmd)}")
-    status_lines.append("Tip: if you see '0%|0/3' for a while, it may jump to 33% all at once.")
+    status_lines.append("Tip: progress may sit at 0% for a while, then jump (normal).")
     yield "\n".join(status_lines), None
 
     proc = subprocess.Popen(
@@ -139,10 +235,8 @@ def generate(
             if not line:
                 continue
             status_lines.append(line)
-
             if len(status_lines) > 250:
                 status_lines = status_lines[-250:]
-
             yield "\n".join(status_lines), None
     finally:
         rc = proc.wait()
@@ -163,7 +257,7 @@ def generate(
 
 
 def on_format_change(fmt):
-    """Disable orientation control when Plan is selected (Plan is always square)."""
+    """Disable orientation control when Plan is selected."""
     if fmt == "plan":
         return gr.update(value="portrait", interactive=False)
     return gr.update(interactive=True)
@@ -173,12 +267,11 @@ def on_center_mode_change(mode):
     """Show lat/lon inputs only when Coordinates is selected."""
     if mode == "Coordinates":
         return (
-            gr.update(visible=True),   # city label still useful
+            gr.update(visible=True),  # city label still useful
             gr.update(visible=True),
             gr.update(visible=True),
             gr.update(visible=True),
         )
-    # City mode
     return (
         gr.update(visible=True),
         gr.update(visible=True),
@@ -188,16 +281,7 @@ 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.
-    """
-    )
+    gr.Markdown("# MapToPoster – Hugging Face Demo")
 
     center_mode = gr.Radio(
         label="Center",
@@ -217,14 +301,14 @@ 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
     )
 
-    with gr.Row():
-        theme = gr.Dropdown(
-            label="Theme",
-            choices=THEMES,
-            value=(THEMES[0] if THEMES else None),
-        )
+    theme = gr.Dropdown(
+        label="Theme",
+        choices=THEMES,
+        value=(THEMES[0] if THEMES else None),
+    )
 
     with gr.Row():
         preset = gr.Dropdown(
@@ -237,9 +321,37 @@ with gr.Blocks(css=APP_CSS) as demo:
             minimum=1000,
             maximum=20000,
             step=250,
-            value=2000,
+            value=PRESET_DIST["City"],
         )
 
+    buildings = gr.Checkbox(
+        label="Buildings layer (small scale only)",
+        value=False,
+        interactive=False,  # will be enabled automatically when allowed
+    )
+
+    # NEW: railroads option
+    railroads = gr.Checkbox(
+        label="Railroads layer",
+        value=False,
+    )
+
+    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
+    )
+
+    distance.change(
+        on_distance_change,
+        inputs=[distance, preset, buildings],
+        outputs=[preset, buildings, distance_hint],
+        queue=False,  # <- UI interaction: do NOT queue
+    )
+
     with gr.Row():
         map_format = gr.Dropdown(
             label="Format",
@@ -252,7 +364,12 @@ with gr.Blocks(css=APP_CSS) as demo:
             value="portrait",
         )
 
-    map_format.change(on_format_change, inputs=[map_format], outputs=[orientation])
+    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)
 
@@ -262,8 +379,15 @@ 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],
+        inputs=[
+            center_mode, city, country, lat, lon,
+            theme, preset, distance, fast_mode,
+            map_format, orientation,
+            buildings,
+            railroads,  # <-- NEW
+        ],
         outputs=[status, out],
+        # leave default queuing behavior for the heavy job
     )
 
 demo.launch()