ignore admin_level = 15 in geocodejson output

Level 15 is an artifical value.

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index f0db09c9be7f0403c0179f6f3e63ba07c9644162..c94121f8983121356254434fd0ce3aad344ba835 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -546,13 +546,15 @@ class PlaceLookup
     {
         $aAddressLines = $this->getAddressDetails(
             $iPlaceID,
     {
         $aAddressLines = $this->getAddressDetails(
             $iPlaceID,

-            false,
+            true,

             $sHousenumber === null ? -1 : $sHousenumber
         );
 
         $aAddress = array();
         foreach ($aAddressLines as $aLine) {
             $sHousenumber === null ? -1 : $sHousenumber
         );
 
         $aAddress = array();
         foreach ($aAddressLines as $aLine) {

-            if (isset($aLine['admin_level'])) {
+            if (isset($aLine['admin_level'])
+                && $aLine['admin_level'] < 15
+                && !isset($aAddress['level'.$aLine['admin_level']])) {

                 $aAddress['level'.$aLine['admin_level']] = $aLine['localname'];
             }
         }
                 $aAddress['level'.$aLine['admin_level']] = $aLine['localname'];
             }
         }