$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;
$iLimit = $iFinalLimit + min($iFinalLimit, 10);
$iMinAddressRank = 0;
$iMaxAddressRank = 30;
+ $aAddressRankList = array();
$sAllowedTypesSQLList = false;
// Format for output
// Preferred language
$aLangPrefOrder = getPreferredLanguages();
+ $bReverseInPlan = true;
+ /*
if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
if (isset($aLangPrefOrder['name:pl'])) $bReverseInPlan = true;
+ */
$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
$sQuery = join(', ',$aPhrases);
}
- function structuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
- {
- if (!isset($_GET[$sKey])) return false;
- $sValue = trim($_GET[$sKey]);
- if (!$sValue) return false;
- $aStructuredQuery[$sKey] = $sValue;
- if ($iMinAddressRank == 0 && $iMaxAddressRank == 30)
- {
- $iMinAddressRank = $iNewMinAddressRank;
- $iMaxAddressRank = $iNewMaxAddressRank;
- }
- return true;
- }
-
// Structured query?
$aStructuredOptions = array(
- array('amenity', 26, 30),
- array('street', 26, 30),
- array('city', 14, 24),
- array('county', 9, 13),
- array('state', 8, 8),
- array('country', 4, 4),
- array('postalcode', 5, 11),
+ array('amenity', 26, 30, false),
+ array('street', 26, 30, false),
+ array('city', 14, 24, false),
+ array('county', 9, 13, false),
+ array('state', 8, 8, false),
+ array('country', 4, 4, false),
+ array('postalcode', 5, 11, array(5, 11)),
);
$aStructuredQuery = array();
$sAllowedTypesSQLList = '';
foreach($aStructuredOptions as $aStructuredOption)
{
- loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]);
+ loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $aAddressRankList, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2], $aStructuredOption[3]);
}
if (sizeof($aStructuredQuery) > 0)
{
$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
}
}
- elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9.]*)[, ]+(-?[0-9]+[0-9.]*)(\\]|$|\\b)/', $sQuery, $aData))
+ elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))
{
$fQueryLat = $aData[2];
$fQueryLon = $aData[3];
$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;
$bStructuredPhrases = false;
}
-
// Convert each phrase to standard form
// Create a list of standard words
// Get all 'sets' of words
}
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)
{
$aValidTokens[$sToken] = $aGBPostcodeLocation;
}
}
+ // US ZIP+4 codes - if there is no token,
+ // merge in the 5-digit ZIP code
+ else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData))
+ {
+ if (isset($aValidTokens[$aData[1]]))
+ {
+ foreach($aValidTokens[$aData[1]] as $aToken)
+ {
+ if (!$aToken['class'])
+ {
+ if (isset($aValidTokens[$sToken]))
+ {
+ $aValidTokens[$sToken][] = $aToken;
+ }
+ else
+ {
+ $aValidTokens[$sToken] = array($aToken);
+ }
+ }
+ }
+ }
+ }
}
foreach($aTokens as $sToken)
/*
Calculate all searches using aValidTokens i.e.
-
'Wodsworth Road, Sheffield' =>
Phrase Wordset
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
}
}
+ elseif ($sPhraseType == 'postalcode')
+ {
+ // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
+ if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
+ {
+ // If we already have a name try putting the postcode first
+ if (sizeof($aSearch['aName']))
+ {
+ $aNewSearch = $aSearch;
+ $aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
+ $aNewSearch['aName'] = array();
+ $aNewSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+ if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
+ }
+
+ if (sizeof($aSearch['aName']))
+ {
+ if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false))
+ {
+ $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+ }
+ else
+ {
+ $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+ $aSearch['iSearchRank'] += 1000; // skip;
+ }
+ }
+ else
+ {
+ $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+ //$aSearch['iNamePhrase'] = $iPhrase;
+ }
+ if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
+ }
+
+ }
elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house')
{
if ($aSearch['sHouseNumber'] === '')
//if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
}
+
}
else
{
if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
$aOrder[] = "$sImportanceSQL DESC";
if (sizeof($aSearch['aFullNameAddress']))
+ {
$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
+ }
if (sizeof($aTerms))
{
if ($iQueryLoop > 20) break;
}
+ if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($iMinAddressRank != 0 || $iMaxAddressRank != 30))
+ {
+ // Need to verify passes rank limits before dropping out of the loop (yuk!)
+ $sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
+ $sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+ if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
+ if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
+ $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
+ $sSQL .= "and (30 between $iMinAddressRank and $iMaxAddressRank ";
+ if ($aAddressRankList) $sSQL .= " OR 30 in (".join(',',$aAddressRankList).")";
+ $sSQL .= ")";
+ if (CONST_Debug) var_dump($sSQL);
+ $aResultPlaceIDs = $oDB->getCol($sSQL);
+ }
+
+
//exit;
if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
if ($iGroupLoop > 4) break;
$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'";
+ if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
$sSQL .= ") ";
if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
$sSQL .= "and linked_place_id is null ";
{
if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
{
- $iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
- $aResultPlaceIDs = array($iPlaceID);
-
- // TODO: this needs refactoring!
+ $iPlaceID = geocodeReverse((float)$_GET['nearlat'], (float)$_GET['nearlon']);
- // 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'";
+ if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
+ $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