osmnx does not behave
This commit is contained in:
parent
25cc0fa300
commit
8d71cab8d5
@ -16,7 +16,9 @@ class LandmarkManager:
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
def __init__(self) -> None:
|
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:
|
with constants.AMENITY_SELECTORS_PATH.open('r') as f:
|
||||||
self.amenity_selectors = yaml.safe_load(f)
|
self.amenity_selectors = yaml.safe_load(f)
|
||||||
with constants.LANDMARK_PARAMETERS_PATH.open('r') as f:
|
with constants.LANDMARK_PARAMETERS_PATH.open('r') as f:
|
||||||
@ -36,21 +38,21 @@ class LandmarkManager:
|
|||||||
|
|
||||||
# List for sightseeing
|
# List for sightseeing
|
||||||
if preferences.sightseeing.score != 0:
|
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)
|
L1 = self.fetch_landmarks(self.amenity_selectors['sightseeing'], SIGHTSEEING, center_coordinates, self.parameters['city_bbox_side'], score_func)
|
||||||
self.correct_score(L1, preferences.sightseeing)
|
self.correct_score(L1, preferences.sightseeing)
|
||||||
L += L1
|
L += L1
|
||||||
|
|
||||||
# List for nature
|
# List for nature
|
||||||
if preferences.nature.score != 0:
|
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)
|
L2 = self.fetch_landmarks(self.amenity_selectors['nature'], NATURE, center_coordinates, self.parameters['city_bbox_side'], score_func)
|
||||||
self.correct_score(L2, preferences.nature)
|
self.correct_score(L2, preferences.nature)
|
||||||
L += L2
|
L += L2
|
||||||
|
|
||||||
# List for shopping
|
# List for shopping
|
||||||
if preferences.shopping.score != 0:
|
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)
|
L3 = self.fetch_landmarks(self.amenity_selectors['shopping'], SHOPPING, center_coordinates, self.parameters['city_bbox_side'], score_func)
|
||||||
self.correct_score(L3, preferences.shopping)
|
self.correct_score(L3, preferences.shopping)
|
||||||
L += L3
|
L += L3
|
||||||
@ -115,6 +117,7 @@ class LandmarkManager:
|
|||||||
dist = distance,
|
dist = distance,
|
||||||
tags = amenity_selectors
|
tags = amenity_selectors
|
||||||
)
|
)
|
||||||
|
self.logger.info(f'Fetched {len(landmarks)} landmarks around {center_coordinates}.')
|
||||||
|
|
||||||
# cleanup the list
|
# cleanup the list
|
||||||
# remove rows where name is None
|
# remove rows where name is None
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
detour_factor: 1.4
|
detour_factor: 1.4
|
||||||
average_walking_speed: 4.8
|
average_walking_speed: 4.8
|
||||||
max_landmarks: 10
|
max_landmarks: 40
|
||||||
|
@ -3,7 +3,7 @@ kind: Deployment
|
|||||||
metadata:
|
metadata:
|
||||||
name: nav-backend
|
name: nav-backend
|
||||||
spec:
|
spec:
|
||||||
replicas: 3
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: nav-backend
|
app: nav-backend
|
||||||
@ -31,7 +31,10 @@ spec:
|
|||||||
memory: 100Mi
|
memory: 100Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 4
|
cpu: 4
|
||||||
memory: 8Gi
|
memory: 10Gi
|
||||||
volumes:
|
volumes:
|
||||||
- name: osm-cache
|
- name: osm-cache
|
||||||
emptyDir: {}
|
persistentVolumeClaim:
|
||||||
|
claimName: osm-cache
|
||||||
|
|
||||||
|
|
@ -5,6 +5,7 @@ kind: Kustomization
|
|||||||
namespace: nav
|
namespace: nav
|
||||||
resources:
|
resources:
|
||||||
- namespace.yaml
|
- namespace.yaml
|
||||||
|
- pvc.yaml
|
||||||
- deployment.yaml
|
- deployment.yaml
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- ingress.yaml
|
- ingress.yaml
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
name: cache
|
name: osm-cache
|
||||||
spec:
|
spec:
|
||||||
storageClassName: "nfs-client"
|
storageClassName: "nfs-client"
|
||||||
accessModes:
|
accessModes:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user