Skip to content

Commit

Permalink
Add more documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
DenisCarriere committed Aug 30, 2015
1 parent b73ac47 commit 4c3cdcc
Show file tree
Hide file tree
Showing 9 changed files with 122 additions and 115 deletions.
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Detailed information about each individual provider that are within Geocoder.
providers/IPInfo.rst
providers/TomTom.rst
providers/What3Words.rst
providers/Yahoo.rst
providers/Yandex.rst


Contributor Guide
Expand Down
9 changes: 5 additions & 4 deletions docs/providers/Mapbox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,22 @@ To make sure your API key is store safely on your computer, you can define that

.. code-block:: bash
$ export MAPBOX_ACCESS_TOKEN=XXXXXXXXXX
$ export MAPBOX_ACCESS_TOKEN=secret_access_token
$ heroku config:set MAPBOX_ACCESS_TOKEN=secret_access_token
Parameters
----------
~~~~~~~~~~

- `location`: Your search location you want geocoded.
- `proximity`: Search nearby [lat, lng].
- `method`: (default=geocode) Use the following:
- `access_token`: use your own access token from Mapbox.
- `method`: (default=geocode) Use the following:

- geocode
- reverse

References
----------
~~~~~~~~~~

- `Mabpox Geocoding API <https://www.mapbox.com/developers/api/geocoding/>`_
- `Get Mabpox Access Token <https://www.mapbox.com/account>`_
Expand Down
6 changes: 3 additions & 3 deletions docs/providers/TomTom.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ To make sure your API key is store safely on your computer, you can define that
$ export TOMTOM_API_KEY=XXXXXXXXXX
Parameters
----------
~~~~~~~~~~

- `location`: Your search location you want geocoded.
- `key`: use your own API Key from TomTom.
Expand All @@ -46,6 +46,6 @@ Parameters
- geocode

References
----------
~~~~~~~~~~

- `TomTom Geocoding API <http://developer.tomtom.com/products/geocoding_api`_
- `TomTom Geocoding API <http://developer.tomtom.com/products/geocoding_api>`_
44 changes: 0 additions & 44 deletions docs/providers/Yahoo.md

This file was deleted.

40 changes: 40 additions & 0 deletions docs/providers/Yahoo.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Yahoo
=====

Yahoo PlaceFinder is a geocoding Web service that helps developers make
their applications location-aware by converting street addresses or
place names into geographic coordinates (and vice versa).
Using Geocoder you can retrieve Yahoo's geocoded data from Yahoo BOSS Geo Services.

Examples
~~~~~~~~

Basic Geocoding
---------------

.. code-block:: python
>>> import geocoder
>>> g = geocoder.yahoo('San Francisco, CA')
>>> g.json
...
Command Line Interface
----------------------

.. code-block:: bash
$ geocode 'San Francisco, CA' --provider yahoo --out geojson
Parameters
~~~~~~~~~~

- `location`: Your search location you want geocoded.
- `method`: (default=geocode) Use the following:

- geocode

References
~~~~~~~~~~

- `Yahoo BOSS Geo Services <https://developer.yahoo.com/boss/geo/>`_
61 changes: 0 additions & 61 deletions docs/providers/Yandex.md

This file was deleted.

70 changes: 70 additions & 0 deletions docs/providers/Yandex.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
Yandex
======

Yandex (Russian: Яндекс) is a Russian Internet company which operates the
largest search engine in Russia with about 60% market share in that country.

The Yandex home page has been rated as the most popular website in Russia.

Examples
~~~~~~~~

Basic Geocoding
---------------

.. code-block:: python
>>> import geocoder
>>> g = geocoder.yandex('Moscow Russia')
>>> g.json
...
Reverse Geocoding
-----------------

.. code-block:: python
>>> import geocoder
>>> g = geocoder.mapbox([55.95, 37.96], method='reverse')
>>> g.json
...
Command Line Interface
----------------------

.. code-block:: bash
$ geocode 'Moscow Russia' --provider yandex --out geojson
$ geocode '55.95, 37.96' --provider yandex --method reverse
Parameters
----------

- `location`: Your search location you want geocoded.
- `location`: Your search location you want geocoded.
- `lang`: Chose the following language:

- **ru-RU** — Russian (by default)
- **uk-UA** — Ukrainian
- **be-BY** — Belarusian
- **en-US** — American English
- **en-BR** — British English
- **tr-TR** — Turkish (only for maps of Turkey)

- `kind`: Type of toponym (only for reverse geocoding):

- **house** — house or building
- **street** — street
- **metro** — subway station
- **district** — city district
- **locality** — locality (city, town, village, etc.)

- `method`: (default=geocode) Use the following:

- geocode
- reverse

References
----------

- `Yandex API Reference <http://api.yandex.com/maps/doc/geocoder/desc/concepts/input_params.xml>`_
2 changes: 1 addition & 1 deletion geocoder/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
__title__ = 'geocoder'
__author__ = 'Denis Carriere'
__author_email__ = '[email protected]'
__version__ = '1.5.3'
__version__ = '1.6.0'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2013-2015 Denis Carriere'

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
except ImportError:
from distutils.core import setup


version = ''
with open('geocoder/__init__.py', 'r') as fd:
version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
Expand Down Expand Up @@ -63,6 +62,6 @@
'Topic :: Internet',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Scientific/Engineering :: GIS',
'Topic :: Software Development :: Libraries :: Python Modules'
'Topic :: Software Development :: Libraries :: Python Modules',
),
)

0 comments on commit 4c3cdcc

Please sign in to comment.