overpass as class

backend/src/utils/cluster_manager.py

@@ -6,15 +6,14 @@ import numpy as np
 from sklearn.cluster import DBSCAN
 from pydantic import BaseModel
 
-from ..overpass.overpass import build_query, send_query
-from ..overpass.caching_strategy import CachingStrategy
+from ..overpass.overpass import Overpass
 from ..structs.landmark import Landmark
 from .get_time_distance import get_distance
 from ..constants import OSM_CACHE_DIR
 
 
 # silence the overpass logger
-logging.getLogger('overpass').setLevel(level=logging.CRITICAL)
+logging.getLogger('Overpass').setLevel(level=logging.CRITICAL)
 
 
 class Cluster(BaseModel):
@@ -79,7 +78,9 @@ class ClusterManager:
         Args: 
             bbox: The bounding box coordinates (around:radius, center_lat, center_lon).
         """
-        CachingStrategy.use('XML', cache_dir=OSM_CACHE_DIR)
+        # Setup the caching in the Overpass class.
+        self.overpass = Overpass(caching_strategy='XML', cache_dir=OSM_CACHE_DIR)
+
 
         self.cluster_type = cluster_type
         if cluster_type == 'shopping' :
@@ -94,16 +95,16 @@ class ClusterManager:
             raise NotImplementedError("Please choose only an available option for cluster detection")
 
         # Initialize the points for cluster detection
-        query = build_query(
+        query = self.overpass.build_query(
             area = bbox,
-            element_types = osm_types,
+            osm_types = osm_types,
             selector = sel,
             out = out
         )
         self.logger.debug(f"Cluster query: {query}")
 
         try:
-            result = send_query(query)
+            result = self.overpass.send_query(query)
         except Exception as e:
             self.logger.error(f"Error fetching landmarks: {e}")
 
@@ -243,15 +244,15 @@ class ClusterManager:
         osm_types = ['node', 'way', 'relation']
 
         for sel in selectors :
-            query = build_query(
+            query = self.overpass.build_query(
                 area = bbox,
-                element_types = osm_types,
+                osm_types = osm_types,
                 selector = sel,
                 out = 'ids center'
             )
 
             try:
-                result = send_query(query)
+                result = self.overpass.send_query(query)
             except Exception as e:
                 self.logger.error(f"Error fetching landmarks: {e}")
                 continue