Merge branch 'feature/polygon-simplification' of https://github.com/a1exsh/Nominatim

diff --git a/configure.ac b/configure.ac
index cc77d333ae4cb32b53f04b4cfe3f2f91e5ca0f00..badcb5b224258b4ef2754775a9ba53d86db8302f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Nominatim,2.4)
+AC_INIT(Nominatim,2.5)
 if git rev-parse HEAD 2>/dev/null >/dev/null; then
     AC_SUBST([PACKAGE_VERSION], [$PACKAGE_VERSION-git-`git rev-parse --short HEAD`])
 fi

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 6781ceecb9993bccdf89b746795ab9a7d8c68763..212eebb97cc2a3b04f8a5369755fe6cc79163cc9 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -584,18 +584,6 @@
                                                                                        else $aSearch['sOperator'] = 'near'; // near = in for the moment
                                                                                        if (strlen($aSearchTerm['operator']) == 0) $aSearch['iSearchRank'] += 1;
 
-                                                                                       // Do we have a shortcut id?
-                                                                                       if ($aSearch['sOperator'] == 'name')
-                                                                                       {
-                                                                                               $sSQL = "select get_tagpair('".$aSearch['sClass']."', '".$aSearch['sType']."')";
-                                                                                               if ($iAmenityID = $this->oDB->getOne($sSQL))
-                                                                                               {
-                                                                                                       $aValidTokens[$aSearch['sClass'].':'.$aSearch['sType']] = array('word_id' => $iAmenityID);
-                                                                                                       $aSearch['aName'][$iAmenityID] = $iAmenityID;
-                                                                                                       $aSearch['sClass'] = '';
-                                                                                                       $aSearch['sType'] = '';
-                                                                                               }
-                                                                                       }
                                                                                        if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                                                                }
                                                                        }
@@ -774,7 +762,6 @@
                        if (!$this->sQuery && !$this->aStructuredQuery) return false;
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
-
                        $sCountryCodesSQL = false;
                        if ($this->aCountryCodes && sizeof($this->aCountryCodes))
                        {

diff --git a/settings/settings.php b/settings/settings.php
index a04795efa30035455d9ab65fda19f87492a3fdbc..75b9ac237ea9ee8a3eed4f2a468d8e72e81c3909 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -10,8 +10,8 @@
        @define('CONST_Limit_Reindexing', true);
 
        // Software versions
-       @define('CONST_Postgresql_Version', '9.1'); // values: 9.0, 9.1, 9.2
-       @define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
+       @define('CONST_Postgresql_Version', '9.3'); // values: 9.0, ... , 9.4
+       @define('CONST_Postgis_Version', '2.1'); // values: 1.5, 2.0, 2.1
 
        // Paths
        @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');

diff --git a/tests/features/api/search.feature b/tests/features/api/search.feature
index ac378b0e0d6c137a71b13ea54bd0eb417504e9b4..859faa76f1256847d18e3eb703d6da8bbe026c02 100644 (file)
--- a/tests/features/api/search.feature
+++ b/tests/features/api/search.feature
@@ -74,3 +74,9 @@ Feature: Search queries
         Then results contain
           | ID | display_name
           | 0  | Illinois.*
+
+    Scenario: Search with class-type feature
+        When sending jsonv2 search query "Hotel California"
+        Then results contain
+          | place_rank
+          | 30