Merge branch 'master' into develop

Author: dunkelstern

.gitignore

@@ -7,3 +7,4 @@ __pycache__
 *.egg-info
 dist/
 build/
+.mypy_cache/

README.md

@@ -353,17 +353,17 @@ This function is a generator which `yield`s the obtained results.
 Geocode a lat, lon location into a readable address:
 - `lat`: Latitude to code
 - `lon`: Longitute to code
-- `radius`: Search radius
+- `radius`: Search radius in meters
 - `limit`: (optional) maximum number of results to return
 
 This function is a generator which `yield`s the obtained results.
 
 #### `reverse_epsg3857`
 
-Geocode a x, y Web Mercator location into a readable address:
-- `x`: x coordinate
-- `y`: y coordinate
-- `radius`: Search radius
+Geocode a x, y location in EPGS 3857 projection (aka Web Mercator) into a readable address:
+- `x`: X coordinate
+- `y`: Y coordinate
+- `radius`: Search radius in meters
 - `limit`: (optional) maximum number of results to return
 
 Use this function if you're using Web Mercator in your application internally to avoid constant re-projection between lat, lon and x, y.

osmgeocoder/data/sql/optimize/003-manual_city_name_updates.sql

@@ -16,4 +16,4 @@ BEGIN
         UPDATE public.oa_city SET city = 'Köln' WHERE license_id = (SELECT id FROM public.oa_license WHERE source = 'de/nw/city_of_cologne' LIMIT 1);
 	END IF;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql';

osmgeocoder/geocoder.py

@@ -105,6 +105,7 @@ def reverse(self, lat, lon, radius=100, limit=10):
         :param limit: Maximum number of matches to return, defaults to 10
         :returns: iterator for addresses formatted to local merit (may contain linebreaks)
         """
+
         items = fetch_address(self, (lat, lon), radius, projection='epsg:4326', limit=limit)
         for item in items:
             if item is not None:
@@ -124,6 +125,7 @@ def reverse_epsg3857(self, x, y, radius=100, limit=10):
         :param limit: Maximum number of matches to return, defaults to 10
         :returns: iterator for addresses formatted to local merit (may contain linebreaks)
         """
+        
         items = fetch_address(self, (x, y), radius, projection='epsg:3857', limit=limit)
         for item in items:
             if item is not None: