use _st_intersects when dealing with countries, it does not use index

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 11e47d9a4d7263aa3ba6456b300f134556a26075..22ad43327adcfd7cf3851257886cd9c1e226d118 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1172,7 +1172,7 @@
                                                                        $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
                                                                        if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
                                     if ($bBoundingBoxSearch)
-                                        $sSQL .= " and st_overlaps($this->sViewboxSmallSQL, geometry)";
+                                        $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";
                                                                        $sSQL .= " order by st_area(geometry) desc limit 1";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $aPlaceIDs = $this->oDB->getCol($sSQL);
@@ -1781,7 +1781,6 @@
                        $bFirst = true;
                        foreach($aToFilter as $iResNum => $aResult)
                        {
-                               if ($aResult['type'] == 'adminitrative') $aResult['type'] = 'administrative';
                                $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
                                if ($bFirst)
                                {