jsonv2 returns wrong place_rank

[nominatim.git] / lib / lib.php
diff --git a/lib/lib.php b/lib/lib.php

index 74430cf7b9d3094e4dbdf00c83b98098a682826b..f34b09b7a51fbef8285d4a19bd9fb9de5b1704ab 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -25,6 +25,19 @@
  
         }
  
  
         }
  
+       function userError($sError) 
+       {
+               header('HTTP/1.0 400 Bad Request');
+               header('Content-type: text/html; charset=utf-8');
+               echo "<html><body><h1>Bad Request</h1>";
+               echo '<p>Nominatim has encountered an error with your request.</p>';
+               echo "<p><b>Details:</b> ".$sError,"</p>";
+               echo '<p>If you feel this error is incorrect feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
+               echo "\n</body></html>\n";
+               exit;
+
+       }
+
         function fail($sError, $sUserError = false)
         {
                 if (!$sUserError) $sUserError = $sError;
         function fail($sError, $sUserError = false)
         {
                 if (!$sUserError) $sUserError = $sError;
@@ -94,7 +107,7 @@
                 return ($a['foundorder'] < $b['foundorder']?-1:1);
         }
  
                 return ($a['foundorder'] < $b['foundorder']?-1:1);
         }
  
-       function getPrefferedLangauges()
+       function getPreferredLanguages()
         {
                 // If we have been provided the value in $_GET it overrides browser value
                 if (isset($_GET['accept-language']) && $_GET['accept-language'])
         {
                 // If we have been provided the value in $_GET it overrides browser value
                 if (isset($_GET['accept-language']) && $_GET['accept-language'])
@@ -273,7 +286,7 @@
                 return false;
  
                 /*
                 return false;
  
                 /*
-                       $fTotalFac is a suprisingly good indicator of accuracy
+                       $fTotalFac is a surprisingly good indicator of accuracy
                         $iZoom = 18 + round(log($fTotalFac,32));
                         $iZoom = max(13,min(18,$iZoom));
                 */
                         $iZoom = 18 + round(log($fTotalFac,32));
                         $iZoom = max(13,min(18,$iZoom));
                 */
@@ -592,45 +605,25 @@
         }
         
         
         }
         
         
-        function javascript_isarray($xVal)
-        {
-                if (!is_array($xVal)) return false;
-                for($i = 0; $i < sizeof($xVal); $i++)
-                {
-                        if (!array_key_exists($i, $xVal)) return false;
-                }
-                return true;
-        }
  
  
-        function javascript_renderData($xVal, $bForceHash = false)
-        {
-                if (is_array($xVal))
-                {
-                        $aVals = array();
-                        if (javascript_isarray($xVal) && !$bForceHash)
-                        {
-                                foreach($xVal as $sKey => $xData)
-                                {
-                                        $aVals[] = javascript_renderData($xData);
-                                }
-                                return '['.join(',',$aVals).']';
-                        }
-                        else
-                        {
-                                foreach($xVal as $sKey => $xData)
-                                {
-                                        $aVals[] = '"'.addslashes($sKey).'"'.':'.javascript_renderData($xData);
-                                }
-                                return '{'.join(',',$aVals).'}';
-                        }
-                }
-                else
-                {
-                        if (is_bool($xVal)) return $xVal?'true':'false';
-//                     if (is_numeric($xVal)) return $xVal;
-                        return '"'.str_replace('>','\\>',str_replace(array("\n","\r"),'\\n',str_replace(array("\n\r","\r\n"),'\\n',str_replace('"','\\"',$xVal)))).'"';
-                }
-        }
+    function javascript_renderData($xVal)
+    {
+        header("Access-Control-Allow-Origin: *");
+
+        $jsonout = json_encode($xVal);
+
+               if( ! isset($_GET['json_callback'])) {
+                       header("Content-Type: application/json; charset=UTF-8");
+                       echo $jsonout;
+               } else {
+                       if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback'])) {
+                               header("Content-Type: application/javascript; charset=UTF-8");
+                               echo $_GET['json_callback'].'('.$jsonout.')';
+                       } else {
+                               header('HTTP/1.0 400 Bad Request');
+                       }
+               }
+    }
  
         function _debugDumpGroupedSearches($aData, $aTokens)
         {
  
         function _debugDumpGroupedSearches($aData, $aTokens)
         {
@@ -910,3 +903,17 @@
  
                 return $iPlaceID;
         }
  
                 return $iPlaceID;
         }
+
+        function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
+        {
+                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;
+                }
+                return true;
+        }
+