added additional languages for pakistan in country settings

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

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index fbf6b650bc9ee8dffcdfc738e15239e5d2bc69a9..3f3beab1964dd2e2578c117bac663ce9baa5535c 100644 (file)
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -264,6 +264,8 @@ class SearchDescription
     {
         if (empty($this->aName)) {
             $this->bNameNeedsAddress = $bNeedsAddress;
     {
         if (empty($this->aName)) {
             $this->bNameNeedsAddress = $bNeedsAddress;

+        } elseif ($bSearchable && count($this->aName) >= 2) {
+            $this->bNameNeedsAddress = false;

         } else {
             $this->bNameNeedsAddress &= $bNeedsAddress;
         }
         } else {
             $this->bNameNeedsAddress &= $bNeedsAddress;
         }


@@ -642,6 +644,7 @@ class SearchDescription
             // Housenumbers on streets and places.
             $sPlacexSql = 'SELECT array_agg(place_id) FROM placex';
             $sPlacexSql .= ' WHERE parent_place_id = sin.place_id AND sin.address_rank < 30';
             // Housenumbers on streets and places.
             $sPlacexSql = 'SELECT array_agg(place_id) FROM placex';
             $sPlacexSql .= ' WHERE parent_place_id = sin.place_id AND sin.address_rank < 30';

+            $sPlacexSql .= $this->oContext->excludeSQL(' AND place_id');

             $sPlacexSql .= '       and housenumber ~* E'.$sHouseNumberRegex;
 
             // Interpolations on streets and places.
             $sPlacexSql .= '       and housenumber ~* E'.$sHouseNumberRegex;
 
             // Interpolations on streets and places.