Merge pull request #1628 from lonvia/split-sql-functions

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index cd23b06843ca550304a50924bb071be3108d8a8b..759c71d7ea735fc7639b9712d4f60e50a3bd3135 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -4,7 +4,7 @@ function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;
     error_log('ERROR: '.$sError);
 {
     if (!$sUserError) $sUserError = $sError;
     error_log('ERROR: '.$sError);

-    echo $sUserError."\n";
+    var_dump($sUserError)."\n";

     exit(-1);
 }
 
     exit(-1);
 }
 


@@ -68,7 +68,7 @@ function javascript_renderData($xVal, $iOptions = 0)
         throw new Exception('Invalid json_callback value', 400);
     }
 
         throw new Exception('Invalid json_callback value', 400);
     }
 

-    $iOptions |= JSON_UNESCAPED_UNICODE;
+    $iOptions |= JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;

     if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) {
         $iOptions |= JSON_PRETTY_PRINT;
     }
     if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) {
         $iOptions |= JSON_PRETTY_PRINT;
     }


@@ -228,3 +228,25 @@ function closestHouseNumber($aRow)
 
     return max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);
 }
 
     return max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);
 }

+
+function getSearchRankLabel($iRank)
+{
+    if (!isset($iRank)) return 'unknown';
+    if ($iRank < 2) return 'continent';
+    if ($iRank < 4) return 'sea';
+    if ($iRank < 8) return 'country';
+    if ($iRank < 12) return 'state';
+    if ($iRank < 16) return 'county';
+    if ($iRank == 16) return 'city';
+    if ($iRank == 17) return 'town / island';
+    if ($iRank == 18) return 'village / hamlet';
+    if ($iRank == 20) return 'suburb';
+    if ($iRank == 21) return 'postcode area';
+    if ($iRank == 22) return 'croft / farm / locality / islet';
+    if ($iRank == 23) return 'postcode area';
+    if ($iRank == 25) return 'postcode point';
+    if ($iRank == 26) return 'street / major landmark';
+    if ($iRank == 27) return 'minory street / path';
+    if ($iRank == 28) return 'house / building';
+    return 'other: ' . $iRank;
+}