fixing package

Author: mvexel

Overpass/Overpass.py

@@ -1,5 +1,6 @@
 import requests
 import json
+from shapely.geometry import mapping, Point
 
 
 class API(object):
@@ -31,7 +32,7 @@ def __init__(self, *args, **kwargs):
             requests_log.setLevel(logging.DEBUG)
             requests_log.propagate = True
 
-    def Get(self, query):
+    def Get(self, query, asGeoJSON=False):
         """Pass in an Overpass query in Overpass QL"""
 
         response = json.loads(
@@ -41,7 +42,11 @@ def Get(self, query):
         if "elements" not in response or len(response["elements"]) == 0:
             return self._ConstructError('No OSM features satisfied your query')
 
-        return response
+        if not asGeoJSON:
+            return response
+
+        # construct geojson
+        return self._asGeoJSON(response["elements"])
 
     def Search(self, feature_type, regex=False):
         """Search for something."""
@@ -85,3 +90,17 @@ def _GetFromOverpass(self, query):
                 return self._ConstructError('Something unexpected happened')
 
         return r.text
+
+    def _asGeoJSON(self, elements):
+        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"]
+        print nodes
+        print ways

setup.py

@@ -1,8 +1,8 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 
 setup(
     name='overpass',
-    packages=find_packages(),
+    packages=['overpass'],
     version='0.0.1',
     description='Python wrapper for the OpenStreetMap Overpass API',
     author='Martijn van Exel',
@@ -11,5 +11,5 @@
     download_url='https://github.com/mvexel/overpass-api-python-wrapper/tarball/0.0.1',
     keywords=['openstreetmap', 'overpass', 'wrapper'],
     classifiers=[],
-    install_requires=['requests>=2.3.0', 'pytest>=2.6'],
+    install_requires=['requests>=2.3.0'],
 )