searches for house numbers must have an address

[nominatim.git] / lib-php / SearchDescription.php

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index 4d944bfb1ee498835c2d3178b2ea04d2439ab75d..fa622e62634c0d4c9c29c58bc70ba478f6012ca6 100644 (file)
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -19,6 +19,8 @@ class SearchDescription
     private $aName = array();
     /// True if the name is rare enough to force index use on name.
     private $bRareName = false;
     private $aName = array();
     /// True if the name is rare enough to force index use on name.
     private $bRareName = false;

+    /// True if the name requires to be accompanied by address terms.
+    private $bNameNeedsAddress = false;

     /// List of word ids making up the address of the object.
     private $aAddress = array();
     /// List of word ids that appear in the name but should be ignored.
     /// List of word ids making up the address of the object.
     private $aAddress = array();
     /// List of word ids that appear in the name but should be ignored.


@@ -113,6 +115,9 @@ class SearchDescription
                 return false;
             }
         }
                 return false;
             }
         }

+        if ($this->bNameNeedsAddress && empty($this->aAddress)) {
+            return false;
+        }

 
         return true;
     }
 
         return true;
     }


@@ -231,6 +236,7 @@ class SearchDescription
     {
         $this->aName[$iId] = $iId;
         $this->bRareName = $bRareName;
     {
         $this->aName[$iId] = $iId;
         $this->bRareName = $bRareName;

+        $this->bNameNeedsAddress = false;

     }
 
     /**
     }
 
     /**


@@ -240,11 +246,19 @@ class SearchDescription
      * @param integer iID            ID of term to add.
      * @param bool bSearchable       Term should be used to search for result
      *                               (i.e. term is not a stop word).
      * @param integer iID            ID of term to add.
      * @param bool bSearchable       Term should be used to search for result
      *                               (i.e. term is not a stop word).

+     * @param bool bNeedsAddress     True if the term is too unspecific to be used
+     *                               in a stand-alone search without an address
+     *                               to narrow down the search.

      * @param integer iPhraseNumber  Index of phrase, where the partial term
      *                               appears.
      */
      * @param integer iPhraseNumber  Index of phrase, where the partial term
      *                               appears.
      */

-    public function addPartialNameToken($iId, $bSearchable, $iPhraseNumber)
+    public function addPartialNameToken($iId, $bSearchable, $bNeedsAddress, $iPhraseNumber)

     {
     {

+        if (empty($this->aName)) {
+            $this->bNameNeedsAddress = $bNeedsAddress;
+        } else {
+            $this->bNameNeedsAddress |= $bNeedsAddress;
+        }

         if ($bSearchable) {
             $this->aName[$iId] = $iId;
         } else {
         if ($bSearchable) {
             $this->aName[$iId] = $iId;
         } else {


@@ -310,6 +324,7 @@ class SearchDescription
     {
         $this->aAddress = array_merge($this->aAddress, $this->aName);
         $this->bRareName = false;
     {
         $this->aAddress = array_merge($this->aAddress, $this->aName);
         $this->bRareName = false;

+        $this->bNameNeedsAddress = true;

         $this->aName = array($iId => $iId);
         $this->iNamePhrase = -1;
     }
         $this->aName = array($iId => $iId);
         $this->iNamePhrase = -1;
     }


@@ -624,7 +639,7 @@ class SearchDescription
             $aOrder[] = $this->oContext->distanceSQL('centroid');
         } elseif ($this->sPostcode) {
             if (empty($this->aAddress)) {
             $aOrder[] = $this->oContext->distanceSQL('centroid');
         } elseif ($this->sPostcode) {
             if (empty($this->aAddress)) {

-                $aTerms[] = "EXISTS(SELECT place_id FROM location_postcode p WHERE p.postcode = '".$this->sPostcode."' AND ST_DWithin(search_name.centroid, p.geometry, 0.1))";
+                $aTerms[] = "EXISTS(SELECT place_id FROM location_postcode p WHERE p.postcode = '".$this->sPostcode."' AND ST_DWithin(search_name.centroid, p.geometry, 0.12))";

             } else {
                 $aOrder[] = "(SELECT min(ST_Distance(search_name.centroid, p.geometry)) FROM location_postcode p WHERE p.postcode = '".$this->sPostcode."')";
             }
             } else {
                 $aOrder[] = "(SELECT min(ST_Distance(search_name.centroid, p.geometry)) FROM location_postcode p WHERE p.postcode = '".$this->sPostcode."')";
             }