feat: improve custom coordinate text layout (two-line title/subtitle)

app.py

@@ -376,7 +376,7 @@ def update_cities(country, province, lang="en"):
 
 def update_districts(country, province, city, lang="en"):
     """Update district dropdown based on city selection."""
-    if country != "中国":
+    if country != "中国" or not city or city.endswith("_WHOLE"):
         return gr.update(choices=[], value=None, visible=False)
 
     lang_code = "en" if lang == "English" else "cn"
@@ -411,6 +411,20 @@ def create_interface():
         else []
     )
     default_city_key = default_cities[0][1] if default_cities else None
+    
+    # Handle district initialization carefully to avoid "Value not in choices" error
+    default_districts = (
+        get_districts(
+            default_country_key,
+            default_province_key,
+            default_city_key,
+            default_lang_code,
+        )
+        if default_city_key
+        else []
+    )
+    default_district_key = default_districts[0][1] if default_districts else None
+    
     default_theme = theme_choices[0][1] if theme_choices else "feature_based"
     default_theme = theme_choices[0][1] if theme_choices else "feature_based"
 
@@ -504,16 +518,11 @@ def create_interface():
                     )
 
                     district_dropdown = gr.Dropdown(
-                        choices=get_districts(
-                            default_country_key,
-                            default_province_key,
-                            default_city_key,
-                            default_lang_code,
-                        ),
-                        value=default_city_key,
+                        choices=default_districts,
+                        value=default_district_key,
                         label="选择区县",
                         interactive=True,
-                        visible=(default_country_key == "中国"),
+                        visible=(default_country_key == "中国" and default_district_key is not None),
                     )
 
                 with gr.Group(visible=False) as custom_coords_group:
@@ -528,11 +537,11 @@ def create_interface():
                             label="经度 (Longitude)", value=None, precision=6
                         )
                     custom_city_name = gr.Textbox(
-                        label="显示城市名 (City Name)", placeholder="如: Shanghai"
+                        label="主标题 (Main Title)", placeholder="如: Shanghai 或 '我们的家'"
                     )
                     custom_country_name = gr.Textbox(
-                        label="显示国家名 (Country Name)",
-                        placeholder="如: China",
+                        label="副标题 (Subtitle)",
+                        placeholder="如: China 或 '2024.10.20'",
                         value="",
                     )
 
@@ -629,6 +638,7 @@ def create_interface():
             current_country,
             current_province,
             current_city,
+            current_district,
             current_theme,
             current_layers,
         ):
@@ -649,6 +659,14 @@ def create_interface():
                 if current_city
                 else []
             )
+            
+            # Ensure district value is valid for new choices
+            valid_district = None
+            if new_districts:
+                if any(v == current_district for d, v in new_districts):
+                    valid_district = current_district
+                else:
+                    valid_district = new_districts[0][1]
 
             # Themes
             new_theme_choices = get_theme_choices(lang_code)
@@ -691,8 +709,8 @@ def create_interface():
                 ),
                 gr.update(
                     choices=new_districts,
-                    value=current_city if current_city else None,
-                    visible=(current_country == "中国"),
+                    value=valid_district,
+                    visible=(current_country == "中国" and valid_district is not None),
                     label="Select District" if lang == "English" else "选择区县",
                 ),
                 gr.update(
@@ -729,12 +747,26 @@ def create_interface():
                     if lang == "English"
                     else "勾选后保留海报边缘背景",
                 ),
+                gr.update(
+                    label="Show Text" if lang == "English" else "显示文字",
+                    info="Show city name and coordinates on poster"
+                    if lang == "English"
+                    else "在海报上显示城市名和经纬度",
+                ),
                 gr.update(
                     value="🚀 Generate Poster" if lang == "English" else "🚀 生成海报"
                 ),
                 gr.update(
                     label="📥 Download Poster" if lang == "English" else "📥 下载海报"
                 ),
+                gr.update(
+                    label="Main Title" if lang == "English" else "主标题 (Main Title)",
+                    placeholder="e.g. Shanghai or 'Our Home'" if lang == "English" else "如: Shanghai 或 '我们的家'"
+                ),
+                gr.update(
+                    label="Subtitle" if lang == "English" else "副标题 (Subtitle)",
+                    placeholder="e.g. China or '2024.10.20'" if lang == "English" else "如: China 或 '2024.10.20'"
+                )
             )
 
         lang_radio.change(
@@ -744,6 +776,7 @@ def create_interface():
                 country_dropdown,
                 province_dropdown,
                 city_dropdown,
+                district_dropdown,
                 theme_dropdown,
                 layers_checkbox,
             ],
@@ -763,6 +796,8 @@ def create_interface():
                 show_text_checkbox,
                 generate_btn,
                 download_btn,
+                custom_city_name,
+                custom_country_name,
             ],
         )
 

cities_data.py

@@ -1044,19 +1044,25 @@ def get_manual_coordinates(name, parent_adcode=None):
 
 def get_china_adcode(name, parent_adcode=None):
     """Search for adcode by name in local China data."""
+    if not name:
+        return None
+    
+    # Strip convention-based suffixes
+    search_name = name.replace("_WHOLE", "")
+    
     info = _load_china_info()
     if not parent_adcode:
         # Check provinces
         china_entry = info.get("100000")
         if china_entry:
             for p in china_entry.get("children", []):
-                if p["name"] == name or p["name"].rstrip("省").rstrip("市") == name:
+                if p["name"] == search_name or p["name"].rstrip("省").rstrip("市") == search_name:
                     return p["adcode"]
     else:
         parent_entry = info.get(str(parent_adcode))
         if parent_entry:
             for child in parent_entry.get("children", []):
-                if child["name"] == name:
+                if child["name"] == search_name:
                     return child["adcode"]
     return None
 
@@ -1209,7 +1215,7 @@ def get_cities(country_name, province_name, lang="en"):
 def get_districts(country_name, province_name, city_name, lang="en"):
     """Return list of (Display, Key) tuples for districts."""
     country_key = get_country_key(country_name)
-    if country_key != "中国":
+    if country_key != "中国" or not city_name or city_name.endswith("_WHOLE"):
         return []
 
     p_adcode = get_china_adcode(province_name)

create_map_poster.py

@@ -552,28 +552,44 @@ def create_poster(
 
     # --- BOTTOM TEXT ---
     if show_text:
-        ax.text(
-            0.5,
-            0.14,
-            display_city,
-            transform=ax.transAxes,
-            color=THEME["text"],
-            ha="center",
-            fontproperties=font_main,
-            zorder=11,
-        )
+        # Title
+        if display_city:
+            ax.text(
+                0.5,
+                0.14,
+                display_city,
+                transform=ax.transAxes,
+                color=THEME["text"],
+                ha="center",
+                fontproperties=font_main,
+                zorder=11,
+            )
 
-        ax.text(
-            0.5,
-            0.10,
-            display_country,
-            transform=ax.transAxes,
-            color=THEME["text"],
-            ha="center",
-            fontproperties=font_sub,
-            zorder=11,
-        )
+        # Subtitle
+        if display_country:
+            ax.text(
+                0.5,
+                0.10,
+                display_country,
+                transform=ax.transAxes,
+                color=THEME["text"],
+                ha="center",
+                fontproperties=font_sub,
+                zorder=11,
+            )
+
+        # Decorative separator line (only show if both exist)
+        if display_city and display_country:
+            ax.plot(
+                [0.4, 0.6],
+                [0.125, 0.125],
+                transform=ax.transAxes,
+                color=THEME["text"],
+                linewidth=1,
+                zorder=11,
+            )
 
+        # Coordinates (Third line, smaller)
         lat, lon = point
         coords_text = (
             f"{lat:.4f}° N / {lon:.4f}° E"
@@ -595,15 +611,6 @@ def create_poster(
             zorder=11,
         )
 
-        ax.plot(
-            [0.4, 0.6],
-            [0.125, 0.125],
-            transform=ax.transAxes,
-            color=THEME["text"],
-            linewidth=1,
-            zorder=11,
-        )
-
     # --- ATTRIBUTION (bottom right) ---
     attr_font = font_sub_base.copy()
     attr_font.set_size(8)