hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for regressions: broken bounded search, error on country codes

Browse Source
This commit is contained in:
Brian Quinion
2013-08-30 12:18:57 +01:00
parent 662af78319
commit eb793ae26e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Geocode.php
View File

@@ -291,7 +291,7 @@
$sCountryCodesSQL = false; $sCountryCodesSQL = false;
if ($this->aCountryCodes && sizeof($this->aCountryCodes)) if ($this->aCountryCodes && sizeof($this->aCountryCodes))
{ {
$sCountryCodesSQL = join(',', $this->aCountryCodes); $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
} }
// Hack to make it handle "new york, ny" (and variants) correctly // Hack to make it handle "new york, ny" (and variants) correctly
@@ -319,7 +319,7 @@
$sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$this->aViewBox[0].",".(float)$this->aViewBox[1]."),ST_Point(".(float)$this->aViewBox[2].",".(float)$this->aViewBox[3].")),4326)"; $sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$this->aViewBox[0].",".(float)$this->aViewBox[1]."),ST_Point(".(float)$this->aViewBox[2].",".(float)$this->aViewBox[3].")),4326)";
$sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aBigViewBox[0].",".(float)$aBigViewBox[1]."),ST_Point(".(float)$aBigViewBox[2].",".(float)$aBigViewBox[3].")),4326)"; $sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aBigViewBox[0].",".(float)$aBigViewBox[1]."),ST_Point(".(float)$aBigViewBox[2].",".(float)$aBigViewBox[3].")),4326)";
$bBoundingBoxSearch = true; $bBoundingBoxSearch = $this->bBoundedSearch;
} }
// Route SQL // Route SQL
@@ -349,7 +349,7 @@
failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL); failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
} }
$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry"; $sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
$bBoundingBoxSearch = true; $bBoundingBoxSearch = $this->bBoundedSearch;
} }
// Do we have anything that looks like a lat/lon pair? // Do we have anything that looks like a lat/lon pair?
@@ -971,11 +971,12 @@
if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; } if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens); if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
// Must have a location term // No location term?
if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon']) if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
{ {
if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
{ {
// Just looking for a country by code - look it up
if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank)
{ {
$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4"; $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";

5
lib/lib.php
View File

@@ -898,3 +898,8 @@
if ($aItemListValues) $aAddressRankList = array_merge($aAddressRankList, $aItemListValues); if ($aItemListValues) $aAddressRankList = array_merge($aAddressRankList, $aItemListValues);
return true; return true;
} }
function addQuotes($s)
{
return "'".$s."'";
}

2
website/search.php
View File

@@ -55,7 +55,7 @@
$aCountryCodes[] = strtolower($sCountryCode); $aCountryCodes[] = strtolower($sCountryCode);
} }
} }
$oGeocode->setCountryCodeList($aCountryCodes); $oGeocode->setCountryCodesList($aCountryCodes);
} }
if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt']) if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt'])