test/README.md - more instructions how to import test db

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 01abc43c7f3359fbfaed4a552734ac14508472ee..0c93e0a96e429945d4a795fe32179fcc573f0544 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -2,29 +2,22 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/NearPoint.php');

 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');

+require_once(CONST_BasePath.'/lib/Phrase.php');

 require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 require_once(CONST_BasePath.'/lib/ReverseGeocode.php');

+require_once(CONST_BasePath.'/lib/SearchDescription.php');
+require_once(CONST_BasePath.'/lib/SearchContext.php');
+require_once(CONST_BasePath.'/lib/TokenList.php');

 
 class Geocode
 {
     protected $oDB;
 
 
 class Geocode
 {
     protected $oDB;
 

-    protected $aLangPrefOrder = array();
-
-    protected $bIncludeAddressDetails = false;
-    protected $bIncludeExtraTags = false;
-    protected $bIncludeNameDetails = false;
+    protected $oPlaceLookup;

 
 

-    protected $bIncludePolygonAsPoints = false;
-    protected $bIncludePolygonAsText = false;
-    protected $bIncludePolygonAsGeoJSON = false;
-    protected $bIncludePolygonAsKML = false;
-    protected $bIncludePolygonAsSVG = false;
-    protected $fPolygonSimplificationThreshold = 0.0;
+    protected $aLangPrefOrder = array();

 
     protected $aExcludePlaceIDs = array();
 
     protected $aExcludePlaceIDs = array();

-    protected $bDeDupe = true;

     protected $bReverseInPlan = false;
 
     protected $iLimit = 20;
     protected $bReverseInPlan = false;
 
     protected $iLimit = 20;


@@ -36,15 +29,13 @@ class Geocode
 
     protected $bBoundedSearch = false;
     protected $aViewBox = false;
 
     protected $bBoundedSearch = false;
     protected $aViewBox = false;

-    protected $sViewboxCentreSQL = false;
-    protected $sViewboxSmallSQL = false;
-    protected $sViewboxLargeSQL = false;
+    protected $aRoutePoints = false;
+    protected $aRouteWidth = false;

 
     protected $iMaxRank = 20;
     protected $iMinAddressRank = 0;
     protected $iMaxAddressRank = 30;
     protected $aAddressRankList = array();
 
     protected $iMaxRank = 20;
     protected $iMinAddressRank = 0;
     protected $iMaxAddressRank = 30;
     protected $aAddressRankList = array();

-    protected $exactMatchCache = array();

 
     protected $sAllowedTypesSQLList = false;
 
 
     protected $sAllowedTypesSQLList = false;
 


@@ -57,13 +48,14 @@ class Geocode
     public function __construct(&$oDB)
     {
         $this->oDB =& $oDB;
     public function __construct(&$oDB)
     {
         $this->oDB =& $oDB;

+        $this->oPlaceLookup = new PlaceLookup($this->oDB);

         $this->oNormalizer = \Transliterator::createFromRules(CONST_Term_Normalization_Rules);
     }
 
     private function normTerm($sTerm)
     {
         if ($this->oNormalizer === null) {
         $this->oNormalizer = \Transliterator::createFromRules(CONST_Term_Normalization_Rules);
     }
 
     private function normTerm($sTerm)
     {
         if ($this->oNormalizer === null) {

-            return null;
+            return $sTerm;

         }
 
         return $this->oNormalizer->transliterate($sTerm);
         }
 
         return $this->oNormalizer->transliterate($sTerm);


@@ -87,69 +79,25 @@ class Geocode
             $aParams = array('q' => $this->sQuery);
         }
 
             $aParams = array('q' => $this->sQuery);
         }
 

+        $aParams = array_merge($aParams, $this->oPlaceLookup->getMoreUrlParams());
+

         if ($this->aExcludePlaceIDs) {
             $aParams['exclude_place_ids'] = implode(',', $this->aExcludePlaceIDs);
         }
 
         if ($this->aExcludePlaceIDs) {
             $aParams['exclude_place_ids'] = implode(',', $this->aExcludePlaceIDs);
         }
 

-        if ($this->bIncludeAddressDetails) $aParams['addressdetails'] = '1';
-        if ($this->bIncludeExtraTags) $aParams['extratags'] = '1';
-        if ($this->bIncludeNameDetails) $aParams['namedetails'] = '1';
-
-        if ($this->bIncludePolygonAsPoints) $aParams['polygon'] = '1';
-        if ($this->bIncludePolygonAsText) $aParams['polygon_text'] = '1';
-        if ($this->bIncludePolygonAsGeoJSON) $aParams['polygon_geojson'] = '1';
-        if ($this->bIncludePolygonAsKML) $aParams['polygon_kml'] = '1';
-        if ($this->bIncludePolygonAsSVG) $aParams['polygon_svg'] = '1';
-
-        if ($this->fPolygonSimplificationThreshold > 0.0) {
-            $aParams['polygon_threshold'] = $this->fPolygonSimplificationThreshold;
-        }
-

         if ($this->bBoundedSearch) $aParams['bounded'] = '1';
         if ($this->bBoundedSearch) $aParams['bounded'] = '1';

-        if (!$this->bDeDupe) $aParams['dedupe'] = '0';

 
         if ($this->aCountryCodes) {
             $aParams['countrycodes'] = implode(',', $this->aCountryCodes);
         }
 
         if ($this->aViewBox) {
 
         if ($this->aCountryCodes) {
             $aParams['countrycodes'] = implode(',', $this->aCountryCodes);
         }
 
         if ($this->aViewBox) {

-            $aParams['viewbox'] = $this->aViewBox[0].','.$this->aViewBox[3]
-                                  .','.$this->aViewBox[2].','.$this->aViewBox[1];
+            $aParams['viewbox'] = join(',', $this->aViewBox);

         }
 
         return $aParams;
     }
 
         }
 
         return $aParams;
     }
 

-    public function setIncludePolygonAsPoints($b = true)
-    {
-        $this->bIncludePolygonAsPoints = $b;
-    }
-
-    public function setIncludePolygonAsText($b = true)
-    {
-        $this->bIncludePolygonAsText = $b;
-    }
-
-    public function setIncludePolygonAsGeoJSON($b = true)
-    {
-        $this->bIncludePolygonAsGeoJSON = $b;
-    }
-
-    public function setIncludePolygonAsKML($b = true)
-    {
-        $this->bIncludePolygonAsKML = $b;
-    }
-
-    public function setIncludePolygonAsSVG($b = true)
-    {
-        $this->bIncludePolygonAsSVG = $b;
-    }
-
-    public function setPolygonSimplificationThreshold($f)
-    {
-        $this->fPolygonSimplificationThreshold = $f;
-    }
-

     public function setLimit($iLimit = 10)
     {
         if ($iLimit > 50) $iLimit = 50;
     public function setLimit($iLimit = 10)
     {
         if ($iLimit > 50) $iLimit = 50;


@@ -183,63 +131,43 @@ class Geocode
         $this->iMaxAddressRank = $iMax;
     }
 
         $this->iMaxAddressRank = $iMax;
     }
 

-    public function setRoute($aRoutePoints, $fRouteWidth)
+    public function setViewbox($aViewbox)

     {
     {

-        $this->aViewBox = false;
-
-        $this->sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-        $sSep = '';
-        foreach ($aRoutePoints as $aPoint) {
-            $fPoint = (float)$aPoint;
-            $this->sViewboxCentreSQL .= $sSep.$fPoint;
-            $sSep = ($sSep == ' ') ? ',' : ' ';
-        }
-        $this->sViewboxCentreSQL .= ")'::geometry,4326)";
+        $aBox = array_map('floatval', $aViewbox);

 
 

-        $this->sViewboxSmallSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;
-        $this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')';
+        $this->aViewBox[0] = max(-180.0, min($aBox[0], $aBox[2]));
+        $this->aViewBox[1] = max(-90.0, min($aBox[1], $aBox[3]));
+        $this->aViewBox[2] = min(180.0, max($aBox[0], $aBox[2]));
+        $this->aViewBox[3] = min(90.0, max($aBox[1], $aBox[3]));

 
 

-        $this->sViewboxLargeSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;
-        $this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
+        if ($this->aViewBox[2] - $this->aViewBox[0] < 0.000000001
+            || $this->aViewBox[3] - $this->aViewBox[1] < 0.000000001
+        ) {
+            userError("Bad parameter 'viewbox'. Not a box.");
+        }

     }
 
     }
 

-    public function setViewbox($aViewbox)
+    private function viewboxImportanceFactor($fX, $fY)

     {
     {

-        $this->aViewBox = array_map('floatval', $aViewbox);
+        if (!$this->aViewBox) {
+            return 1;
+        }

 
 

-        $this->aViewBox[0] = max(-180.0, min(180, $this->aViewBox[0]));
-        $this->aViewBox[1] = max(-90.0, min(90, $this->aViewBox[1]));
-        $this->aViewBox[2] = max(-180.0, min(180, $this->aViewBox[2]));
-        $this->aViewBox[3] = max(-90.0, min(90, $this->aViewBox[3]));
+        $fWidth = ($this->aViewBox[2] - $this->aViewBox[0])/2;
+        $fHeight = ($this->aViewBox[3] - $this->aViewBox[1])/2;

 
 

-        if (abs($this->aViewBox[0] - $this->aViewBox[2]) < 0.000000001
-            || abs($this->aViewBox[1] - $this->aViewBox[3]) < 0.000000001
-        ) {
-            userError("Bad parameter 'viewbox'. Not a box.");
+        $fXDist = abs($fX - ($this->aViewBox[0] + $this->aViewBox[2])/2);
+        $fYDist = abs($fY - ($this->aViewBox[1] + $this->aViewBox[3])/2);
+
+        if ($fXDist <= $fWidth && $fYDist <= $fHeight) {
+            return 1;

         }
 
         }
 

-        $fHeight = $this->aViewBox[0] - $this->aViewBox[2];
-        $fWidth = $this->aViewBox[1] - $this->aViewBox[3];
-        $aBigViewBox[0] = $this->aViewBox[0] + $fHeight;
-        $aBigViewBox[2] = $this->aViewBox[2] - $fHeight;
-        $aBigViewBox[1] = $this->aViewBox[1] + $fWidth;
-        $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
-
-        $this->sViewboxCentreSQL = false;
-        $this->sViewboxSmallSQL = sprintf(
-            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
-            $this->aViewBox[0],
-            $this->aViewBox[1],
-            $this->aViewBox[2],
-            $this->aViewBox[3]
-        );
-        $this->sViewboxLargeSQL = sprintf(
-            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
-            $aBigViewBox[0],
-            $aBigViewBox[1],
-            $aBigViewBox[2],
-            $aBigViewBox[3]
-        );
+        if ($fXDist <= $fWidth * 3 && $fYDist <= 3 * $fHeight) {
+            return 0.5;
+        }
+
+        return 0.25;

     }
 
     public function setQuery($sQueryString)
     }
 
     public function setQuery($sQueryString)


@@ -254,17 +182,9 @@ class Geocode
     }
 
 
     }
 
 

-    public function loadParamArray($oParams)
+    public function loadParamArray($oParams, $sForceGeometryType = null)

     {
     {

-        $this->bIncludeAddressDetails
-         = $oParams->getBool('addressdetails', $this->bIncludeAddressDetails);
-        $this->bIncludeExtraTags
-         = $oParams->getBool('extratags', $this->bIncludeExtraTags);
-        $this->bIncludeNameDetails
-         = $oParams->getBool('namedetails', $this->bIncludeNameDetails);
-

         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);

-        $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);

 
         $this->setLimit($oParams->getInt('limit', $this->iFinalLimit));
         $this->iOffset = $oParams->getInt('offset', $this->iOffset);
 
         $this->setLimit($oParams->getInt('limit', $this->iFinalLimit));
         $this->iOffset = $oParams->getInt('offset', $this->iOffset);


@@ -304,29 +224,28 @@ class Geocode
         $aViewbox = $oParams->getStringList('viewboxlbrt');
         if ($aViewbox) {
             if (count($aViewbox) != 4) {
         $aViewbox = $oParams->getStringList('viewboxlbrt');
         if ($aViewbox) {
             if (count($aViewbox) != 4) {

-                userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+                userError("Bad parameter 'viewboxlbrt'. Expected 4 coordinates.");

             }
             $this->setViewbox($aViewbox);
         } else {
             $aViewbox = $oParams->getStringList('viewbox');
             if ($aViewbox) {
                 if (count($aViewbox) != 4) {
             }
             $this->setViewbox($aViewbox);
         } else {
             $aViewbox = $oParams->getStringList('viewbox');
             if ($aViewbox) {
                 if (count($aViewbox) != 4) {

-                    userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+                    userError("Bad parameter 'viewbox'. Expected 4 coordinates.");

                 }
                 }

-                $this->setViewBox(array(
-                                   $aViewbox[0],
-                                   $aViewbox[3],
-                                   $aViewbox[2],
-                                   $aViewbox[1]
-                                  ));
+                $this->setViewBox($aViewbox);

             } else {
                 $aRoute = $oParams->getStringList('route');
                 $fRouteWidth = $oParams->getFloat('routewidth');
                 if ($aRoute && $fRouteWidth) {
             } else {
                 $aRoute = $oParams->getStringList('route');
                 $fRouteWidth = $oParams->getFloat('routewidth');
                 if ($aRoute && $fRouteWidth) {

-                    $this->setRoute($aRoute, $fRouteWidth);
+                    $this->aRoutePoints = $aRoute;
+                    $this->aRouteWidth = $fRouteWidth;

                 }
             }
         }
                 }
             }
         }

+
+        $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType);
+        $this->oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', false));

     }
 
     public function setQueryFromParams($oParams)
     }
 
     public function setQueryFromParams($oParams)


@@ -372,7 +291,7 @@ class Geocode
         $this->aAddressRankList = array();
 
         $this->aStructuredQuery = array();
         $this->aAddressRankList = array();
 
         $this->aStructuredQuery = array();

-        $this->sAllowedTypesSQLList = '';
+        $this->sAllowedTypesSQLList = false;

 
         $this->loadStructuredAddressElement($sAmenity, 'amenity', 26, 30, false);
         $this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false);
 
         $this->loadStructuredAddressElement($sAmenity, 'amenity', 26, 30, false);
         $this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false);


@@ -382,10 +301,10 @@ class Geocode
         $this->loadStructuredAddressElement($sPostalCode, 'postalcode', 5, 11, array(5, 11));
         $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 
         $this->loadStructuredAddressElement($sPostalCode, 'postalcode', 5, 11, array(5, 11));
         $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 

-        if (sizeof($this->aStructuredQuery) > 0) {
+        if (!empty($this->aStructuredQuery)) {

             $this->sQuery = join(', ', $this->aStructuredQuery);
             if ($this->iMaxAddressRank < 30) {
             $this->sQuery = join(', ', $this->aStructuredQuery);
             if ($this->iMaxAddressRank < 30) {

-                $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+                $this->sAllowedTypesSQLList = '(\'place\',\'boundary\')';

             }
         }
     }
             }
         }
     }


@@ -396,7 +315,7 @@ class Geocode
 
         $aParams = $this->aStructuredQuery;
 
 
         $aParams = $this->aStructuredQuery;
 

-        if (sizeof($aParams) == 1) return false;
+        if (count($aParams) == 1) return false;

 
         $aOrderToFallback = array('postalcode', 'street', 'city', 'county', 'state');
 
 
         $aOrderToFallback = array('postalcode', 'street', 'city', 'county', 'state');
 


@@ -411,300 +330,10 @@ class Geocode
         return false;
     }
 
         return false;
     }
 

-    public function getDetails($aPlaceIDs)
-    {
-        //$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1
-        if (sizeof($aPlaceIDs) == 0) return array();
-
-        $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";
-
-        // Get the details for display (is this a redundant extra step?)
-        $sPlaceIDs = join(',', array_keys($aPlaceIDs));
-
-        $sImportanceSQL = '';
-        $sImportanceSQLGeom = '';
-        if ($this->sViewboxSmallSQL) {
-            $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
-            $sImportanceSQLGeom .= " CASE WHEN ST_Contains($this->sViewboxSmallSQL, geometry) THEN 1 ELSE 0.75 END * ";
-        }
-        if ($this->sViewboxLargeSQL) {
-            $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
-            $sImportanceSQLGeom .= " CASE WHEN ST_Contains($this->sViewboxLargeSQL, geometry) THEN 1 ELSE 0.75 END * ";
-        }
-
-        $sSQL  = "SELECT ";
-        $sSQL .= "    osm_type,";
-        $sSQL .= "    osm_id,";
-        $sSQL .= "    class,";
-        $sSQL .= "    type,";
-        $sSQL .= "    admin_level,";
-        $sSQL .= "    rank_search,";
-        $sSQL .= "    rank_address,";
-        $sSQL .= "    min(place_id) AS place_id, ";
-        $sSQL .= "    min(parent_place_id) AS parent_place_id, ";
-        $sSQL .= "    country_code, ";
-        $sSQL .= "    get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
-        $sSQL .= "    get_name_by_language(name, $sLanguagePrefArraySQL) AS placename,";
-        $sSQL .= "    get_name_by_language(name, ARRAY['ref']) AS ref,";
-        if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
-        if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text AS names,";
-        $sSQL .= "    avg(ST_X(centroid)) AS lon, ";
-        $sSQL .= "    avg(ST_Y(centroid)) AS lat, ";
-        $sSQL .= "    ".$sImportanceSQL."COALESCE(importance,0.75-(rank_search::float/40)) AS importance, ";
-        $sSQL .= "    ( ";
-        $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
-        $sSQL .= "       FROM ";
-        $sSQL .= "         place_addressline s, ";
-        $sSQL .= "         placex p";
-        $sSQL .= "       WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
-        $sSQL .= "         AND p.place_id = s.address_place_id ";
-        $sSQL .= "         AND s.isaddress ";
-        $sSQL .= "         AND p.importance is not null ";
-        $sSQL .= "    ) AS addressimportance, ";
-        $sSQL .= "    (extratags->'place') AS extra_place ";
-        $sSQL .= " FROM placex";
-        $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-        $sSQL .= "   AND (";
-        $sSQL .= "            placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
-        if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
-            $sSQL .= "        OR (extratags->'place') = 'city'";
-        }
-        if ($this->aAddressRankList) {
-            $sSQL .= "        OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
-        }
-        $sSQL .= "       ) ";
-        if ($this->sAllowedTypesSQLList) {
-            $sSQL .= "AND placex.class in $this->sAllowedTypesSQLList ";
-        }
-        $sSQL .= "    AND linked_place_id is null ";
-        $sSQL .= " GROUP BY ";
-        $sSQL .= "     osm_type, ";
-        $sSQL .= "     osm_id, ";
-        $sSQL .= "     class, ";
-        $sSQL .= "     type, ";
-        $sSQL .= "     admin_level, ";
-        $sSQL .= "     rank_search, ";
-        $sSQL .= "     rank_address, ";
-        $sSQL .= "     country_code, ";
-        $sSQL .= "     importance, ";
-        if (!$this->bDeDupe) $sSQL .= "place_id,";
-        $sSQL .= "     langaddress, ";
-        $sSQL .= "     placename, ";
-        $sSQL .= "     ref, ";
-        if ($this->bIncludeExtraTags) $sSQL .= "extratags, ";
-        if ($this->bIncludeNameDetails) $sSQL .= "name, ";
-        $sSQL .= "     extratags->'place' ";
-
-        // postcode table
-        $sSQL .= "UNION ";
-        $sSQL .= "SELECT";
-        $sSQL .= "  'P' as osm_type,";
-        $sSQL .= "  (SELECT osm_id from placex p WHERE p.place_id = parent_place_id) as osm_id,";
-        $sSQL .= "  'place' as class, 'postcode' as type,";
-        $sSQL .= "  null as admin_level, rank_search, rank_address,";
-        $sSQL .= "  place_id, parent_place_id, country_code,";
-        $sSQL .= "  get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
-        $sSQL .= "  postcode as placename,";
-        $sSQL .= "  postcode as ref,";
-        if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
-        if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
-        $sSQL .= "  ST_x(st_centroid(geometry)) AS lon, ST_y(st_centroid(geometry)) AS lat,";
-        $sSQL .=    $sImportanceSQLGeom."(0.75-(rank_search::float/40)) AS importance, ";
-        $sSQL .= "  (";
-        $sSQL .= "     SELECT max(p.importance*(p.rank_address+2))";
-        $sSQL .= "     FROM ";
-        $sSQL .= "       place_addressline s, ";
-        $sSQL .= "       placex p";
-        $sSQL .= "     WHERE s.place_id = parent_place_id";
-        $sSQL .= "       AND p.place_id = s.address_place_id ";
-        $sSQL .= "       AND s.isaddress";
-        $sSQL .= "       AND p.importance is not null";
-        $sSQL .= "  ) AS addressimportance, ";
-        $sSQL .= "  null AS extra_place ";
-        $sSQL .= "FROM location_postcode";
-        $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-
-        if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
-            // only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines
-            // with start- and endnumber, the common osm housenumbers are usually saved as points
-            $sHousenumbers = "";
-            $i = 0;
-            $length = count($aPlaceIDs);
-            foreach ($aPlaceIDs as $placeID => $housenumber) {
-                $i++;
-                $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
-                if ($i<$length) $sHousenumbers .= ", ";
-            }
-
-            if (CONST_Use_US_Tiger_Data) {
-                // Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
-                $sSQL .= " union";
-                $sSQL .= " SELECT ";
-                $sSQL .= "     'T' AS osm_type, ";
-                $sSQL .= "     (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";
-                $sSQL .= "     'place' AS class, ";
-                $sSQL .= "     'house' AS type, ";
-                $sSQL .= "     null AS admin_level, ";
-                $sSQL .= "     30 AS rank_search, ";
-                $sSQL .= "     30 AS rank_address, ";
-                $sSQL .= "     min(place_id) AS place_id, ";
-                $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
-                $sSQL .= "     'us' AS country_code, ";
-                $sSQL .= "     get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
-                $sSQL .= "     null AS placename, ";
-                $sSQL .= "     null AS ref, ";
-                if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
-                if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
-                $sSQL .= "     avg(st_x(centroid)) AS lon, ";
-                $sSQL .= "     avg(st_y(centroid)) AS lat,";
-                $sSQL .= "     ".$sImportanceSQL."-1.15 AS importance, ";
-                $sSQL .= "     (";
-                $sSQL .= "        SELECT max(p.importance*(p.rank_address+2))";
-                $sSQL .= "        FROM ";
-                $sSQL .= "          place_addressline s, ";
-                $sSQL .= "          placex p";
-                $sSQL .= "        WHERE s.place_id = min(blub.parent_place_id)";
-                $sSQL .= "          AND p.place_id = s.address_place_id ";
-                $sSQL .= "          AND s.isaddress";
-                $sSQL .= "          AND p.importance is not null";
-                $sSQL .= "     ) AS addressimportance, ";
-                $sSQL .= "     null AS extra_place ";
-                $sSQL .= " FROM (";
-                $sSQL .= "     SELECT place_id, ";    // interpolate the Tiger housenumbers here
-                $sSQL .= "         ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) AS centroid, ";
-                $sSQL .= "         parent_place_id, ";
-                $sSQL .= "         housenumber_for_place";
-                $sSQL .= "     FROM (";
-                $sSQL .= "            location_property_tiger ";
-                $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)) ";
-                $sSQL .= "     WHERE ";
-                $sSQL .= "         housenumber_for_place>=0";
-                $sSQL .= "         AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
-                $sSQL .= " ) AS blub"; //postgres wants an alias here
-                $sSQL .= " GROUP BY";
-                $sSQL .= "      place_id, ";
-                $sSQL .= "      housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
-                if (!$this->bDeDupe) $sSQL .= ", place_id ";
-            }
-            // osmline
-            // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
-            $sSQL .= " UNION ";
-            $sSQL .= "SELECT ";
-            $sSQL .= "  'W' AS osm_type, ";
-            $sSQL .= "  osm_id, ";
-            $sSQL .= "  'place' AS class, ";
-            $sSQL .= "  'house' AS type, ";
-            $sSQL .= "  null AS admin_level, ";
-            $sSQL .= "  30 AS rank_search, ";
-            $sSQL .= "  30 AS rank_address, ";
-            $sSQL .= "  min(place_id) as place_id, ";
-            $sSQL .= "  min(parent_place_id) AS parent_place_id, ";
-            $sSQL .= "  country_code, ";
-            $sSQL .= "  get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
-            $sSQL .= "  null AS placename, ";
-            $sSQL .= "  null AS ref, ";
-            if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
-            if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
-            $sSQL .= "  AVG(st_x(centroid)) AS lon, ";
-            $sSQL .= "  AVG(st_y(centroid)) AS lat, ";
-            $sSQL .= "  ".$sImportanceSQL."-0.1 AS importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
-            $sSQL .= "  (";
-            $sSQL .= "     SELECT ";
-            $sSQL .= "       MAX(p.importance*(p.rank_address+2)) ";
-            $sSQL .= "     FROM";
-            $sSQL .= "       place_addressline s, ";
-            $sSQL .= "       placex p";
-            $sSQL .= "     WHERE s.place_id = min(blub.parent_place_id) ";
-            $sSQL .= "       AND p.place_id = s.address_place_id ";
-            $sSQL .= "       AND s.isaddress ";
-            $sSQL .= "       AND p.importance is not null";
-            $sSQL .= "  ) AS addressimportance,";
-            $sSQL .= "  null AS extra_place ";
-            $sSQL .= "  FROM (";
-            $sSQL .= "     SELECT ";
-            $sSQL .= "         osm_id, ";
-            $sSQL .= "         place_id, ";
-            $sSQL .= "         country_code, ";
-            $sSQL .= "         CASE ";             // interpolate the housenumbers here
-            $sSQL .= "           WHEN startnumber != endnumber ";
-            $sSQL .= "           THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
-            $sSQL .= "           ELSE ST_LineInterpolatePoint(linegeo, 0.5) ";
-            $sSQL .= "         END as centroid, ";
-            $sSQL .= "         parent_place_id, ";
-            $sSQL .= "         housenumber_for_place ";
-            $sSQL .= "     FROM (";
-            $sSQL .= "            location_property_osmline ";
-            $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)";
-            $sSQL .= "          ) ";
-            $sSQL .= "     WHERE housenumber_for_place>=0 ";
-            $sSQL .= "       AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
-            $sSQL .= "  ) as blub"; //postgres wants an alias here
-            $sSQL .= "  GROUP BY ";
-            $sSQL .= "    osm_id, ";
-            $sSQL .= "    place_id, ";
-            $sSQL .= "    housenumber_for_place, ";
-            $sSQL .= "    country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
-            if (!$this->bDeDupe) $sSQL .= ", place_id ";
-
-            if (CONST_Use_Aux_Location_data) {
-                $sSQL .= " UNION ";
-                $sSQL .= "  SELECT ";
-                $sSQL .= "     'L' AS osm_type, ";
-                $sSQL .= "     place_id AS osm_id, ";
-                $sSQL .= "     'place' AS class,";
-                $sSQL .= "     'house' AS type, ";
-                $sSQL .= "     null AS admin_level, ";
-                $sSQL .= "     0 AS rank_search,";
-                $sSQL .= "     0 AS rank_address, ";
-                $sSQL .= "     min(place_id) AS place_id,";
-                $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
-                $sSQL .= "     'us' AS country_code, ";
-                $sSQL .= "     get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, ";
-                $sSQL .= "     null AS placename, ";
-                $sSQL .= "     null AS ref, ";
-                if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
-                if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
-                $sSQL .= "     avg(ST_X(centroid)) AS lon, ";
-                $sSQL .= "     avg(ST_Y(centroid)) AS lat, ";
-                $sSQL .= "     ".$sImportanceSQL."-1.10 AS importance, ";
-                $sSQL .= "     ( ";
-                $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
-                $sSQL .= "       FROM ";
-                $sSQL .= "          place_addressline s, ";
-                $sSQL .= "          placex p";
-                $sSQL .= "       WHERE s.place_id = min(location_property_aux.parent_place_id)";
-                $sSQL .= "         AND p.place_id = s.address_place_id ";
-                $sSQL .= "         AND s.isaddress";
-                $sSQL .= "         AND p.importance is not null";
-                $sSQL .= "     ) AS addressimportance, ";
-                $sSQL .= "     null AS extra_place ";
-                $sSQL .= "  FROM location_property_aux ";
-                $sSQL .= "  WHERE place_id in ($sPlaceIDs) ";
-                $sSQL .= "    AND 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                $sSQL .= "  GROUP BY ";
-                $sSQL .= "     place_id, ";
-                if (!$this->bDeDupe) $sSQL .= "place_id, ";
-                $sSQL .= "     get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";
-            }
-        }
-
-        $sSQL .= " order by importance desc";
-        if (CONST_Debug) {
-            echo "<hr>";
-            var_dump($sSQL);
-        }
-        $aSearchResults = chksql(
-            $this->oDB->getAll($sSQL),
-            "Could not get details for place."
-        );
-
-        return $aSearchResults;
-    }
-
-    public function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases, $sNormQuery)
+    public function getGroupedSearches($aSearches, $aPhrases, $oValidTokens, $bIsStructured)

     {
         /*
     {
         /*

-             Calculate all searches using aValidTokens i.e.
+             Calculate all searches using oValidTokens i.e.

              'Wodsworth Road, Sheffield' =>
 
              Phrase Wordset
              'Wodsworth Road, Sheffield' =>
 
              Phrase Wordset


@@ -714,15 +343,11 @@ class Geocode
 
              Score how good the search is so they can be ordered
          */
 
              Score how good the search is so they can be ordered
          */

-        foreach ($aPhrases as $iPhrase => $aPhrase) {
+        foreach ($aPhrases as $iPhrase => $oPhrase) {

             $aNewPhraseSearches = array();
             $aNewPhraseSearches = array();

-            if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
-            else $sPhraseType = '';
-
-            foreach ($aPhrase['wordsets'] as $iWordSet => $aWordset) {
-                // Too many permutations - too expensive
-                if ($iWordSet > 120) break;
+            $sPhraseType = $bIsStructured ? $oPhrase->getPhraseType() : '';

 
 

+            foreach ($oPhrase->getWordSets() as $aWordset) {

                 $aWordsetSearches = $aSearches;
 
                 // Add all words from this wordset
                 $aWordsetSearches = $aSearches;
 
                 // Add all words from this wordset


@@ -730,160 +355,60 @@ class Geocode
                     //echo "<br><b>$sToken</b>";
                     $aNewWordsetSearches = array();
 
                     //echo "<br><b>$sToken</b>";
                     $aNewWordsetSearches = array();
 

-                    foreach ($aWordsetSearches as $aCurrentSearch) {
+                    foreach ($aWordsetSearches as $oCurrentSearch) {

                         //echo "<i>";
                         //echo "<i>";

-                        //var_dump($aCurrentSearch);
+                        //var_dump($oCurrentSearch);

                         //echo "</i>";
 
                         //echo "</i>";
 

-                        // If the token is valid
-                        if (isset($aValidTokens[' '.$sToken])) {
-                            foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) {
-                                $aSearch = $aCurrentSearch;
-                                $aSearch['iSearchRank']++;
-                                if (($sPhraseType == '' || $sPhraseType == 'country') && !empty($aSearchTerm['country_code']) && $aSearchTerm['country_code'] != '0') {
-                                    if ($aSearch['sCountryCode'] === false) {
-                                        $aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
-                                        // Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
-                                        if (($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases))) {
-                                            $aSearch['iSearchRank'] += 5;
-                                        }
-                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                    }
-                                } elseif ($sPhraseType == 'postalcode' || ($aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'postcode')) {
-                                    // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
-                                    if ($aSearch['sPostcode'] === '' &&
-                                        isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'] && strpos($sNormQuery, $this->normTerm($aSearchTerm['word'])) !== false) {
-                                        // If we have structured search or this is the first term,
-                                        // make the postcode the primary search element.
-                                        if ($aSearch['sOperator'] === '' && ($sPhraseType == 'postalcode' || ($iToken == 0 && $iPhrase == 0))) {
-                                            $aNewSearch = $aSearch;
-                                            $aNewSearch['sOperator'] = 'postcode';
-                                            $aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
-                                            $aNewSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word'];
-                                            if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
-                                        }
-
-                                        // If we have a structured search or this is not the first term,
-                                        // add the postcode as an addendum.
-                                        if ($sPhraseType == 'postalcode' || sizeof($aSearch['aName'])) {
-                                            $aSearch['sPostcode'] = $aSearchTerm['word'];
-                                            if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                        }
-                                    }
-                                } elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house') {
-                                    if ($aSearch['sHouseNumber'] === '') {
-                                        $aSearch['sHouseNumber'] = $sToken;
-                                        // sanity check: if the housenumber is not mainly made
-                                        // up of numbers, add a penalty
-                                        if (preg_match_all("/[^0-9]/", $sToken, $aMatches) > 2) $aSearch['iSearchRank']++;
-                                        // also housenumbers should appear in the first or second phrase
-                                        if ($iPhrase > 1) $aSearch['iSearchRank'] += 1;
-                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                        /*
-                                        // Fall back to not searching for this item (better than nothing)
-                                        $aSearch = $aCurrentSearch;
-                                        $aSearch['iSearchRank'] += 1;
-                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                         */
-                                    }
-                                } elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null) {
-                                    // require a normalized exact match of the term
-                                    // if we have the normalizer version of the query
-                                    // available
-                                    if ($aSearch['sClass'] === ''
-                                        && ($sNormQuery === null || !($aSearchTerm['word'] && strpos($sNormQuery, $aSearchTerm['word']) === false))) {
-                                        $aSearch['sClass'] = $aSearchTerm['class'];
-                                        $aSearch['sType'] = $aSearchTerm['type'];
-                                        if ($aSearchTerm['operator'] == '') {
-                                            $aSearch['sOperator'] = sizeof($aSearch['aName']) ? 'name' :  'near';
-                                            $aSearch['iSearchRank'] += 2;
-                                        } else {
-                                            $aSearch['sOperator'] = 'near'; // near = in for the moment
-                                        }
-
-                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                    }
-                                } elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
-                                    if (sizeof($aSearch['aName'])) {
-                                        if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false)) {
-                                            $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                        } else {
-                                            $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                            $aSearch['iSearchRank'] += 1000; // skip;
-                                        }
-                                    } else {
-                                        $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                        //$aSearch['iNamePhrase'] = $iPhrase;
-                                    }
-                                    if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
+                        // Tokens with full name matches.
+                        foreach ($oValidTokens->get(' '.$sToken) as $oSearchTerm) {
+                            $aNewSearches = $oCurrentSearch->extendWithFullTerm(
+                                $oSearchTerm,
+                                $oValidTokens->contains($sToken)
+                                  && strpos($sToken, ' ') === false,
+                                $sPhraseType,
+                                $iToken == 0 && $iPhrase == 0,
+                                $iPhrase == 0,
+                                $iToken + 1 == count($aWordset)
+                                  && $iPhrase + 1 == count($aPhrases)
+                            );
+
+                            foreach ($aNewSearches as $oSearch) {
+                                if ($oSearch->getRank() < $this->iMaxRank) {
+                                    $aNewWordsetSearches[] = $oSearch;

                                 }
                             }
                         }
                         // Look for partial matches.
                         // Note that there is no point in adding country terms here
                                 }
                             }
                         }
                         // Look for partial matches.
                         // Note that there is no point in adding country terms here

-                        // because country are omitted in the address.
-                        if (isset($aValidTokens[$sToken]) && $sPhraseType != 'country') {
+                        // because country is omitted in the address.
+                        if ($sPhraseType != 'country') {

                             // Allow searching for a word - but at extra cost
                             // Allow searching for a word - but at extra cost

-                            foreach ($aValidTokens[$sToken] as $aSearchTerm) {
-                                if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
-                                    if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strpos($sToken, ' ') === false) {
-                                        $aSearch = $aCurrentSearch;
-                                        $aSearch['iSearchRank'] += 1;
-                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) {
-                                            $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                            if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                        } elseif (isset($aValidTokens[' '.$sToken])) { // revert to the token version?
-                                            $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                            $aSearch['iSearchRank'] += 1;
-                                            if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                            foreach ($aValidTokens[' '.$sToken] as $aSearchTermToken) {
-                                                if (empty($aSearchTermToken['country_code'])
-                                                    && empty($aSearchTermToken['lat'])
-                                                    && empty($aSearchTermToken['class'])
-                                                ) {
-                                                    $aSearch = $aCurrentSearch;
-                                                    $aSearch['iSearchRank'] += 1;
-                                                    $aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id'];
-                                                    if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                                }
-                                            }
-                                        } else {
-                                            $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                            if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
-                                            if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
-                                        }
-                                    }
-
-                                    if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase) {
-                                        $aSearch = $aCurrentSearch;
-                                        $aSearch['iSearchRank'] += 1;
-                                        if (!sizeof($aCurrentSearch['aName'])) $aSearch['iSearchRank'] += 1;
-                                        if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
-                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) {
-                                            $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                        } else {
-                                            $aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-                                        }
-                                        $aSearch['iNamePhrase'] = $iPhrase;
-                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
+                            foreach ($oValidTokens->get($sToken) as $oSearchTerm) {
+                                $aNewSearches = $oCurrentSearch->extendWithPartialTerm(
+                                    $sToken,
+                                    $oSearchTerm,
+                                    $bIsStructured,
+                                    $iPhrase,
+                                    $oValidTokens->get(' '.$sToken)
+                                );
+
+                                foreach ($aNewSearches as $oSearch) {
+                                    if ($oSearch->getRank() < $this->iMaxRank) {
+                                        $aNewWordsetSearches[] = $oSearch;

                                     }
                                 }
                             }
                                     }
                                 }
                             }

-                        } else {
-                            // Allow skipping a word - but at EXTREAM cost
-                            //$aSearch = $aCurrentSearch;
-                            //$aSearch['iSearchRank']+=100;
-                            //$aNewWordsetSearches[] = $aSearch;

                         }
                     }
                     // Sort and cut
                         }
                     }
                     // Sort and cut

-                    usort($aNewWordsetSearches, 'bySearchRank');
+                    usort($aNewWordsetSearches, array('Nominatim\SearchDescription', 'bySearchRank'));

                     $aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50);
                 }
                     $aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50);
                 }

-                //var_Dump('<hr>',sizeof($aWordsetSearches)); exit;
+                //var_Dump('<hr>',count($aWordsetSearches)); exit;

 
                 $aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches);
 
                 $aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches);

-                usort($aNewPhraseSearches, 'bySearchRank');
+                usort($aNewPhraseSearches, array('Nominatim\SearchDescription', 'bySearchRank'));

 
                 $aSearchHash = array();
                 foreach ($aNewPhraseSearches as $iSearch => $aSearch) {
 
                 $aSearchHash = array();
                 foreach ($aNewPhraseSearches as $iSearch => $aSearch) {


@@ -898,9 +423,12 @@ class Geocode
             // Re-group the searches by their score, junk anything over 20 as just not worth trying
             $aGroupedSearches = array();
             foreach ($aNewPhraseSearches as $aSearch) {
             // Re-group the searches by their score, junk anything over 20 as just not worth trying
             $aGroupedSearches = array();
             foreach ($aNewPhraseSearches as $aSearch) {

-                if ($aSearch['iSearchRank'] < $this->iMaxRank) {
-                    if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
-                    $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
+                $iRank = $aSearch->getRank();
+                if ($iRank < $this->iMaxRank) {
+                    if (!isset($aGroupedSearches[$iRank])) {
+                        $aGroupedSearches[$iRank] = array();
+                    }
+                    $aGroupedSearches[$iRank][] = $aSearch;

                 }
             }
             ksort($aGroupedSearches);
                 }
             }
             ksort($aGroupedSearches);


@@ -908,13 +436,27 @@ class Geocode
             $iSearchCount = 0;
             $aSearches = array();
             foreach ($aGroupedSearches as $iScore => $aNewSearches) {
             $iSearchCount = 0;
             $aSearches = array();
             foreach ($aGroupedSearches as $iScore => $aNewSearches) {

-                $iSearchCount += sizeof($aNewSearches);
+                $iSearchCount += count($aNewSearches);

                 $aSearches = array_merge($aSearches, $aNewSearches);
                 if ($iSearchCount > 50) break;
             }
                 $aSearches = array_merge($aSearches, $aNewSearches);
                 if ($iSearchCount > 50) break;
             }

+        }
+
+        // Revisit searches, drop bad searches and give penalty to unlikely combinations.
+        $aGroupedSearches = array();
+        foreach ($aSearches as $oSearch) {
+            if (!$oSearch->isValidSearch()) {
+                continue;
+            }

 
 

-            //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
+            $iRank = $oSearch->getRank();
+            if (!isset($aGroupedSearches[$iRank])) {
+                $aGroupedSearches[$iRank] = array();
+            }
+            $aGroupedSearches[$iRank][] = $oSearch;

         }
         }

+        ksort($aGroupedSearches);
+

         return $aGroupedSearches;
     }
 
         return $aGroupedSearches;
     }
 


@@ -929,9 +471,9 @@ class Geocode
             osm_id: id of corresponding OSM object
             class: general object class (corresponds to tag key of primary OSM tag)
             type: subclass of object (corresponds to tag value of primary OSM tag)
             osm_id: id of corresponding OSM object
             class: general object class (corresponds to tag key of primary OSM tag)
             type: subclass of object (corresponds to tag value of primary OSM tag)

-            admin_level: see http://wiki.openstreetmap.org/wiki/Admin_level
+            admin_level: see https://wiki.openstreetmap.org/wiki/Admin_level

             rank_search: rank in search hierarchy
             rank_search: rank in search hierarchy

-                        (see also http://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level)
+                        (see also https://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level)

             rank_address: rank in address hierarchy (determines orer in address)
             place_id: internal key (may differ between different instances)
             country_code: ISO country code
             rank_address: rank in address hierarchy (determines orer in address)
             place_id: internal key (may differ between different instances)
             country_code: ISO country code


@@ -952,117 +494,110 @@ class Geocode
 
     public function lookup()
     {
 
     public function lookup()
     {

+        Debug::newFunction('Geocode::lookup');

         if (!$this->sQuery && !$this->aStructuredQuery) return array();
 
         if (!$this->sQuery && !$this->aStructuredQuery) return array();
 

-        $sNormQuery = $this->normTerm($this->sQuery);
-        $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";
-        $sCountryCodesSQL = false;
+        Debug::printDebugArray('Geocode', $this);
+
+        $oCtx = new SearchContext();
+
+        if ($this->aRoutePoints) {
+            $oCtx->setViewboxFromRoute(
+                $this->oDB,
+                $this->aRoutePoints,
+                $this->aRouteWidth,
+                $this->bBoundedSearch
+            );
+        } elseif ($this->aViewBox) {
+            $oCtx->setViewboxFromBox($this->aViewBox, $this->bBoundedSearch);
+        }
+        if ($this->aExcludePlaceIDs) {
+            $oCtx->setExcludeList($this->aExcludePlaceIDs);
+        }

         if ($this->aCountryCodes) {
         if ($this->aCountryCodes) {

-            $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
+            $oCtx->setCountryList($this->aCountryCodes);

         }
 
         }
 

+        Debug::newSection('Query Preprocessing');
+
+        $sNormQuery = $this->normTerm($this->sQuery);
+        Debug::printVar('Normalized query', $sNormQuery);
+
+        $sLanguagePrefArraySQL = $this->oDB->getArraySQL(
+            $this->oDB->getDBQuotedList($this->aLangPrefOrder)
+        );
+

         $sQuery = $this->sQuery;
         if (!preg_match('//u', $sQuery)) {
         $sQuery = $this->sQuery;
         if (!preg_match('//u', $sQuery)) {

-            userError("Query string is not UTF-8 encoded.");
+            userError('Query string is not UTF-8 encoded.');

         }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {
         }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {

-            $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/', '\1illinois\2', $sQuery);
-            $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/', '\1alabama\2', $sQuery);
-            $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/', '\1louisiana\2', $sQuery);
-        }
-
-        $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;
-        if ($this->sViewboxCentreSQL) {
-            // For complex viewboxes (routes) precompute the bounding geometry
-            $sGeom = chksql(
-                $this->oDB->getOne("select ".$this->sViewboxSmallSQL),
-                "Could not get small viewbox"
-            );
-            $this->sViewboxSmallSQL = "'".$sGeom."'::geometry";
-
-            $sGeom = chksql(
-                $this->oDB->getOne("select ".$this->sViewboxLargeSQL),
-                "Could not get large viewbox"
-            );
-            $this->sViewboxLargeSQL = "'".$sGeom."'::geometry";
+            $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/i', '\1illinois\2', $sQuery);
+            $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/i', '\1alabama\2', $sQuery);
+            $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/i', '\1louisiana\2', $sQuery);

         }
 
         // Do we have anything that looks like a lat/lon pair?
         }
 
         // Do we have anything that looks like a lat/lon pair?

-        $oNearPoint = false;
-        if ($aLooksLike = NearPoint::extractFromQuery($sQuery)) {
-            $oNearPoint = $aLooksLike['pt'];
-            $sQuery = $aLooksLike['query'];
-        }
+        $sQuery = $oCtx->setNearPointFromQuery($sQuery);

 
 

-        $aSearchResults = array();

         if ($sQuery || $this->aStructuredQuery) {
         if ($sQuery || $this->aStructuredQuery) {

-            // Start with a blank search
-            $aSearches = array(
-                          array(
-                           'iSearchRank' => 0,
-                           'iNamePhrase' => -1,
-                           'sCountryCode' => false,
-                           'aName' => array(),
-                           'aAddress' => array(),
-                           'aFullNameAddress' => array(),
-                           'aNameNonSearch' => array(),
-                           'aAddressNonSearch' => array(),
-                           'sOperator' => '',
-                           'aFeatureName' => array(),
-                           'sClass' => '',
-                           'sType' => '',
-                           'sHouseNumber' => '',
-                           'sPostcode' => '',
-                           'oNear' => $oNearPoint
-                          )
-                         );
-
-            // Any 'special' terms in the search?
-            $bSpecialTerms = false;
-            preg_match_all('/\\[(.*)=(.*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-            $aSpecialTerms = array();
-            foreach ($aSpecialTermsRaw as $aSpecialTerm) {
-                $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-                $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
+            // Start with a single blank search
+            $aSearches = array(new SearchDescription($oCtx));
+
+            if ($sQuery) {
+                $sQuery = $aSearches[0]->extractKeyValuePairs($sQuery);

             }
 
             }
 

-            preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-            $aSpecialTerms = array();
-            if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity']) {
-                $aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
+            $sSpecialTerm = '';
+            if ($sQuery) {
+                preg_match_all(
+                    '/\\[([\\w ]*)\\]/u',
+                    $sQuery,
+                    $aSpecialTermsRaw,
+                    PREG_SET_ORDER
+                );
+                if (!empty($aSpecialTermsRaw)) {
+                    Debug::printVar('Special terms', $aSpecialTermsRaw);
+                }
+
+                foreach ($aSpecialTermsRaw as $aSpecialTerm) {
+                    $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
+                    if (!$sSpecialTerm) {
+                        $sSpecialTerm = $aSpecialTerm[1];
+                    }
+                }
+            }
+            if (!$sSpecialTerm && $this->aStructuredQuery
+                && isset($this->aStructuredQuery['amenity'])) {
+                $sSpecialTerm = $this->aStructuredQuery['amenity'];

                 unset($this->aStructuredQuery['amenity']);
             }
 
                 unset($this->aStructuredQuery['amenity']);
             }
 

-            foreach ($aSpecialTermsRaw as $aSpecialTerm) {
-                $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-                $sToken = chksql($this->oDB->getOne("SELECT make_standard_name('".$aSpecialTerm[1]."') AS string"));
-                $sSQL = 'SELECT * ';
-                $sSQL .= 'FROM ( ';
-                $sSQL .= '   SELECT word_id, word_token, word, class, type, country_code, operator';
-                $sSQL .= '   FROM word ';
+            if ($sSpecialTerm && !$aSearches[0]->hasOperator()) {
+                $sSpecialTerm = pg_escape_string($sSpecialTerm);
+                $sToken = $this->oDB->getOne(
+                    'SELECT make_standard_name(:term)',
+                    array(':term' => $sSpecialTerm),
+                    'Cannot decode query. Wrong encoding?'
+                );
+                $sSQL = 'SELECT class, type FROM word ';

                 $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';
                 $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';

-                $sSQL .= ') AS x ';
-                $sSQL .= ' WHERE (class is not null AND class not in (\'place\')) ';
-                $sSQL .= ' OR country_code is not null';
-                if (CONST_Debug) var_Dump($sSQL);
-                $aSearchWords = chksql($this->oDB->getAll($sSQL));
+                $sSQL .= '   AND class is not null AND class not in (\'place\')';
+
+                Debug::printSQL($sSQL);
+                $aSearchWords = $this->oDB->getAll($sSQL);

                 $aNewSearches = array();
                 $aNewSearches = array();

-                foreach ($aSearches as $aSearch) {
+                foreach ($aSearches as $oSearch) {

                     foreach ($aSearchWords as $aSearchTerm) {
                     foreach ($aSearchWords as $aSearchTerm) {

-                        $aNewSearch = $aSearch;
-                        if ($aSearchTerm['country_code']) {
-                            $aNewSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
-                            $aNewSearches[] = $aNewSearch;
-                            $bSpecialTerms = true;
-                        }
-                        if ($aSearchTerm['class']) {
-                            $aNewSearch['sClass'] = $aSearchTerm['class'];
-                            $aNewSearch['sType'] = $aSearchTerm['type'];
-                            $aNewSearches[] = $aNewSearch;
-                            $bSpecialTerms = true;
-                        }
+                        $oNewSearch = clone $oSearch;
+                        $oNewSearch->setPoiSearch(
+                            Operator::TYPE,
+                            $aSearchTerm['class'],
+                            $aSearchTerm['type']
+                        );
+                        $aNewSearches[] = $oNewSearch;

                     }
                 }
                 $aSearches = $aNewSearches;
                     }
                 }
                 $aSearches = $aNewSearches;


@@ -1071,125 +606,107 @@ class Geocode
             // Split query into phrases
             // Commas are used to reduce the search space by indicating where phrases split
             if ($this->aStructuredQuery) {
             // Split query into phrases
             // Commas are used to reduce the search space by indicating where phrases split
             if ($this->aStructuredQuery) {

-                $aPhrases = $this->aStructuredQuery;
+                $aInPhrases = $this->aStructuredQuery;

                 $bStructuredPhrases = true;
             } else {
                 $bStructuredPhrases = true;
             } else {

-                $aPhrases = explode(',', $sQuery);
+                $aInPhrases = explode(',', $sQuery);

                 $bStructuredPhrases = false;
             }
 
                 $bStructuredPhrases = false;
             }
 

+            Debug::printDebugArray('Search context', $oCtx);
+            Debug::printDebugArray('Base search', empty($aSearches) ? null : $aSearches[0]);
+            Debug::printVar('Final query phrases', $aInPhrases);
+

             // Convert each phrase to standard form
             // Create a list of standard words
             // Get all 'sets' of words
             // Generate a complete list of all
             // Convert each phrase to standard form
             // Create a list of standard words
             // Get all 'sets' of words
             // Generate a complete list of all

+            Debug::newSection('Tokenization');

             $aTokens = array();
             $aTokens = array();

-            foreach ($aPhrases as $iPhrase => $sPhrase) {
-                $aPhrase = chksql(
-                    $this->oDB->getRow("SELECT make_standard_name('".pg_escape_string($sPhrase)."') as string"),
-                    "Cannot normalize query string (is it a UTF-8 string?)"
+            $aPhrases = array();
+            foreach ($aInPhrases as $iPhrase => $sPhrase) {
+                $sPhrase = $this->oDB->getOne(
+                    'SELECT make_standard_name(:phrase)',
+                    array(':phrase' => $sPhrase),
+                    'Cannot normalize query string (is it a UTF-8 string?)'

                 );
                 );

-                if (trim($aPhrase['string'])) {
-                    $aPhrases[$iPhrase] = $aPhrase;
-                    $aPhrases[$iPhrase]['words'] = explode(' ', $aPhrases[$iPhrase]['string']);
-                    $aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
-                    $aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));
-                } else {
-                    unset($aPhrases[$iPhrase]);
+                if (trim($sPhrase)) {
+                    $oPhrase = new Phrase($sPhrase, is_string($iPhrase) ? $iPhrase : '');
+                    $oPhrase->addTokens($aTokens);
+                    $aPhrases[] = $oPhrase;

                 }
             }
 
                 }
             }
 

-            // Reindex phrases - we make assumptions later on that they are numerically keyed in order
-            $aPhraseTypes = array_keys($aPhrases);
-            $aPhrases = array_values($aPhrases);
+            Debug::printVar('Tokens', $aTokens);
+
+            $oValidTokens = new TokenList();

 
 

-            if (sizeof($aTokens)) {
-                // Check which tokens we have, get the ID numbers
+            if (!empty($aTokens)) {

                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
                 $sSQL .= ' FROM word ';
                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
                 $sSQL .= ' FROM word ';

-                $sSQL .= ' WHERE word_token in ('.join(',', array_map("getDBQuoted", $aTokens)).')';
+                $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';

 
 

-                if (CONST_Debug) var_Dump($sSQL);
-
-                $aValidTokens = array();
-                if (sizeof($aTokens)) {
-                    $aDatabaseWords = chksql(
-                        $this->oDB->getAll($sSQL),
-                        "Could not get word tokens."
-                    );
-                } else {
-                    $aDatabaseWords = array();
-                }
-                $aPossibleMainWordIDs = array();
-                $aWordFrequencyScores = array();
-                foreach ($aDatabaseWords as $aToken) {
-                    // Very special case - require 2 letter country param to match the country code found
-                    if ($bStructuredPhrases && $aToken['country_code'] && !empty($this->aStructuredQuery['country'])
-                        && strlen($this->aStructuredQuery['country']) == 2 && strtolower($this->aStructuredQuery['country']) != $aToken['country_code']
-                    ) {
-                        continue;
-                    }
+                Debug::printSQL($sSQL);

 
 

-                    if (isset($aValidTokens[$aToken['word_token']])) {
-                        $aValidTokens[$aToken['word_token']][] = $aToken;
-                    } else {
-                        $aValidTokens[$aToken['word_token']] = array($aToken);
-                    }
-                    if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
-                    $aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
-                }
-                if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
+                $oValidTokens->addTokensFromDB(
+                    $this->oDB,
+                    $aTokens,
+                    $this->aCountryCodes,
+                    $sNormQuery,
+                    $this->oNormalizer
+                );

 
 

-                // US ZIP+4 codes - if there is no token, merge in the 5-digit ZIP code
+                // Try more interpretations for Tokens that could not be matched.

                 foreach ($aTokens as $sToken) {
                 foreach ($aTokens as $sToken) {

-                    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);
-                                    }
-                                }
-                            }
+                    if ($sToken[0] == ' ' && !$oValidTokens->contains($sToken)) {
+                        if (preg_match('/^ ([0-9]{5}) [0-9]{4}$/', $sToken, $aData)) {
+                            // US ZIP+4 codes - merge in the 5-digit ZIP code
+                            $oValidTokens->addToken(
+                                $sToken,
+                                new Token\Postcode(null, $aData[1], 'us')
+                            );
+                        } elseif (preg_match('/^ [0-9]+$/', $sToken)) {
+                            // Unknown single word token with a number.
+                            // Assume it is a house number.
+                            $oValidTokens->addToken(
+                                $sToken,
+                                new Token\HouseNumber(null, trim($sToken))
+                            );

                         }
                     }
                 }
 
                         }
                     }
                 }
 

-                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
 

-                // Start the search process
-                // array with: placeid => -1 | tiger-housenumber
-                $aResultPlaceIDs = array();
+                Debug::printGroupTable('Valid Tokens', $oValidTokens->debugInfo());

 
 

-                $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases, $sNormQuery);
+                foreach ($aPhrases as $oPhrase) {
+                    $oPhrase->computeWordSets($oValidTokens);
+                }
+                Debug::printDebugTable('Phrases', $aPhrases);
+
+                Debug::newSection('Search candidates');
+
+                $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens, $bStructuredPhrases);

 
                 if ($this->bReverseInPlan) {
                     // Reverse phrase array and also reverse the order of the wordsets in
                     // the first and final phrase. Don't bother about phrases in the middle
                     // because order in the address doesn't matter.
                     $aPhrases = array_reverse($aPhrases);
 
                 if ($this->bReverseInPlan) {
                     // Reverse phrase array and also reverse the order of the wordsets in
                     // the first and final phrase. Don't bother about phrases in the middle
                     // because order in the address doesn't matter.
                     $aPhrases = array_reverse($aPhrases);

-                    $aPhrases[0]['wordsets'] = getInverseWordSets($aPhrases[0]['words'], 0);
-                    if (sizeof($aPhrases) > 1) {
-                        $aFinalPhrase = end($aPhrases);
-                        $aPhrases[sizeof($aPhrases)-1]['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
+                    $aPhrases[0]->invertWordSets();
+                    if (count($aPhrases) > 1) {
+                        $aPhrases[count($aPhrases)-1]->invertWordSets();

                     }
                     }

-                    $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false, $sNormQuery);
+                    $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens, false);

 
                     foreach ($aGroupedSearches as $aSearches) {
                         foreach ($aSearches as $aSearch) {
 
                     foreach ($aGroupedSearches as $aSearches) {
                         foreach ($aSearches as $aSearch) {

-                            if ($aSearch['iSearchRank'] < $this->iMaxRank) {
-                                if (!isset($aReverseGroupedSearches[$aSearch['iSearchRank']])) $aReverseGroupedSearches[$aSearch['iSearchRank']] = array();
-                                $aReverseGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
+                            if (!isset($aReverseGroupedSearches[$aSearch->getRank()])) {
+                                $aReverseGroupedSearches[$aSearch->getRank()] = array();

                             }
                             }

+                            $aReverseGroupedSearches[$aSearch->getRank()][] = $aSearch;

                         }
                     }
 
                         }
                     }
 


@@ -1200,38 +717,9 @@ class Geocode
                 // Re-group the searches by their score, junk anything over 20 as just not worth trying
                 $aGroupedSearches = array();
                 foreach ($aSearches as $aSearch) {
                 // Re-group the searches by their score, junk anything over 20 as just not worth trying
                 $aGroupedSearches = array();
                 foreach ($aSearches as $aSearch) {

-                    if ($aSearch['iSearchRank'] < $this->iMaxRank) {
-                        if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
-                        $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
-                    }
-                }
-                ksort($aGroupedSearches);
-            }
-
-            if (CONST_Search_TryDroppedAddressTerms && sizeof($this->aStructuredQuery) > 0) {
-                $aCopyGroupedSearches = $aGroupedSearches;
-                foreach ($aCopyGroupedSearches as $iGroup => $aSearches) {
-                    foreach ($aSearches as $iSearch => $aSearch) {
-                        $aReductionsList = array($aSearch['aAddress']);
-                        $iSearchRank = $aSearch['iSearchRank'];
-                        while (sizeof($aReductionsList) > 0) {
-                            $iSearchRank += 5;
-                            if ($iSearchRank > iMaxRank) break 3;
-                            $aNewReductionsList = array();
-                            foreach ($aReductionsList as $aReductionsWordList) {
-                                for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++) {
-                                    $aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
-                                    $aReverseSearch = $aSearch;
-                                    $aSearch['aAddress'] = $aReductionsWordListResult;
-                                    $aSearch['iSearchRank'] = $iSearchRank;
-                                    $aGroupedSearches[$iSearchRank][] = $aReverseSearch;
-                                    if (sizeof($aReductionsWordListResult) > 0) {
-                                        $aNewReductionsList[] = $aReductionsWordListResult;
-                                    }
-                                }
-                            }
-                            $aReductionsList = $aNewReductionsList;
-                        }
+                    if ($aSearch->getRank() < $this->iMaxRank) {
+                        if (!isset($aGroupedSearches[$aSearch->getRank()])) $aGroupedSearches[$aSearch->getRank()] = array();
+                        $aGroupedSearches[$aSearch->getRank()][] = $aSearch;

                     }
                 }
                 ksort($aGroupedSearches);
                     }
                 }
                 ksort($aGroupedSearches);


@@ -1244,560 +732,141 @@ class Geocode
                     $sHash = serialize($aSearch);
                     if (isset($aSearchHash[$sHash])) {
                         unset($aGroupedSearches[$iGroup][$iSearch]);
                     $sHash = serialize($aSearch);
                     if (isset($aSearchHash[$sHash])) {
                         unset($aGroupedSearches[$iGroup][$iSearch]);

-                        if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);
+                        if (empty($aGroupedSearches[$iGroup])) unset($aGroupedSearches[$iGroup]);

                     } else {
                         $aSearchHash[$sHash] = 1;
                     }
                 }
             }
 
                     } else {
                         $aSearchHash[$sHash] = 1;
                     }
                 }
             }
 

-            if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
+            Debug::printGroupedSearch(
+                $aGroupedSearches,
+                $oValidTokens->debugTokenByWordIdList()
+            );

 
 

+            // Start the search process

             $iGroupLoop = 0;
             $iQueryLoop = 0;
             $iGroupLoop = 0;
             $iQueryLoop = 0;

+            $aNextResults = array();

             foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
                 $iGroupLoop++;
             foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
                 $iGroupLoop++;

-                foreach ($aSearches as $aSearch) {
+                $aResults = $aNextResults;
+                foreach ($aSearches as $oSearch) {

                     $iQueryLoop++;
                     $iQueryLoop++;

-                    $searchedHousenumber = -1;
-
-                    if (CONST_Debug) echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>";
-                    if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
-
-                    if ($sCountryCodesSQL && $aSearch['sCountryCode'] && !in_array($aSearch['sCountryCode'], $this->aCountryCodes)) {
-                        continue;
-                    }
-
-                    // No location term?
-                    if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['oNear']) {
-                        if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {
-                            // Just looking for a country by code - look it up
-                            if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {
-                                $sSQL = "SELECT place_id FROM placex WHERE country_code='".$aSearch['sCountryCode']."' AND rank_search = 4";
-                                if ($bBoundingBoxSearch)
-                                    $sSQL .= " AND _st_intersects($this->sViewboxSmallSQL, geometry)";
-                                $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";
-                                if (CONST_Debug) var_dump($sSQL);
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                            } else {
-                                $aPlaceIDs = array();
-                            }
-                        } else {
-                            if (!$bBoundingBoxSearch && !$aSearch['oNear']) continue;
-                            if (!$aSearch['sClass']) continue;
-
-                            $sSQL = "SELECT COUNT(*) FROM pg_tables WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-                            if (chksql($this->oDB->getOne($sSQL))) {
-                                $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-                                if ($sCountryCodesSQL) $sSQL .= " JOIN placex USING (place_id)";
-                                $sSQL .= " WHERE st_contains($this->sViewboxSmallSQL, ct.centroid)";
-                                if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                if (sizeof($this->aExcludePlaceIDs)) {
-                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                }
-                                if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
-                                $sSQL .= " limit $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-
-                                // If excluded place IDs are given, it is fair to assume that
-                                // there have been results in the small box, so no further
-                                // expansion in that case.
-                                // Also don't expand if bounded results were requested.
-                                if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {
-                                    $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-                                    if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-                                    $sSQL .= " WHERE ST_Contains($this->sViewboxLargeSQL, ct.centroid)";
-                                    if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                    if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
-                                    $sSQL .= " LIMIT $this->iLimit";
-                                    if (CONST_Debug) var_dump($sSQL);
-                                    $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                                }
-                            } else {
-                                $sSQL = "SELECT place_id ";
-                                $sSQL .= "FROM placex ";
-                                $sSQL .= "WHERE class='".$aSearch['sClass']."' ";
-                                $sSQL .= "  AND type='".$aSearch['sType']."'";
-                                $sSQL .= "  AND ST_Contains($this->sViewboxSmallSQL, geometry) ";
-                                $sSQL .= "  AND linked_place_id is null";
-                                if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                if ($this->sViewboxCentreSQL)   $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, centroid) ASC";
-                                $sSQL .= " LIMIT $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                            }
-                        }
-                    } elseif ($aSearch['oNear'] && !sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['sClass']) {
-                        // If a coordinate is given, the search must either
-                        // be for a name or a special search. Ignore everythin else.
-                        $aPlaceIDs = array();
-                    } elseif ($aSearch['sOperator'] == 'postcode') {
-                        $sSQL  = "SELECT p.place_id FROM location_postcode p ";
-                        if (sizeof($aSearch['aAddress'])) {
-                            $sSQL .= ", search_name s ";
-                            $sSQL .= "WHERE s.place_id = p.parent_place_id ";
-                            $sSQL .= "AND array_cat(s.nameaddress_vector, s.name_vector) @> ARRAY[".join($aSearch['aAddress'], ",")."] AND ";
-                        } else {
-                            $sSQL .= " WHERE ";
-                        }
-                        $sSQL .= "p.postcode = '".pg_escape_string(reset($aSearch['aName']))."'";
-                        if ($aSearch['sCountryCode']) {
-                            $sSQL .= " AND p.country_code = '".$aSearch['sCountryCode']."'";
-                        } elseif ($sCountryCodesSQL) {
-                            $sSQL .= " AND p.country_code in ($sCountryCodesSQL)";
-                        }
-                        $sSQL .= " LIMIT $this->iLimit";
-                        if (CONST_Debug) var_dump($sSQL);
-                        $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                    } else {
-                        $aPlaceIDs = array();
-
-                        // First we need a position, either aName or fLat or both
-                        $aTerms = array();
-                        $aOrder = array();
-
-                        if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress'])) {
-                            $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
-                            $aOrder[] = "";
-                            $aOrder[0] = "  (";
-                            $aOrder[0] .= "   EXISTS(";
-                            $aOrder[0] .= "     SELECT place_id ";
-                            $aOrder[0] .= "     FROM placex ";
-                            $aOrder[0] .= "     WHERE parent_place_id = search_name.place_id";
-                            $aOrder[0] .= "       AND transliteration(housenumber) ~* E'".$sHouseNumberRegex."' ";
-                            $aOrder[0] .= "     LIMIT 1";
-                            $aOrder[0] .= "   ) ";
-                            // also housenumbers from interpolation lines table are needed
-                            $aOrder[0] .= "   OR EXISTS(";
-                            $aOrder[0] .= "     SELECT place_id ";
-                            $aOrder[0] .= "     FROM location_property_osmline ";
-                            $aOrder[0] .= "     WHERE parent_place_id = search_name.place_id";
-                            $aOrder[0] .= "       AND startnumber is not NULL";
-                            $aOrder[0] .= "       AND ".intval($aSearch['sHouseNumber']).">=startnumber ";
-                            $aOrder[0] .= "       AND ".intval($aSearch['sHouseNumber'])."<=endnumber ";
-                            $aOrder[0] .= "     LIMIT 1";
-                            $aOrder[0] .= "   )";
-                            $aOrder[0] .= " )";
-                            $aOrder[0] .= " DESC";
-                        }
-
-                        // TODO: filter out the pointless search terms (2 letter name tokens and less)
-                        // they might be right - but they are just too darned expensive to run
-                        if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'], ",")."]";
-                        if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";
-                        if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) {
-                            // For infrequent name terms disable index usage for address
-                            if (CONST_Search_NameOnlySearchFrequencyThreshold
-                                && sizeof($aSearch['aName']) == 1
-                                && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold
-                            ) {
-                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
-                            } else {
-                                $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";
-                                if (sizeof($aSearch['aAddressNonSearch'])) {
-                                    $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'], ",")."]";
-                                }
-                            }
-                        }
-                        if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-                        if ($aSearch['sHouseNumber']) {
-                            $aTerms[] = "address_rank between 16 and 27";
-                        } else {
-                            if ($this->iMinAddressRank > 0) {
-                                $aTerms[] = "address_rank >= ".$this->iMinAddressRank;
-                            }
-                            if ($this->iMaxAddressRank < 30) {
-                                $aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
-                            }
-                        }
-                        if ($aSearch['oNear']) {
-                            $aTerms[] = $aSearch['oNear']->withinSQL('centroid');
-
-                            $aOrder[] = $aSearch['oNear']->distanceSQL('centroid');
-                        } elseif ($aSearch['sPostcode']) {
-                            $aOrder[] = "(SELECT min(ST_Distance(search_name.centroid, p.geometry)) FROM location_postcode p WHERE p.postcode = '".$aSearch['sPostcode']."')";
-                        }
-                        if (sizeof($this->aExcludePlaceIDs)) {
-                            $aTerms[] = "place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                        }
-                        if ($sCountryCodesSQL) {
-                            $aTerms[] = "country_code in ($sCountryCodesSQL)";
-                        }
-
-                        if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
-                        if ($oNearPoint) {
-                            $aOrder[] = $oNearPoint->distanceSQL('centroid');
-                        }
-
-                        if ($aSearch['sHouseNumber']) {
-                            $sImportanceSQL = '- abs(26 - address_rank) + 3';
-                        } else {
-                            $sImportanceSQL = '(CASE WHEN importance = 0 OR importance IS NULL THEN 0.75-(search_rank::float/40) ELSE importance END)';
-                        }
-                        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
-                        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
-
-                        $aOrder[] = "$sImportanceSQL DESC";
-                        if (sizeof($aSearch['aFullNameAddress'])) {
-                            $sExactMatchSQL = ' ( ';
-                            $sExactMatchSQL .= '   SELECT count(*) FROM ( ';
-                            $sExactMatchSQL .= '      SELECT unnest(ARRAY['.join($aSearch['aFullNameAddress'], ",").']) ';
-                            $sExactMatchSQL .= '      INTERSECT ';
-                            $sExactMatchSQL .= '      SELECT unnest(nameaddress_vector)';
-                            $sExactMatchSQL .= '   ) s';
-                            $sExactMatchSQL .= ') as exactmatch';
-                            $aOrder[] = 'exactmatch DESC';
-                        } else {
-                            $sExactMatchSQL = '0::int as exactmatch';
-                        }
-
-                        if (sizeof($aTerms)) {
-                            $sSQL = "SELECT place_id, ";
-                            $sSQL .= $sExactMatchSQL;
-                            $sSQL .= " FROM search_name";
-                            $sSQL .= " WHERE ".join(' and ', $aTerms);
-                            $sSQL .= " ORDER BY ".join(', ', $aOrder);
-                            if ($aSearch['sHouseNumber'] || $aSearch['sClass']) {
-                                $sSQL .= " LIMIT 20";
-                            } elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) {
-                                $sSQL .= " LIMIT 1";
-                            } else {
-                                $sSQL .= " LIMIT ".$this->iLimit;
-                            }
-
-                            if (CONST_Debug) var_dump($sSQL);
-                            $aViewBoxPlaceIDs = chksql(
-                                $this->oDB->getAll($sSQL),
-                                "Could not get places for search terms."
-                            );
-                            //var_dump($aViewBoxPlaceIDs);
-                            // 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;
-                                $aPlaceIDs[] = $aViewBoxRow['place_id'];
-                                $this->exactMatchCache[$aViewBoxRow['place_id']] = $aViewBoxRow['exactmatch'];
-                            }
-                        }
-                        //var_Dump($aPlaceIDs);
-                        //exit;
-
-                        //now search for housenumber, if housenumber provided
-                        if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) {
-                            $searchedHousenumber = intval($aSearch['sHouseNumber']);
-                            $aRoadPlaceIDs = $aPlaceIDs;
-                            $sPlaceIDs = join(',', $aPlaceIDs);
-
-                            // Now they are indexed, look for a house attached to a street we found
-                            $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
-                            $sSQL = "SELECT place_id FROM placex ";
-                            $sSQL .= "WHERE parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
-                            if (sizeof($this->aExcludePlaceIDs)) {
-                                $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                            }
-                            $sSQL .= " LIMIT $this->iLimit";
-                            if (CONST_Debug) var_dump($sSQL);
-                            $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-
-                            // if nothing found, search in the interpolation line table
-                            if (!sizeof($aPlaceIDs)) {
-                                // do we need to use transliteration and the regex for housenumbers???
-                                //new query for lines, not housenumbers anymore
-                                $sSQL = "SELECT distinct place_id FROM location_property_osmline";
-                                $sSQL .= " WHERE startnumber is not NULL and parent_place_id in (".$sPlaceIDs.") and (";
-                                if ($searchedHousenumber%2 == 0) {
-                                    //if housenumber is even, look for housenumber in streets with interpolationtype even or all
-                                    $sSQL .= "interpolationtype='even'";
-                                } else {
-                                    //look for housenumber in streets with interpolationtype odd or all
-                                    $sSQL .= "interpolationtype='odd'";
-                                }
-                                $sSQL .= " or interpolationtype='all') and ";
-                                $sSQL .= $searchedHousenumber.">=startnumber and ";
-                                $sSQL .= $searchedHousenumber."<=endnumber";
-
-                                if (sizeof($this->aExcludePlaceIDs)) {
-                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                }
-                                //$sSQL .= " limit $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                //get place IDs
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
-                            }
-
-                            // If nothing found try the aux fallback table
-                            if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs)) {
-                                $sSQL = "SELECT place_id FROM location_property_aux ";
-                                $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") ";
-                                $sSQL .= " AND housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
-                                if (sizeof($this->aExcludePlaceIDs)) {
-                                    $sSQL .= " AND parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                }
-                                //$sSQL .= " limit $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                            }
-
-                            //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
-                            if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) {
-                                $sSQL = "SELECT distinct place_id FROM location_property_tiger";
-                                $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") and (";
-                                if ($searchedHousenumber%2 == 0) {
-                                    $sSQL .= "interpolationtype='even'";
-                                } else {
-                                    $sSQL .= "interpolationtype='odd'";
-                                }
-                                $sSQL .= " or interpolationtype='all') and ";
-                                $sSQL .= $searchedHousenumber.">=startnumber and ";
-                                $sSQL .= $searchedHousenumber."<=endnumber";
-
-                                if (sizeof($this->aExcludePlaceIDs)) {
-                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                }
-                                //$sSQL .= " limit $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                //get place IDs
-                                $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
-                            }
-
-                            // Fallback to the road (if no housenumber was found)
-                            if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber'])) {
-                                $aPlaceIDs = $aRoadPlaceIDs;
-                                //set to -1, if no housenumbers were found
-                                $searchedHousenumber = -1;
-                            }
-                            //else: housenumber was found, remains saved in searchedHousenumber
-                        }
-
-
-                        if ($aSearch['sClass'] && sizeof($aPlaceIDs)) {
-                            $sPlaceIDs = join(',', $aPlaceIDs);
-                            $aClassPlaceIDs = array();
-
-                            if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') {
-                                // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
-                                $sSQL = "SELECT place_id ";
-                                $sSQL .= " FROM placex ";
-                                $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
-                                $sSQL .= "   AND class='".$aSearch['sClass']."' ";
-                                $sSQL .= "   AND type='".$aSearch['sType']."'";
-                                $sSQL .= "   AND linked_place_id is null";
-                                if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                $sSQL .= " ORDER BY rank_search ASC ";
-                                $sSQL .= " LIMIT $this->iLimit";
-                                if (CONST_Debug) var_dump($sSQL);
-                                $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                            }

 
 

-                            if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in
-                                $sClassTable = 'place_classtype_'.$aSearch['sClass'].'_'.$aSearch['sType'];
-                                $sSQL = "SELECT count(*) FROM pg_tables ";
-                                $sSQL .= "WHERE tablename = '$sClassTable'";
-                                $bCacheTable = chksql($this->oDB->getOne($sSQL));
-
-                                $sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)";
-
-                                if (CONST_Debug) var_dump($sSQL);
-                                $this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL)));
-
-                                // For state / country level searches the normal radius search doesn't work very well
-                                $sPlaceGeom = false;
-                                if ($this->iMaxRank < 9 && $bCacheTable) {
-                                    // Try and get a polygon to search in instead
-                                    $sSQL = "SELECT geometry ";
-                                    $sSQL .= " FROM placex";
-                                    $sSQL .= " WHERE place_id in ($sPlaceIDs)";
-                                    $sSQL .= "   AND rank_search < $this->iMaxRank + 5";
-                                    $sSQL .= "   AND ST_Geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon')";
-                                    $sSQL .= " ORDER BY rank_search ASC ";
-                                    $sSQL .= " LIMIT 1";
-                                    if (CONST_Debug) var_dump($sSQL);
-                                    $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
-                                }
+                    Debug::newSection("Search Loop, group $iGroupLoop, loop $iQueryLoop");
+                    Debug::printGroupedSearch(
+                        array($iGroupedRank => array($oSearch)),
+                        $oValidTokens->debugTokenByWordIdList()
+                    );

 
 

-                                if ($sPlaceGeom) {
-                                    $sPlaceIDs = false;
-                                } else {
-                                    $this->iMaxRank += 5;
-                                    $sSQL = "SELECT place_id FROM placex WHERE place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank";
-                                    if (CONST_Debug) var_dump($sSQL);
-                                    $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                                    $sPlaceIDs = join(',', $aPlaceIDs);
-                                }
+                    $aNewResults = $oSearch->query(
+                        $this->oDB,
+                        $this->iMinAddressRank,
+                        $this->iMaxAddressRank,
+                        $this->iLimit
+                    );

 
 

-                                if ($sPlaceIDs || $sPlaceGeom) {
-                                    $fRange = 0.01;
-                                    if ($bCacheTable) {
-                                        // More efficient - can make the range bigger
-                                        $fRange = 0.05;
-
-                                        $sOrderBySQL = '';
-                                        if ($oNearPoint) {
-                                            $sOrderBySQL = $oNearPoint->distanceSQL('l.centroid');
-                                        } elseif ($sPlaceIDs) {
-                                            $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
-                                        } elseif ($sPlaceGeom) {
-                                            $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
-                                        }
-
-                                        $sSQL = "select distinct i.place_id".($sOrderBySQL?', i.order_term':'')." from (";
-                                        $sSQL .= "select l.place_id".($sOrderBySQL?','.$sOrderBySQL.' as order_term':'')." from ".$sClassTable." as l";
-                                        if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
-                                        if ($sPlaceIDs) {
-                                            $sSQL .= ",placex as f where ";
-                                            $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, f.centroid, $fRange) ";
-                                        }
-                                        if ($sPlaceGeom) {
-                                            $sSQL .= " where ";
-                                            $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
-                                        }
-                                        if (sizeof($this->aExcludePlaceIDs)) {
-                                            $sSQL .= " and l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                        }
-                                        if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)";
-                                        $sSQL .= 'limit 300) i ';
-                                        if ($sOrderBySQL) $sSQL .= "order by order_term asc";
-                                        if ($this->iOffset) $sSQL .= " offset $this->iOffset";
-                                        $sSQL .= " limit $this->iLimit";
-                                        if (CONST_Debug) var_dump($sSQL);
-                                        $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
-                                    } else {
-                                        if ($aSearch['oNear']) {
-                                            $fRange = $aSearch['oNear']->radius();
-                                        }
-
-                                        $sOrderBySQL = '';
-                                        if ($oNearPoint) {
-                                            $sOrderBySQL = $oNearPoint->distanceSQL('l.geometry');
-                                        } else {
-                                            $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
-                                        }
-
-                                        $sSQL = "SELECT distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'');
-                                        $sSQL .= " FROM placex as l, placex as f ";
-                                        $sSQL .= " WHERE f.place_id in ($sPlaceIDs) ";
-                                        $sSQL .= "  AND ST_DWithin(l.geometry, f.centroid, $fRange) ";
-                                        $sSQL .= "  AND l.class='".$aSearch['sClass']."' ";
-                                        $sSQL .= "  AND l.type='".$aSearch['sType']."' ";
-                                        if (sizeof($this->aExcludePlaceIDs)) {
-                                            $sSQL .= " AND l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";
-                                        }
-                                        if ($sCountryCodesSQL) $sSQL .= " AND l.country_code in ($sCountryCodesSQL)";
-                                        if ($sOrderBy) $sSQL .= "ORDER BY ".$OrderBysSQL." ASC";
-                                        if ($this->iOffset) $sSQL .= " OFFSET $this->iOffset";
-                                        $sSQL .= " limit $this->iLimit";
-                                        if (CONST_Debug) var_dump($sSQL);
-                                        $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
-                                    }
-                                }
-                            }
-                            $aPlaceIDs = $aClassPlaceIDs;
+                    // The same result may appear in different rounds, only
+                    // use the one with minimal rank.
+                    foreach ($aNewResults as $iPlace => $oRes) {
+                        if (!isset($aResults[$iPlace])
+                            || $aResults[$iPlace]->iResultRank > $oRes->iResultRank) {
+                            $aResults[$iPlace] = $oRes;

                         }
                     }
 
                         }
                     }
 

-                    if (CONST_Debug) {
-                        echo "<br><b>Place IDs:</b> ";
-                        var_Dump($aPlaceIDs);
-                    }
+                    if ($iQueryLoop > 20) break;
+                }

 
 

-                    if (sizeof($aPlaceIDs) && $aSearch['sPostcode']) {
-                        $sSQL = 'SELECT place_id FROM placex';
-                        $sSQL .= ' WHERE place_id in ('.join(',', $aPlaceIDs).')';
-                        $sSQL .= " AND postcode = '".pg_escape_string($aSearch['sPostcode'])."'";
-                        if (CONST_Debug) var_dump($sSQL);
-                        $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                        if ($aFilteredPlaceIDs) {
-                            $aPlaceIDs = $aFilteredPlaceIDs;
-                            if (CONST_Debug) {
-                                echo "<br><b>Place IDs after postcode filtering:</b> ";
-                                var_Dump($aPlaceIDs);
-                            }
+                if (!empty($aResults)) {
+                    $aSplitResults = Result::splitResults($aResults);
+                    Debug::printVar('Split results', $aSplitResults);
+                    if ($iGroupLoop <= 4 && empty($aSplitResults['tail'])
+                        && reset($aSplitResults['head'])->iResultRank > 0) {
+                        // Haven't found an exact match for the query yet.
+                        // Therefore add result from the next group level.
+                        $aNextResults = $aSplitResults['head'];
+                        foreach ($aNextResults as $oRes) {
+                            $oRes->iResultRank--;

                         }
                         }

+                        $aResults = array();
+                    } else {
+                        $aResults = $aSplitResults['head'];

                     }
                     }

-
-                    foreach ($aPlaceIDs as $iPlaceID) {
-                        // array for placeID => -1 | Tiger housenumber
-                        $aResultPlaceIDs[$iPlaceID] = $searchedHousenumber;
-                    }
-                    if ($iQueryLoop > 20) break;

                 }
 
                 }
 

-                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {
+                if (!empty($aResults) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {

                     // Need to verify passes rank limits before dropping out of the loop (yuk!)
                     // reduces the number of place ids, like a filter
                     // rank_address is 30 for interpolated housenumbers
                     // Need to verify passes rank limits before dropping out of the loop (yuk!)
                     // reduces the number of place ids, like a filter
                     // rank_address is 30 for interpolated housenumbers

-                    $sSQL = "SELECT place_id ";
-                    $sSQL .= "FROM placex ";
-                    $sSQL .= "WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
-                    $sSQL .= "  AND (";
-                    $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                    if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
-                        $sSQL .= "     OR (extratags->'place') = 'city'";
+                    $aFilterSql = array();
+                    $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
+                    if ($sPlaceIds) {
+                        $sSQL = 'SELECT place_id FROM placex ';
+                        $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
+                        $sSQL .= '  AND (';
+                        $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                        $sSQL .= "         OR placex.rank_search between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                        if ($this->aAddressRankList) {
+                            $sSQL .= '     OR placex.rank_address in ('.join(',', $this->aAddressRankList).')';
+                        }
+                        $sSQL .= ')';
+                        $aFilterSql[] = $sSQL;

                     }
                     }

-                    if ($this->aAddressRankList) {
-                        $sSQL .= "     OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
+                    $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
+                    if ($sPlaceIds) {
+                        $sSQL = ' SELECT place_id FROM location_postcode lp ';
+                        $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
+                        $sSQL .= "  AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                        if ($this->aAddressRankList) {
+                            $sSQL .= '     OR lp.rank_address in ('.join(',', $this->aAddressRankList).')';
+                        }
+                        $sSQL .= ') ';
+                        $aFilterSql[] = $sSQL;

                     }
                     }

-                    if (CONST_Use_US_Tiger_Data) {
-                        $sSQL .= "  ) ";
-                        $sSQL .= "UNION ";
-                        $sSQL .= "  SELECT place_id ";
-                        $sSQL .= "  FROM location_property_tiger ";
-                        $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
-                        $sSQL .= "    AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',', $this->aAddressRankList).")";
+
+                    $aFilteredIDs = array();
+                    if ($aFilterSql) {
+                        $sSQL = join(' UNION ', $aFilterSql);
+                        Debug::printSQL($sSQL);
+                        $aFilteredIDs = $this->oDB->getCol($sSQL);

                     }
                     }

-                    $sSQL .= ") UNION ";
-                    $sSQL .= "  SELECT place_id ";
-                    $sSQL .= "  FROM location_property_osmline ";
-                    $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).")";
-                    $sSQL .= "    AND startnumber is not NULL AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";
-                    if (CONST_Debug) var_dump($sSQL);
-                    $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
+

                     $tempIDs = array();
                     $tempIDs = array();

-                    foreach ($aFilteredPlaceIDs as $placeID) {
-                        $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
+                    foreach ($aResults as $oResult) {
+                        if (($this->iMaxAddressRank == 30 &&
+                             ($oResult->iTable == Result::TABLE_OSMLINE
+                              || $oResult->iTable == Result::TABLE_AUX
+                              || $oResult->iTable == Result::TABLE_TIGER))
+                            || in_array($oResult->iId, $aFilteredIDs)
+                        ) {
+                            $tempIDs[$oResult->iId] = $oResult;
+                        }

                     }
                     }

-                    $aResultPlaceIDs = $tempIDs;
+                    $aResults = $tempIDs;

                 }
 
                 }
 

-                //exit;
-                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
+                if (!empty($aResults)) break;

                 if ($iGroupLoop > 4) break;
                 if ($iQueryLoop > 30) break;
             }
                 if ($iGroupLoop > 4) break;
                 if ($iQueryLoop > 30) break;
             }

-
-            // Did we find anything?
-            if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) {
-                $aSearchResults = $this->getDetails($aResultPlaceIDs);
-            }

         } else {
             // Just interpret as a reverse geocode
             $oReverse = new ReverseGeocode($this->oDB);
             $oReverse->setZoom(18);
 
         } else {
             // Just interpret as a reverse geocode
             $oReverse = new ReverseGeocode($this->oDB);
             $oReverse->setZoom(18);
 

-            $aLookup = $oReverse->lookup(
-                $oNearPoint->lat(),
-                $oNearPoint->lon(),
-                false
-            );
+            $oLookup = $oReverse->lookupPoint($oCtx->sqlNear, false);

 
 

-            if (CONST_Debug) var_dump("Reverse search", $aLookup);
+            Debug::printVar('Reverse search', $oLookup);

 
 

-            if ($aLookup['place_id']) {
-                $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
-                $aResultPlaceIDs[$aLookup['place_id']] = -1;
-            } else {
-                $aSearchResults = array();
+            if ($oLookup) {
+                $aResults = array($oLookup->iId => $oLookup);

             }
         }
 
         // No results? Done
             }
         }
 
         // No results? Done

-        if (!sizeof($aSearchResults)) {
+        if (empty($aResults)) {

             if ($this->bFallback) {
                 if ($this->fallbackStructuredQuery()) {
                     return $this->lookup();
             if ($this->bFallback) {
                 if ($this->fallbackStructuredQuery()) {
                     return $this->lookup();


@@ -1807,116 +876,82 @@ class Geocode
             return array();
         }
 
             return array();
         }
 

-        $aClassType = getClassTypesWithImportance();
+        if ($this->aAddressRankList) {
+            $this->oPlaceLookup->setAddressRankList($this->aAddressRankList);
+        }
+        $this->oPlaceLookup->setAllowedTypesSQLList($this->sAllowedTypesSQLList);
+        $this->oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
+        if ($oCtx->hasNearPoint()) {
+            $this->oPlaceLookup->setAnchorSql($oCtx->sqlNear);
+        }
+
+        $aSearchResults = $this->oPlaceLookup->lookup($aResults);
+

         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]);
         }
 
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]);
         }
 

-        if (CONST_Debug) {
-            echo '<i>Recheck words:<\i>';
-            var_dump($aRecheckWords);
-        }
-
-        $oPlaceLookup = new PlaceLookup($this->oDB);
-        $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
-        $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
-        $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
-        $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
-        $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
-        $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
+        Debug::printVar('Recheck words', $aRecheckWords);

 
 

-        foreach ($aSearchResults as $iResNum => $aResult) {
-            // Default
-            $fDiameter = getResultDiameter($aResult);
+        foreach ($aSearchResults as $iIdx => $aResult) {
+            $fRadius = ClassTypes\getDefRadius($aResult);

 
 

-            $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
+            $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fRadius);

             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }

-            
-            if ($aResult['extra_place'] == 'city') {
-                $aResult['class'] = 'place';
-                $aResult['type'] = 'city';
-                $aResult['rank_search'] = 16;
-            }

 
             // Is there an icon set for this type of result?
 
             // Is there an icon set for this type of result?

-            if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
-                && $aClassType[$aResult['class'].':'.$aResult['type']]['icon']
-            ) {
-                $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
+            $sIcon = ClassTypes\getIconFile($aResult);
+            if (isset($sIcon)) {
+                $aResult['icon'] = $sIcon;

             }
 
             }
 

-            if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'])
-                && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label']
-            ) {
-                $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'];
-            } elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
-                && $aClassType[$aResult['class'].':'.$aResult['type']]['label']
-            ) {
-                $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
-            }
-            // if tag '&addressdetails=1' is set in query
-            if ($this->bIncludeAddressDetails) {
-                // getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql
-                $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code'], $aResultPlaceIDs[$aResult['place_id']]);
-                if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) {
-                    $aResult['address'] = array_merge(array('city' => array_values($aResult['address'])[0]), $aResult['address']);
-                }
+            $sLabel = ClassTypes\getLabel($aResult);
+            if (isset($sLabel)) {
+                $aResult['label'] = $sLabel;

             }
             }

+            $aResult['name'] = $aResult['langaddress'];

 
 

-            if ($this->bIncludeExtraTags) {
-                if ($aResult['extra']) {
-                    $aResult['sExtraTags'] = json_decode($aResult['extra']);
-                } else {
-                    $aResult['sExtraTags'] = (object) array();
+            if ($oCtx->hasNearPoint()) {
+                $aResult['importance'] = 0.001;
+                $aResult['foundorder'] = $aResult['addressimportance'];
+            } else {
+                $aResult['importance'] = max(0.001, $aResult['importance']);
+                $aResult['importance'] *= $this->viewboxImportanceFactor(
+                    $aResult['lon'],
+                    $aResult['lat']
+                );
+                // Adjust importance for the number of exact string matches in the result
+                $iCountWords = 0;
+                $sAddress = $aResult['langaddress'];
+                foreach ($aRecheckWords as $i => $sWord) {
+                    if (stripos($sAddress, $sWord)!==false) {
+                        $iCountWords++;
+                        if (preg_match('/(^|,)\s*'.preg_quote($sWord, '/').'\s*(,|$)/', $sAddress)) $iCountWords += 0.1;
+                    }

                 }
                 }

-            }

 
 

-            if ($this->bIncludeNameDetails) {
-                if ($aResult['names']) {
-                    $aResult['sNameDetails'] = json_decode($aResult['names']);
+                $aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
+
+                // secondary ordering (for results with same importance (the smaller the better):
+                // - approximate importance of address parts
+                $aResult['foundorder'] = -$aResult['addressimportance']/10;
+                // - number of exact matches from the query
+                $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
+                // - importance of the class/type
+                $iClassImportance = ClassTypes\getImportance($aResult);
+                if (isset($iClassImportance)) {
+                    $aResult['foundorder'] += 0.0001 * $iClassImportance;

                 } else {
                 } else {

-                    $aResult['sNameDetails'] = (object) array();
-                }
-            }
-
-            // Adjust importance for the number of exact string matches in the result
-            $aResult['importance'] = max(0.001, $aResult['importance']);
-            $iCountWords = 0;
-            $sAddress = $aResult['langaddress'];
-            foreach ($aRecheckWords as $i => $sWord) {
-                if (stripos($sAddress, $sWord)!==false) {
-                    $iCountWords++;
-                    if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
+                    $aResult['foundorder'] += 0.01;

                 }
             }
                 }
             }

-
-            $aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
-
-            $aResult['name'] = $aResult['langaddress'];
-            // secondary ordering (for results with same importance (the smaller the better):
-            // - approximate importance of address parts
-            $aResult['foundorder'] = -$aResult['addressimportance']/10;
-            // - number of exact matches from the query
-            if (isset($this->exactMatchCache[$aResult['place_id']])) {
-                $aResult['foundorder'] -= $this->exactMatchCache[$aResult['place_id']];
-            } elseif (isset($this->exactMatchCache[$aResult['parent_place_id']])) {
-                $aResult['foundorder'] -= $this->exactMatchCache[$aResult['parent_place_id']];
-            }
-            // - importance of the class/type
-            if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-                && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']
-            ) {
-                $aResult['foundorder'] += 0.0001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
-            } else {
-                $aResult['foundorder'] += 0.01;
-            }
-            if (CONST_Debug) var_dump($aResult);
-            $aSearchResults[$iResNum] = $aResult;
+            $aSearchResults[$iIdx] = $aResult;

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

+        Debug::printVar('Pre-filter results', $aSearchResults);

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


@@ -1924,7 +959,7 @@ class Geocode
         $aSearchResults = array();
 
         $bFirst = true;
         $aSearchResults = array();
 
         $bFirst = true;

-        foreach ($aToFilter as $iResNum => $aResult) {
+        foreach ($aToFilter as $aResult) {

             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
             if ($bFirst) {
                 $fLat = $aResult['lat'];
             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
             if ($bFirst) {
                 $fLat = $aResult['lat'];


@@ -1932,7 +967,7 @@ class Geocode
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $bFirst = false;
             }
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $bFirst = false;
             }

-            if (!$this->bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
+            if (!$this->oPlaceLookup->doDeDupe() || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])

                 && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
                 && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;


@@ -1941,9 +976,32 @@ class Geocode
             }
 
             // Absolute limit on number of results
             }
 
             // Absolute limit on number of results

-            if (sizeof($aSearchResults) >= $this->iFinalLimit) break;
+            if (count($aSearchResults) >= $this->iFinalLimit) break;

         }
 
         }
 

+        Debug::printVar('Post-filter results', $aSearchResults);

         return $aSearchResults;
     } // end lookup()
         return $aSearchResults;
     } // end lookup()

+
+    public function debugInfo()
+    {
+        return array(
+                'Query' => $this->sQuery,
+                'Structured query' => $this->aStructuredQuery,
+                'Name keys' => Debug::fmtArrayVals($this->aLangPrefOrder),
+                'Excluded place IDs' => Debug::fmtArrayVals($this->aExcludePlaceIDs),
+                'Try reversed query'=> $this->bReverseInPlan,
+                'Limit (for searches)' => $this->iLimit,
+                'Limit (for results)'=> $this->iFinalLimit,
+                'Country codes' => Debug::fmtArrayVals($this->aCountryCodes),
+                'Bounded search' => $this->bBoundedSearch,
+                'Viewbox' => Debug::fmtArrayVals($this->aViewBox),
+                'Route points' => Debug::fmtArrayVals($this->aRoutePoints),
+                'Route width' => $this->aRouteWidth,
+                'Max rank' => $this->iMaxRank,
+                'Min address rank' => $this->iMinAddressRank,
+                'Max address rank' => $this->iMaxAddressRank,
+                'Address rank list' => Debug::fmtArrayVals($this->aAddressRankList)
+               );
+    }

 } // end class
 } // end class