Revert "increase inital search radius for reverse"

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 92cad8a034c93fcce84c2fe66b3fdbabf8031ad3..aa0e870adb5c4242015b16f39f2b8af5b6fc903e 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -75,9 +75,13 @@
 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();

+    $bReverseInPlan = true;
+    /*

        if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
        if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
        if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
        if (isset($aLangPrefOrder['name: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))."]";
 
 
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 


@@ -266,7 +270,7 @@
                                $sQuery = trim(str_replace($aData[0], ' ', $sQuery));
                        }
                }
                                $sQuery = trim(str_replace($aData[0], ' ', $sQuery));
                        }
                }

-               elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9.]*)[, ]+(-?[0-9]+[0-9.]*)(\\]|$|\\b)/', $sQuery, $aData))
+               elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))

                {
                        $fQueryLat = $aData[2];
                        $fQueryLon = $aData[3];
                {
                        $fQueryLat = $aData[2];
                        $fQueryLon = $aData[3];


@@ -447,6 +451,28 @@
                                                        $aValidTokens[$sToken] = $aGBPostcodeLocation;
                                                }
                                        }
                                                        $aValidTokens[$sToken] = $aGBPostcodeLocation;
                                                }
                                        }

+                                       // US ZIP+4 codes - if there is no token,
+                                       //      merge in the 5-digit ZIP code
+                                       else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData))
+                                       {
+                                               if (isset($aValidTokens[$aData[1]]))
+                                               {
+                                                       foreach($aValidTokens[$aData[1]] as $aToken)
+                                                       {
+                                                               if (!$aToken['class'])
+                                                               {
+                                                                       if (isset($aValidTokens[$sToken]))
+                                                                       {
+                                                                               $aValidTokens[$sToken][] = $aToken;
+                                                                       }
+                                                                       else
+                                                                       {
+                                                                               $aValidTokens[$sToken] = array($aToken);
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }

                                }
 
                                foreach($aTokens as $sToken)
                                }
 
                                foreach($aTokens as $sToken)


@@ -1012,6 +1038,7 @@
                                                        $aPlaceIDs = $oDB->getCol($sSQL);
 
                                                        // If not try the aux fallback table
                                                        $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($aPlaceIDs))
                                                        {
                                                                $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";


@@ -1023,6 +1050,7 @@
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                $aPlaceIDs = $oDB->getCol($sSQL);
                                                        }
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                $aPlaceIDs = $oDB->getCol($sSQL);
                                                        }

+                                                       */

 
                                                        if (!sizeof($aPlaceIDs))
                                                        {
 
                                                        if (!sizeof($aPlaceIDs))
                                                        {


@@ -1203,6 +1231,10 @@
                                //var_Dump($aResultPlaceIDs);exit;
                                // Get the details for display (is this a redundant extra step?)
                                $sPlaceIDs = join(',',$aResultPlaceIDs);
                                //var_Dump($aResultPlaceIDs);exit;
                                // Get the details for display (is this a redundant extra step?)
                                $sPlaceIDs = join(',',$aResultPlaceIDs);

+                               $sImportanceSQL = '';
+                               if ($sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
+                               if ($sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
+

                                $sOrderSQL = 'CASE ';
                                foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
                                {
                                $sOrderSQL = 'CASE ';
                                foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
                                {


@@ -1215,7 +1247,7 @@
                                $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 .= "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 .= $sImportanceSQL."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 .= "(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) ";


@@ -1238,13 +1270,14 @@
                                $sSQL .= "null as ref,";
                                $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
                                //$sSQL .= $sOrderSQL." as porder, ";
                                $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 .= $sImportanceSQL."0.015 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 .= "(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 .= " 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,";


@@ -1252,7 +1285,7 @@
                                $sSQL .= "null as ref,";
                                $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
                                //$sSQL .= $sOrderSQL." as porder, ";
                                $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 .= $sImportanceSQL."0.01 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 .= "(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) ";


@@ -1262,6 +1295,7 @@
                                $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
                                $sSQL .= "order by importance desc";
                                //$sSQL .= "order by rank_search,rank_address,porder asc";
                                $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
                                $sSQL .= "order by importance desc";
                                //$sSQL .= "order by rank_search,rank_address,porder asc";

+                               */

                                if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
                                $aSearchResults = $oDB->getAll($sSQL);
                                //var_dump($sSQL,$aSearchResults);exit;
                                if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
                                $aSearchResults = $oDB->getAll($sSQL);
                                //var_dump($sSQL,$aSearchResults);exit;


@@ -1323,6 +1357,7 @@
                                        $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
                                        $sSQL .= "group by place_id";
                                        if (!$bDeDupe) $sSQL .= ",place_id";
                                        $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 .= " 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,";


@@ -1335,6 +1370,7 @@
                                        $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
                                        $sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
                                        $sSQL .= "group by place_id";
                                        $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";
                                        if (!$bDeDupe) $sSQL .= ",place_id";
                                        $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
                                        $sSQL .= "order by importance desc";


@@ -1412,10 +1448,10 @@
                                        {
                                                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
                                        }
                                        {
                                                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
                                        }

-                                       elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
+                                       /*elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))

                                        {
                                                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
                                        {
                                                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);

-                                       }
+                                       }*/

                                        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
                                        {
                                                $fRadius = 0.01;
                                        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
                                        {
                                                $fRadius = 0.01;