corrected overpass return and switched to json

backend/src/utils/cluster_manager.py

@@ -9,7 +9,6 @@ from pydantic import BaseModel
 from ..overpass.overpass import Overpass, get_base_info
 from ..structs.landmark import Landmark
 from .get_time_distance import get_distance
-from ..constants import OSM_CACHE_DIR
 from .utils import create_bbox
 
 
@@ -81,7 +80,7 @@ class ClusterManager:
             bbox: The bounding box coordinates (around:radius, center_lat, center_lon).
         """
         # Setup the caching in the Overpass class.
-        self.overpass = Overpass(caching_strategy='XML', cache_dir=OSM_CACHE_DIR)
+        self.overpass = Overpass()
 
         self.cluster_type = cluster_type
         if cluster_type == 'shopping' :
@@ -112,13 +111,13 @@ class ClusterManager:
 
         else :
             points = []
-            for osm_type in osm_types :
-                for elem in result.findall(osm_type):
-                    
-                    # Get coordinates and append them to the points list
-                    _, coords = get_base_info(elem, osm_type)
-                    if coords is not None :
-                        points.append(coords)
+            for elem in result:
+                osm_type = elem.get('type')
+                
+                # Get coordinates and append them to the points list
+                _, coords = get_base_info(elem, osm_type)
+                if coords is not None :
+                    points.append(coords)
 
             if points :
                 self.all_points = np.array(points)
@@ -249,20 +248,20 @@ class ClusterManager:
                 self.logger.error(f"Error fetching landmarks: {e}")
                 continue
 
-            for osm_type in osm_types :
-                for elem in result.findall(osm_type):
+            for elem in result:
+                osm_type = elem.get('type')
 
-                    id, coords, name = get_base_info(elem, osm_type, with_name=True)
+                id, coords, name = get_base_info(elem, osm_type, with_name=True)
 
-                    if name is None or coords is None :
-                        continue
+                if name is None or coords is None :
+                    continue
 
-                    d = get_distance(cluster.centroid, coords)
-                    if  d < min_dist :
-                        min_dist = d
-                        new_name = name
-                        osm_type = osm_type     # Add type: 'way' or 'relation'
-                        osm_id = id             # Add OSM id
+                d = get_distance(cluster.centroid, coords)
+                if  d < min_dist :
+                    min_dist = d
+                    new_name = name
+                    osm_type = osm_type     # Add type: 'way' or 'relation'
+                    osm_id = id             # Add OSM id
 
         return Landmark(
             name=new_name,

backend/src/utils/landmarks_manager.py

@@ -12,7 +12,7 @@ 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
+from ..constants import AMENITY_SELECTORS_PATH, LANDMARK_PARAMETERS_PATH, OPTIMIZER_PARAMETERS_PATH
 
 
 class LandmarkManager:
@@ -54,7 +54,7 @@ class LandmarkManager:
             self.detour_factor = parameters['detour_factor']
 
         # Setup the caching in the Overpass class.
-        self.overpass = Overpass(caching_strategy='XML', cache_dir=OSM_CACHE_DIR)
+        self.overpass = Overpass()
 
         self.logger.info('LandmakManager successfully initialized.')
 
@@ -194,24 +194,24 @@ class LandmarkManager:
             # 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'
-                )
+                    bbox = bbox,
+                    osm_types = osm_types,
+                    selector = sel,
+                    conditions = query_conditions,        # except for nature....
+                    out = 'ids center tags'
+                    )
             except Exception as e:
                 self.logger.error(f"Error fetching landmarks: {e}")
                 continue
 
-            return_list += self.xml_to_landmarks(result, landmarktype, preference_level)
+            return_list += self.json_to_landmarks(result, landmarktype, preference_level)
 
         self.logger.debug(f"Fetched {len(return_list)} landmarks of type {landmarktype} in {bbox}")
 
         return return_list
 
 
-    def xml_to_landmarks(self, root: ET.Element, landmarktype, preference_level) -> list[Landmark]:
+    def json_to_landmarks(self, elements: list, landmarktype, preference_level) -> list[Landmark]:
         """
         Parse the Overpass API result and extract landmarks.
 
@@ -221,82 +221,83 @@ class LandmarkManager:
         into Landmark objects.
 
         Args:
-        root (ET.Element): The root element of the XML response from Overpass API.
+        elements (list): The elements of json response from Overpass API.
         elem_type (str): The type of landmark (e.g., node, way, relation).
 
         Returns:
         list[Landmark]: A list of Landmark objects extracted from the XML data.
         """
-        if root is None :
+        print(f'in landmarks manager : {type(elements)}')
+        if elements is None :
             return []
 
         landmarks = []
-        for osm_type in ['node', 'way', 'relation'] :
-            for elem in root.findall(osm_type):
+        for elem in elements:
+            osm_type = elem.get('type')
 
-                id, coords, name = get_base_info(elem, osm_type, with_name=True)
-
-                if name is None or coords is None :
-                    continue
-
-                tags = elem.findall('tag')
-
-                # Convert this to Landmark object
-                landmark = Landmark(name=name,
-                                    type=landmarktype,
-                                    location=coords,
-                                    osm_id=id,
-                                    osm_type=osm_type,
-                                    attractiveness=0,
-                                    n_tags=len(tags))
-
-                # Browse through tags to add information to landmark.
-                for tag in tags:
-                    key = tag.get('k')
-                    value = tag.get('v')
-
-                    # Skip this landmark if not suitable.
-                    if key == 'building:part' and value == 'yes' :
-                        break
-                    if 'disused:' in key :
-                        break
-                    if 'boundary:' in key :
-                        break
-                    if 'shop' in key and landmarktype != 'shopping' :
-                        break
-                    # if value == 'apartments' :
-                    #     break
-
-                    # Fill in the other attributes.
-                    if key == 'image' :
-                        landmark.image_url = value
-                    if key == 'website' :
-                        landmark.website_url = value
-                    if key == 'place_of_worship' :
-                        landmark.is_place_of_worship = True
-                    if key == 'wikipedia' :
-                        landmark.wiki_url = value
-                    if key == 'name:en' :
-                        landmark.name_en = value
-                    if 'building:' in key or 'pay' in key :
-                        landmark.n_tags -= 1
-
-                    # Set the duration.
-                    if value in ['museum', 'aquarium', 'planetarium'] :
-                        landmark.duration = 60
-                    elif value == 'viewpoint' :
-                        landmark.is_viewpoint = True
-                        landmark.duration = 10
-                    elif value == 'cathedral' :
-                        landmark.is_place_of_worship = False
-                        landmark.duration = 10
-
-                else:
-                    self.set_landmark_score(landmark, landmarktype, preference_level)
-                    landmarks.append(landmark)
+            id, coords, name = get_base_info(elem, osm_type, with_name=True)
 
+            if name is None or coords is None :
                 continue
 
+            tags = elem.get('tags')
+
+            # Convert this to Landmark object
+            landmark = Landmark(name=name,
+                                type=landmarktype,
+                                location=coords,
+                                osm_id=id,
+                                osm_type=osm_type,
+                                attractiveness=0,
+                                n_tags=len(tags))
+
+            # self.logger.debug('added landmark.')
+
+            # Browse through tags to add information to landmark.
+            for key, value in tags.items():
+
+                # Skip this landmark if not suitable.
+                if key == 'building:part' and value == 'yes' :
+                    break
+                if 'disused:' in key :
+                    break
+                if 'boundary:' in key :
+                    break
+                if 'shop' in key and landmarktype != 'shopping' :
+                    break
+                # if value == 'apartments' :
+                #     break
+
+                # Fill in the other attributes.
+                if key == 'image' :
+                    landmark.image_url = value
+                if key == 'website' :
+                    landmark.website_url = value
+                if key == 'place_of_worship' :
+                    landmark.is_place_of_worship = True
+                if key == 'wikipedia' :
+                    landmark.wiki_url = value
+                if key == 'name:en' :
+                    landmark.name_en = value
+                if 'building:' in key or 'pay' in key :
+                    landmark.n_tags -= 1
+
+                # Set the duration.
+                if value in ['museum', 'aquarium', 'planetarium'] :
+                    landmark.duration = 60
+                elif value == 'viewpoint' :
+                    landmark.is_viewpoint = True
+                    landmark.duration = 10
+                elif value == 'cathedral' :
+                    landmark.is_place_of_worship = False
+                    landmark.duration = 10
+
+            else:
+                self.set_landmark_score(landmark, landmarktype, preference_level)
+                landmarks.append(landmark)
+
+            continue
+
         return landmarks
 
 def dict_to_selector_list(d: dict) -> list:

backend/src/utils/toilets_manager.py

@@ -4,7 +4,6 @@ import xml.etree.ElementTree as ET
 
 from ..overpass.overpass import Overpass, get_base_info
 from ..structs.landmark import Toilets
-from ..constants import OSM_CACHE_DIR
 from .utils import create_bbox
 
 
@@ -42,7 +41,7 @@ class ToiletsManager:
         self.location = location
 
         # Setup the caching in the Overpass class.
-        self.overpass = Overpass(caching_strategy='XML', cache_dir=OSM_CACHE_DIR)
+        self.overpass = Overpass()
 
 
     def generate_toilet_list(self) -> list[Toilets] :
@@ -70,55 +69,55 @@ class ToiletsManager:
             self.logger.error(f"Error fetching landmarks: {e}")
             return None
 
-        toilets_list = self.xml_to_toilets(result)
+        toilets_list = self.to_toilets(result)
 
         return toilets_list
 
 
-    def xml_to_toilets(self, root: ET.Element) -> list[Toilets]:
+    def to_toilets(self, elements: list) -> list[Toilets]:
         """
         Parse the Overpass API result and extract landmarks.
 
-        This method processes the XML root element returned by the Overpass API and 
+        This method processes the JSON elements returned by the Overpass API and 
         extracts landmarks of types 'node', 'way', and 'relation'. It retrieves 
         relevant information such as name, coordinates, and tags, and converts them 
         into Landmark objects.
 
         Args:
-        root (ET.Element): The root element of the XML response from Overpass API.
+        list (osm elements): The root element of the JSON response from Overpass API.
         elem_type (str): The type of landmark (e.g., node, way, relation).
 
         Returns:
         list[Landmark]: A list of Landmark objects extracted from the XML data.
         """
-        if root is None :
+        if elements is None :
             return []
 
         toilets_list = []
-        for osm_type in ['node', 'way', 'relation'] :
-            for elem in root.findall(osm_type):
-                # Get coordinates and append them to the points list
-                _, coords = get_base_info(elem, osm_type)
-                if coords is None :
-                    continue
+        for elem in elements:
+            osm_type = elem.get('type')
+            # Get coordinates and append them to the points list
+            _, coords = get_base_info(elem, osm_type)
+            if coords is None :
+                continue
 
-                toilets = Toilets(location=coords)
+            toilets = Toilets(location=coords)
 
-                # Extract tags as a dictionary
-                tags = {tag.get('k'): tag.get('v') for tag in elem.findall('tag')}
+            # Extract tags as a dictionary
+            tags = elem.get('tags')
 
-                if 'wheelchair' in tags.keys() and tags['wheelchair'] == 'yes':
-                    toilets.wheelchair = True
+            if 'wheelchair' in tags.keys() and tags['wheelchair'] == 'yes':
+                toilets.wheelchair = True
 
-                if 'changing_table' in tags.keys() and tags['changing_table'] == 'yes':
-                    toilets.changing_table = True
+            if 'changing_table' in tags.keys() and tags['changing_table'] == 'yes':
+                toilets.changing_table = True
 
-                if 'fee' in tags.keys() and tags['fee'] == 'yes':
-                    toilets.fee = True
+            if 'fee' in tags.keys() and tags['fee'] == 'yes':
+                toilets.fee = True
 
-                if 'opening_hours' in tags.keys() :
-                    toilets.opening_hours = tags['opening_hours']
+            if 'opening_hours' in tags.keys() :
+                toilets.opening_hours = tags['opening_hours']
 
-                toilets_list.append(toilets)
+            toilets_list.append(toilets)
 
         return toilets_list