Setting 'out geometry;' on asGeoJSON=True queries - geoJSON output

generation is now straight forward, and results look good.

Author: mharnold

overpass/api.py

@@ -2,8 +2,6 @@
 import requests
 import json
 import geojson
-#from shapely.geometry import mapping, Point
-
 
 class API(object):
     """A simple Python wrapper for the OpenStreetMap Overpass API"""
@@ -16,6 +14,7 @@ class API(object):
     _bbox = [-180.0, -90.0, 180.0, 90.0]
 
     _QUERY_TEMPLATE = "[out:{responseformat}];{query}out body;"
+    _GEOJSON_QUERY_TEMPLATE = "[out:json];{query}out body geom;"
 
     def __init__(self, *args, **kwargs):
         self.endpoint = kwargs.get("endpoint", self._endpoint)
@@ -43,7 +42,7 @@ def Get(self, query, asGeoJSON=False):
 
         try:
             response = json.loads(self._GetFromOverpass(
-                self._ConstructQLQuery(query)))
+                self._ConstructQLQuery(query, asGeoJSON=asGeoJSON)))
         except OverpassException as oe:
             print oe
             sys.exit(1)
@@ -61,12 +60,18 @@ def Search(self, feature_type, regex=False):
         """Search for something."""
         pass
 
-    def _ConstructQLQuery(self, userquery):
+    def _ConstructQLQuery(self, userquery, asGeoJSON=False):
         raw_query = str(userquery)
         if not raw_query.endswith(";"):
             raw_query += ";"
 
-        complete_query = self._QUERY_TEMPLATE.format(responseformat=self.responseformat, query=raw_query)
+        if asGeoJSON:
+            template = self._GEOJSON_QUERY_TEMPLATE
+        else:
+            template = self._QUERY_TEMPLATE
+
+        complete_query = template.format(responseformat=self.responseformat, query=raw_query)
+
         if self.debug:
             print complete_query
         return complete_query
@@ -97,16 +102,7 @@ def _GetFromOverpass(self, query):
             return r.text
 
     def _asGeoJSON(self, elements):
-        """
-        Construct geoJSON from elements
-        TODO:  Add secondary overpass call to get coords for ways for nodes not included in elements.
-        """
-        node_elements_by_id = {}
-
-        # index node elements by id
-        for elem in elements:
-            if elem["type"] == "node": 
-                node_elements_by_id[elem["id"]] = elem
+        #print 'DEB _asGeoJson elements:', elements
 
         features = []
         for elem in elements:
@@ -115,13 +111,8 @@ def _asGeoJSON(self, elements):
                 geometry=geojson.Point((elem["lon"], elem["lat"]))
             elif elem["type"] == "way":
                 points = []
-                for node_id in elem["nodes"]:
-                    node_elem = node_elements_by_id.get(node_id)
-                    if node_elem:
-                        point = (node_elem["lon"], node_elem["lat"])
-                        points.append(point)
-                    else
-                        print 'WARNING _asGeoJson skipping missing node ref in way
+                for coords in elem["geometry"]:
+                    points.append((coords["lon"], coords["lat"]))
                 geometry = geojson.LineString(points)
             else:
                 continue
@@ -134,22 +125,6 @@ def _asGeoJSON(self, elements):
 
         return geojson.FeatureCollection(features)
 
-'''
-        nodes = [{
-            "id": elem.get("id"),
-            "tags": elem.get("tags")
-            "geom": Point(elem["lon"], elem["lat"])}
-            for elem in elements if elem["type"] == "node"]
-        ways = [{
-            "id": elem.get("id"),
-            "tags": elem.get("tags"),
-            "nodes": elem.get("nodes")}
-            for elem in elements if elem["type"] == "way"]
-'''
-
-
-
-
 class OverpassException(Exception):
     def __init__(self, status_code, message):
         self.status_code = status_code

test_api.py

@@ -10,17 +10,18 @@ def test_initialize_api(self):
 
     def test_geojson(self):
         api = overpass.API()
-        osm_elements = api.Get(overpass.MapQuery(37.86517,-122.31851,37.86687,-122.31635))
-        osm_geo  = api.Get(overpass.MapQuery(37.86517,-122.31851,37.86687,-122.31635), asGeoJSON=True)
+        #osm_elements = api.Get(overpass.MapQuery(37.86517,-122.31851,37.86687,-122.31635))
         #print 'DEB osm_elements:', geojson.dumps(osm_elements,sort_keys=True,indent=2)
-        print 'DEB osm_geo:', geojson.dumps(osm_geo,sort_keys=True,indent=2)
-        assert len(osm_geo['features']>1)
+        osm_geo  = api.Get(overpass.MapQuery(37.86517,-122.31851,37.86687,-122.31635), asGeoJSON=True)
+        #with open('test.geojson','w') as f:
+        #    geojson.dump(osm_geo,f,indent=2,sort_keys=True)
+        assert len(osm_geo['features'])>1
 
-    def run_tests():
+    def run_tests(self):
         self.test_initialize_api()
         self.test_geojson()
 
 if __name__ == '__main__':
     tapi = TestAPI()
-    tapi.test_geojson()
+    tapi.run_tests()
     print "overpass PASS"