fix

app.py

@@ -191,16 +191,10 @@ def generate_poster(
 
     # 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 selected_country == "中国" and selected_location:
+        if selected_location.endswith("_WHOLE"):
+            is_whole_province = True
+            selected_location = selected_location.replace("_WHOLE", "")
 
     if not selected_location:
         return None, "❌ 请选择城市或区县名称"
@@ -216,14 +210,14 @@ def generate_poster(
         # 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")
+            print(f"Whole province detected ({selected_location}). 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_city = selected_location
             display_country = "中国"
         # Hierarchical logic for China (Chinese language)
         elif district_dropdown and district_dropdown != city_dropdown:
@@ -400,6 +394,7 @@ def create_interface():
         css="""
         .header-title {
             text-align: center;
+            color: #666;
             font-size: 2em;
             font-weight: bold;
             margin-bottom: 0.5em;
@@ -431,11 +426,12 @@ def create_interface():
             <div class="header-subtitle">选择任意城市，自定义主题风格，生成精美地图海报</div>
             
             <div style="max-width: 800px; margin: 0 auto 20px auto; padding: 12px; background: #fff5f5; border: 1px solid #feb2b2; border-radius: 8px; text-align: left; font-size: 13px; line-height: 1.6; color: #c53030;">
-                <b>⚠️ 注意：</b><br>
-                • <b>特大城市</b>（如北京）：中心定位可能不准。<br>
-                • <b>小城市</b>：由于 OpenStreetMap 数据缺失，部分图层（如公园/水域）可能无法显示。<br>
-                • <b>生成速度</b>：使用国外服务器数据且渲染逻辑较基础，下载和生成速度可能较慢。<br>
-                • <b>数据来源</b>：© OpenStreetMap contributors
+                <b>⚠️ 注意!</b><br>
+                • <b>特大城市</b>（如北京）: 当城市面积过大时，中心定位可能不准。<br>
+                • <b>地点中英文不完善</b> : 由于地点中英文翻译数据量过大，未能显示完善<br>
+                • <b>小城市</b> : 由于 OpenStreetMap 数据缺失，部分图层（如公园/水域）可能无法显示。<br>
+                • <b>生成速度</b> : 国外地点使用国外服务器数据且渲染逻辑较基础，下载和生成速度可能较慢。<br>
+                • <b>数据来源</b> : © OpenStreetMap contributors
             </div>
         """)
 

cities_data.py

@@ -1157,22 +1157,22 @@ def get_cities(country_name, province_name, lang="en"):
             if p_entry:
                 choices = []
                 
-                # Add "Whole Province" option
+                # Add "Whole Province" option with a unique marker in the value
                 whole_province_display = "整个省" if lang == "cn" else "Whole Province"
-                choices.append((whole_province_display, province_name))
+                choices.append((whole_province_display, province_name + "_WHOLE"))
 
-                for c in p_entry.get("children", []):
-                    name = c["name"]
-                    display = translate(name, lang)
-                    choices.append((display, name))
-                # Add the province itself if it's a municipality?
-                # info.json treats municipalities as provinces with districts as children.
-                # If children level is 'district', then the 'cities' list should be just [province_name]
+                # For municipalities, return [Whole Province, Municipality Name]
                 if (
                     p_entry.get("children")
                     and p_entry["children"][0].get("level") == "district"
                 ):
-                    return [(translate(province_name, lang), province_name)]
+                    choices.append((translate(province_name, lang), province_name))
+                    return choices
+
+                for c in p_entry.get("children", []):
+                    name = c["name"]
+                    display = translate(name, lang)
+                    choices.append((display, name))
                 
                 # Keep "Whole Province" at top, then sorted cities
                 return [choices[0]] + sorted(choices[1:], key=lambda x: x[0])