From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 30 Apr 2015 19:26:11 +0000 (+0200)
Subject: Merge branch 'feature/polygon-simplification' of https://github.com/a1exsh/Nominatim
X-Git-Tag: v.2.5.0~62
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a7e1b3b1eeec1cebc71ee7ae0282dfe3bb31456c?hp=46e64bd93385d7c2e30154a07fa7cae79bf9ecee

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

diff --git a/configure.ac b/configure.ac
index cc77d333..badcb5b2 100644
--- 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 6781ceec..212eebb9 100644
--- 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 a04795ef..75b9ac23 100644
--- 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 ac378b0e..859faa76 100644
--- 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