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 a1f528fa89995cd8de9af08cf9a0e658694cd3c8..9babe5ed907ca91c290b967630f777510fe21df9 100644 (file)
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -1,4 +1,12 @@
 <?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)
 {
 
 function loadSettings($sProjectDir)
 {


@@ -6,10 +14,7 @@ function loadSettings($sProjectDir)
     // Temporary hack to set the direcory via environment instead of
     // the installed scripts. Neither setting is part of the official
     // set of settings.
     // Temporary hack to set the direcory via environment instead of
     // 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_SqlDir') or define('CONST_SqlDir', $_SERVER['NOMINATIM_SQLDIR']);

     defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);
     defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);

-    defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']);

 }
 
 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_ConfigDir.'/'.$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'];
 }


@@ -208,22 +206,11 @@ function parseLatLon($sQuery)
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 

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

     }
     }

-
-    return max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);

 }
 }