]> git.openstreetmap.org Git - nominatim.git/blobdiff - lib/SearchDescription.php
Merge pull request #941 from mtmail/parameter-parser-tests2
[nominatim.git] / lib / SearchDescription.php
index 39f7ffca90910c9b2b416d952156982ef90fd9ec..2e72deccc4792908b8067c9cdd30f0a8762a60ad 100644 (file)
@@ -4,6 +4,7 @@ namespace Nominatim;
 
 require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php');
 require_once(CONST_BasePath.'/lib/SearchContext.php');
 
 require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php');
 require_once(CONST_BasePath.'/lib/SearchContext.php');
+require_once(CONST_BasePath.'/lib/Result.php');
 
 /**
  * Description of a single interpretation of a search query.
 
 /**
  * Description of a single interpretation of a search query.
@@ -43,27 +44,42 @@ class SearchDescription
     private $iNamePhrase = -1;
 
 
     private $iNamePhrase = -1;
 
 
+    /**
+     * Create an empty search description.
+     *
+     * @param object $oContext Global context to use. Will be inherited by
+     *                         all derived search objects.
+     */
     public function __construct($oContext)
     {
         $this->oContext = $oContext;
     }
 
     public function __construct($oContext)
     {
         $this->oContext = $oContext;
     }
 
+    /**
+     * Get current search rank.
+     *
+     * The higher the search rank the lower the likelihood that the
+     * search is a correct interpretation of the search query.
+     *
+     * @return integer Search rank.
+     */
     public function getRank()
     {
         return $this->iSearchRank;
     }
 
     public function getRank()
     {
         return $this->iSearchRank;
     }
 
-    public function addToRank($iAddRank)
-    {
-        $this->iSearchRank += $iAddRank;
-        return $this->iSearchRank;
-    }
-
-    public function getPostCode()
-    {
-        return $this->sPostcode;
-    }
-
+    /**
+     * Make this search a POI search.
+     *
+     * In a POI search, objects are not (only) searched by their name
+     * but also by the primary OSM key/value pair (class and type in Nominatim).
+     *
+     * @param integer $iOperator Type of POI search
+     * @param string  $sClass    Class (or OSM tag key) of POI.
+     * @param string  $sType     Type (or OSM tag value) of POI.
+     *
+     * @return void
+     */
     public function setPoiSearch($iOperator, $sClass, $sType)
     {
         $this->iOperator = $iOperator;
     public function setPoiSearch($iOperator, $sClass, $sType)
     {
         $this->iOperator = $iOperator;
@@ -71,22 +87,11 @@ class SearchDescription
         $this->sType = $sType;
     }
 
         $this->sType = $sType;
     }
 
-    public function isNamedSearch()
-    {
-        return sizeof($this->aName) > 0 || sizeof($this->aAddress) > 0;
-    }
-
-    public function isCountrySearch()
-    {
-        return $this->sCountryCode && sizeof($this->aName) == 0
-               && !$this->iOperator && !$this->oContext->hasNearPoint();
-    }
-
-    public function isPoiSearch()
-    {
-        return (bool) $this->sClass;
-    }
-
+    /**
+     * Check if this might be a full address search.
+     *
+     * @return bool True if the search contains name, address and housenumber.
+     */
     public function looksLikeFullAddress()
     {
         return sizeof($this->aName)
     public function looksLikeFullAddress()
     {
         return sizeof($this->aName)
@@ -94,38 +99,27 @@ class SearchDescription
                && preg_match('/[0-9]+/', $this->sHouseNumber);
     }
 
                && preg_match('/[0-9]+/', $this->sHouseNumber);
     }
 
-    public function isOperator($iType)
-    {
-        return $this->iOperator == $iType;
-    }
-
-    public function hasHouseNumber()
-    {
-        return (bool) $this->sHouseNumber;
-    }
-
-    private function poiTable()
-    {
-        return 'place_classtype_'.$this->sClass.'_'.$this->sType;
-    }
-
-    public function countryCodeSQL($sVar)
-    {
-        if ($this->sCountryCode) {
-            return $sVar.' = \''.$this->sCountryCode."'";
-        }
-        if ($this->oContext->sqlCountryList) {
-            return $sVar.' in '.$this->oContext->sqlCountryList;
-        }
-
-        return '';
-    }
-
+    /**
+     * Check if any operator is set.
+     *
+     * @return bool True, if this is a special search operation.
+     */
     public function hasOperator()
     {
         return $this->iOperator != Operator::NONE;
     }
 
     public function hasOperator()
     {
         return $this->iOperator != Operator::NONE;
     }
 
+    /**
+     * Extract key/value pairs from a query.
+     *
+     * Key/value pairs are recognised if they are of the form [<key>=<value>].
+     * If multiple terms of this kind are found then all terms are removed
+     * but only the first is used for search.
+     *
+     * @param string $sQuery Original query string.
+     *
+     * @return string The query string with the special search patterns removed.
+     */
     public function extractKeyValuePairs($sQuery)
     {
         // Search for terms of kind [<key>=<value>].
     public function extractKeyValuePairs($sQuery)
     {
         // Search for terms of kind [<key>=<value>].
@@ -146,18 +140,20 @@ class SearchDescription
         return $sQuery;
     }
 
         return $sQuery;
     }
 
-    public function isValidSearch(&$aCountryCodes)
+    /**
+     * Check if the combination of parameters is sensible.
+     *
+     * @return bool True, if the search looks valid.
+     */
+    public function isValidSearch()
     {
         if (!sizeof($this->aName)) {
             if ($this->sHouseNumber) {
                 return false;
             }
     {
         if (!sizeof($this->aName)) {
             if ($this->sHouseNumber) {
                 return false;
             }
-        }
-        if ($aCountryCodes
-            && $this->sCountryCode
-            && !in_array($this->sCountryCode, $aCountryCodes)
-        ) {
-            return false;
+            if (!$this->sClass && !$this->sCountryCode) {
+                return false;
+            }
         }
 
         return true;
         }
 
         return true;
@@ -166,7 +162,22 @@ class SearchDescription
     /////////// Search building functions
 
 
     /////////// Search building functions
 
 
-    public function extendWithFullTerm($aSearchTerm, $bWordInQuery, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken, &$iGlobalRank)
+    /**
+     * Derive new searches by adding a full term to the existing search.
+     *
+     * @param mixed[] $aSearchTerm  Description of the token.
+     * @param bool    $bHasPartial  True if there are also tokens of partial terms
+     *                              with the same name.
+     * @param string  $sPhraseType  Type of phrase the token is contained in.
+     * @param bool    $bFirstToken  True if the token is at the beginning of the
+     *                              query.
+     * @param bool    $bFirstPhrase True if the token is in the first phrase of
+     *                              the query.
+     * @param bool    $bLastToken   True if the token is at the end of the query.
+     *
+     * @return SearchDescription[] List of derived search descriptions.
+     */
+    public function extendWithFullTerm($aSearchTerm, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken)
     {
         $aNewSearches = array();
 
     {
         $aNewSearches = array();
 
@@ -184,12 +195,6 @@ class SearchDescription
                     $oSearch->iSearchRank += 5;
                 }
                 $aNewSearches[] = $oSearch;
                     $oSearch->iSearchRank += 5;
                 }
                 $aNewSearches[] = $oSearch;
-
-                // If it is at the beginning, we can be almost sure that
-                // the terms are in the wrong order. Increase score for all searches.
-                if ($bFirstToken) {
-                    $iGlobalRank++;
-                }
             }
         } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode')
                   && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'postcode'
             }
         } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode')
                   && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'postcode'
@@ -197,7 +202,8 @@ class SearchDescription
             // 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.
             // 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 (!$this->sPostcode && $bWordInQuery
+            if (!$this->sPostcode
+                && $aSearchTerm['word']
                 && pg_escape_string($aSearchTerm['word']) == $aSearchTerm['word']
             ) {
                 // If we have structured search or this is the first term,
                 && pg_escape_string($aSearchTerm['word']) == $aSearchTerm['word']
             ) {
                 // If we have structured search or this is the first term,
@@ -234,34 +240,29 @@ class SearchDescription
                 $oSearch->sHouseNumber = trim($aSearchTerm['word_token']);
                 // sanity check: if the housenumber is not mainly made
                 // up of numbers, add a penalty
                 $oSearch->sHouseNumber = trim($aSearchTerm['word_token']);
                 // sanity check: if the housenumber is not mainly made
                 // up of numbers, add a penalty
-                if (preg_match_all("/[^0-9]/", $oSearch->sHouseNumber, $aMatches) > 2) {
+                if (preg_match_all('/[^0-9]/', $oSearch->sHouseNumber, $aMatches) > 2) {
                     $oSearch->iSearchRank++;
                 }
                 if (!isset($aSearchTerm['word_id'])) {
                     $oSearch->iSearchRank++;
                 }
                 // also must not appear in the middle of the address
                     $oSearch->iSearchRank++;
                 }
                 if (!isset($aSearchTerm['word_id'])) {
                     $oSearch->iSearchRank++;
                 }
                 // also must not appear in the middle of the address
-                if (sizeof($this->aAddress) || sizeof($this->aAddressNonSearch)) {
+                if (sizeof($this->aAddress)
+                    || sizeof($this->aAddressNonSearch)
+                    || $this->sPostcode
+                ) {
                     $oSearch->iSearchRank++;
                 }
                 $aNewSearches[] = $oSearch;
             }
                     $oSearch->iSearchRank++;
                 }
                 $aNewSearches[] = $oSearch;
             }
-        } 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 ($this->iOperator == Operator::NONE
-                && (isset($aSearchTerm['word']) && $aSearchTerm['word'])
-                && $bWordInQuery
-            ) {
+        } elseif ($sPhraseType == '' && $aSearchTerm['class']) {
+            if ($this->iOperator == Operator::NONE) {
                 $oSearch = clone $this;
                 $oSearch->iSearchRank++;
 
                 $iOp = Operator::NEAR; // near == in for the moment
                 if ($aSearchTerm['operator'] == '') {
                 $oSearch = clone $this;
                 $oSearch->iSearchRank++;
 
                 $iOp = Operator::NEAR; // near == in for the moment
                 if ($aSearchTerm['operator'] == '') {
-                    if (sizeof($this->aName)) {
+                    if (sizeof($this->aName) || $this->oContext->isBoundedSearch()) {
                         $iOp = Operator::NAME;
                     }
                     $oSearch->iSearchRank += 2;
                         $iOp = Operator::NAME;
                     }
                     $oSearch->iSearchRank += 2;
@@ -270,13 +271,17 @@ class SearchDescription
                 $oSearch->setPoiSearch($iOp, $aSearchTerm['class'], $aSearchTerm['type']);
                 $aNewSearches[] = $oSearch;
             }
                 $oSearch->setPoiSearch($iOp, $aSearchTerm['class'], $aSearchTerm['type']);
                 $aNewSearches[] = $oSearch;
             }
-        } elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
+        } elseif (isset($aSearchTerm['word_id'])
+                  && $aSearchTerm['word_id']
+                  && $sPhraseType != 'country'
+        ) {
             $iWordID = $aSearchTerm['word_id'];
             $iWordID = $aSearchTerm['word_id'];
-            if (sizeof($this->aName)) {
-                if (($sPhraseType == '' || !$bFirstPhrase)
-                    && $sPhraseType != 'country'
-                    && !$bHasPartial
-                ) {
+            // Full words can only be a name if they appear at the beginning
+            // of the phrase. In structured search the name must forcably in
+            // the first phrase. In unstructured search it may be in a later
+            // phrase when the first phrase is a house number.
+            if (sizeof($this->aName) || !($bFirstPhrase || $sPhraseType == '')) {
+                if (($sPhraseType == '' || !$bFirstPhrase) && !$bHasPartial) {
                     $oSearch = clone $this;
                     $oSearch->iSearchRank++;
                     $oSearch->aAddress[$iWordID] = $iWordID;
                     $oSearch = clone $this;
                     $oSearch->iSearchRank++;
                     $oSearch->aAddress[$iWordID] = $iWordID;
@@ -295,7 +300,18 @@ class SearchDescription
         return $aNewSearches;
     }
 
         return $aNewSearches;
     }
 
-    public function extendWithPartialTerm($aSearchTerm, $bStructuredPhrases, $iPhrase, &$aWordFrequencyScores, $aFullTokens)
+    /**
+     * Derive new searches by adding a partial term to the existing search.
+     *
+     * @param mixed[] $aSearchTerm        Description of the token.
+     * @param bool    $bStructuredPhrases True if the search is structured.
+     * @param integer $iPhrase            Number of the phrase the token is in.
+     * @param array[] $aFullTokens        List of full term tokens with the
+     *                                    same name.
+     *
+     * @return SearchDescription[] List of derived search descriptions.
+     */
+    public function extendWithPartialTerm($aSearchTerm, $bStructuredPhrases, $iPhrase, $aFullTokens)
     {
         // Only allow name terms.
         if (!(isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])) {
     {
         // Only allow name terms.
         if (!(isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])) {
@@ -309,9 +325,9 @@ class SearchDescription
             && sizeof($this->aName)
             && strpos($aSearchTerm['word_token'], ' ') === false
         ) {
             && sizeof($this->aName)
             && strpos($aSearchTerm['word_token'], ' ') === false
         ) {
-            if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
+            if ($aSearchTerm['search_name_count'] + 1 < CONST_Max_Word_Frequency) {
                 $oSearch = clone $this;
                 $oSearch = clone $this;
-                $oSearch->iSearchRank++;
+                $oSearch->iSearchRank += 2;
                 $oSearch->aAddress[$iWordID] = $iWordID;
                 $aNewSearches[] = $oSearch;
             } else {
                 $oSearch->aAddress[$iWordID] = $iWordID;
                 $aNewSearches[] = $oSearch;
             } else {
@@ -345,14 +361,14 @@ class SearchDescription
             && (!sizeof($this->aName) || $this->iNamePhrase == $iPhrase)
         ) {
             $oSearch = clone $this;
             && (!sizeof($this->aName) || $this->iNamePhrase == $iPhrase)
         ) {
             $oSearch = clone $this;
-            $oSearch->iSearchRank++;
+            $oSearch->iSearchRank += 2;
             if (!sizeof($this->aName)) {
                 $oSearch->iSearchRank += 1;
             }
             if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) {
                 $oSearch->iSearchRank += 2;
             }
             if (!sizeof($this->aName)) {
                 $oSearch->iSearchRank += 1;
             }
             if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) {
                 $oSearch->iSearchRank += 2;
             }
-            if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
+            if ($aSearchTerm['search_name_count'] + 1 < CONST_Max_Word_Frequency) {
                 $oSearch->aName[$iWordID] = $iWordID;
             } else {
                 $oSearch->aNameNonSearch[$iWordID] = $iWordID;
                 $oSearch->aName[$iWordID] = $iWordID;
             } else {
                 $oSearch->aNameNonSearch[$iWordID] = $iWordID;
@@ -367,7 +383,105 @@ class SearchDescription
     /////////// Query functions
 
 
     /////////// Query functions
 
 
-    public function queryCountry(&$oDB)
+    /**
+     * Query database for places that match this search.
+     *
+     * @param object  $oDB                  Database connection to use.
+     * @param mixed[] $aWordFrequencyScores Number of times tokens appears
+     *                                      overall in a planet database.
+     * @param integer $iMinRank             Minimum address rank to restrict
+     *                                      search to.
+     * @param integer $iMaxRank             Maximum address rank to restrict
+     *                                      search to.
+     * @param integer $iLimit               Maximum number of results.
+     *
+     * @return mixed[] An array with two fields: IDs contains the list of
+     *                 matching place IDs and houseNumber the houseNumber
+     *                 if appicable or -1 if not.
+     */
+    public function query(&$oDB, &$aWordFrequencyScores, $iMinRank, $iMaxRank, $iLimit)
+    {
+        $aResults = array();
+        $iHousenumber = -1;
+
+        if ($this->sCountryCode
+            && !sizeof($this->aName)
+            && !$this->iOperator
+            && !$this->sClass
+            && !$this->oContext->hasNearPoint()
+        ) {
+            // Just looking for a country - look it up
+            if (4 >= $iMinRank && 4 <= $iMaxRank) {
+                $aResults = $this->queryCountry($oDB);
+            }
+        } elseif (!sizeof($this->aName) && !sizeof($this->aAddress)) {
+            // Neither name nor address? Then we must be
+            // looking for a POI in a geographic area.
+            if ($this->oContext->isBoundedSearch()) {
+                $aResults = $this->queryNearbyPoi($oDB, $iLimit);
+            }
+        } elseif ($this->iOperator == Operator::POSTCODE) {
+            // looking for postcode
+            $aResults = $this->queryPostcode($oDB, $iLimit);
+        } else {
+            // Ordinary search:
+            // First search for places according to name and address.
+            $aResults = $this->queryNamedPlace(
+                $oDB,
+                $aWordFrequencyScores,
+                $iMinRank,
+                $iMaxRank,
+                $iLimit
+            );
+
+            //now search for housenumber, if housenumber provided
+            if ($this->sHouseNumber && sizeof($aResults)) {
+                $aNamedPlaceIDs = $aResults;
+                $aResults = $this->queryHouseNumber($oDB, $aNamedPlaceIDs, $iLimit);
+
+                if (!sizeof($aResults) && $this->looksLikeFullAddress()) {
+                    $aResults = $aNamedPlaceIDs;
+                }
+            }
+
+            // finally get POIs if requested
+            if ($this->sClass && sizeof($aResults)) {
+                $aResults = $this->queryPoiByOperator($oDB, $aResults, $iLimit);
+            }
+        }
+
+        if (CONST_Debug) {
+            echo '<br><b>Place IDs:</b> ';
+            var_dump(array_keys($aResults));
+        }
+
+        if (sizeof($aResults) && $this->sPostcode) {
+            $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
+            if ($sPlaceIds) {
+                $sSQL = 'SELECT place_id FROM placex';
+                $sSQL .= ' WHERE place_id in ('.$sPlaceIds.')';
+                $sSQL .= " AND postcode = '".$this->sPostcode."'";
+                if (CONST_Debug) var_dump($sSQL);
+                $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL));
+                if ($aFilteredPlaceIDs) {
+                    $aNewResults = array();
+                    foreach ($aFilteredPlaceIDs as $iPlaceId) {
+                        $aNewResults[$iPlaceId] = $aResults[$iPlaceId];
+                    }
+                    $aResults = $aNewResults;
+                    if (CONST_Debug) {
+                        echo '<br><b>Place IDs after postcode filtering:</b> ';
+                        var_dump(array_keys($aResults));
+                    }
+                }
+            }
+        }
+
+        return $aResults;
+    }
+
+
+    private function queryCountry(&$oDB)
     {
         $sSQL = 'SELECT place_id FROM placex ';
         $sSQL .= "WHERE country_code='".$this->sCountryCode."'";
     {
         $sSQL = 'SELECT place_id FROM placex ';
         $sSQL .= "WHERE country_code='".$this->sCountryCode."'";
@@ -375,19 +489,25 @@ class SearchDescription
         if ($this->oContext->bViewboxBounded) {
             $sSQL .= ' AND ST_Intersects('.$this->oContext->sqlViewboxSmall.', geometry)';
         }
         if ($this->oContext->bViewboxBounded) {
             $sSQL .= ' AND ST_Intersects('.$this->oContext->sqlViewboxSmall.', geometry)';
         }
-        $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";
+        $sSQL .= ' ORDER BY st_area(geometry) DESC LIMIT 1';
 
         if (CONST_Debug) var_dump($sSQL);
 
 
         if (CONST_Debug) var_dump($sSQL);
 
-        return chksql($oDB->getCol($sSQL));
+        $aResults = array();
+        foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+            $aResults[$iPlaceId] = new Result($iPlaceId);
+        }
+
+        return $aResults;
     }
 
     }
 
-    public function queryNearbyPoi(&$oDB, $iLimit)
+    private function queryNearbyPoi(&$oDB, $iLimit)
     {
         if (!$this->sClass) {
             return array();
         }
 
     {
         if (!$this->sClass) {
             return array();
         }
 
+        $aDBResults = array();
         $sPoiTable = $this->poiTable();
 
         $sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'";
         $sPoiTable = $this->poiTable();
 
         $sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'";
@@ -398,7 +518,7 @@ class SearchDescription
             }
             if ($this->oContext->hasNearPoint()) {
                 $sSQL .= ' WHERE '.$this->oContext->withinSQL('ct.centroid');
             }
             if ($this->oContext->hasNearPoint()) {
                 $sSQL .= ' WHERE '.$this->oContext->withinSQL('ct.centroid');
-            } else if ($this->oContext->bViewboxBounded) {
+            } elseif ($this->oContext->bViewboxBounded) {
                 $sSQL .= ' WHERE ST_Contains('.$this->oContext->sqlViewboxSmall.', ct.centroid)';
             }
             if ($this->oContext->sqlCountryList) {
                 $sSQL .= ' WHERE ST_Contains('.$this->oContext->sqlViewboxSmall.', ct.centroid)';
             }
             if ($this->oContext->sqlCountryList) {
@@ -413,7 +533,7 @@ class SearchDescription
             }
             $sSQL .= " limit $iLimit";
             if (CONST_Debug) var_dump($sSQL);
             }
             $sSQL .= " limit $iLimit";
             if (CONST_Debug) var_dump($sSQL);
-            return chksql($oDB->getCol($sSQL));
+            $aDBResults = chksql($oDB->getCol($sSQL));
         }
 
         if ($this->oContext->hasNearPoint()) {
         }
 
         if ($this->oContext->hasNearPoint()) {
@@ -424,16 +544,21 @@ class SearchDescription
             if ($this->oContext->sqlCountryList) {
                 $sSQL .= ' AND country_code in '.$this->oContext->sqlCountryList;
             }
             if ($this->oContext->sqlCountryList) {
                 $sSQL .= ' AND country_code in '.$this->oContext->sqlCountryList;
             }
-            $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid')." ASC";
+            $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid').' ASC';
             $sSQL .= " LIMIT $iLimit";
             if (CONST_Debug) var_dump($sSQL);
             $sSQL .= " LIMIT $iLimit";
             if (CONST_Debug) var_dump($sSQL);
-            return chksql($oDB->getCol($sSQL));
+            $aDBResults = chksql($oDB->getCol($sSQL));
+        }
+
+        $aResults = array();
+        foreach ($aDBResults as $iPlaceId) {
+            $aResults[$iPlaceId] = new Result($iPlaceId);
         }
 
         }
 
-        return array();
+        return $aResults;
     }
 
     }
 
-    public function queryPostcode(&$oDB, $iLimit)
+    private function queryPostcode(&$oDB, $iLimit)
     {
         $sSQL = 'SELECT p.place_id FROM location_postcode p ';
 
     {
         $sSQL = 'SELECT p.place_id FROM location_postcode p ';
 
@@ -453,10 +578,15 @@ class SearchDescription
 
         if (CONST_Debug) var_dump($sSQL);
 
 
         if (CONST_Debug) var_dump($sSQL);
 
-        return chksql($oDB->getCol($sSQL));
+        $aResults = array();
+        foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+            $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_POSTCODE);
+        }
+
+        return $aResults;
     }
 
     }
 
-    public function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
+    private function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
     {
         $aTerms = array();
         $aOrder = array();
     {
         $aTerms = array();
         $aOrder = array();
@@ -509,13 +639,13 @@ class SearchDescription
         }
 
         if ($this->sHouseNumber) {
         }
 
         if ($this->sHouseNumber) {
-            $aTerms[] = "address_rank between 16 and 27";
+            $aTerms[] = 'address_rank between 16 and 27';
         } elseif (!$this->sClass || $this->iOperator == Operator::NAME) {
             if ($iMinAddressRank > 0) {
         } elseif (!$this->sClass || $this->iOperator == Operator::NAME) {
             if ($iMinAddressRank > 0) {
-                $aTerms[] = "address_rank >= ".$iMinAddressRank;
+                $aTerms[] = 'address_rank >= '.$iMinAddressRank;
             }
             if ($iMaxAddressRank < 30) {
             }
             if ($iMaxAddressRank < 30) {
-                $aTerms[] = "address_rank <= ".$iMaxAddressRank;
+                $aTerms[] = 'address_rank <= '.$iMaxAddressRank;
             }
         }
 
             }
         }
 
@@ -546,7 +676,7 @@ class SearchDescription
         if ($this->sHouseNumber) {
             $sImportanceSQL = '- abs(26 - address_rank) + 3';
         } else {
         if ($this->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)';
+            $sImportanceSQL = '(CASE WHEN importance = 0 OR importance IS NULL THEN 0.75001-(search_rank::float/40) ELSE importance END)';
         }
         $sImportanceSQL .= $this->oContext->viewboxImportanceSQL('centroid');
         $aOrder[] = "$sImportanceSQL DESC";
         }
         $sImportanceSQL .= $this->oContext->viewboxImportanceSQL('centroid');
         $aOrder[] = "$sImportanceSQL DESC";
@@ -568,6 +698,8 @@ class SearchDescription
             $iLimit = 20;
         }
 
             $iLimit = 20;
         }
 
+        $aResults = array();
+
         if (sizeof($aTerms)) {
             $sSQL = 'SELECT place_id,'.$sExactMatchSQL;
             $sSQL .= ' FROM search_name';
         if (sizeof($aTerms)) {
             $sSQL = 'SELECT place_id,'.$sExactMatchSQL;
             $sSQL .= ' FROM search_name';
@@ -577,18 +709,29 @@ class SearchDescription
 
             if (CONST_Debug) var_dump($sSQL);
 
 
             if (CONST_Debug) var_dump($sSQL);
 
-            return chksql(
+            $aDBResults = chksql(
                 $oDB->getAll($sSQL),
                 $oDB->getAll($sSQL),
-                "Could not get places for search terms."
+                'Could not get places for search terms.'
             );
             );
+
+            foreach ($aDBResults as $aResult) {
+                $oResult = new Result($aResult['place_id']);
+                $oResult->iExactMatches = $aResult['exactmatch'];
+                $aResults[$aResult['place_id']] = $oResult;
+            }
         }
 
         }
 
-        return array();
+        return $aResults;
     }
 
     }
 
-    public function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
+    private function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
     {
     {
-        $sPlaceIDs = join(',', $aRoadPlaceIDs);
+        $aResults = array();
+        $sPlaceIDs = Result::joinIdsByTable($aRoadPlaceIDs, Result::TABLE_PLACEX);
+
+        if (!$sPlaceIDs) {
+            return $aResults;
+        }
 
         $sHouseNumberRegex = '\\\\m'.$this->sHouseNumber.'\\\\M';
         $sSQL = 'SELECT place_id FROM placex ';
 
         $sHouseNumberRegex = '\\\\m'.$this->sHouseNumber.'\\\\M';
         $sSQL = 'SELECT place_id FROM placex ';
@@ -599,15 +742,14 @@ class SearchDescription
 
         if (CONST_Debug) var_dump($sSQL);
 
 
         if (CONST_Debug) var_dump($sSQL);
 
-        $aPlaceIDs = chksql($oDB->getCol($sSQL));
-
-        if (sizeof($aPlaceIDs)) {
-            return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
+        // XXX should inherit the exactMatches from its parent
+        foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+            $aResults[$iPlaceId] = new Result($iPlaceId);
         }
 
         $bIsIntHouseNumber= (bool) preg_match('/[0-9]+/', $this->sHouseNumber);
         $iHousenumber = intval($this->sHouseNumber);
         }
 
         $bIsIntHouseNumber= (bool) preg_match('/[0-9]+/', $this->sHouseNumber);
         $iHousenumber = intval($this->sHouseNumber);
-        if ($bIsIntHouseNumber) {
+        if ($bIsIntHouseNumber && !sizeof($aResults)) {
             // if nothing found, search in the interpolation line table
             $sSQL = 'SELECT distinct place_id FROM location_property_osmline';
             $sSQL .= ' WHERE startnumber is not NULL';
             // if nothing found, search in the interpolation line table
             $sSQL = 'SELECT distinct place_id FROM location_property_osmline';
             $sSQL .= ' WHERE startnumber is not NULL';
@@ -621,22 +763,22 @@ class SearchDescription
                 $sSQL .= "interpolationtype='odd'";
             }
             $sSQL .= " or interpolationtype='all') and ";
                 $sSQL .= "interpolationtype='odd'";
             }
             $sSQL .= " or interpolationtype='all') and ";
-            $sSQL .= $iHousenumber.">=startnumber and ";
-            $sSQL .= $iHousenumber."<=endnumber";
+            $sSQL .= $iHousenumber.'>=startnumber and ';
+            $sSQL .= $iHousenumber.'<=endnumber';
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
             $sSQL .= " limit $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
             $sSQL .= " limit $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
-            $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
-
-            if (sizeof($aPlaceIDs)) {
-                return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
+            foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                $oResult = new Result($iPlaceId, Result::TABLE_OSMLINE);
+                $oResult->iHouseNumber = $iHousenumber;
+                $aResults[$iPlaceId] = $oResult;
             }
         }
 
         // If nothing found try the aux fallback table
             }
         }
 
         // If nothing found try the aux fallback table
-        if (CONST_Use_Aux_Location_data) {
+        if (CONST_Use_Aux_Location_data && !sizeof($aResults)) {
             $sSQL = 'SELECT place_id FROM location_property_aux';
             $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.')';
             $sSQL .= " AND housenumber = '".$this->sHouseNumber."'";
             $sSQL = 'SELECT place_id FROM location_property_aux';
             $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.')';
             $sSQL .= " AND housenumber = '".$this->sHouseNumber."'";
@@ -645,16 +787,14 @@ class SearchDescription
 
             if (CONST_Debug) var_dump($sSQL);
 
 
             if (CONST_Debug) var_dump($sSQL);
 
-            $aPlaceIDs = chksql($oDB->getCol($sSQL));
-
-            if (sizeof($aPlaceIDs)) {
-                return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
+            foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                $aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_AUX);
             }
         }
 
         // If nothing found then search in Tiger data (location_property_tiger)
             }
         }
 
         // If nothing found then search in Tiger data (location_property_tiger)
-        if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber) {
-            $sSQL = 'SELECT distinct place_id FROM location_property_tiger';
+        if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber && !sizeof($aResults)) {
+            $sSQL = 'SELECT place_id FROM location_property_tiger';
             $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.') and (';
             if ($iHousenumber % 2 == 0) {
                 $sSQL .= "interpolationtype='even'";
             $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.') and (';
             if ($iHousenumber % 2 == 0) {
                 $sSQL .= "interpolationtype='even'";
@@ -662,28 +802,32 @@ class SearchDescription
                 $sSQL .= "interpolationtype='odd'";
             }
             $sSQL .= " or interpolationtype='all') and ";
                 $sSQL .= "interpolationtype='odd'";
             }
             $sSQL .= " or interpolationtype='all') and ";
-            $sSQL .= $iHousenumber.">=startnumber and ";
-            $sSQL .= $iHousenumber."<=endnumber";
+            $sSQL .= $iHousenumber.'>=startnumber and ';
+            $sSQL .= $iHousenumber.'<=endnumber';
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
             $sSQL .= " limit $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
             $sSQL .= " limit $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
-            $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
-
-            if (sizeof($aPlaceIDs)) {
-                return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
+            foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                $oResult = new Result($iPlaceId, Result::TABLE_TIGER);
+                $oResult->iHouseNumber = $iHousenumber;
+                $aResults[$iPlaceId] = $oResult;
             }
         }
 
             }
         }
 
-        return array();
+        return $aResults;
     }
 
 
     }
 
 
-    public function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
+    private function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
     {
     {
-        $sPlaceIDs = join(',', $aParentIDs);
-        $aClassPlaceIDs = array();
+        $aResults = array();
+        $sPlaceIDs = Result::joinIdsByTable($aParentIDs, Result::TABLE_PLACEX);
+
+        if (!$sPlaceIDs) {
+            return $aResults;
+        }
 
         if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NAME) {
             // If they were searching for a named class (i.e. 'Kings Head pub')
 
         if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NAME) {
             // If they were searching for a named class (i.e. 'Kings Head pub')
@@ -692,14 +836,16 @@ class SearchDescription
             $sSQL .= " WHERE place_id in ($sPlaceIDs)";
             $sSQL .= "   AND class='".$this->sClass."' ";
             $sSQL .= "   AND type='".$this->sType."'";
             $sSQL .= " WHERE place_id in ($sPlaceIDs)";
             $sSQL .= "   AND class='".$this->sClass."' ";
             $sSQL .= "   AND type='".$this->sType."'";
-            $sSQL .= "   AND linked_place_id is null";
+            $sSQL .= '   AND linked_place_id is null';
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
             $sSQL .= $this->oContext->excludeSQL(' AND place_id');
-            $sSQL .= " ORDER BY rank_search ASC ";
+            $sSQL .= ' ORDER BY rank_search ASC ';
             $sSQL .= " LIMIT $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
             $sSQL .= " LIMIT $iLimit";
 
             if (CONST_Debug) var_dump($sSQL);
 
-            $aClassPlaceIDs = chksql($oDB->getCol($sSQL));
+            foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                $aResults[$iPlaceId] = new Result($iPlaceId);
+            }
         }
 
         // NEAR and IN are handled the same
         }
 
         // NEAR and IN are handled the same
@@ -720,8 +866,8 @@ class SearchDescription
                 $sSQL .= " WHERE place_id in ($sPlaceIDs)";
                 $sSQL .= "   AND rank_search < $iMaxRank + 5";
                 $sSQL .= "   AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')";
                 $sSQL .= " WHERE place_id in ($sPlaceIDs)";
                 $sSQL .= "   AND rank_search < $iMaxRank + 5";
                 $sSQL .= "   AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')";
-                $sSQL .= " ORDER BY rank_search ASC ";
-                $sSQL .= " LIMIT 1";
+                $sSQL .= ' ORDER BY rank_search ASC ';
+                $sSQL .= ' LIMIT 1';
                 if (CONST_Debug) var_dump($sSQL);
                 $sPlaceGeom = chksql($oDB->getOne($sSQL));
             }
                 if (CONST_Debug) var_dump($sSQL);
                 $sPlaceGeom = chksql($oDB->getOne($sSQL));
             }
@@ -747,7 +893,7 @@ class SearchDescription
                     if ($this->oContext->hasNearPoint()) {
                         $sOrderBySQL = $this->oContext->distanceSQL('l.centroid');
                     } elseif ($sPlaceIDs) {
                     if ($this->oContext->hasNearPoint()) {
                         $sOrderBySQL = $this->oContext->distanceSQL('l.centroid');
                     } elseif ($sPlaceIDs) {
-                        $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
+                        $sOrderBySQL = 'ST_Distance(l.centroid, f.geometry)';
                     } elseif ($sPlaceGeom) {
                         $sOrderBySQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
                     }
                     } elseif ($sPlaceGeom) {
                         $sOrderBySQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
                     }
@@ -763,7 +909,7 @@ class SearchDescription
                     $sSQL .= ' from '.$sClassTable.' as l';
 
                     if ($sPlaceIDs) {
                     $sSQL .= ' from '.$sClassTable.' as l';
 
                     if ($sPlaceIDs) {
-                        $sSQL .= ",placex as f WHERE ";
+                        $sSQL .= ',placex as f WHERE ';
                         $sSQL .= "f.place_id in ($sPlaceIDs) ";
                         $sSQL .= " AND ST_DWithin(l.centroid, f.centroid, $fRange)";
                     } elseif ($sPlaceGeom) {
                         $sSQL .= "f.place_id in ($sPlaceIDs) ";
                         $sSQL .= " AND ST_DWithin(l.centroid, f.centroid, $fRange)";
                     } elseif ($sPlaceGeom) {
@@ -779,7 +925,9 @@ class SearchDescription
 
                     if (CONST_Debug) var_dump($sSQL);
 
 
                     if (CONST_Debug) var_dump($sSQL);
 
-                    $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
+                    foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                        $aResults[$iPlaceId] = new Result($iPlaceId);
+                    }
                 } else {
                     if ($this->oContext->hasNearPoint()) {
                         $fRange = $this->oContext->nearRadius();
                 } else {
                     if ($this->oContext->hasNearPoint()) {
                         $fRange = $this->oContext->nearRadius();
@@ -789,7 +937,7 @@ class SearchDescription
                     if ($this->oContext->hasNearPoint()) {
                         $sOrderBySQL = $this->oContext->distanceSQL('l.geometry');
                     } else {
                     if ($this->oContext->hasNearPoint()) {
                         $sOrderBySQL = $this->oContext->distanceSQL('l.geometry');
                     } else {
-                        $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
+                        $sOrderBySQL = 'ST_Distance(l.geometry, f.geometry)';
                     }
 
                     $sSQL = 'SELECT distinct l.place_id';
                     }
 
                     $sSQL = 'SELECT distinct l.place_id';
@@ -803,20 +951,38 @@ class SearchDescription
                     $sSQL .= "  AND l.type='".$this->sType."'";
                     $sSQL .= $this->oContext->excludeSQL(' AND l.place_id');
                     if ($sOrderBySQL) {
                     $sSQL .= "  AND l.type='".$this->sType."'";
                     $sSQL .= $this->oContext->excludeSQL(' AND l.place_id');
                     if ($sOrderBySQL) {
-                        $sSQL .= "ORDER BY orderterm ASC";
+                        $sSQL .= 'ORDER BY orderterm ASC';
                     }
                     $sSQL .= " limit $iLimit";
 
                     if (CONST_Debug) var_dump($sSQL);
 
                     }
                     $sSQL .= " limit $iLimit";
 
                     if (CONST_Debug) var_dump($sSQL);
 
-                    $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
+                    foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
+                        $aResults[$iPlaceId] = new Result($iPlaceId);
+                    }
                 }
             }
         }
 
                 }
             }
         }
 
-        return $aClassPlaceIDs;
+        return $aResults;
+    }
+
+    private function poiTable()
+    {
+        return 'place_classtype_'.$this->sClass.'_'.$this->sType;
     }
 
     }
 
+    private function countryCodeSQL($sVar)
+    {
+        if ($this->sCountryCode) {
+            return $sVar.' = \''.$this->sCountryCode."'";
+        }
+        if ($this->oContext->sqlCountryList) {
+            return $sVar.' in '.$this->oContext->sqlCountryList;
+        }
+
+        return '';
+    }
 
     /////////// Sort functions
 
 
     /////////// Sort functions
 
@@ -840,19 +1006,19 @@ class SearchDescription
             return $aWordIDs[$k];
         };
 
             return $aWordIDs[$k];
         };
 
-        echo "<tr>";
+        echo '<tr>';
         echo "<td>$this->iSearchRank</td>";
         echo "<td>$this->iSearchRank</td>";
-        echo "<td>".join(', ', array_map($kf, $this->aName))."</td>";
-        echo "<td>".join(', ', array_map($kf, $this->aNameNonSearch))."</td>";
-        echo "<td>".join(', ', array_map($kf, $this->aAddress))."</td>";
-        echo "<td>".join(', ', array_map($kf, $this->aAddressNonSearch))."</td>";
-        echo "<td>".$this->sCountryCode."</td>";
-        echo "<td>".Operator::toString($this->iOperator)."</td>";
-        echo "<td>".$this->sClass."</td>";
-        echo "<td>".$this->sType."</td>";
-        echo "<td>".$this->sPostcode."</td>";
-        echo "<td>".$this->sHouseNumber."</td>";
-
-        echo "</tr>";
+        echo '<td>'.join(', ', array_map($kf, $this->aName)).'</td>';
+        echo '<td>'.join(', ', array_map($kf, $this->aNameNonSearch)).'</td>';
+        echo '<td>'.join(', ', array_map($kf, $this->aAddress)).'</td>';
+        echo '<td>'.join(', ', array_map($kf, $this->aAddressNonSearch)).'</td>';
+        echo '<td>'.$this->sCountryCode.'</td>';
+        echo '<td>'.Operator::toString($this->iOperator).'</td>';
+        echo '<td>'.$this->sClass.'</td>';
+        echo '<td>'.$this->sType.'</td>';
+        echo '<td>'.$this->sPostcode.'</td>';
+        echo '<td>'.$this->sHouseNumber.'</td>';
+
+        echo '</tr>';
     }
 }
     }
 }