diff --git a/backend/src/landmarks_manager.py b/backend/src/landmarks_manager.py index 690fae8..0392245 100644 --- a/backend/src/landmarks_manager.py +++ b/backend/src/landmarks_manager.py @@ -16,7 +16,9 @@ class LandmarkManager: logger = logging.getLogger(__name__) def __init__(self) -> None: - ox.config(cache_folder=constants.OSM_CACHE_DIR) + ox.settings.cache_folder = constants.OSM_CACHE_DIR + ox.settings.use_cache = True + ox.config(use_cache=True, cache_folder=constants.OSM_CACHE_DIR) 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: @@ -36,21 +38,21 @@ class LandmarkManager: # List for sightseeing if preferences.sightseeing.score != 0: - score_func = lambda loc, n_tags: int((self.count_elements_within_radius(loc, self.parameters['radius_close_to']) + n_tags * self.parameters['tag_coeff']) * self.parameters['church_coeff']) + score_func = lambda loc, n_tags: int((10 + n_tags * self.parameters['tag_coeff']) * self.parameters['church_coeff']) L1 = self.fetch_landmarks(self.amenity_selectors['sightseeing'], SIGHTSEEING, center_coordinates, self.parameters['city_bbox_side'], score_func) self.correct_score(L1, preferences.sightseeing) L += L1 # List for nature if preferences.nature.score != 0: - score_func = lambda loc, n_tags: int((self.count_elements_within_radius(loc, self.parameters['radius_close_to']) + n_tags * self.parameters['tag_coeff']) * self.parameters['park_coeff']) + score_func = lambda loc, n_tags: int((10 + n_tags * self.parameters['tag_coeff']) * self.parameters['park_coeff']) L2 = self.fetch_landmarks(self.amenity_selectors['nature'], NATURE, center_coordinates, self.parameters['city_bbox_side'], score_func) self.correct_score(L2, preferences.nature) L += L2 # List for shopping if preferences.shopping.score != 0: - score_func = lambda loc, n_tags: self.count_elements_within_radius(loc, self.parameters['radius_close_to']) + n_tags * self.parameters['tag_coeff'] + score_func = lambda loc, n_tags: int((10 + n_tags * self.parameters['tag_coeff'])) L3 = self.fetch_landmarks(self.amenity_selectors['shopping'], SHOPPING, center_coordinates, self.parameters['city_bbox_side'], score_func) self.correct_score(L3, preferences.shopping) L += L3 @@ -115,6 +117,7 @@ class LandmarkManager: dist = distance, tags = amenity_selectors ) + self.logger.info(f'Fetched {len(landmarks)} landmarks around {center_coordinates}.') # cleanup the list # remove rows where name is None diff --git a/backend/src/parameters/optimizer_parameters.yaml b/backend/src/parameters/optimizer_parameters.yaml index b6dca0e..515d028 100644 --- a/backend/src/parameters/optimizer_parameters.yaml +++ b/backend/src/parameters/optimizer_parameters.yaml @@ -1,3 +1,3 @@ detour_factor: 1.4 average_walking_speed: 4.8 -max_landmarks: 10 +max_landmarks: 40 diff --git a/deployment/deployment.yaml b/deployment/deployment.yaml index 616b587..aabc6fa 100644 --- a/deployment/deployment.yaml +++ b/deployment/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: nav-backend spec: - replicas: 3 + replicas: 1 selector: matchLabels: app: nav-backend @@ -31,7 +31,10 @@ spec: memory: 100Mi limits: cpu: 4 - memory: 8Gi + memory: 10Gi volumes: - name: osm-cache - emptyDir: {} + persistentVolumeClaim: + claimName: osm-cache + + \ No newline at end of file diff --git a/deployment/kustomization.yaml b/deployment/kustomization.yaml index 28040ec..bbb5d0c 100644 --- a/deployment/kustomization.yaml +++ b/deployment/kustomization.yaml @@ -5,6 +5,7 @@ kind: Kustomization namespace: nav resources: - namespace.yaml + - pvc.yaml - deployment.yaml - service.yaml - ingress.yaml diff --git a/deployment/pvc.yaml b/deployment/pvc.yaml index 15897ec..a7e747f 100644 --- a/deployment/pvc.yaml +++ b/deployment/pvc.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: cache + name: osm-cache spec: storageClassName: "nfs-client" accessModes: