indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

More tests

merge-requests/30/head
Bob Mottram 2022-08-22 21:44:14 +01:00
parent 54bd5f802f
commit 1277c165fb
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
maps.py
View File

@ -486,8 +486,8 @@ def _hashtag_map_to_kml(base_dir: str, tag_name: str,
except OSError: except OSError:
print('EX: unable to read tag map links ' + tag_map_filename) print('EX: unable to read tag map links ' + tag_map_filename)
if map_links: if map_links:
start_secs_since_epoch = start_hours_since_epoch * 60 * 60 start_secs_since_epoch = int(start_hours_since_epoch * 60 * 60)
end_secs_since_epoch = end_hours_since_epoch * 60 * 60 end_secs_since_epoch = int(end_hours_since_epoch * 60 * 60)
for link_line in map_links: for link_line in map_links:
link_line = link_line.strip().split(' ') link_line = link_line.strip().split(' ')
if len(link_line) < 3: if len(link_line) < 3:
@ -599,22 +599,23 @@ def html_hashtag_maps(base_dir: str, tag_name: str,
_hashtag_map_kml_within_hours(base_dir, tag_name, hours) _hashtag_map_kml_within_hours(base_dir, tag_name, hours)
if not new_kml_str: if not new_kml_str:
continue continue
if new_kml_str != kml_str: if new_kml_str == kml_str:
kml_str = new_kml_str continue
period_str2 = period_str.replace('Last ', '').lower() kml_str = new_kml_str
endpoint_str = \ period_str2 = period_str.replace('Last ', '').lower()
'/tagmaps/' + tag_name + '-' + period_str2.replace(' ', '_') endpoint_str = \
download_filename = \ '/tagmaps/' + tag_name + '-' + period_str2.replace(' ', '_')
(tag_name + '-' + download_filename = \
period_str.lower()).replace(' ', '_') + '.kml' (tag_name + '-' +
if html_str: period_str.lower()).replace(' ', '_') + '.kml'
html_str += ' ' if html_str:
description = period_str html_str += ' '
if translate.get(period_str): description = period_str
description = translate[period_str] if translate.get(period_str):
html_str += '<a href="' + endpoint_str + \ description = translate[period_str]
'" download="' + download_filename + '">' + \ html_str += '<a href="' + endpoint_str + \
description + '</a>' '" download="' + download_filename + '">' + \
description + '</a>'
if html_str: if html_str:
html_str = '<center>' + html_str + '</center>\n' html_str = '<center>' + html_str + '</center>\n'
return html_str return html_str

9
tests.py
View File

@ -192,6 +192,7 @@ from happening import dav_month_via_server
from happening import dav_day_via_server from happening import dav_day_via_server
from webapp_theme_designer import color_contrast from webapp_theme_designer import color_contrast
from maps import get_map_links_from_post_content from maps import get_map_links_from_post_content
from maps import geocoords_from_map_link
TEST_SERVER_GROUP_RUNNING = False TEST_SERVER_GROUP_RUNNING = False
@ -7521,8 +7522,16 @@ def _test_hashtag_maps():
map_links = get_map_links_from_post_content(content) map_links = get_map_links_from_post_content(content)
link = "www.google.com/maps/@52.217291,-3.0811865,20.04z" link = "www.google.com/maps/@52.217291,-3.0811865,20.04z"
assert link in map_links assert link in map_links
zoom, latitude, longitude = geocoords_from_map_link(link)
assert zoom
assert latitude
assert longitude
link = "www.openstreetmap.org/#map=19/52.90860/-3.59917" link = "www.openstreetmap.org/#map=19/52.90860/-3.59917"
assert link in map_links assert link in map_links
zoom, latitude, longitude = geocoords_from_map_link(link)
assert zoom
assert latitude
assert longitude
assert len(map_links) == 2 assert len(map_links) == 2