Single common URL cache for semi-static lookups #74

spotproviders/sota.py

@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 import requests
 from requests_cache import CachedSession
 
+from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import HTTP_HEADERS
 from core.sig_utils import get_icon_for_sig
 from data.sig_ref import SIGRef
@@ -21,8 +22,6 @@ class SOTA(HTTPSpotProvider):
     SPOTS_URL = "https://api-db2.sota.org.uk/api/spots/60/all/all"
     # SOTA spots don't contain lat/lon, we need a separate lookup for that
     SUMMIT_URL_ROOT = "https://api-db2.sota.org.uk/api/summits/"
-    SUMMIT_DATA_CACHE_TIME_DAYS = 30
-    SUMMIT_DATA_CACHE = CachedSession("cache/sota_summit_data_cache", expire_after=timedelta(days=SUMMIT_DATA_CACHE_TIME_DAYS))
 
     def __init__(self, provider_config):
         super().__init__(provider_config, self.EPOCH_URL, self.POLL_INTERVAL_SEC)
@@ -57,7 +56,7 @@ class SOTA(HTTPSpotProvider):
 
                 # SOTA doesn't give summit lat/lon/grid in the main call, so we need another separate call for this
                 try:
-                    summit_response = self.SUMMIT_DATA_CACHE.get(self.SUMMIT_URL_ROOT + source_spot["summitCode"], headers=HTTP_HEADERS)
+                    summit_response = SEMI_STATIC_URL_DATA_CACHE.get(self.SUMMIT_URL_ROOT + source_spot["summitCode"], headers=HTTP_HEADERS)
                     summit_data = summit_response.json()
                     spot.dx_grid = summit_data["locator"]
                     spot.dx_latitude = summit_data["latitude"]