$aSearchResults = array();
$aExcludePlaceIDs = array();
$sCountryCodesSQL = false;
- $sSuggestion = $sSuggestionURL = false;
$bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
$bReverseInPlan = false;
$iFinalLimit = isset($_GET['limit'])?(int)$_GET['limit']:10;
$sNearPointSQL = false;
if (isset($_GET['nearlat']) && isset($_GET['nearlon']))
{
- $sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$_GET['nearlon'].",".$_GET['nearlat']."),4326)";
+ $sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$_GET['nearlon'].",".(float)$_GET['nearlat']."),4326)";
$aSearches[0]['fLat'] = (float)$_GET['nearlat'];
$aSearches[0]['fLon'] = (float)$_GET['nearlon'];
$aSearches[0]['fRadius'] = 0.1;
}
if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
- $aSuggestion = array();
- $bSuggestion = false;
- if (CONST_Suggestions_Enabled)
- {
- foreach($aPhrases as $iPhrase => $aPhrase)
- {
- if (!isset($aValidTokens[' '.$aPhrase['wordsets'][0][0]]))
- {
- $sQuotedPhrase = getDBQuoted(' '.$aPhrase['wordsets'][0][0]);
- $aSuggestionWords = getWordSuggestions($oDB, $aPhrase['wordsets'][0][0]);
- $aRow = $aSuggestionWords[0];
- if ($aRow && $aRow['word'])
- {
- $aSuggestion[] = $aRow['word'];
- $bSuggestion = true;
- }
- else
- {
- $aSuggestion[] = $aPhrase['string'];
- }
- }
- else
- {
- $aSuggestion[] = $aPhrase['string'];
- }
- }
- }
- if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
-
// Try and calculate GB postcodes we might be missing
foreach($aTokens as $sToken)
{
{
if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
{
- $iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
- $aResultPlaceIDs = array($iPlaceID);
+ $iPlaceID = geocodeReverse((float)$_GET['nearlat'], (float)$_GET['nearlon']);
- // TODO: this needs refactoring!
-
- // Get the details for display (is this a redundant extra step?)
- $sPlaceIDs = join(',',$aResultPlaceIDs);
- $sOrderSQL = 'CASE ';
- foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+ if ($iPlaceID)
{
- $sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
- }
- $sOrderSQL .= ' ELSE 10000000 END';
- $sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
- $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- $sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
- $sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
- $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
- //$sSQL .= $sOrderSQL." as porder, ";
- $sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
- $sSQL .= "(extratags->'place') as extra_place ";
- $sSQL .= "from placex where place_id in ($sPlaceIDs) ";
- $sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
- if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
- $sSQL .= ") ";
- $sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
- if (!$bDeDupe) $sSQL .= ",place_id";
- $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
- $sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
- $sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
- $sSQL .= ",extratags->'place' ";
- $sSQL .= " union ";
- $sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
- $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- $sSQL .= "null as placename,";
- $sSQL .= "null as ref,";
- $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
- //$sSQL .= $sOrderSQL." as porder, ";
- $sSQL .= "-0.15 as importance, ";
- $sSQL .= "null as extra_place ";
- $sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
- $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
- $sSQL .= "group by place_id";
- if (!$bDeDupe) $sSQL .= ",place_id";
- /*
- $sSQL .= " union ";
- $sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
- $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- $sSQL .= "null as placename,";
- $sSQL .= "null as ref,";
- $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
- //$sSQL .= $sOrderSQL." as porder, ";
- $sSQL .= "-0.10 as importance, ";
- $sSQL .= "null as extra_place ";
- $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
- $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
- $sSQL .= "group by place_id";
- if (!$bDeDupe) $sSQL .= ",place_id";
- $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
- $sSQL .= "order by importance desc";
- //$sSQL .= "order by rank_search,rank_address,porder asc";
- */
- if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
- $aSearchResults = $oDB->getAll($sSQL);
- //var_dump($sSQL,$aSearchResults);exit;
+ $aResultPlaceIDs = array($iPlaceID);
+ // TODO: this needs refactoring!
- if (PEAR::IsError($aSearchResults))
+ // Get the details for display (is this a redundant extra step?)
+ $sPlaceIDs = join(',',$aResultPlaceIDs);
+ $sOrderSQL = 'CASE ';
+ foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+ {
+ $sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
+ }
+ $sOrderSQL .= ' ELSE 10000000 END';
+ $sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+ $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ $sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+ $sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
+ $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+ //$sSQL .= $sOrderSQL." as porder, ";
+ $sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
+ $sSQL .= "(extratags->'place') as extra_place ";
+ $sSQL .= "from placex where place_id in ($sPlaceIDs) ";
+ $sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+ if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
+ $sSQL .= ") ";
+ $sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
+ if (!$bDeDupe) $sSQL .= ",place_id";
+ $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+ $sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
+ $sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
+ $sSQL .= ",extratags->'place' ";
+ $sSQL .= " union ";
+ $sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+ $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ $sSQL .= "null as placename,";
+ $sSQL .= "null as ref,";
+ $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+ //$sSQL .= $sOrderSQL." as porder, ";
+ $sSQL .= "-0.15 as importance, ";
+ $sSQL .= "null as extra_place ";
+ $sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
+ $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+ $sSQL .= "group by place_id";
+ if (!$bDeDupe) $sSQL .= ",place_id";
+ /*
+ $sSQL .= " union ";
+ $sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+ $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ $sSQL .= "null as placename,";
+ $sSQL .= "null as ref,";
+ $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+ //$sSQL .= $sOrderSQL." as porder, ";
+ $sSQL .= "-0.10 as importance, ";
+ $sSQL .= "null as extra_place ";
+ $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
+ $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+ $sSQL .= "group by place_id";
+ */
+ if (!$bDeDupe) $sSQL .= ",place_id";
+ $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+ $sSQL .= "order by importance desc";
+ //$sSQL .= "order by rank_search,rank_address,porder asc";
+ if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
+ $aSearchResults = $oDB->getAll($sSQL);
+ //var_dump($sSQL,$aSearchResults);exit;
+
+ if (PEAR::IsError($aSearchResults))
+ {
+ failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
+ }
+ }
+ else
{
- failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
+ $aSearchResults = array();
}
}
}
if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);
if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
- if ($sSuggestion)
- {
- $sSuggestionURL = $sMoreURL.'&q='.urlencode($sSuggestion);
- }
$sMoreURL .= '&q='.urlencode($sQuery);
if (CONST_Debug) exit;
projects / nominatim.git / blobdiff