customized tablespace settings for poldi

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 6596fca4c77edb3008a8211fca3ab77d0297e00b..d9adf6b849088b4a0eef95245087495cf2396eab 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -54,6 +54,8 @@
        }
 
   // Only certain ranks of feature
        }
 
   // Only certain ranks of feature

+       if (isset($_GET['featureType']) && !isset($_GET['featuretype'])) $_GET['featuretype'] = $_GET['featureType'];
+

        if (isset($_GET['featuretype']))
        {
                switch($_GET['featuretype'])
        if (isset($_GET['featuretype']))
        {
                switch($_GET['featuretype'])


@@ -99,13 +101,19 @@
                $aPhrases = array_reverse($aPhrases); 
                $sQuery = join(', ',$aPhrases);
        }
                $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 ($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 
 
                // If we have a view box create the SQL
                // Small is the actual view box, Large is double (on each axis) that 


@@ -173,26 +181,40 @@
                // 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))
                {
                // 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))
                {
                }
                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)
                {
                }
 
                if ($sQuery)
                {

-

                        // Start with a blank search
                        $aSearches = array(
                                array('iSearchRank' => 0, 'iNamePhrase' => -1, 'sCountryCode' => false, 'aName'=>array(), 'aAddress'=>array(), 
                        // Start with a blank search
                        $aSearches = array(
                                array('iSearchRank' => 0, 'iNamePhrase' => -1, 'sCountryCode' => false, 'aName'=>array(), 'aAddress'=>array(), 


@@ -264,7 +286,8 @@
                                $aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
                                if (PEAR::isError($aPhrase))
                                {
                                $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']))
                                        exit;
                                }
                                if (trim($aPhrase['string']))


@@ -278,7 +301,7 @@
                                {
                                        unset($aPhrases[$iPhrase]);
                                }
                                {
                                        unset($aPhrases[$iPhrase]);
                                }

-                       }                       
+                       }

 
                        // reindex phrases - we make assumptions later on
                        $aPhrases = array_values($aPhrases);
 
                        // reindex phrases - we make assumptions later on
                        $aPhrases = array_values($aPhrases);


@@ -347,7 +370,7 @@
                                }
                        }
                        if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
                                }
                        }
                        if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);

-/*
+

                        // Try and calculate GB postcodes we might be missing
                        foreach($aTokens as $sToken)
                        {
                        // Try and calculate GB postcodes we might be missing
                        foreach($aTokens as $sToken)
                        {


@@ -365,7 +388,16 @@
                                        }
                                }
                        }
                                        }
                                }
                        }

-*/
+
+                       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(array('class'=>'place','type'=>'house'));
+                               }
+                       }
+

                        // Any words that have failed completely?
                        // TODO: suggestions
 
                        // Any words that have failed completely?
                        // TODO: suggestions
 


@@ -655,7 +687,9 @@
                                                        {
                                                                if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank)
                                                                {
                                                        {
                                                                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);
                                                                }
                                                        }
                                                                        $aPlaceIDs = $oDB->getCol($sSQL);
                                                                }
                                                        }


@@ -744,7 +778,7 @@
                                                                $sSQL .= " from search_name";
                                                                $sSQL .= " where ".join(' and ',$aTerms);
                                                                $sSQL .= " order by ".join(', ',$aOrder);
                                                                $sSQL .= " from search_name";
                                                                $sSQL .= " where ".join(' and ',$aTerms);
                                                                $sSQL .= " order by ".join(', ',$aOrder);

-                                                               if ($aSearch['sHouseNumber'])
+                                                               if ($aSearch['sHouseNumber'] || $aSearch['sClass'])

                                                                        $sSQL .= " limit 50";
                                                                elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass'])
                                                                        $sSQL .= " limit 1";
                                                                        $sSQL .= " limit 50";
                                                                elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass'])
                                                                        $sSQL .= " limit 1";


@@ -816,7 +850,7 @@
                                                                }
 
                                                                // Fallback to the road
                                                                }
 
                                                                // Fallback to the road

-                                                               if (!sizeof($aPlaceIDs) && preg_match('/^[0-9]+$/', $aSearch['sHouseNumber']))
+                                                               if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))

                                                                {
                                                                        $aPlaceIDs = $aRoadPlaceIDs;
                                                                }
                                                                {
                                                                        $aPlaceIDs = $aRoadPlaceIDs;
                                                                }


@@ -839,36 +873,70 @@
                                                                
                                                                if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
                                                                {
                                                                
                                                                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);
 
                                                                        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);
                                                                        $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;
                                                                        {
 
                                                                        $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
                                                                        {
                                                                                // 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)";
                                                                                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 (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);
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
                                                                                $aPlaceIDs = $oDB->getCol($sSQL);


@@ -876,7 +944,12 @@
                                                                        else
                                                                        {
                                                                                if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
                                                                        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))
                                                                                $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))


@@ -884,8 +957,8 @@
                                                                                        $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
                                                                                }
                                                                                if ($sCountryCodesSQL) $sSQL .= " and l.country_code in ($sCountryCodesSQL)";                                                           
                                                                                        $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);
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
                                                                                $aPlaceIDs = $oDB->getCol($sSQL);


@@ -973,6 +1046,75 @@
                                        $aSearchResults = $oDB->getAll($sSQL);
 //var_dump($sSQL,$aSearchResults);exit;
 
                                        $aSearchResults = $oDB->getAll($sSQL);
 //var_dump($sSQL,$aSearchResults);exit;
 

+                                       if (PEAR::IsError($aSearchResults))
+                                       {
+                                               var_dump($sSQL, $aSearchResults);                                       
+                                               exit;
+                                       }
+                               }
+                       } // 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!
+
+                                       // 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,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(ST_Centroid(geometry))) as lon,avg(ST_Y(ST_Centroid(geometry))) as lat, ";
+//                                     $sSQL .= $sOrderSQL." as porder, ";
+                                       $sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
+                                       $sSQL .= "from placex where place_id in ($sPlaceIDs) ";
+                                       $sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+                                       $sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,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 .= " 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 .= "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 .= "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) var_dump('<hr>',$sSQL);
+                                       $aSearchResults = $oDB->getAll($sSQL);
+//var_dump($sSQL,$aSearchResults);exit;
+

                                        if (PEAR::IsError($aSearchResults))
                                        {
                                                var_dump($sSQL, $aSearchResults);                                       
                                        if (PEAR::IsError($aSearchResults))
                                        {
                                                var_dump($sSQL, $aSearchResults);                                       


@@ -1034,7 +1176,7 @@
                                }
 
                                // Output data suitable for display (points and a bounding box)
                                }
 
                                // Output data suitable for display (points and a bounding box)

-                               if ($bShowPolygons)
+                               if ($bShowPolygons && isset($aPolyPoints))

                                {
                                        $aResult['aPolyPoints'] = array();
                                        foreach($aPolyPoints as $aPoint)
                                {
                                        $aResult['aPolyPoints'] = array();
                                        foreach($aPolyPoints as $aPoint)


@@ -1094,6 +1236,12 @@
                        $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
                }
 
                        $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'])
+               {
+                       $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
+               }
+

                if ($bShowAddressDetails)
                {
                        $aResult['address'] = getAddressDetails($oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);
                if ($bShowAddressDetails)
                {
                        $aResult['address'] = getAddressDetails($oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);


@@ -1151,6 +1299,9 @@
                        $aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']] = true;
                        $aSearchResults[] = $aResult;
                }
                        $aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']] = true;
                        $aSearchResults[] = $aResult;
                }

+
+               // Absolute limit on number of results
+               if (sizeof($aSearchResults) >= $iLimit) break;

        }
 
        $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '1 day'::interval,'YYYY/MM/DD') from import_status limit 1");
        }
 
        $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '1 day'::interval,'YYYY/MM/DD') from import_status limit 1");