Merge pull request #57 from themiurgo/multiline

Support for full multiline query

Author: mvexel

overpass/api.py

@@ -35,11 +35,14 @@ def __init__(self, *args, **kwargs):
             requests_log.setLevel(logging.DEBUG)
             requests_log.propagate = True
 
-    def Get(self, query, responseformat="geojson", verbosity="body"):
+    def Get(self, query, responseformat="geojson", verbosity="body", build=True):
         """Pass in an Overpass query in Overpass QL"""
 
         # Construct full Overpass query
-        full_query = self._ConstructQLQuery(query, responseformat=responseformat, verbosity=verbosity)
+        if build:
+            full_query = self._ConstructQLQuery(query, responseformat=responseformat, verbosity=verbosity)
+        else:
+            full_query = query
 
         # Get the response from Overpass
         raw_response = self._GetFromOverpass(full_query)

overpass/cli.py

@@ -12,14 +12,19 @@
     help='URL of your prefered API.')
 @click.option('--responseformat', default='geojson', help="""Format to save the data.
     Options are 'geojson' and 'osm'. Default format is geojson.""")
+@click.option('-f', '--queryasfile', help="Pass a full query as a file (useful for multiline queries).",
+        is_flag=True)
 @click.argument('query', type=str)
-def cli(timeout, endpoint, responseformat, query):
+def cli(timeout, endpoint, responseformat, query, queryasfile):
     """Run query"""
     api = overpass.API(timeout=timeout, endpoint=endpoint)
     if responseformat not in api.SUPPORTED_FORMATS:
         print("format {} not supported. Supported formats: {}".format(
             responseformat,
             ", ".join(api.SUPPORTED_FORMATS)))
         sys.exit(1)
-    result = api.Get(query, responseformat=responseformat)
+    if queryasfile:
+        queryfile = click.open_file(query, "r")
+        query = queryfile.read()
+    result = api.Get(query, responseformat=responseformat, build=not bool(queryasfile))
     click.echo(result)