limit fallback to pure number housenumbers

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index d6007ef591730fd918f0801bddc70a0b09191fbc..6596fca4c77edb3008a8211fca3ab77d0297e00b 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -13,6 +13,7 @@
        $sOutputFormat = 'html';
        $aSearchResults = array();
        $aExcludePlaceIDs = array();
        $sOutputFormat = 'html';
        $aSearchResults = array();
        $aExcludePlaceIDs = array();

+       $sCountryCodesSQL = false;

        $sSuggestion = $sSuggestionURL = false;
        $bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
        $bReverseInPlan = false;
        $sSuggestion = $sSuggestionURL = false;
        $bDeDupe = isset($_GET['dedupe'])?(bool)$_GET['dedupe']:true;
        $bReverseInPlan = false;


@@ -37,7 +38,10 @@
 
        // Prefered language    
        $aLangPrefOrder = getPrefferedLangauges();
 
        // Prefered language    
        $aLangPrefOrder = getPrefferedLangauges();

-//     if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
+       if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
+       if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
+       if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
+

        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        if (isset($_GET['exclude_place_ids']) && $_GET['exclude_place_ids'])
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        if (isset($_GET['exclude_place_ids']) && $_GET['exclude_place_ids'])


@@ -62,10 +66,27 @@
                        break;
                case 'city':
                        $iMinAddressRank = 14;
                        break;
                case 'city':
                        $iMinAddressRank = 14;

-                       $iMaxAddressRank = 18;
+                       $iMaxAddressRank = 16;
+                       break;
+               case 'settlement':
+                       $iMinAddressRank = 8;
+                       $iMaxAddressRank = 20;

                        break;
                }
        }
                        break;
                }
        }

+
+       if (isset($_GET['countrycodes']))
+       {
+               $aCountryCodes = array();
+               foreach(explode(',',$_GET['countrycodes']) as $sCountryCode)
+               {
+                       if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
+                       {
+                               $aCountryCodes[] = "'".strtolower($sCountryCode)."'";
+                       }
+               }
+               $sCountryCodesSQL = join(',', $aCountryCodes);
+       }

                
        // Search query
        $sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
                
        // Search query
        $sQuery = (isset($_GET['q'])?trim($_GET['q']):'');


@@ -283,6 +304,7 @@
                                var_dump($sSQL, $aDatabaseWords);
                                exit;
                        }
                                var_dump($sSQL, $aDatabaseWords);
                                exit;
                        }

+                       $aPossibleMainWordIDs = array();

                        foreach($aDatabaseWords as $aToken)
                        {
                                if (isset($aValidTokens[$aToken['word_token']]))
                        foreach($aDatabaseWords as $aToken)
                        {
                                if (isset($aValidTokens[$aToken['word_token']]))


@@ -293,6 +315,7 @@
                                {
                                        $aValidTokens[$aToken['word_token']] = array($aToken);
                                }
                                {
                                        $aValidTokens[$aToken['word_token']] = array($aToken);
                                }

+                               if ($aToken['word_token'][0]==' ' && !$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;

                        }
                        if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 
                        }
                        if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 


@@ -572,18 +595,24 @@
                                
                                if (CONST_Debug) var_Dump($aGroupedSearches);
 
                                
                                if (CONST_Debug) var_Dump($aGroupedSearches);
 

-                               if ($bReverseInPlan && false)
+                               if ($bReverseInPlan)

                                {
                                {

-                                       foreach($aGroupedSearches as $iGroup => $aSearches)
+                                       $aCopyGroupedSearches = $aGroupedSearches;
+                                       foreach($aCopyGroupedSearches as $iGroup => $aSearches)

                                        {
                                                foreach($aSearches as $iSearch => $aSearch)
                                                {
                                                        if (sizeof($aSearch['aAddress']))
                                                        {
                                        {
                                                foreach($aSearches as $iSearch => $aSearch)
                                                {
                                                        if (sizeof($aSearch['aAddress']))
                                                        {

-                                                               $aReverseSearch = $aSearch;

                                                                $iReverseItem = array_pop($aSearch['aAddress']);
                                                                $iReverseItem = array_pop($aSearch['aAddress']);

-                                                               $aReverseSearch['aName'][$iReverseItem] = $iReverseItem;
-                                                               $aGroupedSearches[$iGroup][] = $aReverseSearch;
+                                                               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;

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -641,7 +670,9 @@
                                                                if ($oDB->getOne($sSQL))
                                                                {
                                                                $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType'];                                                               
                                                                if ($oDB->getOne($sSQL))
                                                                {
                                                                $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType'];                                                               

+                                                               if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";

                                                                $sSQL .= " where st_contains($sViewboxSmallSQL, centroid)";
                                                                $sSQL .= " where st_contains($sViewboxSmallSQL, centroid)";

+                                                               if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             

                                                                if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                $sSQL .= " limit $iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                $sSQL .= " limit $iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);


@@ -650,7 +681,9 @@
                                                                if (!sizeof($aPlaceIDs))
                                                                {
                                                                        $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType'];                                                               
                                                                if (!sizeof($aPlaceIDs))
                                                                {
                                                                        $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType'];                                                               

+                                                                       if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";

                                                                        $sSQL .= " where st_contains($sViewboxLargeSQL, centroid)";
                                                                        $sSQL .= " where st_contains($sViewboxLargeSQL, centroid)";

+                                                                       if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             

                                                                        if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                        $sSQL .= " limit $iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                        $sSQL .= " limit $iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);


@@ -661,6 +694,7 @@
                                                        {
                                                                $sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
                                                                $sSQL .= " and st_contains($sViewboxSmallSQL, centroid)";
                                                        {
                                                                $sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
                                                                $sSQL .= " and st_contains($sViewboxSmallSQL, centroid)";

+                                                               if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             

                                                                if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                $sSQL .= " limit $iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                $sSQL .= " limit $iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);


@@ -690,19 +724,23 @@
                                                        {
                                                                $aTerms[] = "place_id not in (".join(',',$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";
                                                        if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
                                                        if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";

-                                                       if ($sViewboxSmallSQL) $aOrder[] = "ST_Contains($sViewboxSmallSQL, centroid) desc";
-                                                       if ($sViewboxLargeSQL) $aOrder[] = "ST_Contains($sViewboxLargeSQL, centroid) desc";
-                                                       $aOrder[] = "search_rank ASC";
+
+                                                       $sImportanceSQL = 'case when importance = 0 OR importance IS NULL then 0.92-(search_rank::float/33) 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($aTerms))
                                                        {
                                                                $sSQL = "select place_id";
                                                
                                                        if (sizeof($aTerms))
                                                        {
                                                                $sSQL = "select place_id";

-                                                               if ($sViewboxSmallSQL) $sSQL .= ",ST_Contains($sViewboxSmallSQL, centroid) as in_small";
-                                                               else $sSQL .= ",false as in_small";
-                                                               if ($sViewboxLargeSQL) $sSQL .= ",ST_Contains($sViewboxLargeSQL, centroid) as in_large";
-                                                               else $sSQL .= ",false as in_large";

                                                                $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);


@@ -720,19 +758,21 @@
                                                                        var_dump($sSQL, $aViewBoxPlaceIDs);                                     
                                                                        exit;
                                                                }
                                                                        var_dump($sSQL, $aViewBoxPlaceIDs);                                     
                                                                        exit;
                                                                }

-
+//var_dump($aViewBoxPlaceIDs);

                                                                // Did we have an viewbox matches?
                                                                $aPlaceIDs = array();
                                                                $bViewBoxMatch = false;
                                                                foreach($aViewBoxPlaceIDs as $aViewBoxRow)
                                                                {
                                                                // Did we have an viewbox matches?
                                                                $aPlaceIDs = array();
                                                                $bViewBoxMatch = false;
                                                                foreach($aViewBoxPlaceIDs as $aViewBoxRow)
                                                                {

-                                                                       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;
+//                                                                     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'];
                                                                }
                                                        }
                                                                        $aPlaceIDs[] = $aViewBoxRow['place_id'];
                                                                }
                                                        }

+//var_Dump($aPlaceIDs);
+//exit;

 
                                                        if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
                                                        {
 
                                                        if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
                                                        {


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

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

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


@@ -791,6 +831,7 @@
                                                                {
                                                                        // 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']."'";
                                                                {
                                                                        // 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']."'";

+                                                                       if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             

                                                                        $sSQL .= " order by rank_search asc limit $iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $aPlaceIDs = $oDB->getCol($sSQL);
                                                                        $sSQL .= " order by rank_search asc limit $iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $aPlaceIDs = $oDB->getCol($sSQL);


@@ -799,6 +840,7 @@
                                                                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";
                                                                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";

+

                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $iMaxRank = ((int)$oDB->getOne($sSQL)) + 5;
 
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $iMaxRank = ((int)$oDB->getOne($sSQL)) + 5;
 


@@ -807,6 +849,9 @@
                                                                        $aPlaceIDs = $oDB->getCol($sSQL);
                                                                        $sPlaceIDs = join(',',$aPlaceIDs);
 
                                                                        $aPlaceIDs = $oDB->getCol($sSQL);
                                                                        $sPlaceIDs = join(',',$aPlaceIDs);
 

+                                                                       if ($sPlaceIDs)
+                                                                       {
+

                                                                        $fRange = 0.01;
                                                                        $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                                                        if ($oDB->getOne($sSQL))
                                                                        $fRange = 0.01;
                                                                        $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                                                        if ($oDB->getOne($sSQL))


@@ -814,12 +859,14 @@
                                                                                // More efficient - can make the range bigger
                                                                        $fRange = 0.05;
                                                                                $sSQL = "select l.place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
                                                                                // More efficient - can make the range bigger
                                                                        $fRange = 0.05;
                                                                                $sSQL = "select l.place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";

+                                                                               if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";

                                                                                $sSQL .= ",placex as f where ";
                                                                                $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, st_centroid(f.geometry), $fRange) ";
                                                                                if (sizeof($aExcludePlaceIDs))
                                                                                {
                                                                                        $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
                                                                                }
                                                                                $sSQL .= ",placex as f where ";
                                                                                $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, st_centroid(f.geometry), $fRange) ";
                                                                                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";
                                                                                $sSQL .= " limit $iLimit";
                                                                                if ($sNearPointSQL) $sSQL .= " order by ST_Distance($sNearPointSQL, l.centroid) ASC";
                                                                                else $sSQL .= " order by ST_Distance(l.centroid, f.geometry) asc";
                                                                                $sSQL .= " limit $iLimit";


@@ -830,18 +877,20 @@
                                                                        {
                                                                                if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
                                                                                $sSQL = "select l.place_id from placex as l,placex as f where ";
                                                                        {
                                                                                if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
                                                                                $sSQL = "select l.place_id 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 .= "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 .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
                                                                                }
                                                                                $sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' ";
                                                                                if (sizeof($aExcludePlaceIDs))
                                                                                {
                                                                                        $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";
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
                                                                                $aPlaceIDs = $oDB->getCol($sSQL);
                                                                        }
                                                                                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";
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
                                                                                $aPlaceIDs = $oDB->getCol($sSQL);
                                                                        }

+                                                                       }

                                                                }
                                                        }
                                                
                                                                }
                                                        }
                                                


@@ -884,10 +933,11 @@
                                        $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 .= "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 .= $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 .= "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";
+                                       $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) ";
                                        if (!$bDeDupe) $sSQL .= ",place_id";
                                        $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
                                        $sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";


@@ -898,24 +948,27 @@
                                        $sSQL .= "null as placename,";
                                        $sSQL .= "null as ref,";
                                        $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
                                        $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 .= $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 .= "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 '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 .= "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 .= "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 .= $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 .= "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 rank_search,rank_address,porder asc";
+                                       $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 (CONST_Debug) var_dump('<hr>',$sSQL);
                                        $aSearchResults = $oDB->getAll($sSQL);
 //var_dump($sSQL,$aSearchResults);exit;


@@ -934,9 +987,9 @@
        {
                $sSearchResult = 'No Results Found';
        }
        {
                $sSearchResult = 'No Results Found';
        }

-       
+//var_Dump($aSearchResults);
+//exit;

        $aClassType = getClassTypesWithImportance();
        $aClassType = getClassTypesWithImportance();

-

        foreach($aSearchResults as $iResNum => $aResult)
        {
                if (CONST_Search_AreaPolygons || true)
        foreach($aSearchResults as $iResNum => $aResult)
        {
                if (CONST_Search_AreaPolygons || true)


@@ -1049,7 +1102,7 @@
                }
 
 //if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']);
                }
 
 //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'])
                {
                if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) 
                        && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
                {


@@ -1064,15 +1117,15 @@
                {
                        $aResult['importance'] = 1000000000000000;
                }
                {
                        $aResult['importance'] = 1000000000000000;
                }

-
+*/

                $aResult['name'] = $aResult['langaddress'];
                $aResult['foundorder'] = $iResNum;
                $aSearchResults[$iResNum] = $aResult;
        }
                $aResult['name'] = $aResult['langaddress'];
                $aResult['foundorder'] = $iResNum;
                $aSearchResults[$iResNum] = $aResult;
        }

-
-//var_dump($aSearchResults);exit;

        
        uasort($aSearchResults, 'byImportance');
        
        uasort($aSearchResults, 'byImportance');

+
+//var_dump($aSearchResults);exit;

        
        $aOSMIDDone = array();
        $aClassTypeNameDone = array();
        
        $aOSMIDDone = array();
        $aClassTypeNameDone = array();