X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/389138abfe11eef3207f63d432865b00119beb3c..62e2da1f937882bf55363b0f10d8625200850642:/lib-php/lib.php?ds=sidebyside diff --git a/lib-php/lib.php b/lib-php/lib.php index a1f528fa..9babe5ed 100644 --- a/lib-php/lib.php +++ b/lib-php/lib.php @@ -1,4 +1,12 @@ $b['importance']?-1:1); + } return $a['foundorder'] <=> $b['foundorder']; } @@ -208,22 +206,11 @@ function parseLatLon($sQuery) 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']); }