[Python-modules-commits] [overpass] 01/06: Import overpass_0.5.6.orig.tar.gz
Sandro Tosi
morph at moszumanska.debian.org
Sun Oct 2 17:35:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository overpass.
commit 4d6601aaeca13cd9e563f7027a5ce56f162f2b68
Author: Sandro Tosi <morph at debian.org>
Date: Sun Oct 2 11:48:56 2016 -0400
Import overpass_0.5.6.orig.tar.gz
---
PKG-INFO | 184 +------------------------------------
README.rst | 180 ------------------------------------
overpass.egg-info/PKG-INFO | 184 +------------------------------------
overpass.egg-info/SOURCES.txt | 3 -
overpass.egg-info/entry_points.txt | 3 -
overpass.egg-info/requires.txt | 1 -
overpass/api.py | 11 ++-
overpass/cli.py | 25 -----
setup.cfg | 2 +-
setup.py | 16 +---
10 files changed, 16 insertions(+), 593 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 69b7b45..692a90a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,192 +1,12 @@
Metadata-Version: 1.1
Name: overpass
-Version: 0.4.0
+Version: 0.5.6
Summary: Python wrapper for the OpenStreetMap Overpass API
Home-page: https://github.com/mvexel/overpass-api-python-wrapper
Author: Martijn van Exel
Author-email: m at rtijn.org
License: Apache
-Description: Overpass API python wrapper
- ===========================
-
- This is a thin wrapper around the OpenStreetMap `Overpass
- API <http://wiki.openstreetmap.org/wiki/Overpass_API>`__.
-
- .. image:: https://travis-ci.org/mvexel/overpass-api-python-wrapper.svg
- :target: https://travis-ci.org/mvexel/overpass-api-python-wrapper
-
-
- Install it
- ==========
-
- .. code:: bash
-
- $ pip install overpass
-
- If you get an error similar to
-
- ::
-
- OSError: Could not find library geos_c or load any of its variants ['libgeos_c.so.1', 'libgeos_c.so']
-
- you can install the required libraries on linux with
-
- .. code:: bash
-
- $ sudo apt-get install libgeos-c1 libgeos-3.4.2
-
- Use it
- ======
-
- You can use the overpass command line interface or use it as a Python
- library.
-
- Command line interface
- ---------------------
-
- You can use the CLI to execute queries and save the result in a GeoJSON
- file.
-
- ::
-
- Usage: overpass [OPTIONS] QUERY OUTPUT_FILE
-
- Run query and save the result in output_file
-
- Options:
- --timeout INTEGER Timeout in seconds
- --endpoint TEXT URL of your prefered API
- --format TEXT Format to save the data. Options are 'geojson', 'json', 'xml'. Default format is geojson.
- --help Show this message and exit.
-
- For example:
-
- To make a query and save the result as GeoJSON:
-
- .. code:: bash
-
- overpass --timeout 50 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.geojson
-
- Or to get the result as an OSM XML file:
-
- .. code:: bash
-
- overpass --timeout 50 --format xml 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.osm
-
- Python Library
- -------------
-
- .. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]')
-
- Note that you don't have to include any of the output meta statements.
- The wrapper will, well, wrap those.
-
- You will get your result as a dictionary, which (for now) represents the
- JSON output you would get `from the Overpass API
- directly <http://overpass-api.de/output_formats.html#json>`__. So you
- could do this for example:
-
- .. code:: python
-
- >>> print [(feature['tags']['name'], feature['id']) for feature in response['elements']]
- [(u'Salt Lake City', 150935219), (u'Salt Lake City', 585370637), (u'Salt Lake City', 1615721573)]
-
- You can specify the format of the response. By default, you will get GeoJSON using the `responseformat` parameter. Alternatives are plain JSON (`json`) and OSM XML (`xml`), as ouput directly by the Overpass API.
-
- .. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]', responseformat="xml")
-
- Parameters
- ~~~~~~~~~~
-
- The API takes a few parameters:
-
- ``endpoint``
- ^^^^^^^^^^
-
- The default endpoint is ``http://overpass-api.de/api/interpreter`` but
- you can pass in the rambler instance
- (``http://overpass.osm.rambler.ru/cgi/interpreter``) or your own:
-
- .. code:: python
-
- api = overpass.API(endpoint=http://overpass.myserver/interpreter)
-
- ``timeout``
- ^^^^^^^^^^
-
- The default timeout is 25 seconds, but you can set it to whatever you
- want.
-
- .. code:: python
-
- api = overpass.API(timeout=600)
-
- ``debug``
- ^^^^^^^^^^
-
- Setting this to ``True`` will get you debug output.
-
- Simple queries
- ~~~~~~~~~~~
-
- In addition to just send your query and parse the result, the wrapper
- provides shortcuts for often used map queries. To use them, just pass
- them like to normal query to the API.
-
- MapQuery
- ^^^^^^^^
-
- This is a shorthand for a `complete ways and
- relations <http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide#Completed_ways_and_relations>`__
- query in a bounding box (the 'map call'). You just pass the bounding box
- to the constructor:
-
- .. code:: python
-
- >>> map_query = overpass.MapQuery(50.746,7.154,50.748,7.157)
- >>> response = api.Get(map_query)
-
- WayQuery
- ^^^^^^^^
-
- This is shorthand for getting a set of ways and their child nodes that
- satisfy certain criteria. Pass the criteria as a Overpass QL stub to the
- constructor:
-
- .. code:: python
-
- >>> way_query = overpass.WayQuery('[name="Highway 51"]')
- >>> response = api.Get(way_query)
-
- Need help? Want feature?
- =======================
-
- Create a `new
- issue <https://github.com/mvexel/overpass-api-python-wrapper/issues>`__.
-
- Test it
- -------
-
- ::
-
- py.test
-
- Fork it
- -------
-
- `Yes
- please <https://github.com/mvexel/overpass-api-python-wrapper/fork>`__.
- `Help
- wanted <https://github.com/mvexel/overpass-api-python-wrapper/labels/help%20wanted>`__.
-
+Description: See README.md
Keywords: openstreetmap,overpass,wrapper
Platform: UNKNOWN
Classifier: License :: OSI Approved :: Apache Software License
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 7402c32..0000000
--- a/README.rst
+++ /dev/null
@@ -1,180 +0,0 @@
-Overpass API python wrapper
-===========================
-
-This is a thin wrapper around the OpenStreetMap `Overpass
-API <http://wiki.openstreetmap.org/wiki/Overpass_API>`__.
-
-.. image:: https://travis-ci.org/mvexel/overpass-api-python-wrapper.svg
- :target: https://travis-ci.org/mvexel/overpass-api-python-wrapper
-
-
-Install it
-==========
-
-.. code:: bash
-
- $ pip install overpass
-
-If you get an error similar to
-
-::
-
- OSError: Could not find library geos_c or load any of its variants ['libgeos_c.so.1', 'libgeos_c.so']
-
-you can install the required libraries on linux with
-
-.. code:: bash
-
- $ sudo apt-get install libgeos-c1 libgeos-3.4.2
-
-Use it
-======
-
-You can use the overpass command line interface or use it as a Python
-library.
-
-Command line interface
----------------------
-
-You can use the CLI to execute queries and save the result in a GeoJSON
-file.
-
-::
-
- Usage: overpass [OPTIONS] QUERY OUTPUT_FILE
-
- Run query and save the result in output_file
-
- Options:
- --timeout INTEGER Timeout in seconds
- --endpoint TEXT URL of your prefered API
- --format TEXT Format to save the data. Options are 'geojson', 'json', 'xml'. Default format is geojson.
- --help Show this message and exit.
-
-For example:
-
-To make a query and save the result as GeoJSON:
-
-.. code:: bash
-
- overpass --timeout 50 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.geojson
-
-Or to get the result as an OSM XML file:
-
-.. code:: bash
-
- overpass --timeout 50 --format xml 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.osm
-
-Python Library
--------------
-
-.. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]')
-
-Note that you don't have to include any of the output meta statements.
-The wrapper will, well, wrap those.
-
-You will get your result as a dictionary, which (for now) represents the
-JSON output you would get `from the Overpass API
-directly <http://overpass-api.de/output_formats.html#json>`__. So you
-could do this for example:
-
-.. code:: python
-
- >>> print [(feature['tags']['name'], feature['id']) for feature in response['elements']]
- [(u'Salt Lake City', 150935219), (u'Salt Lake City', 585370637), (u'Salt Lake City', 1615721573)]
-
-You can specify the format of the response. By default, you will get GeoJSON using the `responseformat` parameter. Alternatives are plain JSON (`json`) and OSM XML (`xml`), as ouput directly by the Overpass API.
-
-.. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]', responseformat="xml")
-
-Parameters
-~~~~~~~~~~
-
-The API takes a few parameters:
-
-``endpoint``
-^^^^^^^^^^
-
-The default endpoint is ``http://overpass-api.de/api/interpreter`` but
-you can pass in the rambler instance
-(``http://overpass.osm.rambler.ru/cgi/interpreter``) or your own:
-
-.. code:: python
-
- api = overpass.API(endpoint=http://overpass.myserver/interpreter)
-
-``timeout``
-^^^^^^^^^^
-
-The default timeout is 25 seconds, but you can set it to whatever you
-want.
-
-.. code:: python
-
- api = overpass.API(timeout=600)
-
-``debug``
-^^^^^^^^^^
-
-Setting this to ``True`` will get you debug output.
-
-Simple queries
-~~~~~~~~~~~
-
-In addition to just send your query and parse the result, the wrapper
-provides shortcuts for often used map queries. To use them, just pass
-them like to normal query to the API.
-
-MapQuery
-^^^^^^^^
-
-This is a shorthand for a `complete ways and
-relations <http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide#Completed_ways_and_relations>`__
-query in a bounding box (the 'map call'). You just pass the bounding box
-to the constructor:
-
-.. code:: python
-
- >>> map_query = overpass.MapQuery(50.746,7.154,50.748,7.157)
- >>> response = api.Get(map_query)
-
-WayQuery
-^^^^^^^^
-
-This is shorthand for getting a set of ways and their child nodes that
-satisfy certain criteria. Pass the criteria as a Overpass QL stub to the
-constructor:
-
-.. code:: python
-
- >>> way_query = overpass.WayQuery('[name="Highway 51"]')
- >>> response = api.Get(way_query)
-
-Need help? Want feature?
-=======================
-
-Create a `new
-issue <https://github.com/mvexel/overpass-api-python-wrapper/issues>`__.
-
-Test it
--------
-
-::
-
- py.test
-
-Fork it
--------
-
-`Yes
-please <https://github.com/mvexel/overpass-api-python-wrapper/fork>`__.
-`Help
-wanted <https://github.com/mvexel/overpass-api-python-wrapper/labels/help%20wanted>`__.
diff --git a/overpass.egg-info/PKG-INFO b/overpass.egg-info/PKG-INFO
index 69b7b45..692a90a 100644
--- a/overpass.egg-info/PKG-INFO
+++ b/overpass.egg-info/PKG-INFO
@@ -1,192 +1,12 @@
Metadata-Version: 1.1
Name: overpass
-Version: 0.4.0
+Version: 0.5.6
Summary: Python wrapper for the OpenStreetMap Overpass API
Home-page: https://github.com/mvexel/overpass-api-python-wrapper
Author: Martijn van Exel
Author-email: m at rtijn.org
License: Apache
-Description: Overpass API python wrapper
- ===========================
-
- This is a thin wrapper around the OpenStreetMap `Overpass
- API <http://wiki.openstreetmap.org/wiki/Overpass_API>`__.
-
- .. image:: https://travis-ci.org/mvexel/overpass-api-python-wrapper.svg
- :target: https://travis-ci.org/mvexel/overpass-api-python-wrapper
-
-
- Install it
- ==========
-
- .. code:: bash
-
- $ pip install overpass
-
- If you get an error similar to
-
- ::
-
- OSError: Could not find library geos_c or load any of its variants ['libgeos_c.so.1', 'libgeos_c.so']
-
- you can install the required libraries on linux with
-
- .. code:: bash
-
- $ sudo apt-get install libgeos-c1 libgeos-3.4.2
-
- Use it
- ======
-
- You can use the overpass command line interface or use it as a Python
- library.
-
- Command line interface
- ---------------------
-
- You can use the CLI to execute queries and save the result in a GeoJSON
- file.
-
- ::
-
- Usage: overpass [OPTIONS] QUERY OUTPUT_FILE
-
- Run query and save the result in output_file
-
- Options:
- --timeout INTEGER Timeout in seconds
- --endpoint TEXT URL of your prefered API
- --format TEXT Format to save the data. Options are 'geojson', 'json', 'xml'. Default format is geojson.
- --help Show this message and exit.
-
- For example:
-
- To make a query and save the result as GeoJSON:
-
- .. code:: bash
-
- overpass --timeout 50 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.geojson
-
- Or to get the result as an OSM XML file:
-
- .. code:: bash
-
- overpass --timeout 50 --format xml 'node(area:3602758138)[amenity=cafe]' brasilia-cafe.osm
-
- Python Library
- -------------
-
- .. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]')
-
- Note that you don't have to include any of the output meta statements.
- The wrapper will, well, wrap those.
-
- You will get your result as a dictionary, which (for now) represents the
- JSON output you would get `from the Overpass API
- directly <http://overpass-api.de/output_formats.html#json>`__. So you
- could do this for example:
-
- .. code:: python
-
- >>> print [(feature['tags']['name'], feature['id']) for feature in response['elements']]
- [(u'Salt Lake City', 150935219), (u'Salt Lake City', 585370637), (u'Salt Lake City', 1615721573)]
-
- You can specify the format of the response. By default, you will get GeoJSON using the `responseformat` parameter. Alternatives are plain JSON (`json`) and OSM XML (`xml`), as ouput directly by the Overpass API.
-
- .. code:: python
-
- >>> import overpass
- >>> api = overpass.API()
- >>> response = api.Get('node["name"="Salt Lake City"]', responseformat="xml")
-
- Parameters
- ~~~~~~~~~~
-
- The API takes a few parameters:
-
- ``endpoint``
- ^^^^^^^^^^
-
- The default endpoint is ``http://overpass-api.de/api/interpreter`` but
- you can pass in the rambler instance
- (``http://overpass.osm.rambler.ru/cgi/interpreter``) or your own:
-
- .. code:: python
-
- api = overpass.API(endpoint=http://overpass.myserver/interpreter)
-
- ``timeout``
- ^^^^^^^^^^
-
- The default timeout is 25 seconds, but you can set it to whatever you
- want.
-
- .. code:: python
-
- api = overpass.API(timeout=600)
-
- ``debug``
- ^^^^^^^^^^
-
- Setting this to ``True`` will get you debug output.
-
- Simple queries
- ~~~~~~~~~~~
-
- In addition to just send your query and parse the result, the wrapper
- provides shortcuts for often used map queries. To use them, just pass
- them like to normal query to the API.
-
- MapQuery
- ^^^^^^^^
-
- This is a shorthand for a `complete ways and
- relations <http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide#Completed_ways_and_relations>`__
- query in a bounding box (the 'map call'). You just pass the bounding box
- to the constructor:
-
- .. code:: python
-
- >>> map_query = overpass.MapQuery(50.746,7.154,50.748,7.157)
- >>> response = api.Get(map_query)
-
- WayQuery
- ^^^^^^^^
-
- This is shorthand for getting a set of ways and their child nodes that
- satisfy certain criteria. Pass the criteria as a Overpass QL stub to the
- constructor:
-
- .. code:: python
-
- >>> way_query = overpass.WayQuery('[name="Highway 51"]')
- >>> response = api.Get(way_query)
-
- Need help? Want feature?
- =======================
-
- Create a `new
- issue <https://github.com/mvexel/overpass-api-python-wrapper/issues>`__.
-
- Test it
- -------
-
- ::
-
- py.test
-
- Fork it
- -------
-
- `Yes
- please <https://github.com/mvexel/overpass-api-python-wrapper/fork>`__.
- `Help
- wanted <https://github.com/mvexel/overpass-api-python-wrapper/labels/help%20wanted>`__.
-
+Description: See README.md
Keywords: openstreetmap,overpass,wrapper
Platform: UNKNOWN
Classifier: License :: OSI Approved :: Apache Software License
diff --git a/overpass.egg-info/SOURCES.txt b/overpass.egg-info/SOURCES.txt
index fa42566..c23e716 100644
--- a/overpass.egg-info/SOURCES.txt
+++ b/overpass.egg-info/SOURCES.txt
@@ -1,14 +1,11 @@
-README.rst
setup.cfg
setup.py
overpass/__init__.py
overpass/api.py
-overpass/cli.py
overpass/errors.py
overpass/queries.py
overpass.egg-info/PKG-INFO
overpass.egg-info/SOURCES.txt
overpass.egg-info/dependency_links.txt
-overpass.egg-info/entry_points.txt
overpass.egg-info/requires.txt
overpass.egg-info/top_level.txt
\ No newline at end of file
diff --git a/overpass.egg-info/entry_points.txt b/overpass.egg-info/entry_points.txt
deleted file mode 100644
index b6e7982..0000000
--- a/overpass.egg-info/entry_points.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [console_scripts]
- overpass=overpass.cli:cli
diff --git a/overpass.egg-info/requires.txt b/overpass.egg-info/requires.txt
index 5a3478d..80d50b9 100644
--- a/overpass.egg-info/requires.txt
+++ b/overpass.egg-info/requires.txt
@@ -1,4 +1,3 @@
-click
requests>=2.3.0
geojson>=1.0.9
diff --git a/overpass/api.py b/overpass/api.py
index a19209a..708d045 100644
--- a/overpass/api.py
+++ b/overpass/api.py
@@ -12,7 +12,7 @@ class API(object):
# defaults for the API class
_timeout = 25 # seconds
- _endpoint = "http://overpass-api.de/api/interpreter"
+ _endpoint = "https://overpass-api.de/api/interpreter"
_debug = False
_QUERY_TEMPLATE = "[out:{out}];{query}out {verbosity};"
@@ -35,16 +35,19 @@ class API(object):
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)
- if responseformat == "xml":
+ if responseformat == "xml" or responseformat.startswith("csv"):
return raw_response
response = json.loads(raw_response)
diff --git a/overpass/cli.py b/overpass/cli.py
deleted file mode 100644
index 28bb026..0000000
--- a/overpass/cli.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
-import click
-import geojson
-import sys
-import overpass
-
-
- at click.command()
- at click.option('--timeout', default=25, help='Timeout in seconds.')
- at click.option('--endpoint', default='http://overpass-api.de/api/interpreter',
- help='URL of your prefered API.')
- at click.option('--responseformat', default='geojson', help="""Format to save the data.
- Options are 'geojson' and 'osm'. Default format is geojson.""")
- at click.argument('query', type=str)
-def cli(timeout, endpoint, responseformat, query):
- """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)
- click.echo(result)
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index df0d51e..8c9157d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
description-file = README.md
[egg_info]
-tag_date = 0
tag_build =
+tag_date = 0
tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index f890b32..415b3ea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,12 @@
from codecs import open as codecs_open
from setuptools import setup, find_packages
-# Get the long description from the relevant file
-with codecs_open('README.rst', encoding='utf-8') as f:
- long_description = f.read()
-
setup(
name='overpass',
packages=['overpass'],
- version='0.4.0',
+ version='0.5.6',
description='Python wrapper for the OpenStreetMap Overpass API',
- long_description=long_description,
+ long_description='See README.md',
author='Martijn van Exel',
author_email='m at rtijn.org',
url='https://github.com/mvexel/overpass-api-python-wrapper',
@@ -26,12 +22,8 @@ setup(
'Topic :: Scientific/Engineering :: GIS',
'Topic :: Utilities',
],
- install_requires=['click', 'requests>=2.3.0', 'geojson>=1.0.9'],
+ install_requires=['requests>=2.3.0', 'geojson>=1.0.9'],
extras_require={
'test': ['pytest'],
- },
- entry_points="""
- [console_scripts]
- overpass=overpass.cli:cli
-"""
+ }
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/overpass.git
More information about the Python-modules-commits
mailing list