From: Sarah Hoffmann Date: Fri, 12 Apr 2013 21:23:36 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~623 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/12c1deeb8a313873af7c33c878f48a819305b483?hp=-c Merge remote-tracking branch 'upstream/master' Conflicts: lib/log.php website/reverse.php website/search.php --- 12c1deeb8a313873af7c33c878f48a819305b483 diff --combined lib/log.php index 8022376d,b08f5383..361c0fb1 --- a/lib/log.php +++ b/lib/log.php @@@ -13,37 -13,39 +13,37 @@@ $_SERVER["REMOTE_ADDR"], $_SERVER['QUERY_STRING'], $sQuery - ); + ); if (CONST_Log_DB) { - // Log - if ($sType == 'search') - { - $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')'); - } - - $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)'; + if (isset($_GET['email'])) + $sUserAgent = $_GET['email']; + else + $sUserAgent = $_SERVER['HTTP_USER_AGENT']; + $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)'; $sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]); - $sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).')'; + $sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($sUserAgent).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).','.getDBQuoted($hLog[3]).')'; $oDB->query($sSQL); } if (CONST_Log_File && CONST_Log_File_ReverseLog != '') { - if ($sType == 'reverse') - { - $aStartTime = explode('.',$hLog[0]); - file_put_contents(CONST_Log_File_ReverseLog, - $aStartTime[0].','.$aStartTime[1].','. - php_uname('n').','. - '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'. - '"'.addslashes($hLog[1]).'",'. - $_GET['lat'].','. - $_GET['lon'].','. - $_GET['zoom'].','. - '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. - '"'.addslashes($sOutputFormat).'"'."\n", - FILE_APPEND); - } + if ($sType == 'reverse') + { + $aStartTime = explode('.',$hLog[0]); + file_put_contents(CONST_Log_File_ReverseLog, + $aStartTime[0].','.$aStartTime[1].','. + php_uname('n').','. + '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'. + '"'.addslashes($hLog[1]).'",'. + $_GET['lat'].','. + $_GET['lon'].','. + $_GET['zoom'].','. + '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. + '"'.addslashes($sOutputFormat).'"'."\n", + FILE_APPEND); + } } return $hLog; @@@ -57,6 -59,12 +57,6 @@@ if (CONST_Log_DB) { - $sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults; - $sSQL .= ' where starttime = '.getDBQuoted($hLog[0]); - $sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]); - $sSQL .= ' and query = '.getDBQuoted($hLog[3]); - $oDB->query($sSQL); - $sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults; $sSQL .= ' where starttime = '.getDBQuoted($hLog[0]); $sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]); @@@ -66,17 -74,17 +66,17 @@@ if (CONST_Log_File && CONST_Log_File_SearchLog != '') { - $aStartTime = explode('.',$hLog[0]); - file_put_contents(CONST_Log_File_SearchLog, - $aStartTime[0].','.$aStartTime[1].','. - php_uname('n').','. - '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'. - '"'.addslashes($hLog[1]).'",'. - '"'.addslashes($hLog[3]).'",'. - '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. - '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'. - $iNumResults."\n", - FILE_APPEND); + $aStartTime = explode('.',$hLog[0]); + file_put_contents(CONST_Log_File_SearchLog, + $aStartTime[0].','.$aStartTime[1].','. + php_uname('n').','. + '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'. + '"'.addslashes($hLog[1]).'",'. + '"'.addslashes($hLog[3]).'",'. + '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. + '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'. + $iNumResults."\n", + FILE_APPEND); } } diff --combined settings/settings.php index 159c24ac,f2cdf918..31dc8eac --- a/settings/settings.php +++ b/settings/settings.php @@@ -48,17 -48,15 +48,17 @@@ // Website settings @define('CONST_NoAccessControl', true); - @define('CONST_ClosedForIndexing', false); - @define('CONST_ClosedForIndexingExceptionIPs', ''); @define('CONST_BlockedIPs', ''); + @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks'); + @define('CONST_WhitelistedIPs', ''); + @define('CONST_BlockedUserAgents', ''); + @define('CONST_BlockReverseMaxLoad', 15); @define('CONST_BulkUserIPs', ''); - @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); + @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/'); @define('CONST_Tile_Default', 'Mapnik'); - @define('CONST_Default_Language', 'xx'); + @define('CONST_Default_Language', false); @define('CONST_Default_Lat', 20.0); @define('CONST_Default_Lon', 0.0); @define('CONST_Default_Zoom', 2); diff --combined website/reverse.php index c348659e,fda11582..a1c39d9d --- a/website/reverse.php +++ b/website/reverse.php @@@ -4,60 -4,44 +4,32 @@@ require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/log.php'); - if (preg_match(CONST_BlockedUserAgents, $_SERVER["HTTP_USER_AGENT"]) > 0) - { - $fLoadAvg = getLoadAverage(); - if ($fLoadAvg >= CONST_BlockReverseMaxLoad) { - header('HTTP/1.0 403 Forbidden'); - header('Content-type: text/html; charset=utf-8'); - echo "

App temporarily blocked

"; - echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim "; - echo "geolocation service due to high server load."; - echo "\n\n"; - exit; - } - - } - - - if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false) - { - $fLoadAvg = getLoadAverage(); - if ($fLoadAvg > 2) sleep(60); - if ($fLoadAvg > 4) sleep(120); - if ($fLoadAvg > 6) - { - echo "Bulk User: Temporary block due to high server load\n"; - exit; - } - } - - $oDB =& getDB(); - ini_set('memory_limit', '200M'); - if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false) - { - $fLoadAvg = getLoadAverage(); - if ($fLoadAvg > 2) sleep(60); - if ($fLoadAvg > 4) sleep(120); - if ($fLoadAvg > 6) - { - echo "Bulk User: Temporary block due to high server load\n"; - exit; - } - } -- - // Format for output - $sOutputFormat = 'xml'; - if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) - { - $sOutputFormat = $_GET['format']; - } + $oDB =& getDB(); + ini_set('memory_limit', '200M'); + + // Format for output + $sOutputFormat = 'xml'; + if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) + { + $sOutputFormat = $_GET['format']; + } // Show address breakdown $bShowAddressDetails = true; if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails']; - // Preferred language - $aLangPrefOrder = getPreferredLanguages(); - $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]"; + // Preferred language + $aLangPrefOrder = getPreferredLanguages(); + $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]"; $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder); - if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R')) - { - $iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc")); + if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R')) + { + $iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc")); if (CONST_Debug) var_dump($sSQL); if (!$iPlaceID) $sError = 'OSM ID Not Found'; - } + } else { // Location to look up @@@ -67,27 -51,27 +39,27 @@@ // Zoom to rank, this could probably be calculated but a lookup gives fine control $aZoomRank = array( - 0 => 2, // Continent / Sea - 1 => 2, - 2 => 2, - 3 => 4, // Country - 4 => 4, - 5 => 8, // State - 6 => 10, // Region - 7 => 10, - 8 => 12, // County - 9 => 12, - 10 => 17, // City - 11 => 17, - 12 => 18, // Town / Village - 13 => 18, - 14 => 22, // Suburb - 15 => 22, - 16 => 26, // Street, TODO: major street? - 17 => 26, - 18 => 30, // or >, Building - 19 => 30, // or >, Building - ); + 0 => 2, // Continent / Sea + 1 => 2, + 2 => 2, + 3 => 4, // Country + 4 => 4, + 5 => 8, // State + 6 => 10, // Region + 7 => 10, + 8 => 12, // County + 9 => 12, + 10 => 17, // City + 11 => 17, + 12 => 18, // Town / Village + 13 => 18, + 14 => 22, // Suburb + 15 => 22, + 16 => 26, // Street, TODO: major street? + 17 => 26, + 18 => 30, // or >, Building + 19 => 30, // or >, Building + ); $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28; // Find the nearest point @@@ -122,7 -106,7 +94,7 @@@ $aPlace = $oDB->getRow($sSQL); if (PEAR::IsError($aPlace)) { - failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); + failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); } $iPlaceID = $aPlace['place_id']; $iParentPlaceID = $aPlace['parent_place_id']; @@@ -131,14 -115,15 +103,15 @@@ // The point we found might be too small - use the address to find what it is a child of if ($iPlaceID && $iMaxRank < 28) { - if ($aPlace['rank_search'] > 28 && $iParentPlaceID) { + if ($aPlace['rank_search'] > 28 && $iParentPlaceID) + { $iPlaceID = $iParentPlaceID; } $sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1"; $iPlaceID = $oDB->getOne($sSQL); if (PEAR::IsError($iPlaceID)) { - failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); + failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); } if (!$iPlaceID) { @@@ -150,14 -135,14 +123,14 @@@ if ($iPlaceID) { $sSQL = "select placex.*,"; - $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 .= " st_y(centroid) as lat, st_x(centroid) as lon"; - $sSQL .= " from placex where place_id = $iPlaceID "; + $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 .= " st_y(centroid) as lat, st_x(centroid) as lon"; + $sSQL .= " from placex where place_id = $iPlaceID "; $aPlace = $oDB->getRow($sSQL); - //var_dump($sSQL, $aPlace); exit; + //var_dump($sSQL, $aPlace); exit; if ($bShowAddressDetails) { diff --combined website/search.php index 9940d815,cc8fe02a..6b09bb9e --- a/website/search.php +++ b/website/search.php @@@ -37,26 -37,33 +37,33 @@@ // Show / use polygons $bShowPolygons = (boolean)isset($_GET['polygon']) && $_GET['polygon']; - if ($sOutputFormat == 'html') { + if ($sOutputFormat == 'html') + { $bAsText = $bShowPolygons; $bShowPolygons = false; $bAsGeoJSON = false; $bAsKML = false; $bAsSVG = false; - } else { + } + else + { $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson']; $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml']; $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg']; $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text']; if ((($bShowPolygons?1:0) - + ($bAsGeoJSON?1:0) - + ($bAsKML?1:0) - + ($bAsSVG?1:0) - + ($bAsText?1:0) - ) > CONST_PolygonOutput_MaximumTypes) { - if (CONST_PolygonOutput_MaximumTypes) { + + ($bAsGeoJSON?1:0) + + ($bAsKML?1:0) + + ($bAsSVG?1:0) + + ($bAsText?1:0) + ) > CONST_PolygonOutput_MaximumTypes) + { + if (CONST_PolygonOutput_MaximumTypes) + { userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option"); - } else { + } + else + { userError("Polygon output is disabled"); } exit; @@@ -66,12 -73,11 +73,12 @@@ // Show address breakdown $bShowAddressDetails = isset($_GET['addressdetails']) && $_GET['addressdetails']; - // Preferred language + // Preferred language $aLangPrefOrder = getPreferredLanguages(); 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))."]"; @@@ -120,7 -126,7 +127,7 @@@ } $sCountryCodesSQL = join(',', $aCountryCodes); } - + // Search query $sQuery = (isset($_GET['q'])?trim($_GET['q']):''); if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') @@@ -128,8 -134,8 +135,8 @@@ $sQuery = substr($_SERVER['PATH_INFO'], 1); // reverse order of '/' separated string - $aPhrases = explode('/', $sQuery); - $aPhrases = array_reverse($aPhrases); + $aPhrases = explode('/', $sQuery); + $aPhrases = array_reverse($aPhrases); $sQuery = join(', ',$aPhrases); } @@@ -139,7 -145,8 +146,8 @@@ $sValue = trim($_GET[$sKey]); if (!$sValue) return false; $aStructuredQuery[$sKey] = $sValue; - if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) { + if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) + { $iMinAddressRank = $iNewMinAddressRank; $iMaxAddressRank = $iNewMaxAddressRank; } @@@ -162,7 -169,8 +170,8 @@@ { loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]); } - if (sizeof($aStructuredQuery) > 0) { + if (sizeof($aStructuredQuery) > 0) + { $sQuery = join(', ', $aStructuredQuery); if ($iMaxAddressRank < 30) { @@@ -175,8 -183,8 +184,8 @@@ $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 = 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('/,\s*il\s*(,|$)/',', illinois\1', $sQuery); $sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery); @@@ -184,7 -192,7 +193,7 @@@ } // If we have a view box create the SQL - // Small is the actual view box, Large is double (on each axis) that + // Small is the actual view box, Large is double (on each axis) that $sViewboxCentreSQL = $sViewboxSmallSQL = $sViewboxLargeSQL = false; if (isset($_GET['viewboxlbrt']) && $_GET['viewboxlbrt']) { @@@ -202,7 -210,9 +211,9 @@@ $aCoOrdinates[1] += $fWidth; $aCoOrdinates[3] -= $fWidth; $sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aCoOrdinates[0].",".(float)$aCoOrdinates[1]."),ST_Point(".(float)$aCoOrdinates[2].",".(float)$aCoOrdinates[3].")),4326)"; - } else { + } + else + { $bBoundingBoxSearch = false; } if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth']) @@@ -287,8 -297,8 +298,8 @@@ // Start with a blank search $aSearches = array( array('iSearchRank' => 0, 'iNamePhrase' => -1, 'sCountryCode' => false, 'aName'=>array(), 'aAddress'=>array(), 'aFullNameAddress'=>array(), - 'aNameNonSearch'=>array(), 'aAddressNonSearch'=>array(), - 'sOperator'=>'', 'aFeatureName' => array(), 'sClass'=>'', 'sType'=>'', 'sHouseNumber'=>'', 'fLat'=>'', 'fLon'=>'', 'fRadius'=>'') + 'aNameNonSearch'=>array(), 'aAddressNonSearch'=>array(), + 'sOperator'=>'', 'aFeatureName' => array(), 'sClass'=>'', 'sType'=>'', 'sHouseNumber'=>'', 'fLat'=>'', 'fLon'=>'', 'fRadius'=>'') ); $sNearPointSQL = false; @@@ -365,7 -375,7 +376,7 @@@ // Convert each phrase to standard form // Create a list of standard words // Get all 'sets' of words - // Generate a complete list of all + // Generate a complete list of all $aTokens = array(); foreach($aPhrases as $iPhrase => $sPhrase) { @@@ -396,122 -406,120 +407,120 @@@ if (sizeof($aTokens)) { - // Check which tokens we have, get the ID numbers - $sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count'; - $sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')'; - // $sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency; - // $sSQL .= ' group by word_token, word, class, type, country_code'; + // Check which tokens we have, get the ID numbers + $sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count'; + $sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')'; + //$sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency; + //$sSQL .= ' group by word_token, word, class, type, country_code'; - if (CONST_Debug) var_Dump($sSQL); - - $aValidTokens = array(); - if (sizeof($aTokens)) - $aDatabaseWords = $oDB->getAll($sSQL); - else - $aDatabaseWords = array(); - if (PEAR::IsError($aDatabaseWords)) - { - failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords); - } - $aPossibleMainWordIDs = array(); - $aWordFrequencyScores = array(); - foreach($aDatabaseWords as $aToken) - { - // Very special case - require 2 letter country param to match the country code found - if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country']) - && strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code']) - { - continue; - } + if (CONST_Debug) var_Dump($sSQL); - if (isset($aValidTokens[$aToken['word_token']])) + $aValidTokens = array(); + if (sizeof($aTokens)) $aDatabaseWords = $oDB->getAll($sSQL); + else $aDatabaseWords = array(); + if (PEAR::IsError($aDatabaseWords)) { - $aValidTokens[$aToken['word_token']][] = $aToken; + failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords); } - else + $aPossibleMainWordIDs = array(); + $aWordFrequencyScores = array(); + foreach($aDatabaseWords as $aToken) { - $aValidTokens[$aToken['word_token']] = array($aToken); - } - if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1; - $aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1; - } - if (CONST_Debug) var_Dump($aPhrases, $aValidTokens); + // Very special case - require 2 letter country param to match the country code found + if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country']) + && strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code']) + { + continue; + } - $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 (isset($aValidTokens[$aToken['word_token']])) + { + $aValidTokens[$aToken['word_token']][] = $aToken; + } + else + { + $aValidTokens[$aToken['word_token']] = array($aToken); + } + if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1; + $aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1; } - } - if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion); + if (CONST_Debug) var_Dump($aPhrases, $aValidTokens); - // Try and calculate GB postcodes we might be missing - foreach($aTokens as $sToken) - { - // Source of gb postcodes is now definitive - always use - if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData)) + $aSuggestion = array(); + $bSuggestion = false; + if (CONST_Suggestions_Enabled) { - if (substr($aData[1],-2,1) != ' ') + foreach($aPhrases as $iPhrase => $aPhrase) { - $aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1)); - $aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1); + 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']; + } } - $aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $oDB); - if ($aGBPostcodeLocation) + } + if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion); + + // Try and calculate GB postcodes we might be missing + foreach($aTokens as $sToken) + { + // Source of gb postcodes is now definitive - always use + if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData)) { - $aValidTokens[$sToken] = $aGBPostcodeLocation; + if (substr($aData[1],-2,1) != ' ') + { + $aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1)); + $aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1); + } + $aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $oDB); + if ($aGBPostcodeLocation) + { + $aValidTokens[$sToken] = $aGBPostcodeLocation; + } } } - } - 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)) + foreach($aTokens as $sToken) { - $aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house')); + // 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(array('class'=>'place','type'=>'house')); + } } - } - // Any words that have failed completely? - // TODO: suggestions + // Any words that have failed completely? + // TODO: suggestions - // Start the search process - $aResultPlaceIDs = array(); + // Start the search process + $aResultPlaceIDs = array(); - /* - Calculate all searches using aValidTokens i.e. + /* + Calculate all searches using aValidTokens i.e. - 'Wodsworth Road, Sheffield' => + 'Wodsworth Road, Sheffield' => - Phrase Wordset - 0 0 (wodsworth road) - 0 1 (wodsworth)(road) - 1 0 (sheffield) + Phrase Wordset + 0 0 (wodsworth road) + 0 1 (wodsworth)(road) + 1 0 (sheffield) - Score how good the search is so they can be ordered - */ + Score how good the search is so they can be ordered + */ foreach($aPhrases as $iPhrase => $sPhrase) { $aNewPhraseSearches = array(); @@@ -525,14 -533,14 +534,14 @@@ // Add all words from this wordset foreach($aWordset as $iToken => $sToken) { - //echo "
$sToken"; + //echo "
$sToken"; $aNewWordsetSearches = array(); foreach($aWordsetSearches as $aCurrentSearch) { - //echo ""; - //var_dump($aCurrentSearch); - //echo ""; + //echo ""; + //var_dump($aCurrentSearch); + //echo ""; // If the token is valid if (isset($aValidTokens[' '.$sToken])) @@@ -572,12 -580,12 +581,12 @@@ { $aSearch['sHouseNumber'] = $sToken; if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; - /* + /* // Fall back to not searching for this item (better than nothing) $aSearch = $aCurrentSearch; $aSearch['iSearchRank'] += 1; if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; - */ + */ } } elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null) @@@ -622,7 -630,7 +631,7 @@@ else { $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; - // $aSearch['iNamePhrase'] = $iPhrase; + //$aSearch['iNamePhrase'] = $iPhrase; } if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } @@@ -637,38 -645,38 +646,38 @@@ { if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strlen($sToken) >= 4) { - $aSearch = $aCurrentSearch; + $aSearch = $aCurrentSearch; $aSearch['iSearchRank'] += 1; if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) { $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; - if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; + if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version? { foreach($aValidTokens[' '.$sToken] as $aSearchTermToken) { - if (empty($aSearchTermToken['country_code']) - && empty($aSearchTermToken['lat']) - && empty($aSearchTermToken['class'])) + if (empty($aSearchTermToken['country_code']) + && empty($aSearchTermToken['lat']) + && empty($aSearchTermToken['class'])) { - $aSearch = $aCurrentSearch; + $aSearch = $aCurrentSearch; $aSearch['iSearchRank'] += 1; $aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id']; - if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; + if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } } } else { $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; - if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; + if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } } if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase) { - $aSearch = $aCurrentSearch; + $aSearch = $aCurrentSearch; $aSearch['iSearchRank'] += 2; if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2; if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) @@@ -676,7 -684,7 +685,7 @@@ else $aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; $aSearch['iNamePhrase'] = $iPhrase; - if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; + if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } } } @@@ -692,25 -700,19 +701,19 @@@ // Sort and cut usort($aNewWordsetSearches, 'bySearchRank'); $aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50); - } - // var_Dump('
',sizeof($aWordsetSearches)); exit; + } + //var_Dump('
',sizeof($aWordsetSearches)); exit; $aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches); usort($aNewPhraseSearches, 'bySearchRank'); - $aSearchHash = array(); - foreach($aNewPhraseSearches as $iSearch => $aSearch) - { - $sHash = serialize($aSearch); - if (isset($aSearchHash[$sHash])) - { - unset($aNewPhraseSearches[$iSearch]); - } - else - { - $aSearchHash[$sHash] = 1; - } - } + $aSearchHash = array(); + foreach($aNewPhraseSearches as $iSearch => $aSearch) + { + $sHash = serialize($aSearch); + if (isset($aSearchHash[$sHash])) unset($aNewPhraseSearches[$iSearch]); + else $aSearchHash[$sHash] = 1; + } $aNewPhraseSearches = array_slice($aNewPhraseSearches, 0, 50); } @@@ -736,141 -738,141 +739,141 @@@ if ($iSearchCount > 50) break; } - // if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); + //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); } } else { - // Re-group the searches by their score, junk anything over 20 as just not worth trying - $aGroupedSearches = array(); - foreach($aSearches as $aSearch) + // Re-group the searches by their score, junk anything over 20 as just not worth trying + $aGroupedSearches = array(); + foreach($aSearches as $aSearch) + { + if ($aSearch['iSearchRank'] < $iMaxRank) { - if ($aSearch['iSearchRank'] < $iMaxRank) - { - if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array(); - $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch; - } + if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array(); + $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch; } - ksort($aGroupedSearches); + } + ksort($aGroupedSearches); } - - if (CONST_Debug) var_Dump($aGroupedSearches); - if ($bReverseInPlan) + if (CONST_Debug) var_Dump($aGroupedSearches); + + if ($bReverseInPlan) + { + $aCopyGroupedSearches = $aGroupedSearches; + foreach($aCopyGroupedSearches as $iGroup => $aSearches) { - $aCopyGroupedSearches = $aGroupedSearches; - foreach($aCopyGroupedSearches as $iGroup => $aSearches) + foreach($aSearches as $iSearch => $aSearch) { - foreach($aSearches as $iSearch => $aSearch) + if (sizeof($aSearch['aAddress'])) { - if (sizeof($aSearch['aAddress'])) + $iReverseItem = array_pop($aSearch['aAddress']); + if (isset($aPossibleMainWordIDs[$iReverseItem])) { - $iReverseItem = array_pop($aSearch['aAddress']); - if (isset($aPossibleMainWordIDs[$iReverseItem])) - { - $aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']); - $aSearch['aName'] = array($iReverseItem); - $aGroupedSearches[$iGroup][] = $aSearch; - } - // $aReverseSearch['aName'][$iReverseItem] = $iReverseItem; - // $aGroupedSearches[$iGroup][] = $aReverseSearch; + $aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']); + $aSearch['aName'] = array($iReverseItem); + $aGroupedSearches[$iGroup][] = $aSearch; } + //$aReverseSearch['aName'][$iReverseItem] = $iReverseItem; + //$aGroupedSearches[$iGroup][] = $aReverseSearch; } } } + } - if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0) + if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0) + { + $aCopyGroupedSearches = $aGroupedSearches; + foreach($aCopyGroupedSearches as $iGroup => $aSearches) { - $aCopyGroupedSearches = $aGroupedSearches; - foreach($aCopyGroupedSearches as $iGroup => $aSearches) + foreach($aSearches as $iSearch => $aSearch) { - foreach($aSearches as $iSearch => $aSearch) + $aReductionsList = array($aSearch['aAddress']); + $iSearchRank = $aSearch['iSearchRank']; + while(sizeof($aReductionsList) > 0) { - $aReductionsList = array($aSearch['aAddress']); - $iSearchRank = $aSearch['iSearchRank']; - while(sizeof($aReductionsList) > 0) + $iSearchRank += 5; + if ($iSearchRank > iMaxRank) break 3; + $aNewReductionsList = array(); + foreach($aReductionsList as $aReductionsWordList) { - $iSearchRank += 5; - if ($iSearchRank > iMaxRank) break 3; - $aNewReductionsList = array(); - foreach($aReductionsList as $aReductionsWordList) + for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++) { - for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++) + $aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1)); + $aReverseSearch = $aSearch; + $aSearch['aAddress'] = $aReductionsWordListResult; + $aSearch['iSearchRank'] = $iSearchRank; + $aGroupedSearches[$iSearchRank][] = $aReverseSearch; + if (sizeof($aReductionsWordListResult) > 0) { - $aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1)); - $aReverseSearch = $aSearch; - $aSearch['aAddress'] = $aReductionsWordListResult; - $aSearch['iSearchRank'] = $iSearchRank; - $aGroupedSearches[$iSearchRank][] = $aReverseSearch; - if (sizeof($aReductionsWordListResult) > 0) - { - $aNewReductionsList[] = $aReductionsWordListResult; - } + $aNewReductionsList[] = $aReductionsWordListResult; } } - $aReductionsList = $aNewReductionsList; } + $aReductionsList = $aNewReductionsList; } } - ksort($aGroupedSearches); } + ksort($aGroupedSearches); + } - // Filter out duplicate searches - $aSearchHash = array(); - foreach($aGroupedSearches as $iGroup => $aSearches) + // Filter out duplicate searches + $aSearchHash = array(); + foreach($aGroupedSearches as $iGroup => $aSearches) + { + foreach($aSearches as $iSearch => $aSearch) { - foreach($aSearches as $iSearch => $aSearch) + $sHash = serialize($aSearch); + if (isset($aSearchHash[$sHash])) { - $sHash = serialize($aSearch); - if (isset($aSearchHash[$sHash])) - { - unset($aGroupedSearches[$iGroup][$iSearch]); - if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]); - } - else - { - $aSearchHash[$sHash] = 1; - } + unset($aGroupedSearches[$iGroup][$iSearch]); + if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]); + } + else + { + $aSearchHash[$sHash] = 1; } } + } - if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); + if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); - $iGroupLoop = 0; - $iQueryLoop = 0; - foreach($aGroupedSearches as $iGroupedRank => $aSearches) + $iGroupLoop = 0; + $iQueryLoop = 0; + foreach($aGroupedSearches as $iGroupedRank => $aSearches) + { + $iGroupLoop++; + foreach($aSearches as $aSearch) { - $iGroupLoop++; - foreach($aSearches as $aSearch) - { - $iQueryLoop++; + $iQueryLoop++; - if (CONST_Debug) { echo "
Search Loop, group $iGroupLoop, loop $iQueryLoop"; } - if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens); + if (CONST_Debug) { echo "
Search Loop, group $iGroupLoop, loop $iQueryLoop"; } + if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens); - // Must have a location term - if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon']) + // Must have a location term + if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon']) + { + if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) { - if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) + if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank) { - if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank) - { - $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4"; - if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; - $sSQL .= " order by st_area(geometry) desc limit 1"; - if (CONST_Debug) var_dump($sSQL); - $aPlaceIDs = $oDB->getCol($sSQL); - } + $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4"; + if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; + $sSQL .= " order by st_area(geometry) desc limit 1"; + if (CONST_Debug) var_dump($sSQL); + $aPlaceIDs = $oDB->getCol($sSQL); } - else + } + else + { + if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue; + if (!$aSearch['sClass']) continue; + $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; + if ($oDB->getOne($sSQL)) { - if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue; - if (!$aSearch['sClass']) continue; - $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; - if ($oDB->getOne($sSQL)) - { $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct"; if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; $sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)"; @@@ -879,7 -881,7 +882,7 @@@ { $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; } - 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"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); @@@ -893,7 -895,7 +896,7 @@@ if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; $sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid)"; if ($sCountryCodesSQL) $sSQL .= " and calculated_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"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); @@@ -909,209 -911,202 +912,202 @@@ if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); } - } } - else - { - $aPlaceIDs = array(); + } + else + { + $aPlaceIDs = array(); - // First we need a position, either aName or fLat or both - $aTerms = array(); - $aOrder = array(); + // First we need a position, either aName or fLat or both + $aTerms = array(); + $aOrder = array(); - // TODO: filter out the pointless search terms (2 letter name tokens and less) - // they might be right - but they are just too darned expensive to run - if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]"; - if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]"; - if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) - { - // For infrequent name terms disable index usage for address - if (CONST_Search_NameOnlySearchFrequencyThreshold && - sizeof($aSearch['aName']) == 1 && + // TODO: filter out the pointless search terms (2 letter name tokens and less) + // they might be right - but they are just too darned expensive to run + if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]"; + if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]"; + if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) + { + // For infrequent name terms disable index usage for address + if (CONST_Search_NameOnlySearchFrequencyThreshold && + sizeof($aSearch['aName']) == 1 && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold) - { - $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]"; - } - else - { - $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]"; - if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]"; - } + { + $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]"; } - if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'"; - if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank in (26,27)"; - if ($aSearch['fLon'] && $aSearch['fLat']) + else { - $aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")"; - $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC"; + $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]"; + if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]"; } - if (sizeof($aExcludePlaceIDs)) + } + if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'"; + if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank in (26,27)"; + if ($aSearch['fLon'] && $aSearch['fLat']) + { + $aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")"; + $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC"; + } + if (sizeof($aExcludePlaceIDs)) + { + $aTerms[] = "place_id not in (".join(',',$aExcludePlaceIDs).")"; + } + if ($sCountryCodesSQL) + { + $aTerms[] = "country_code in ($sCountryCodesSQL)"; + } + + if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL"; + if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc"; + + $sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)'; + if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END"; + 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)) + { + $sSQL = "select place_id"; + $sSQL .= " from search_name"; + $sSQL .= " where ".join(' and ',$aTerms); + $sSQL .= " order by ".join(', ',$aOrder); + if ($aSearch['sHouseNumber'] || $aSearch['sClass']) + $sSQL .= " limit 50"; + elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) + $sSQL .= " limit 1"; + else + $sSQL .= " limit ".$iLimit; + + if (CONST_Debug) { var_dump($sSQL); } + $aViewBoxPlaceIDs = $oDB->getAll($sSQL); + if (PEAR::IsError($aViewBoxPlaceIDs)) { - $aTerms[] = "place_id not in (".join(',',$aExcludePlaceIDs).")"; + failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs); } - if ($sCountryCodesSQL) + //var_dump($aViewBoxPlaceIDs); + // Did we have an viewbox matches? + $aPlaceIDs = array(); + $bViewBoxMatch = false; + foreach($aViewBoxPlaceIDs as $aViewBoxRow) { - $aTerms[] = "country_code in ($sCountryCodesSQL)"; + //if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break; + //if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break; + //if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1; + //else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2; + $aPlaceIDs[] = $aViewBoxRow['place_id']; } + } + //var_Dump($aPlaceIDs); + //exit; - if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL"; - if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc"; - - $sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)'; - if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END"; - 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 ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) + { + $aRoadPlaceIDs = $aPlaceIDs; + $sPlaceIDs = join(',',$aPlaceIDs); - - if (sizeof($aTerms)) + // Now they are indexed look for a house attached to a street we found + $sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M'; + $sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'"; + if (sizeof($aExcludePlaceIDs)) { - $sSQL = "select place_id"; - $sSQL .= " from search_name"; - $sSQL .= " where ".join(' and ',$aTerms); - $sSQL .= " order by ".join(', ',$aOrder); - if ($aSearch['sHouseNumber'] || $aSearch['sClass']) - $sSQL .= " limit 50"; - elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) - $sSQL .= " limit 1"; - else - $sSQL .= " limit ".$iLimit; - - if (CONST_Debug) var_dump($sSQL); - $iStartTime = time(); - $aViewBoxPlaceIDs = $oDB->getAll($sSQL); - if (PEAR::IsError($aViewBoxPlaceIDs)) - { - failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs); - } - if (time() - $iStartTime > 60) { - file_put_contents(CONST_BasePath.'/log/long_queries.log', date('Y-m-d H:i:s', $iStartTime).' '.$sSQL."\n", FILE_APPEND); - } + $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; + } + $sSQL .= " limit $iLimit"; + if (CONST_Debug) var_dump($sSQL); + $aPlaceIDs = $oDB->getCol($sSQL); - //var_dump($aViewBoxPlaceIDs); - // Did we have an viewbox matches? - $aPlaceIDs = array(); - $bViewBoxMatch = false; - foreach($aViewBoxPlaceIDs as $aViewBoxRow) + // If not try the aux fallback table + if (!sizeof($aPlaceIDs)) + { + $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; + if (sizeof($aExcludePlaceIDs)) { - // if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break; - // if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break; - // if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1; - // else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2; - $aPlaceIDs[] = $aViewBoxRow['place_id']; + $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; } + //$sSQL .= " limit $iLimit"; + if (CONST_Debug) var_dump($sSQL); + $aPlaceIDs = $oDB->getCol($sSQL); } - //var_Dump($aPlaceIDs); - //exit; - if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) + if (!sizeof($aPlaceIDs)) { - $aRoadPlaceIDs = $aPlaceIDs; - $sPlaceIDs = join(',',$aPlaceIDs); - - // Now they are indexed look for a house attached to a street we found - $sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M'; - $sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'"; + $sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; if (sizeof($aExcludePlaceIDs)) { $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; } - $sSQL .= " limit $iLimit"; + //$sSQL .= " limit $iLimit"; if (CONST_Debug) var_dump($sSQL); $aPlaceIDs = $oDB->getCol($sSQL); + } - // If not try the aux fallback table - if (!sizeof($aPlaceIDs)) - { - $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; - if (sizeof($aExcludePlaceIDs)) - { - $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; - } - // $sSQL .= " limit $iLimit"; - if (CONST_Debug) var_dump($sSQL); - $aPlaceIDs = $oDB->getCol($sSQL); - } + // Fallback to the road + if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber'])) + { + $aPlaceIDs = $aRoadPlaceIDs; + } - if (!sizeof($aPlaceIDs)) - { - $sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; - if (sizeof($aExcludePlaceIDs)) - { - $sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")"; - } - // $sSQL .= " limit $iLimit"; - if (CONST_Debug) var_dump($sSQL); - $aPlaceIDs = $oDB->getCol($sSQL); - } + } - // Fallback to the road - if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber'])) - { - $aPlaceIDs = $aRoadPlaceIDs; - } - + if ($aSearch['sClass'] && sizeof($aPlaceIDs)) + { + $sPlaceIDs = join(',',$aPlaceIDs); + $aClassPlaceIDs = array(); + + if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') + { + // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match + $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'"; + $sSQL .= " and linked_place_id is null"; + if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; + $sSQL .= " order by rank_search asc limit $iLimit"; + if (CONST_Debug) var_dump($sSQL); + $aClassPlaceIDs = $oDB->getCol($sSQL); } - - if ($aSearch['sClass'] && sizeof($aPlaceIDs)) + + if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in { - $sPlaceIDs = join(',',$aPlaceIDs); + $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)"; - $aClassPlaceIDs = array(); + if (CONST_Debug) var_dump($sSQL); + $iMaxRank = ((int)$oDB->getOne($sSQL)); - if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') + // For state / country level searches the normal radius search doesn't work very well + $sPlaceGeom = false; + if ($iMaxRank < 9 && $bCacheTable) { - // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match - $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'"; - $sSQL .= " and linked_place_id is null"; - if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; - $sSQL .= " order by rank_search asc limit $iLimit"; + // 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); - $aClassPlaceIDs = $oDB->getCol($sSQL); + $sPlaceGeom = $oDB->getOne($sSQL); } - - if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in - { - $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 ($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); - $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); - } + $aPlaceIDs = $oDB->getCol($sSQL); + $sPlaceIDs = join(',',$aPlaceIDs); + } - if ($sPlaceIDs || $sPlaceGeom) - { + if ($sPlaceIDs || $sPlaceGeom) + { $fRange = 0.01; if ($bCacheTable) { // More efficient - can make the range bigger - $fRange = 0.05; + $fRange = 0.05; $sOrderBySQL = ''; if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)"; @@@ -1156,199 -1151,199 +1152,199 @@@ { $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")"; } - if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)"; + if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)"; if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc"; if ($iOffset) $sSQL .= " offset $iOffset"; $sSQL .= " limit $iLimit"; if (CONST_Debug) var_dump($sSQL); $aClassPlaceIDs = array_merge($aClassPlaceIDs, $oDB->getCol($sSQL)); } - } } - - $aPlaceIDs = $aClassPlaceIDs; - } - - } - - if (PEAR::IsError($aPlaceIDs)) - { - failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs); - } - if (CONST_Debug) { echo "
Place IDs: "; var_Dump($aPlaceIDs); } + $aPlaceIDs = $aClassPlaceIDs; - foreach($aPlaceIDs as $iPlaceID) - { - $aResultPlaceIDs[$iPlaceID] = $iPlaceID; } - if ($iQueryLoop > 20) break; - } - //exit; - if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break; - if ($iGroupLoop > 4) break; - if ($iQueryLoop > 30) break; - } + } - // Did we find anything? - if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) - { - //var_Dump($aResultPlaceIDs);exit; - // Get the details for display (is this a redundant extra step?) - $sPlaceIDs = join(',',$aResultPlaceIDs); - $sOrderSQL = 'CASE '; - foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID) + if (PEAR::IsError($aPlaceIDs)) { - $sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' '; + failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs); } - $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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; - $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 .= ") "; - if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList "; - $sSQL .= "and linked_place_id is null "; - $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 .= ",langaddress "; - $sSQL .= ",placename "; - $sSQL .= ",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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; - $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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; - $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 "
"; var_dump($sSQL); } - $aSearchResults = $oDB->getAll($sSQL); - //var_dump($sSQL,$aSearchResults);exit; - - if (PEAR::IsError($aSearchResults)) + + if (CONST_Debug) { echo "
Place IDs: "; var_Dump($aPlaceIDs); } + + foreach($aPlaceIDs as $iPlaceID) { - failInternalError("Could not get details for place.", $sSQL, $aSearchResults); + $aResultPlaceIDs[$iPlaceID] = $iPlaceID; } + if ($iQueryLoop > 20) break; } - } // end if ($sQuery) - else + + //exit; + if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break; + if ($iGroupLoop > 4) break; + if ($iQueryLoop > 30) break; + } + + // Did we find anything? + if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) { - if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '') + //var_Dump($aResultPlaceIDs);exit; + // 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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; + $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 .= ") "; + if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList "; + $sSQL .= "and linked_place_id is null "; + $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 .= ",langaddress "; + $sSQL .= ",placename "; + $sSQL .= ",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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; + $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 .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; + $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 "
"; var_dump($sSQL); } + $aSearchResults = $oDB->getAll($sSQL); + //var_dump($sSQL,$aSearchResults);exit; + + if (PEAR::IsError($aSearchResults)) { - $iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']); - $aResultPlaceIDs = array($iPlaceID); + failInternalError("Could not get details for place.", $sSQL, $aSearchResults); + } + } + } // end if ($sQuery) + else + { + 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! + // 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) - { - $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 "
", 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); - } + // 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 "
", 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); } } } - + } + $sSearchResult = ''; if (!sizeof($aSearchResults) && isset($_GET['q']) && $_GET['q']) { $sSearchResult = 'No Results Found'; } - //var_Dump($aSearchResults); - //exit; + //var_Dump($aSearchResults); + //exit; $aClassType = getClassTypesWithImportance(); $aRecheckWords = preg_split('/\b/u',$sQuery); foreach($aRecheckWords as $i => $sWord) @@@ -1386,11 -1381,12 +1382,12 @@@ if ($bAsSVG) $aResult['assvg'] = $aPointPolygon['assvg']; if ($bAsText) $aResult['astext'] = $aPointPolygon['astext']; - if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null ) { + if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null ) + { $aResult['lat'] = $aPointPolygon['centrelat']; $aResult['lon'] = $aPointPolygon['centrelon']; } - if ($bShowPolygons) + if ($bShowPolygons) { // Translate geometary string to point array if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch)) @@@ -1443,12 -1439,12 +1440,12 @@@ // Default $fDiameter = 0.0001; - if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) + if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) { $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defzoom']; } - elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) + elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) { $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']; @@@ -1480,14 -1476,14 +1477,14 @@@ } // Is there an icon set for this type of result? - if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['icon']) + if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon']) + && $aClassType[$aResult['class'].':'.$aResult['type']]['icon']) { $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png'; } - if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['label']) + if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label']) + && $aClassType[$aResult['class'].':'.$aResult['type']]['label']) { $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label']; } @@@ -1500,8 -1496,8 +1497,8 @@@ $aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']); } - //var_dump($aResult['address']); - //exit; + //var_dump($aResult['address']); + //exit; } // Adjust importance for the number of exact string matches in the result @@@ -1515,23 -1511,23 +1512,23 @@@ $aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right - //if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']); - /* - if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) - && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) - { - $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']; - } - elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']) - { - $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type']]['importance']; - } - else - { - $aResult['importance'] = 1000000000000000; - } - */ + //if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']); + /* + if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) + && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) + { + $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']; + } + elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance']) + && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']) + { + $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type']]['importance']; + } + else + { + $aResult['importance'] = 1000000000000000; + } + */ $aResult['name'] = $aResult['langaddress']; $aResult['foundorder'] = -$aResult['addressimportance']; $aSearchResults[$iResNum] = $aResult; @@@ -1556,7 -1552,7 +1553,7 @@@ $bFirst = false; } if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']]) - && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))) + && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))) { $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true; $aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true; @@@ -1578,7 -1574,7 +1575,7 @@@ { logEnd($oDB, $hLog, sizeof($aToFilter)); } - $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs); + $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs); if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"]; if ($bShowPolygons) $sMoreURL .= '&polygon=1'; if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';