diff --git a/backend/src/landmarks_manager.py b/backend/src/example_landmarks_manager.py similarity index 93% rename from backend/src/landmarks_manager.py rename to backend/src/example_landmarks_manager.py index 0392245..30df6dc 100644 --- a/backend/src/landmarks_manager.py +++ b/backend/src/example_landmarks_manager.py @@ -1,8 +1,6 @@ import yaml import logging -import osmnx as ox -from shapely.geometry import Point, Polygon, LineString, MultiPolygon - +from OSMPythonTools import cachingStrategy, overpass from structs.landmarks import Landmark, LandmarkType from structs.preferences import Preferences, Preference import constants @@ -16,9 +14,8 @@ class LandmarkManager: logger = logging.getLogger(__name__) def __init__(self) -> None: - ox.settings.cache_folder = constants.OSM_CACHE_DIR - ox.settings.use_cache = True - ox.config(use_cache=True, cache_folder=constants.OSM_CACHE_DIR) + strategy = cachingStrategy.JSON(cacheDir=constants.OSM_CACHE_DIR) + self.query_builder = overpass.Overpass() with constants.AMENITY_SELECTORS_PATH.open('r') as f: self.amenity_selectors = yaml.safe_load(f) with constants.LANDMARK_PARAMETERS_PATH.open('r') as f: diff --git a/backend/src/optimizer.py b/backend/src/example_optimizer.py similarity index 100% rename from backend/src/optimizer.py rename to backend/src/example_optimizer.py diff --git a/backend/src/refiner.py b/backend/src/example_refiner.py similarity index 98% rename from backend/src/refiner.py rename to backend/src/example_refiner.py index a292b73..5eb4368 100644 --- a/backend/src/refiner.py +++ b/backend/src/example_refiner.py @@ -10,7 +10,7 @@ from math import pi from structs.landmarks import Landmark from landmarks_manager import take_most_important -from optimizer import solve_optimization, link_list_simple, print_res, get_distance +from backend.src.example_optimizer import solve_optimization, link_list_simple, print_res, get_distance import constants diff --git a/backend/src/main.py b/backend/src/main.py index a1ff712..8a76288 100644 --- a/backend/src/main.py +++ b/backend/src/main.py @@ -1,4 +1,4 @@ -from optimizer import solve_optimization +from backend.src.example_optimizer import solve_optimization # from refiner import refine_optimization from landmarks_manager import LandmarkManager from structs.landmarks import Landmark diff --git a/backend/src/parameters/landmark_parameters.yaml b/backend/src/parameters/landmark_parameters.yaml index 524b7b6..b85c89a 100644 --- a/backend/src/parameters/landmark_parameters.yaml +++ b/backend/src/parameters/landmark_parameters.yaml @@ -1,4 +1,4 @@ -city_bbox_side: 1500 #m +city_bbox_side: 5000 #m radius_close_to: 30 church_coeff: 0.6 park_coeff: 1.5 diff --git a/backend/src/tester.py b/backend/src/tester.py index 57692d2..71d82e7 100644 --- a/backend/src/tester.py +++ b/backend/src/tester.py @@ -4,7 +4,7 @@ from typing import List from landmarks_manager import LandmarkManager from fastapi.encoders import jsonable_encoder -from optimizer import solve_optimization +from backend.src.example_optimizer import solve_optimization # from refiner import refine_optimization from structs.landmarks import Landmark from structs.landmarktype import LandmarkType