province added

app.py

@@ -189,18 +189,44 @@ def generate_poster(
         else city_dropdown
     )
 
+    # Detect if we are selecting an entire province
+    is_whole_province = False
+    if selected_country == "中国":
+        p_adcode = get_china_adcode(province)
+        if selected_location == province and p_adcode:
+            # Check if this province has 'city' children or 'district' children
+            from cities_data import _load_china_info
+            info = _load_china_info()
+            p_entry = info.get(str(p_adcode))
+            if p_entry and p_entry.get("childrenNum", 0) > 0:
+                if p_entry["children"][0].get("level") == "city":
+                    is_whole_province = True
+
     if not selected_location:
         return None, "❌ 请选择城市或区县名称"
 
     if not selected_country:
         return None, "❌ 请选择国家"
 
+    # For whole province, we might want to override the distance if it's too small
+    actual_distance = distance
+    if is_whole_province:
+        # A province is much larger than a city. Default 10km is way too small.
+        # We'll use a larger default or just trust the user if they've slid it up,
+        # but let's ensure it's at least 150km for a province.
+        if distance < 100000:
+            actual_distance = 200000 # 200km default for province
+            print(f"Whole province detected. Increasing distance to {actual_distance}m")
+
     # Determine display names based on poster_lang
     lang_code = "en" if poster_lang == "English" else "cn"
 
     if selected_country == "中国" and lang_code == "cn":
+        if is_whole_province:
+            display_city = province
+            display_country = "中国"
         # Hierarchical logic for China (Chinese language)
-        if district_dropdown and district_dropdown != city_dropdown:
+        elif district_dropdown and district_dropdown != city_dropdown:
             # Case 3 & 4: District selected
             display_city = district_dropdown
             if province == city_dropdown:
@@ -265,7 +291,7 @@ def generate_poster(
             display_city,  # Pass translated names for display
             display_country,
             coords,
-            distance,
+            actual_distance,
             output_file,
             output_format,
             width=width,

cities_data.py

@@ -1156,6 +1156,11 @@ def get_cities(country_name, province_name, lang="en"):
             p_entry = info.get(str(p_adcode))
             if p_entry:
                 choices = []
+                
+                # Add "Whole Province" option
+                whole_province_display = "整个省" if lang == "cn" else "Whole Province"
+                choices.append((whole_province_display, province_name))
+
                 for c in p_entry.get("children", []):
                     name = c["name"]
                     display = translate(name, lang)
@@ -1168,7 +1173,9 @@ def get_cities(country_name, province_name, lang="en"):
                     and p_entry["children"][0].get("level") == "district"
                 ):
                     return [(translate(province_name, lang), province_name)]
-                return sorted(choices, key=lambda x: x[0])
+                
+                # Keep "Whole Province" at top, then sorted cities
+                return [choices[0]] + sorted(choices[1:], key=lambda x: x[0])
 
     province_key = province_name
     if country_key in CITIES:

create_map_poster.py

@@ -327,8 +327,14 @@ def create_poster(
     # Progress bar for data fetching
     # Note: tqdm writes to stderr, we will just yield status updates for the UI
 
-    # 1. Fetch Street Network using a bounding box
-    yield "Downloading street network..."
+    # 1. Fetch Street Network
+    # Detect if we are doing a "Whole Province" (large area)
+    # If the bounding box is very large, we should limit the road types to avoid timeouts
+    is_large_area = False
+    if dist > 50000: # Over 50km half-width is likely a province or large region
+        is_large_area = True
+        print(f"Large area detected (dist={dist}m). Fetching major roads only.")
+        yield "Large region detected. Fetching major roads only to avoid timeout..."
 
     import math
 
@@ -340,7 +346,17 @@ def create_poster(
     west, east = lon - delta_lon, lon + delta_lon
 
     bbox = (west, south, east, north)
-    G = ox.graph_from_bbox(bbox, network_type="all")
+    
+    if is_large_area:
+        # Use custom filter for major roads only
+        custom_filter = (
+            '["highway"~"motorway|trunk|primary|secondary"]'
+        )
+        yield "Downloading major road network..."
+        G = ox.graph_from_bbox(bbox, custom_filter=custom_filter, network_type="drive")
+    else:
+        yield "Downloading street network..."
+        G = ox.graph_from_bbox(bbox, network_type="all")
 
     # 2. Fetch Water and Parks in one request
     yield "Downloading features (water, parks)..."