Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / lib.php

diff --git a/lib-php/lib.php b/lib-php/lib.php
index 9babe5ed907ca91c290b967630f777510fe21df9..f7c6e55e3c115ef7e1b3daf2fb694bb168d4a5fa 100644 (file)
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -11,7 +11,7 @@
 function loadSettings($sProjectDir)
 {
     @define('CONST_InstallDir', $sProjectDir);
 function loadSettings($sProjectDir)
 {
     @define('CONST_InstallDir', $sProjectDir);

-    // Temporary hack to set the direcory via environment instead of
+    // Temporary hack to set the directory via environment instead of

     // the installed scripts. Neither setting is part of the official
     // set of settings.
     defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);
     // the installed scripts. Neither setting is part of the official
     // set of settings.
     defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);


@@ -206,6 +206,36 @@ function parseLatLon($sQuery)
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 

+function addressRankToGeocodeJsonType($iAddressRank)
+{
+    if ($iAddressRank >= 29 && $iAddressRank <= 30) {
+        return 'house';
+    }
+    if ($iAddressRank >= 26 && $iAddressRank < 28) {
+        return 'street';
+    }
+    if ($iAddressRank >= 22 && $iAddressRank < 26) {
+        return 'locality';
+    }
+    if ($iAddressRank >= 17 && $iAddressRank < 22) {
+        return 'district';
+    }
+    if ($iAddressRank >= 13 && $iAddressRank < 17) {
+        return 'city';
+    }
+    if ($iAddressRank >= 10 && $iAddressRank < 13) {
+        return 'county';
+    }
+    if ($iAddressRank >= 5 && $iAddressRank < 10) {
+        return 'state';
+    }
+    if ($iAddressRank >= 4 && $iAddressRank < 5) {
+        return 'country';
+    }
+
+    return 'locality';
+}
+

 if (!function_exists('array_key_last')) {
     function array_key_last(array $array)
     {
 if (!function_exists('array_key_last')) {
     function array_key_last(array $array)
     {