Refactor weather app logic and simplify related components

This commit is contained in:
2569718930@qq.com
2026-04-03 01:47:03 +08:00
parent e32eff6e31
commit 3e265d2764
6 changed files with 28 additions and 4 deletions
+2 -1
View File
@@ -1451,9 +1451,10 @@ def _analyze(city: str, force_refresh: bool = False) -> Dict[str, Any]:
}
# ── Assemble result ──
city_meta = CITIES.get(city, {}) or {}
result = {
"name": city,
"display_name": city.title(),
"display_name": str(city_meta.get("display_name") or city_meta.get("name") or city.title()),
"lat": lat,
"lon": lon,
"temp_symbol": sym,
+3 -2
View File
@@ -201,11 +201,12 @@ async def list_cities(request: Request):
out = []
for name, info in CITIES.items():
risk = CITY_RISK_PROFILES.get(name, {})
city_meta = CITY_REGISTRY.get(name, {}) or {}
settlement_source = str(info.get("settlement_source") or "metar").strip().lower() or "metar"
out.append(
{
"name": name,
"display_name": name.title(),
"display_name": str(city_meta.get("display_name") or city_meta.get("name") or name.title()),
"lat": info["lat"],
"lon": info["lon"],
"risk_level": risk.get("risk_level", "low"),
@@ -213,7 +214,7 @@ async def list_cities(request: Request):
"airport": risk.get("airport_name", ""),
"icao": risk.get("icao", ""),
"temp_unit": "fahrenheit" if info["f"] else "celsius",
"is_major": CITY_REGISTRY.get(name, {}).get("is_major", True),
"is_major": city_meta.get("is_major", True),
"settlement_source": settlement_source,
"settlement_source_label": SETTLEMENT_SOURCE_LABELS.get(
settlement_source,