ready for testing

backend/src/utils/landmarks_manager.py

@@ -1,5 +1,6 @@
 """Module used to import data from OSM and arrange them in categories."""
 import logging
+import math as m
 import xml.etree.ElementTree as ET
 import yaml
 
@@ -9,12 +10,10 @@ from ..structs.landmark import Landmark
 from .take_most_important import take_most_important
 from .cluster_manager import ClusterManager
 from ..overpass.overpass import Overpass, get_base_info
+from .utils import create_bbox
 
 from ..constants import AMENITY_SELECTORS_PATH, LANDMARK_PARAMETERS_PATH, OPTIMIZER_PARAMETERS_PATH, OSM_CACHE_DIR
 
-# silence the overpass logger
-logging.getLogger('Overpass').setLevel(level=logging.CRITICAL)
-
 
 class LandmarkManager:
     """
@@ -37,8 +36,7 @@ class LandmarkManager:
 
         with LANDMARK_PARAMETERS_PATH.open('r') as f:
             parameters = yaml.safe_load(f)
-            self.max_bbox_side = parameters['city_bbox_side']
-            self.radius_close_to = parameters['radius_close_to']
+            self.max_bbox_side = parameters['max_bbox_side']
             self.church_coeff = parameters['church_coeff']
             self.nature_coeff = parameters['nature_coeff']
             self.overall_coeff = parameters['overall_coeff']
@@ -80,13 +78,13 @@ class LandmarkManager:
         """
         self.logger.debug('Starting to fetch landmarks...')
         max_walk_dist = int((preferences.max_time_minute/2)/60*self.walking_speed*1000/self.detour_factor)
-        reachable_bbox_side = min(max_walk_dist, self.max_bbox_side)
+        radius = min(max_walk_dist, int(self.max_bbox_side/2))
 
         # use set to avoid duplicates, this requires some __methods__ to be set in Landmark
         all_landmarks = set()
 
         # Create a bbox using the around technique, tuple of strings
-        bbox = tuple((min(2000, reachable_bbox_side/2), center_coordinates[0], center_coordinates[1]))
+        bbox = create_bbox(center_coordinates, radius)
 
         # list for sightseeing
         if preferences.sightseeing.score != 0:
@@ -193,17 +191,15 @@ class LandmarkManager:
                 query_conditions = []
                 osm_types.append('node')
 
-            query = self.overpass.build_query(
-                area = bbox,
+            # Send the overpass query
+            try:
+                result = self.overpass.send_query(
+                bbox = bbox,
                 osm_types = osm_types,
                 selector = sel,
                 conditions = query_conditions,        # except for nature....
                 out = 'center'
                 )
-            self.logger.debug(f"Query: {query}")
-
-            try:
-                result = self.overpass.send_query(query)
             except Exception as e:
                 self.logger.error(f"Error fetching landmarks: {e}")
                 continue