X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c988be1ddf10c7838c4e057adb351b1c076c6cca..14e6dab005c49a77ac49b6503f7807e620ea0ed3:/website/search.php diff --git a/website/search.php b/website/search.php index ba7df0f0..d9adf6b8 100755 --- a/website/search.php +++ b/website/search.php @@ -54,6 +54,8 @@ } // Only certain ranks of feature + if (isset($_GET['featureType']) && !isset($_GET['featuretype'])) $_GET['featuretype'] = $_GET['featureType']; + if (isset($_GET['featuretype'])) { switch($_GET['featuretype']) @@ -99,13 +101,19 @@ $aPhrases = array_reverse($aPhrases); $sQuery = join(', ',$aPhrases); } - if ($sQuery) { $hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder); // Hack to make it handle "new york, ny" (and variants) correctly $sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $sQuery); + if (isset($aLangPrefOrder['name:en'])) + { + $sQuery = preg_replace('/\\bil\\b/','illinois', $sQuery); + $sQuery = preg_replace('/\\bal\\b/','alabama', $sQuery); + $sQuery = preg_replace('/\\bla\\b/','louisiana', $sQuery); + $sQuery = preg_replace('/\\bde louisiana\\b/','de la', $sQuery); + } // If we have a view box create the SQL // Small is the actual view box, Large is double (on each axis) that @@ -173,21 +181,36 @@ // Do we have anything that looks like a lat/lon pair? if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[ ]+([0-9.]+)?[, ]+([EW])[ ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?\\b/', $sQuery, $aData)) { - $_GET['nearlat'] = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60); - $_GET['nearlon'] = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60); - $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); + $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60); + $fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60); + if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1) + { + $_GET['nearlat'] = $fQueryLat; + $_GET['nearlon'] = $fQueryLon; + $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); + } } elseif (preg_match('/\\b([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([NS])[, ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([EW])\\b/', $sQuery, $aData)) { - $_GET['nearlat'] = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60); - $_GET['nearlon'] = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60); - $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); + $fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60); + $fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60); + if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1) + { + $_GET['nearlat'] = $fQueryLat; + $_GET['nearlon'] = $fQueryLon; + $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.]*)(\\]|$|\\b)/', $sQuery, $aData)) { - $_GET['nearlat'] = $aData[2]; - $_GET['nearlon'] = $aData[3]; - $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); + $fQueryLat = $aData[2]; + $fQueryLon = $aData[3]; + if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1) + { + $_GET['nearlat'] = $fQueryLat; + $_GET['nearlon'] = $fQueryLon; + $sQuery = trim(str_replace($aData[0], ' ', $sQuery)); + } } if ($sQuery) @@ -263,7 +286,8 @@ $aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string"); if (PEAR::isError($aPhrase)) { - var_dump($aPhrase); + echo "Illegal query string (not an UTF-8 string): ".$sPhrase; + if (CONST_Debug) var_dump($aPhrase); exit; } if (trim($aPhrase['string'])) @@ -346,7 +370,7 @@ } } if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion); -/* + // Try and calculate GB postcodes we might be missing foreach($aTokens as $sToken) { @@ -364,14 +388,13 @@ } } } -*/ foreach($aTokens as $sToken) { // Unknown single word token with a number - assume it is a house number if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken)) { - $aValidTokens[' '.$sToken] = array('class'=>'place','type'=>'house'); + $aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house')); } } @@ -664,7 +687,9 @@ { if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank) { - $sSQL = "select place_id from placex where country_code='".$aSearch['sCountryCode']."' and rank_search = 4 order by st_area(geometry) desc limit 1"; + $sSQL = "select place_id from placex where country_code='".$aSearch['sCountryCode']."' and rank_search = 4"; + if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)"; + $sSQL .= " order by st_area(geometry) desc limit 1"; $aPlaceIDs = $oDB->getCol($sSQL); } } @@ -848,36 +873,70 @@ if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in { - $sSQL = "select rank_search from placex where place_id in ($sPlaceIDs) order by rank_search asc limit 1"; + $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; + $bCacheTable = $oDB->getOne($sSQL); + + $sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)"; if (CONST_Debug) var_dump($sSQL); - $iMaxRank = ((int)$oDB->getOne($sSQL)) + 5; + $iMaxRank = ((int)$oDB->getOne($sSQL)); + // For state / country level searches the normal radius search doesn't work very well + $sPlaceGeom = false; + if ($iMaxRank < 9 && $bCacheTable) + { + // Try and get a polygon to search in instead + $sSQL = "select geometry from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank + 5 and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon') order by rank_search asc limit 1"; + if (CONST_Debug) var_dump($sSQL); + $sPlaceGeom = $oDB->getOne($sSQL); + } + + if ($sPlaceGeom) + { + $sPlaceIDs = false; + } + else + { + $iMaxRank += 5; $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); $sPlaceIDs = join(',',$aPlaceIDs); + } - if ($sPlaceIDs) + if ($sPlaceIDs || $sPlaceGeom) { $fRange = 0.01; - $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; - if ($oDB->getOne($sSQL)) + if ($bCacheTable) { // More efficient - can make the range bigger - $fRange = 0.05; - $sSQL = "select l.place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l"; + $fRange = 0.05; + + $sOrderBySQL = ''; + if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)"; + else if ($sPlaceIDs) $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)"; + else if ($sPlaceGeom) $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)"; + + $sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l"; if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)"; - $sSQL .= ",placex as f where "; - $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, st_centroid(f.geometry), $fRange) "; + if ($sPlaceIDs) + { + $sSQL .= ",placex as f where "; + $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, st_centroid(f.geometry), $fRange) "; + } + if ($sPlaceGeom) + { + $sSQL .= " where "; + $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) "; + } if (sizeof($aExcludePlaceIDs)) { $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")"; } if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)"; - if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.centroid) ASC"; - else $sSQL .= " order by ST_Distance(l.centroid, f.geometry) asc"; + if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc"; + if ($iOffset) $sSQL .= " offset $iOffset"; $sSQL .= " limit $iLimit"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); @@ -885,7 +944,12 @@ else { if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius']; - $sSQL = "select l.place_id from placex as l,placex as f where "; + + $sOrderBySQL = ''; + if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)"; + else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)"; + + $sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from placex as l,placex as f where "; $sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, st_centroid(f.geometry), $fRange) "; $sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' "; if (sizeof($aExcludePlaceIDs)) @@ -893,8 +957,8 @@ $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")"; } if ($sCountryCodesSQL) $sSQL .= " and l.country_code in ($sCountryCodesSQL)"; - if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.geometry) ASC"; - else $sSQL .= " order by ST_Distance(l.geometry, f.geometry) asc, l.rank_search ASC"; + if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc"; + if ($iOffset) $sSQL .= " offset $iOffset"; $sSQL .= " limit $iLimit"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); @@ -1063,8 +1127,6 @@ $sSearchResult = ''; if (!sizeof($aSearchResults) && isset($_GET['q']) && $_GET['q']) { -echo "here"; -exit; $sSearchResult = 'No Results Found'; } //var_Dump($aSearchResults); @@ -1114,7 +1176,7 @@ exit; } // Output data suitable for display (points and a bounding box) - if ($bShowPolygons) + if ($bShowPolygons && isset($aPolyPoints)) { $aResult['aPolyPoints'] = array(); foreach($aPolyPoints as $aPoint)