more invalidations when boundary changes rank

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

diff --git a/lib-php/lib.php b/lib-php/lib.php
index 04b9bf86b1634e24c7f8a08d05b13536647733a0..f7c6e55e3c115ef7e1b3daf2fb694bb168d4a5fa 100644 (file)
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -1,15 +1,20 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 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.
     // the installed scripts. Neither setting is part of the official
     // set of settings.

-    defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
-    defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']);
-    defined('CONST_SqlDir') or define('CONST_SqlDir', $_SERVER['NOMINATIM_SQLDIR']);
-    defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']);
+    defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);

 }
 
 function getSetting($sConfName, $sDefault = null)
 }
 
 function getSetting($sConfName, $sDefault = null)


@@ -32,22 +37,14 @@ function getSettingBool($sConfName)
            || strcmp($sVal, '1') == 0;
 }
 
            || strcmp($sVal, '1') == 0;
 }
 

-function getSettingConfig($sConfName, $sSystemConfig)
-{
-    $sValue = $_SERVER['NOMINATIM_'.$sConfName];
-
-    if (!$sValue) {
-        return CONST_DataDir.'/settings/'.$sSystemConfig;
-    }
-
-    return $sValue;
-}
-

 function fail($sError, $sUserError = false)
 {
 function fail($sError, $sUserError = false)
 {

-    if (!$sUserError) $sUserError = $sError;
+    if (!$sUserError) {
+        $sUserError = $sError;
+    }

     error_log('ERROR: '.$sError);
     error_log('ERROR: '.$sError);

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

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


@@ -95,8 +92,9 @@ function getDatabaseDate(&$oDB)
 
 function byImportance($a, $b)
 {
 
 function byImportance($a, $b)
 {

-    if ($a['importance'] != $b['importance'])
+    if ($a['importance'] != $b['importance']) {

         return ($a['importance'] > $b['importance']?-1:1);
         return ($a['importance'] > $b['importance']?-1:1);

+    }

 
     return $a['foundorder'] <=> $b['foundorder'];
 }
 
     return $a['foundorder'] <=> $b['foundorder'];
 }


@@ -132,24 +130,6 @@ function addQuotes($s)
     return "'".$s."'";
 }
 
     return "'".$s."'";
 }
 

-function fwriteConstDef($rFile, $sConstName, $value)
-{
-    $sEscapedValue;
-
-    if (is_bool($value)) {
-        $sEscapedValue = $value ? 'true' : 'false';
-    } elseif (is_numeric($value)) {
-        $sEscapedValue = strval($value);
-    } elseif (!$value) {
-        $sEscapedValue = 'false';
-    } else {
-        $sEscapedValue = addQuotes(str_replace("'", "\\'", (string)$value));
-    }
-
-    fwrite($rFile, "@define('CONST_$sConstName', $sEscapedValue);\n");
-}
-
-

 function parseLatLon($sQuery)
 {
     $sFound    = null;
 function parseLatLon($sQuery)
 {
     $sFound    = null;


@@ -226,55 +206,41 @@ function parseLatLon($sQuery)
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 

-function createPointsAroundCenter($fLon, $fLat, $fRadius)
+function addressRankToGeocodeJsonType($iAddressRank)

 {
 {

-    $iSteps = max(8, min(100, ($fRadius * 40000)^2));
-    $fStepSize = (2*pi())/$iSteps;
-    $aPolyPoints = array();
-    for ($f = 0; $f < 2*pi(); $f += $fStepSize) {
-        $aPolyPoints[] = array('', $fLon+($fRadius*sin($f)), $fLat+($fRadius*cos($f)) );
+    if ($iAddressRank >= 29 && $iAddressRank <= 30) {
+        return 'house';

     }
     }

-    return $aPolyPoints;
-}
-
-function closestHouseNumber($aRow)
-{
-    $fHouse = $aRow['startnumber']
-                + ($aRow['endnumber'] - $aRow['startnumber']) * $aRow['fraction'];
-
-    switch ($aRow['interpolationtype']) {
-        case 'odd':
-            $iHn = (int)($fHouse/2) * 2 + 1;
-            break;
-        case 'even':
-            $iHn = (int)(round($fHouse/2)) * 2;
-            break;
-        default:
-            $iHn = (int)(round($fHouse));
-            break;
+    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 max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);
+    return 'locality';

 }
 
 }
 

-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;
+if (!function_exists('array_key_last')) {
+    function array_key_last(array $array)
+    {
+        if (!empty($array)) {
+            return key(array_slice($array, -1, 1, true));
+        }
+    }

 }
 }