Skip to content

p3 compatibility + some formatting + removing unused import #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2014
Merged

p3 compatibility + some formatting + removing unused import #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9f726
p3 compatibility + some formatting + removing unused import
mvexel Nov 19, 2014
8f979f9
more print statements to functions
mvexel Nov 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions overpass/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import requests
import json
from shapely.geometry import mapping, Point
from shapely.geometry import Point


class API(object):
Expand Down Expand Up @@ -44,7 +44,7 @@ def Get(self, query, asGeoJSON=False):
response = json.loads(self._GetFromOverpass(
self._ConstructQLQuery(query)))
except OverpassException as oe:
print oe
print(oe)
sys.exit(1)

if "elements" not in response or len(response["elements"]) == 0:
Expand All @@ -67,7 +67,7 @@ def _ConstructQLQuery(self, userquery):

complete_query = self._QUERY_TEMPLATE.format(responseformat=self.responseformat, query=raw_query)
if self.debug:
print complete_query
print(complete_query)
return complete_query

def _GetFromOverpass(self, query):
Expand All @@ -79,7 +79,7 @@ def _GetFromOverpass(self, query):
try:
r = requests.get(self.endpoint, params=payload, timeout=self.timeout)
except requests.exceptions.Timeout:
raise OverpassException(408,
raise OverpassException(408,
'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))
Expand Down Expand Up @@ -107,12 +107,14 @@ def _asGeoJSON(self, elements):
"tags": elem.get("tags"),
"nodes": elem.get("nodes")}
for elem in elements if elem["type"] == "way"]
print nodes
print ways
print(nodes)
print(ways)


class OverpassException(Exception):
def __init__(self, status_code, message):
self.status_code = status_code
self.message = message

def __str__(self):
return json.dumps({'status': self.status_code, 'message': self.message})
return json.dumps({'status': self.status_code, 'message': self.message})