branching retrieving logic into separate function

Author: mvexel

Overpass.py

@@ -41,33 +41,20 @@ def __init__(self,
             requests_log.propagate = True
 
     def Get(self, query):
-        """Pass in an Overpass query in Overpass XML or Overpass QL"""
+        """Pass in an Overpass query in Overpass QL"""
 
-        payload = {"data": self._ConstructQLQuery(query)}
-
-        try:
-            r = requests.get(self.endpoint, params=payload, timeout=self.timeout)
-        except requests.exceptions.Timeout:
-            return self._ConstructError(
-                'Query timed out. API instance is set to time out in {timeout} seconds. '
-                'Try passing in a higher value when instantiating this API:'
-                'api = Overpass.API(timeout=60)'.format(timeout=self.timeout))
-
-        self._status = r.status_code
-
-        if self._status != 200:
-            if self._status == 400:
-                return self._ConstructError('Query syntax error')
-            elif self._status == 500:
-                return self._ConstructError('Overpass internal server error')
-
-        response = json.loads(r.text)
+        response = json.loads(
+            self._GetFromOverpass(
+                self._ConstructQLQuery(query)))
 
         if "elements" not in response or len(response["elements"]) == 0:
             return self._ConstructError('No OSM features satisfied your query')
 
         return response
 
+    def Search(self, feature_type, regex=False):
+        """Search for something."""
+
     def _ConstructError(self, msg):
         return {
             "status": self._status,
@@ -80,3 +67,29 @@ def _ConstructQLQuery(self, userquery):
         if not userquery.endswith(";"):
             userquery += ";"
         return "[out:json];" + userquery + "out body;"
+
+    def _GetFromOverpass(self, query):
+        """This sends the API request to the Overpass instance and
+        returns the raw result, or an error."""
+
+        payload = {"data": query}
+
+        try:
+            r = requests.get(self.endpoint, params=payload, timeout=self.timeout)
+        except requests.exceptions.Timeout:
+            return self._ConstructError(
+                'Query timed out. API instance is set to time out in {timeout} seconds. '
+                'Try passing in a higher value when instantiating this API:'
+                'api = Overpass.API(timeout=60)'.format(timeout=self.timeout))
+
+        self._status = r.status_code
+
+        if self._status != 200:
+            if self._status == 400:
+                return self._ConstructError('Query syntax error')
+            elif self._status == 500:
+                return self._ConstructError('Overpass internal server error')
+            else:
+                return self._ConstructError('Something unexpected happened')
+
+        return r.text