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

fix/backend/veiwpoint-nodes-and-churches #38

Merged
kscheidecker merged 2 commits from fix/backend/veiwpoint-nodes-and-churches into main 2024-11-18 16:09:20 +00:00
Conversation 0 Commits 2 Files Changed 20 +57 -31
5 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4305b21329 - Show all commits

5
backend/src/parameters/landmark_parameters.yaml
View File

@@ -1,11 +1,12 @@
city_bbox_side: 7500 #m city_bbox_side: 7500 #m
radius_close_to: 50 radius_close_to: 50
church_coeff: 0.5 church_coeff: 0.75
nature_coeff: 1.25 nature_coeff: 1.25
overall_coeff: 10 overall_coeff: 10
tag_exponent: 1.15 tag_exponent: 1.15
image_bonus: 10 image_bonus: 10
viewpoint_bonus: 15 viewpoint_bonus: 15
wikipedia_bonus: 6 wikipedia_bonus: 4
name_bonus: 3
N_important: 40 N_important: 40
pay_bonus: -1 pay_bonus: -1

2
backend/src/parameters/optimizer_parameters.yaml
View File

@@ -3,4 +3,4 @@ detour_corridor_width: 300
average_walking_speed: 4.8 average_walking_speed: 4.8
max_landmarks: 10 max_landmarks: 10
max_landmarks_refiner: 30 max_landmarks_refiner: 30
overshoot: 1.8 overshoot: 1.2

1
backend/src/structs/linked_landmarks.py
View File

@@ -35,6 +35,7 @@ class LinkedLandmarks:
time_to_next = get_time(landmark.location, self._landmarks[i + 1].location) time_to_next = get_time(landmark.location, self._landmarks[i + 1].location)
landmark.time_to_reach_next = time_to_next landmark.time_to_reach_next = time_to_next
self.total_time += time_to_next self.total_time += time_to_next
self.total_time += landmark.duration
self._landmarks[-1].next_uuid = None self._landmarks[-1].next_uuid = None
self._landmarks[-1].time_to_reach_next = 0 self._landmarks[-1].time_to_reach_next = 0

8
backend/src/tester.py
View File

@@ -22,8 +22,8 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] =
preferences = Preferences( preferences = Preferences(
sightseeing=Preference(type='sightseeing', score = 5), sightseeing=Preference(type='sightseeing', score = 5),
nature=Preference(type='nature', score = 5), nature=Preference(type='nature', score = 5),
shopping=Preference(type='shopping', score = 5), shopping=Preference(type='shopping', score = 0),
max_time_minute=15, max_time_minute=30,
detour_tolerance_minute=0 detour_tolerance_minute=0
) )
@@ -74,7 +74,7 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] =
# test(tuple((48.8344400, 2.3220540))) # Café Chez César # test(tuple((48.8344400, 2.3220540))) # Café Chez César
# test(tuple((48.8375946, 2.2949904))) # Point random # test(tuple((48.8375946, 2.2949904))) # Point random
# test(tuple((47.377859, 8.540585))) # Zurich HB # test(tuple((47.377859, 8.540585))) # Zurich HB
# test(tuple((45.758217, 4.831814))) # Lyon Bellecour test(tuple((45.758217, 4.831814))) # Lyon Bellecour
# test(tuple((48.5848435, 7.7332974))) # Strasbourg Gare # test(tuple((48.5848435, 7.7332974))) # Strasbourg Gare
# test(tuple((48.2067858, 16.3692340))) # Vienne # test(tuple((48.2067858, 16.3692340))) # Vienne
test(tuple((48.084588, 7.280405))) # Turckheim # test(tuple((48.2432090, 7.3892691))) # Orschwiller

70
backend/src/utils/landmarks_manager.py
View File

@@ -39,6 +39,7 @@ class LandmarkManager:
self.overall_coeff = parameters['overall_coeff'] self.overall_coeff = parameters['overall_coeff']
self.tag_exponent = parameters['tag_exponent'] self.tag_exponent = parameters['tag_exponent']
self.image_bonus = parameters['image_bonus'] self.image_bonus = parameters['image_bonus']
self.name_bonus = parameters['name_bonus']
self.wikipedia_bonus = parameters['wikipedia_bonus'] self.wikipedia_bonus = parameters['wikipedia_bonus']
self.viewpoint_bonus = parameters['viewpoint_bonus'] self.viewpoint_bonus = parameters['viewpoint_bonus']
self.pay_bonus = parameters['pay_bonus'] self.pay_bonus = parameters['pay_bonus']
@@ -202,18 +203,29 @@ class LandmarkManager:
""" """
return_list = [] return_list = []
if landmarktype == 'nature' : query_conditions = []
else : query_conditions = ['count_tags()>5']
# caution, when applying a list of selectors, overpass will search for elements that match ALL selectors simultaneously # caution, when applying a list of selectors, overpass will search for elements that match ALL selectors simultaneously
# we need to split the selectors into separate queries and merge the results # we need to split the selectors into separate queries and merge the results
for sel in dict_to_selector_list(amenity_selector): for sel in dict_to_selector_list(amenity_selector):
self.logger.debug(f"Current selector: {sel}") self.logger.debug(f"Current selector: {sel}")
query_conditions = ['count_tags()>5']
element_types = ['way', 'relation']
if 'viewpoint' in sel :
query_conditions = []
element_types.append('node')
query = overpassQueryBuilder( query = overpassQueryBuilder(
bbox = bbox, bbox = bbox,
elementType = ['way', 'relation'], elementType = element_types,
# selector can in principle be a list already, # selector can in principle be a list already,
# but it generates the intersection of the queries # but it generates the intersection of the queries
# we want the union # we want the union
selector = sel, selector = sel,
conditions = ['count_tags()>5'], conditions = query_conditions, # except for nature....
includeCenter = True, includeCenter = True,
out = 'body' out = 'body'
) )
@@ -229,18 +241,23 @@ class LandmarkManager:
name = elem.tag('name') name = elem.tag('name')
location = (elem.centerLat(), elem.centerLon()) location = (elem.centerLat(), elem.centerLon())
osm_type = elem.type() # Add type: 'way' or 'relation'
osm_id = elem.id() # Add OSM id
# TODO: exclude these from the get go # TODO: exclude these from the get go
# skip if unprecise location # handle unprecise and no-name locations
if name is None or location[0] is None: if name is None or location[0] is None:
if osm_type == 'node' and 'viewpoint' in elem.tags().values():
name = 'Viewpoint'
name_en = 'Viewpoint'
location = (elem.lat(), elem.lon())
else :
continue continue
# skip if part of another building # skip if part of another building
if 'building:part' in elem.tags().keys() and elem.tag('building:part') == 'yes': if 'building:part' in elem.tags().keys() and elem.tag('building:part') == 'yes':
continue continue
osm_type = elem.type() # Add type: 'way' or 'relation'
osm_id = elem.id() # Add OSM id
elem_type = landmarktype # Add the landmark type as 'sightseeing, elem_type = landmarktype # Add the landmark type as 'sightseeing,
n_tags = len(elem.tags().keys()) # Add number of tags n_tags = len(elem.tags().keys()) # Add number of tags
score = n_tags**self.tag_exponent # Add score score = n_tags**self.tag_exponent # Add score
@@ -248,60 +265,67 @@ class LandmarkManager:
image_url = None image_url = None
name_en = None name_en = None
# Adjust scoring # Adjust scoring, browse through tag keys
skip = False skip = False
for tag in elem.tags().keys(): for tag_key in elem.tags().keys():
if "pay" in tag: if "pay" in tag_key:
# payment options are misleading and should not count for the scoring. # payment options are misleading and should not count for the scoring.
score += self.pay_bonus score += self.pay_bonus
if "disused" in tag: if "disused" in tag_key:
# skip disused amenities # skip disused amenities
skip = True skip = True
break break
if "wiki" in tag: if "name" in tag_key :
score += self.name_bonus
if "wiki" in tag_key:
# wikipedia entries count more # wikipedia entries count more
score += self.wikipedia_bonus score += self.wikipedia_bonus
if "viewpoint" in tag: if "image" in tag_key:
# viewpoints must count more
score += self.viewpoint_bonus
duration = 10
if "image" in tag:
# images must count more # images must count more
score += self.image_bonus score += self.image_bonus
if elem_type != "nature": if elem_type != "nature":
if "leisure" in tag and elem.tag('leisure') == "park": if "leisure" in tag_key and elem.tag('leisure') == "park":
elem_type = "nature" elem_type = "nature"
if landmarktype != "shopping": if landmarktype != "shopping":
if "shop" in tag: if "shop" in tag_key:
skip = True skip = True
break break
if tag == "building" and elem.tag('building') in ['retail', 'supermarket', 'parking']: if tag_key == "building" and elem.tag('building') in ['retail', 'supermarket', 'parking']:
skip = True skip = True
break break
# Extract image, website and english name # Extract image, website and english name
if tag in ['website', 'contact:website']: if tag_key in ['website', 'contact:website']:
website_url = elem.tag(tag) website_url = elem.tag(tag_key)
if tag == 'image': if tag_key == 'image':
image_url = elem.tag('image') image_url = elem.tag('image')
if tag =='name:en': if tag_key =='name:en':
name_en = elem.tag('name:en') name_en = elem.tag('name:en')
if skip: if skip:
continue continue
# Don't visit random apartments
if 'apartments' in elem.tags().values():
continue
score = score_function(score) score = score_function(score)
if "place_of_worship" in elem.tags().values(): if "place_of_worship" in elem.tags().values():
score = score * self.church_coeff score = score * self.church_coeff
duration = 10 duration = 10
if 'viewpoint' in elem.tags().values() :
# viewpoints must count more
score += self.viewpoint_bonus
duration = 10
elif "museum" in elem.tags().values() or "aquarium" in elem.tags().values() or "planetarium" in elem.tags().values(): elif "museum" in elem.tags().values() or "aquarium" in elem.tags().values() or "planetarium" in elem.tags().values():
duration = 60 duration = 60