mirror of https://gitlab.com/bashrc2/epicyon
Remove debug
parent
a334949350
commit
2847368653
8
maps.py
8
maps.py
|
@ -172,7 +172,6 @@ def _geocoords_from_osmorg_link(url: str) -> (int, float, float):
|
||||||
def _geocoords_from_osmorg_go_link(url: str, session) -> (int, float, float):
|
def _geocoords_from_osmorg_go_link(url: str, session) -> (int, float, float):
|
||||||
"""Returns geocoordinates from an OSM go map link
|
"""Returns geocoordinates from an OSM go map link
|
||||||
"""
|
"""
|
||||||
print('Debug: _geocoords_from_osmorg_go_link ' + url)
|
|
||||||
osm_domain = 'osm.org'
|
osm_domain = 'osm.org'
|
||||||
if osm_domain not in url:
|
if osm_domain not in url:
|
||||||
return None, None, None
|
return None, None, None
|
||||||
|
@ -190,18 +189,12 @@ def _geocoords_from_osmorg_go_link(url: str, session) -> (int, float, float):
|
||||||
if not resolved_url:
|
if not resolved_url:
|
||||||
return None, None, None
|
return None, None, None
|
||||||
|
|
||||||
print('Debug: _geocoords_from_osmorg_go_link ' + resolved_url)
|
|
||||||
|
|
||||||
if 'osm.org' in resolved_url:
|
if 'osm.org' in resolved_url:
|
||||||
(zoom, latitude, longitude) = \
|
(zoom, latitude, longitude) = \
|
||||||
_geocoords_from_osmorg_link(resolved_url)
|
_geocoords_from_osmorg_link(resolved_url)
|
||||||
print('Debug: _geocoords_from_osmorg_go_link2 ' + str(zoom) + ' ' +
|
|
||||||
str(latitude) + ' ' + str(longitude))
|
|
||||||
else:
|
else:
|
||||||
(zoom, latitude, longitude) = \
|
(zoom, latitude, longitude) = \
|
||||||
_geocoords_from_osm_link(resolved_url, 'openstreetmap.org')
|
_geocoords_from_osm_link(resolved_url, 'openstreetmap.org')
|
||||||
print('Debug: _geocoords_from_osmorg_go_link3 ' + str(zoom) + ' ' +
|
|
||||||
str(latitude) + ' ' + str(longitude))
|
|
||||||
return zoom, latitude, longitude
|
return zoom, latitude, longitude
|
||||||
|
|
||||||
|
|
||||||
|
@ -435,7 +428,6 @@ def geocoords_from_map_link(url: str, osm_domain: str,
|
||||||
_geocoords_from_osm_link(url, osm_domain)
|
_geocoords_from_osm_link(url, osm_domain)
|
||||||
return zoom, latitude, longitude
|
return zoom, latitude, longitude
|
||||||
if 'osm.org' in url and 'mlat=' not in url and '/go/' in url:
|
if 'osm.org' in url and 'mlat=' not in url and '/go/' in url:
|
||||||
print('Debug: _geocoords_from_osmorg_go_link 0 ' + url)
|
|
||||||
zoom, latitude, longitude = \
|
zoom, latitude, longitude = \
|
||||||
_geocoords_from_osmorg_go_link(url, session)
|
_geocoords_from_osmorg_go_link(url, session)
|
||||||
return zoom, latitude, longitude
|
return zoom, latitude, longitude
|
||||||
|
|
Loading…
Reference in New Issue