Merge pull request #35 from atlefren/master

Handle server runtime error from overpass API

Author: tbolender

overpass/api.py

@@ -2,7 +2,8 @@
 import json
 import geojson
 
-from .errors import OverpassSyntaxError, TimeoutError, MultipleRequestsError, ServerLoadError, UnknownOverpassError
+from .errors import (OverpassSyntaxError, TimeoutError, MultipleRequestsError,
+                     ServerLoadError, UnknownOverpassError, ServerRuntimeError)
 
 
 class API(object):
@@ -48,6 +49,10 @@ def Get(self, query, asGeoJSON=False):
         if "elements" not in response:
             raise UnknownOverpassError("Received an invalid answer from Overpass.")
 
+        remark = response.get('remark', None)
+        if remark is not None and remark.startswith('runtime error'):
+            raise ServerRuntimeError(remark)
+
         if not asGeoJSON:
             return response
 

overpass/errors.py

@@ -34,4 +34,11 @@ class UnknownOverpassError(OverpassError):
     """An unknown kind of error happened during the request."""
 
     def __init__(self, message):
-        self.message = message
+        self.message = message
+
+
+class ServerRuntimeError(OverpassError):
+    """The Overpass server returned a runtime error"""
+
+    def __init__(self, message):
+        self.message = message