anydev/anyway
0
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

linting
Some checks failed
Run linting on the backend code / Build (pull_request) Has been cancelled
Details
Run testing on the backend code / Build (pull_request) Has been cancelled
Details
Build and deploy the backend to staging / Deploy to staging (pull_request) Has been cancelled
Details
Build and deploy the backend to staging / Build and push image (pull_request) Has been cancelled
Details

Browse Source
This commit is contained in:
kscheidecker
2025-02-19 16:04:18 +01:00
parent 05092e55f1
commit 73f0dc8361
12 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/overpass/overpass.py
View File

@@ -65,14 +65,12 @@ class Overpass :
self.logger.debug(f'Query string: {query_str}')
return self.fetch_data_from_api(query_str)
# Hybrid cache: some data from Overpass, some data from cache.
else :
# Resize the bbox for smaller search area and build new query string.
non_cached_bbox = Overpass._get_non_cached_bbox(non_cached_cells, bbox)
query_str = Overpass.build_query(non_cached_bbox, osm_types, selector, conditions, out)
self.logger.debug(f'Query string: {query_str}')
non_cached_responses = self.fetch_data_from_api(query_str)
return Overpass._filter_landmarks(cached_responses, bbox) + non_cached_responses
# Resize the bbox for smaller search area and build new query string.
non_cached_bbox = Overpass._get_non_cached_bbox(non_cached_cells, bbox)
query_str = Overpass.build_query(non_cached_bbox, osm_types, selector, conditions, out)
self.logger.debug(f'Query string: {query_str}')
non_cached_responses = self.fetch_data_from_api(query_str)
return Overpass._filter_landmarks(cached_responses, bbox) + non_cached_responses
def fetch_data_from_api(self, query_str: str) -> List[dict]:
@@ -97,8 +95,8 @@ class Overpass :
return elements
except urllib.error.URLError as e:
self.logger.error(f"Error connecting to Overpass API: {e}")
raise ConnectionError(f"Error connecting to Overpass API: {e}") from e
self.logger.error(f"Error connecting to Overpass API: {str(exc)}")
raise ConnectionError(f"Error connecting to Overpass API: {str(exc)}") from e
except Exception as exc :
raise Exception(f'An unexpected error occured: {str(exc)}') from exc
@@ -389,8 +387,8 @@ def get_base_info(elem: dict, osm_type: OSM_TYPES, with_name=False) :
if with_name :
name = elem.get('tags', {}).get('name')
return osm_id, coords, name
else :
return osm_id, coords
return osm_id, coords
def fill_cache():
@@ -421,4 +419,4 @@ def fill_cache():
except Exception as exc :
overpass.logger.error(f'An error occured while parsing file {entry.path} as .json file: {str(exc)}')
overpass.logger.info(f"Successfully filled {n_files}/{total} cache files.")
overpass.logger.info(f"Successfully filled {n_files}/{total} cache files.")