Added query to retrieve map.

Author: tbolender

Overpass/Overpass.py

@@ -13,6 +13,8 @@ class API(object):
     _debug = False
     _bbox = [-180.0, -90.0, 180.0, 90.0]
 
+    _QUERY_TEMPLATE = "[out:{responseformat}];{query}out body;"
+
     def __init__(self, *args, **kwargs):
         self.endpoint = kwargs.get("endpoint", self._endpoint)
         self.timeout = kwargs.get("timeout", self._timeout)
@@ -59,12 +61,14 @@ def _ConstructError(self, msg):
         }
 
     def _ConstructQLQuery(self, userquery):
-        if not userquery.endswith(";"):
-            userquery += ";"
-        fullquery = "[out:{responseformat}];".format(responseformat=self.responseformat) + userquery + "out body;"
+        raw_query = str(userquery)
+        if not raw_query.endswith(";"):
+            raw_query += ";"
+
+        complete_query = self._QUERY_TEMPLATE.format(responseformat=self.responseformat, query=raw_query)
         if self.debug:
-            print fullquery
-        return "[out:{responseformat}];".format(responseformat=self.responseformat) + userquery + "out body;"
+            print complete_query
+        return complete_query
 
     def _GetFromOverpass(self, query):
         """This sends the API request to the Overpass instance and

Overpass/queries.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+
+class MapQuery(object):
+    """Query to retrieve complete ways and relations in an area."""
+
+    _QUERY_TEMPLATE = "(node({bbox[0]},{bbox[1]},{bbox[2]},{bbox[2]});<;>;);"
+
+    def __init__(self, bbox):
+        """
+        Initialize query with given bounding box.
+        :param bbox Bounding box with limit values in format (s, w, n, e) in a sequence.
+        """
+        self.bbox = bbox
+
+    def __str__(self):
+        return self._QUERY_TEMPLATE.format(bbox=self.bbox)