organicmaps/osm_conflate
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Better error message for overpass timeouts

Browse source
This commit is contained in:
Ilya Zverev 2018-03-15 11:11:14 +03:00
parent 913974e22e
commit 8218e04a12
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conflate/conflate.py
View file

@ -436,6 +436,8 @@ class OsmConflator:
query = self.construct_overpass_query(bboxes)
logging.debug('Overpass query: %s', query)
r = requests.get(OVERPASS_SERVER + 'interpreter', {'data': query})
if r.encoding is None:
r.encoding = 'utf-8'
if r.status_code != 200:
logging.error('Failed to download data from Overpass API: %s', r.status_code)
if 'rate_limited' in r.text:
@ -444,6 +446,9 @@ class OsmConflator:
else:
logging.error('Error message: %s', r.text)
raise IOError()
if 'runtime error: Query timed out' in r.text:
logging.error('Query timed out, try increasing the "overpass_timeout" profile variable')
raise IOError()
self.parse_osm(r.content)
def parse_osm(self, fileobj):