Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index a4e4aa6c737ff9674b1ef6a1f68ac8cd6b51eb1c..e569aa8b53e299a4c2f4d3b618b3525d8200d618 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -246,7 +246,13 @@
 
                if (sizeof($aNearPostcodes))
                {
-                       return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005));
+                       $aPostcodes = array();
+                       foreach($aNearPostcodes as $aPostcode)
+                       {
+                               $aPostcodes[] = array('lat' => $aPostcode['lat'], 'lon' => $aPostcode['lon'], 'radius' => 0.005);
+                       }
+
+                       return $aPostcodes;
                }
 
                return false;
@@ -884,17 +890,7 @@
                return $iPlaceID;
        }
 
-       function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, &$aAddressRankList, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
+       function addQuotes($s)
        {
-               if (!isset($_GET[$sKey])) return false;
-               $sValue = trim($_GET[$sKey]);
-               if (!$sValue) return false;
-               $aStructuredQuery[$sKey] = $sValue;
-               if ($iMinAddressRank == 0 && $iMaxAddressRank == 30)
-               {
-                       $iMinAddressRank = $iNewMinAddressRank;
-                       $iMaxAddressRank = $iNewMaxAddressRank;
-               }
-               if ($aItemListValues) $aAddressRankList = array_merge($aAddressRankList, $aItemListValues);
-               return true;
+               return "'".$s."'";
        }