Add JMA Haneda temps and fix stale detail loading

src/data_collection/weather_sources.py

@@ -10,11 +10,12 @@ from src.data_collection.open_meteo_cache import OpenMeteoCacheMixin
 from src.data_collection.settlement_sources import SettlementSourceMixin
 from src.data_collection.metar_sources import MetarSourceMixin
 from src.data_collection.mgm_sources import MgmSourceMixin
+from src.data_collection.jma_amedas_sources import JmaAmedasSourceMixin
 from src.data_collection.nmc_sources import NmcSourceMixin
 from src.data_collection.nws_open_meteo_sources import NwsOpenMeteoSourceMixin
 
 
-class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSourceMixin, MgmSourceMixin, NmcSourceMixin, NwsOpenMeteoSourceMixin):
+class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSourceMixin, MgmSourceMixin, JmaAmedasSourceMixin, NmcSourceMixin, NwsOpenMeteoSourceMixin):
     """
     Multi-source weather data collector
 
@@ -167,6 +168,11 @@ class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSour
         )
         self._nmc_cache: Dict[str, Dict] = {}
         self._nmc_cache_lock = threading.Lock()
+        self.jma_cache_ttl_sec = int(
+            os.getenv("JMA_AMEDAS_CACHE_TTL_SEC", "300")
+        )
+        self._jma_cache: Dict[str, Dict] = {}
+        self._jma_cache_lock = threading.Lock()
         self.settlement_cache_ttl_sec = int(
             os.getenv("SETTLEMENT_SOURCE_CACHE_TTL_SEC", "120")
         )
@@ -756,6 +762,21 @@ class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSour
             results["mgm_nearby"] = official_rows
         results["nearby_source"] = "nmc"
 
+    def _attach_japan_official_nearby(
+        self, results: Dict, city_lower: str, use_fahrenheit: bool
+    ) -> None:
+        if city_lower != "tokyo":
+            return
+        official_rows = self.fetch_jma_amedas_official_nearby(
+            city_lower, use_fahrenheit=use_fahrenheit
+        )
+        if not official_rows:
+            return
+        results["jma_official_nearby"] = official_rows
+        if "mgm_nearby" not in results:
+            results["mgm_nearby"] = official_rows
+        results["nearby_source"] = "jma"
+
     def _attach_warsaw_official_nearby(
         self, results: Dict, use_fahrenheit: bool
     ) -> None:
@@ -851,6 +872,7 @@ class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSour
 
                 self._attach_turkish_mgm_data(results, city_lower)
                 self._attach_china_official_nearby(results, city_lower, use_fahrenheit)
+                self._attach_japan_official_nearby(results, city_lower, use_fahrenheit)
                 if city_lower == "warsaw":
                     self._attach_warsaw_official_nearby(results, use_fahrenheit)
                 self._attach_global_nearby_cluster(
@@ -878,6 +900,7 @@ class WeatherDataCollector(OpenMeteoCacheMixin, SettlementSourceMixin, MetarSour
 
                 self._attach_turkish_mgm_data(results, city_lower)
                 self._attach_china_official_nearby(results, city_lower, use_fahrenheit)
+                self._attach_japan_official_nearby(results, city_lower, use_fahrenheit)
                 if city_lower == "warsaw":
                     self._attach_warsaw_official_nearby(results, use_fahrenheit)
                 self._attach_global_nearby_cluster(