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

Get route param working again after recent changes (implies bounded=1)

Browse Source
This commit is contained in:
Brian Quinion
2012-11-07 01:22:17 +00:00
parent a44f9c6aab
commit 2b6a163ef9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/search.php
View File

@@ -225,6 +225,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;
} }
// Do we have anything that looks like a lat/lon pair? // Do we have anything that looks like a lat/lon pair?
@@ -772,7 +773,7 @@
{ {
$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct"; $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid) and linked_place_id is null"; $sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)";
if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";
if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc"; if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
@@ -783,7 +784,7 @@
{ {
$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct"; $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
$sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid) and linked_place_id is null"; $sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid)";
if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";
if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc"; if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
@@ -1058,13 +1059,13 @@
if ($iQueryLoop > 20) break; if ($iQueryLoop > 20) break;
} }
//exit; //exit;
if (sizeof($aResultPlaceIDs)) break; if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
if ($iGroupLoop > 4) break; if ($iGroupLoop > 4) break;
if ($iQueryLoop > 30) break; if ($iQueryLoop > 30) break;
} }
//exit; //exit;
// Did we find anything? // Did we find anything?
if (sizeof($aResultPlaceIDs)) if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
{ {
//var_Dump($aResultPlaceIDs);exit; //var_Dump($aResultPlaceIDs);exit;
// Get the details for display (is this a redundant extra step?) // Get the details for display (is this a redundant extra step?)