Update create_map_poster.py

create_map_poster.py

@@ -16,9 +16,9 @@ FONTS_DIR = "fonts"
 POSTERS_DIR = "posters"
 
 # ---- Layout tuning (easy knobs) ----
-FIGSIZE = (12, 16)          # Poster size in inches
-MAP_POS = (0.03, 0.18, 0.94, 0.80)  # [left, bottom, width, height] in figure coords
-MAP_PAD = 0.03              # Crop padding fraction (3% margin)
+FIGSIZE = (12, 16)   # Poster size in inches (width, height)
+MAP_PAD = 0.03       # Crop padding fraction (3% margin)
+OVERFETCH = 1.20     # Fetch a bit larger area, then crop to poster ratio
 
 def load_fonts():
     """
@@ -183,20 +183,15 @@ def create_gradient_fade(ax, color, location='bottom', zorder=10):
 
 def get_edge_colors_by_type(G):
     """
-    Assigns colors to edges based on road type hierarchy.
-    Returns a list of colors corresponding to each edge in the graph.
+    Assign colors to edges based on road type hierarchy.
     """
     edge_colors = []
 
-    for u, v, data in G.edges(data=True):
-        # Get the highway type (can be a list or string)
+    for _, _, data in G.edges(data=True):
         highway = data.get('highway', 'unclassified')
-
-        # Handle list of highway types (take the first one)
         if isinstance(highway, list):
             highway = highway[0] if highway else 'unclassified'
 
-        # Assign color based on road type
         if highway in ['motorway', 'motorway_link']:
             color = THEME['road_motorway']
         elif highway in ['trunk', 'trunk_link', 'primary', 'primary_link']:
@@ -216,18 +211,15 @@ def get_edge_colors_by_type(G):
 
 def get_edge_widths_by_type(G):
     """
-    Assigns line widths to edges based on road type.
-    Major roads get thicker lines.
+    Assign line widths to edges based on road type.
     """
     edge_widths = []
 
-    for u, v, data in G.edges(data=True):
+    for _, _, data in G.edges(data=True):
         highway = data.get('highway', 'unclassified')
-
         if isinstance(highway, list):
             highway = highway[0] if highway else 'unclassified'
 
-        # Assign width based on road importance
         if highway in ['motorway', 'motorway_link']:
             width = 1.2
         elif highway in ['trunk', 'trunk_link', 'primary', 'primary_link']:
@@ -245,13 +237,10 @@ def get_edge_widths_by_type(G):
 
 def get_coordinates(city, country):
     """
-    Fetches coordinates for a given city and country using geopy.
-    Includes rate limiting to be respectful to the geocoding service.
+    Fetch coordinates for a given city and country using geopy.
     """
     print("Looking up coordinates...")
     geolocator = Nominatim(user_agent="city_map_poster")
-
-    # Add a small delay to respect Nominatim's usage policy
     time.sleep(1)
 
     location = geolocator.geocode(f"{city}, {country}")
@@ -266,18 +255,22 @@ def get_coordinates(city, country):
 def create_poster(city, country, point, dist, output_file):
     print(f"\nGenerating map for {city}, {country}...")
 
+    dist_fetch = int(dist * OVERFETCH)
+
     # Progress bar for data fetching
-    with tqdm(total=3, desc="Fetching map data", unit="step", bar_format='{l_bar}{bar}| {n_fmt}/{total_fmt}') as pbar:
+    with tqdm(total=3, desc="Fetching map data", unit="step",
+              bar_format='{l_bar}{bar}| {n_fmt}/{total_fmt}') as pbar:
+
         # 1. Fetch Street Network
         pbar.set_description("Downloading street network")
-        G = ox.graph_from_point(point, dist=dist, dist_type='bbox', network_type='all')
+        G = ox.graph_from_point(point, dist=dist_fetch, dist_type='bbox', network_type='all')
         pbar.update(1)
-        time.sleep(0.5)  # Rate limit between requests
+        time.sleep(0.5)
 
         # 2. Fetch Water Features
         pbar.set_description("Downloading water features")
         try:
-            water = ox.features_from_point(point, tags={'natural': 'water', 'waterway': 'riverbank'}, dist=dist)
+            water = ox.features_from_point(point, tags={'natural': 'water', 'waterway': 'riverbank'}, dist=dist_fetch)
         except:
             water = None
         pbar.update(1)
@@ -286,7 +279,7 @@ def create_poster(city, country, point, dist, output_file):
         # 3. Fetch Parks
         pbar.set_description("Downloading parks/green spaces")
         try:
-            parks = ox.features_from_point(point, tags={'leisure': 'park', 'landuse': 'grass'}, dist=dist)
+            parks = ox.features_from_point(point, tags={'leisure': 'park', 'landuse': 'grass'}, dist=dist_fetch)
         except:
             parks = None
         pbar.update(1)
@@ -309,21 +302,25 @@ def create_poster(city, country, point, dist, output_file):
         except:
             pass
 
-    # 2. Setup Plot
+    # --- Setup Plot (two axes: map full-bleed + typography overlay) ---
     print("Rendering map...")
-    fig, ax = plt.subplots(figsize=FIGSIZE, facecolor=THEME['bg'])
-    ax.set_facecolor(THEME['bg'])
+    fig = plt.figure(figsize=FIGSIZE, facecolor=THEME['bg'])
+
+    # Map axis: full-bleed
+    ax_map = fig.add_axes([0, 0, 1, 1])
+    ax_map.set_facecolor(THEME['bg'])
+    ax_map.set_axis_off()
 
-    # Reserve a dedicated map area (leave room for bottom typography)
-    ax.set_position(list(MAP_POS))
-    map_h_frac = MAP_POS[3]
+    # Typography axis: overlay, full-bleed
+    ax_page = fig.add_axes([0, 0, 1, 1], facecolor="none")
+    ax_page.set_axis_off()
 
-    # 3. Plot Layers
+    # --- Plot Layers ---
     # Layer 1: Polygons
     if water is not None and not getattr(water, "empty", True):
-        water.plot(ax=ax, facecolor=THEME['water'], edgecolor='none', zorder=1)
+        water.plot(ax=ax_map, facecolor=THEME['water'], edgecolor='none', zorder=1)
     if parks is not None and not getattr(parks, "empty", True):
-        parks.plot(ax=ax, facecolor=THEME['parks'], edgecolor='none', zorder=2)
+        parks.plot(ax=ax_map, facecolor=THEME['parks'], edgecolor='none', zorder=2)
 
     # Layer 2: Roads with hierarchy coloring
     print("Applying road hierarchy colors...")
@@ -331,64 +328,59 @@ def create_poster(city, country, point, dist, output_file):
     edge_widths = get_edge_widths_by_type(G)
 
     ox.plot_graph(
-        G, ax=ax, bgcolor=THEME['bg'],
+        G, ax=ax_map, bgcolor=THEME['bg'],
         node_size=0,
         edge_color=edge_colors,
         edge_linewidth=edge_widths,
         show=False, close=False
     )
 
-    # Crop view to match the poster/map area aspect ratio (in projected units)
-    fig_w, fig_h = fig.get_size_inches()
-    target_ratio = fig_w / (fig_h * map_h_frac)  # width/height of the map area
-    crop_axes_to_ratio(ax, target_ratio=target_ratio, pad=MAP_PAD)
+    # Crop view to match poster aspect ratio (full-bleed)
+    target_ratio = FIGSIZE[0] / FIGSIZE[1]  # width/height
+    crop_axes_to_ratio(ax_map, target_ratio=target_ratio, pad=MAP_PAD)
 
     # Layer 3: Gradients (Top and Bottom)
-    create_gradient_fade(ax, THEME['gradient_color'], location='bottom', zorder=10)
-    create_gradient_fade(ax, THEME['gradient_color'], location='top', zorder=10)
+    create_gradient_fade(ax_map, THEME['gradient_color'], location='bottom', zorder=10)
+    create_gradient_fade(ax_map, THEME['gradient_color'], location='top', zorder=10)
 
-    # 4. Typography using Roboto font
+    # --- Typography using Roboto font ---
     if FONTS:
         font_main = FontProperties(fname=FONTS['bold'], size=60)
         font_sub = FontProperties(fname=FONTS['light'], size=22)
         font_coords = FontProperties(fname=FONTS['regular'], size=14)
+        font_attr = FontProperties(fname=FONTS['light'], size=8)
     else:
-        # Fallback to system fonts
         font_main = FontProperties(family='monospace', weight='bold', size=60)
         font_sub = FontProperties(family='monospace', weight='normal', size=22)
         font_coords = FontProperties(family='monospace', size=14)
+        font_attr = FontProperties(family='monospace', size=8)
 
     spaced_city = "  ".join(list(city.upper()))
 
-    # --- BOTTOM TEXT ---
-    ax.text(0.5, 0.14, spaced_city, transform=ax.transAxes,
-            color=THEME['text'], ha='center', fontproperties=font_main, zorder=11)
+    # --- BOTTOM TEXT (page coordinates) ---
+    ax_page.text(0.5, 0.14, spaced_city, transform=ax_page.transAxes,
+                 color=THEME['text'], ha='center', fontproperties=font_main, zorder=11)
 
-    ax.text(0.5, 0.10, country.upper(), transform=ax.transAxes,
-            color=THEME['text'], ha='center', fontproperties=font_sub, zorder=11)
+    ax_page.text(0.5, 0.10, country.upper(), transform=ax_page.transAxes,
+                 color=THEME['text'], ha='center', fontproperties=font_sub, zorder=11)
 
     lat, lon = point
     coords = f"{lat:.4f}° N / {lon:.4f}° E" if lat >= 0 else f"{abs(lat):.4f}° S / {lon:.4f}° E"
     if lon < 0:
         coords = coords.replace("E", "W")
 
-    ax.text(0.5, 0.07, coords, transform=ax.transAxes,
-            color=THEME['text'], alpha=0.7, ha='center', fontproperties=font_coords, zorder=11)
+    ax_page.text(0.5, 0.07, coords, transform=ax_page.transAxes,
+                 color=THEME['text'], alpha=0.7, ha='center', fontproperties=font_coords, zorder=11)
 
-    ax.plot([0.4, 0.6], [0.125, 0.125], transform=ax.transAxes,
-            color=THEME['text'], linewidth=1, zorder=11)
+    ax_page.plot([0.4, 0.6], [0.125, 0.125], transform=ax_page.transAxes,
+                 color=THEME['text'], linewidth=1, zorder=11)
 
     # --- ATTRIBUTION (bottom right) ---
-    if FONTS:
-        font_attr = FontProperties(fname=FONTS['light'], size=8)
-    else:
-        font_attr = FontProperties(family='monospace', size=8)
-
-    ax.text(0.98, 0.02, "© OpenStreetMap contributors", transform=ax.transAxes,
-            color=THEME['text'], alpha=0.5, ha='right', va='bottom',
-            fontproperties=font_attr, zorder=11)
+    ax_page.text(0.98, 0.02, "© OpenStreetMap contributors", transform=ax_page.transAxes,
+                 color=THEME['text'], alpha=0.5, ha='right', va='bottom',
+                 fontproperties=font_attr, zorder=11)
 
-    # 5. Save
+    # --- Save ---
     print(f"Saving to {output_file}...")
     plt.savefig(output_file, dpi=300, facecolor=THEME['bg'])
     plt.close()
@@ -490,8 +482,10 @@ Examples:
 
     parser.add_argument('--city', '-c', type=str, help='City name')
     parser.add_argument('--country', '-C', type=str, help='Country name')
-    parser.add_argument('--theme', '-t', type=str, default='feature_based', help='Theme name (default: feature_based)')
-    parser.add_argument('--distance', '-d', type=int, default=29000, help='Map radius in meters (default: 29000)')
+    parser.add_argument('--theme', '-t', type=str, default='feature_based',
+                        help='Theme name (default: feature_based)')
+    parser.add_argument('--distance', '-d', type=int, default=29000,
+                        help='Map radius in meters (default: 29000)')
     parser.add_argument('--list-themes', action='store_true', help='List all available themes')
 
     args = parser.parse_args()