Merge remote-tracking branch 'upstream/master'

diff --git a/docs/api/Reverse.md b/docs/api/Reverse.md
index c133750cedb5ca638a76337f8ce86ac51c1ed036..56281d06f2420c43990f95a44bd18bb4a1dd3725 100644 (file)
--- a/docs/api/Reverse.md
+++ b/docs/api/Reverse.md
@@ -92,7 +92,10 @@ In terms of address details the zoom levels are as follows:
   5   | state
   8   | county
   10  | city
-  14  | suburb
+  12  | town / borough
+  13  | village / suburb
+  14  | neighbourhood
+  15  | locality
   16  | major streets
   17  | major and minor streets
   18  | building

diff --git a/lib-php/ReverseGeocode.php b/lib-php/ReverseGeocode.php
index 712f14809bb07f0edffc3b0e371cf791119380db..fddad60dca19d77b2f1433808b52189d007be34e 100644 (file)
--- a/lib-php/ReverseGeocode.php
+++ b/lib-php/ReverseGeocode.php
@@ -40,10 +40,10 @@ class ReverseGeocode
                       9 => 12,
                       10 => 17, // City
                       11 => 17,
-                      12 => 18, // Town / Village
-                      13 => 18,
-                      14 => 22, // Suburb
-                      15 => 22,
+                      12 => 18, // Town
+                      13 => 19, // Village
+                      14 => 22, // Neighbourhood
+                      15 => 25, // Locality
                       16 => 26, // major street
                       17 => 27, // minor street
                       18 => 30, // or >, Building