hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-06 18:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix syntax errors from introduction of SearchDescription

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-10-08 15:26:14 +02:00
parent 16268f92cc
commit 75e35f3832
3 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Geocode.php
View File

@@ -5,6 +5,7 @@ namespace Nominatim;
require_once(CONST_BasePath.'/lib/NearPoint.php'); require_once(CONST_BasePath.'/lib/NearPoint.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');
require_once(CONST_BasePath.'/lib/ReverseGeocode.php'); require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
require_once(CONST_BasePath.'/lib/SearchDescription.php');
class Geocode class Geocode
{ {
@@ -743,7 +744,7 @@ class Geocode
// Recheck if the original word shows up in the query. // Recheck if the original word shows up in the query.
$bWordInQuery = false; $bWordInQuery = false;
if (isset($aSearchTerm['word']) && $aSearchTerm['word']) { if (isset($aSearchTerm['word']) && $aSearchTerm['word']) {
$bWordInQuery = $this->normTerm($aSearchTerm['word'])) !== false; $bWordInQuery = $this->normTerm($aSearchTerm['word']) !== false;
} }
foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) { foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) {
$aNewSearches = $oCurrentSearch->extendWithFullTerm( $aNewSearches = $oCurrentSearch->extendWithFullTerm(
@@ -790,13 +791,13 @@ class Geocode
} }
} }
// Sort and cut // Sort and cut
usort($aNewWordsetSearches, 'bySearchRank'); usort($aNewWordsetSearches, array('Nominatim\SearchDescription', 'bySearchRank'));
$aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50); $aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50);
} }
//var_Dump('<hr>',sizeof($aWordsetSearches)); exit; //var_Dump('<hr>',sizeof($aWordsetSearches)); exit;
$aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches); $aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches);
usort($aNewPhraseSearches, 'bySearchRank'); usort($aNewPhraseSearches, array('Nominatim\SearchDescription', 'bySearchRank'));
$aSearchHash = array(); $aSearchHash = array();
foreach ($aNewPhraseSearches as $iSearch => $aSearch) { foreach ($aNewPhraseSearches as $iSearch => $aSearch) {
@@ -835,12 +836,12 @@ class Geocode
// Revisit searches, drop bad searches and give penalty to unlikely combinations. // Revisit searches, drop bad searches and give penalty to unlikely combinations.
$aGroupedSearches = array(); $aGroupedSearches = array();
foreach ($aSearches as $oSearch) { foreach ($aSearches as $oSearch) {
if (!$oSearch->isValidSearch()) { if (!$oSearch->isValidSearch($this->aCountryCodes)) {
continue; continue;
} }
$iRank = $oSearch->addToRank($iGlobalRank); $iRank = $oSearch->addToRank($iGlobalRank);
if (!isset($aGroupedSearches[$iRank]) { if (!isset($aGroupedSearches[$iRank])) {
$aGroupedSearches[$iRank] = array(); $aGroupedSearches[$iRank] = array();
} }
$aGroupedSearches[$iRank][] = $oSearch; $aGroupedSearches[$iRank][] = $oSearch;
@@ -983,7 +984,7 @@ class Geocode
$oNewSearch->setPoiSearch( $oNewSearch->setPoiSearch(
Operator::TYPE, Operator::TYPE,
$aSearchTerm['class'], $aSearchTerm['class'],
$aSearchTerm['type'], $aSearchTerm['type']
); );
$aNewSearches[] = $oNewSearch; $aNewSearches[] = $oNewSearch;
} }
@@ -1077,8 +1078,8 @@ class Geocode
foreach ($aTokens as $sToken) { foreach ($aTokens as $sToken) {
// Unknown single word token with a number - assume it is a house number // Unknown single word token with a number - assume it is a house number
if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken, ' ') === false && preg_match('/[0-9]/', $sToken)) { if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken, ' ') === false && preg_match('/^[0-9]+$/', $sToken)) {
$aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house')); $aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house', 'word_token' => ' '.$sToken));
} }
} }
@@ -1173,7 +1174,7 @@ class Geocode
$this->oDB, $this->oDB,
$sCountryCodesSQL, $sCountryCodesSQL,
$bBoundingBoxSearch ? $this->sViewboxSmallSQL : '', $bBoundingBoxSearch ? $this->sViewboxSmallSQL : '',
$sViewboxCentreSQL, $this->sViewboxCentreSQL,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '', $this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit $this->iLimit
); );
@@ -1210,13 +1211,13 @@ class Geocode
$aResult = $oSearch->queryHouseNumber( $aResult = $oSearch->queryHouseNumber(
$this->oDB, $this->oDB,
$aPlaceIDs, $aPlaceIDs,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '' $this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit $this->iLimit
); );
if (sizeof($aResult)) { if (sizeof($aResult)) {
$searchedHousenumber = $aResult['iHouseNumber']; $searchedHousenumber = $aResult['iHouseNumber'];
$aPlaceIDs = $aResults['aPlaceIDs']; $aPlaceIDs = $aResult['aPlaceIDs'];
} elseif (!$oSearch->looksLikeFullAddress()) { } elseif (!$oSearch->looksLikeFullAddress()) {
$aPlaceIDs = array(); $aPlaceIDs = array();
} }
@@ -1227,7 +1228,7 @@ class Geocode
$aPlaceIDs = $oSearch->queryPoiByOperator( $aPlaceIDs = $oSearch->queryPoiByOperator(
$this->oDB, $this->oDB,
$aPlaceIDs, $aPlaceIDs,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '' $this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit $this->iLimit
); );
} }

81
lib/SearchDescription.php
View File

@@ -5,7 +5,7 @@ namespace Nominatim;
/** /**
* Operators describing special searches. * Operators describing special searches.
*/ */
abstract final class Operator abstract class Operator
{ {
/// No operator selected. /// No operator selected.
const NONE = 0; const NONE = 0;
@@ -103,7 +103,7 @@ class SearchDescription
public function isCountrySearch() public function isCountrySearch()
{ {
return $this->sCountryCode && sizeof($this->aName) == 0 return $this->sCountryCode && sizeof($this->aName) == 0
&& !$this->iOperator && !$this->oNear; && !$this->iOperator && !$this->oNearPoint;
} }
/** /**
@@ -111,7 +111,7 @@ class SearchDescription
*/ */
public function isNearSearch() public function isNearSearch()
{ {
return (bool) $this->oNear; return (bool) $this->oNearPoint;
} }
public function isPoiSearch() public function isPoiSearch()
@@ -147,7 +147,7 @@ class SearchDescription
return $sVar.' = \''.$this->sCountryCode."'"; return $sVar.' = \''.$this->sCountryCode."'";
} }
if ($sCountryList) { if ($sCountryList) {
return $sVar.' in ('.$this->sCountryCode.')'; return $sVar.' in ('.$sCountryList.')';
} }
return ''; return '';
@@ -193,7 +193,7 @@ class SearchDescription
} }
} }
if ($aCountryCodes if ($aCountryCodes
&& $this->sCounrtyCode && $this->sCountryCode
&& !in_array($this->sCountryCode, $aCountryCodes) && !in_array($this->sCountryCode, $aCountryCodes)
) { ) {
return false; return false;
@@ -289,7 +289,7 @@ class SearchDescription
&& (isset($aSearchTerm['word']) && $aSearchTerm['word']) && (isset($aSearchTerm['word']) && $aSearchTerm['word'])
&& $bWordInQuery && $bWordInQuery
) { ) {
$oSearch = clone this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$iOp = Operator::NEAR; // near == in for the moment $iOp = Operator::NEAR; // near == in for the moment
@@ -307,13 +307,12 @@ class SearchDescription
$iWordID = $aSearchTerm['word_id']; $iWordID = $aSearchTerm['word_id'];
if (sizeof($this->aName)) { if (sizeof($this->aName)) {
if (($sPhraseType == '' || !$bFirstPhrase) if (($sPhraseType == '' || !$bFirstPhrase)
&& $sPhraseType != 'country')) && $sPhraseType != 'country'
&& !$bHasPartial && !$bHasPartial
) { ) {
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$oSearch->aAddress[$iWordID] = $iWordID; $oSearch->aAddress[$iWordID] = $iWordID;
);
$aNewSearches[] = $oSearch; $aNewSearches[] = $oSearch;
} }
else { else {
@@ -345,18 +344,18 @@ class SearchDescription
&& strpos($aSearchTerm['word_token'], ' ') === false && strpos($aSearchTerm['word_token'], ' ') === false
) { ) {
if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) { if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
$oSearch = clone this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$oSearch->aAddress[$iWordID] = $iWordID; $oSearch->aAddress[$iWordID] = $iWordID;
$aNewSearches[] = $oSearch; $aNewSearches[] = $oSearch;
} else { } else {
$oSearch = clone this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$oSearch->aAddressNonSearch[$iWordID] = $iWordID; $oSearch->aAddressNonSearch[$iWordID] = $iWordID;
if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) { if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) {
$oSearch->iSearchRank += 2; $oSearch->iSearchRank += 2;
} }
if (sizeof($aFullTokens) { if (sizeof($aFullTokens)) {
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
} }
$aNewSearches[] = $oSearch; $aNewSearches[] = $oSearch;
@@ -382,18 +381,18 @@ class SearchDescription
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
if (!sizeof($this->aName)) { if (!sizeof($this->aName)) {
$aSearch->iSearchRank += 1; $oSearch->iSearchRank += 1;
} }
if (preg_match('#^[0-9]+$#', $sSerchTerm['word_token')) { if (preg_match('#^[0-9]+$#', $aSearchTerm['word_token'])) {
$oSearch->iSearchRank += 2; $oSearch->iSearchRank += 2;
} }
if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) { if ($aWordFrequencyScores[$iWordID] < CONST_Max_Word_Frequency) {
$oSearch->aName[$iWordID] = $iWordID; $oSearch->aName[$iWordID] = $iWordID;
} else { } else {
$aSearch->aNameNonSearch[$iWordID] = $iWordID; $oSearch->aNameNonSearch[$iWordID] = $iWordID;
} }
$oSearch->iNamePhrase = $iPhrase; $oSearch->iNamePhrase = $iPhrase;
$aNewSearches[] = $aSearch; $aNewSearches[] = $oSearch;
} }
return $aNewSearches; return $aNewSearches;
@@ -406,7 +405,7 @@ class SearchDescription
$sSQL = 'SELECT place_id FROM placex '; $sSQL = 'SELECT place_id FROM placex ';
$sSQL .= "WHERE country_code='".$this->sCountryCode."'"; $sSQL .= "WHERE country_code='".$this->sCountryCode."'";
$sSQL .= ' AND rank_search = 4'; $sSQL .= ' AND rank_search = 4';
if ($ViewboxSQL) { if ($sViewboxSQL) {
$sSQL .= " AND ST_Intersects($sViewboxSQL, geometry)"; $sSQL .= " AND ST_Intersects($sViewboxSQL, geometry)";
} }
$sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1"; $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";
@@ -448,7 +447,7 @@ class SearchDescription
} }
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($this->oDB->getCol($sSQL)); return chksql($oDB->getCol($sSQL));
} }
if ($this->oNearPoint) { if ($this->oNearPoint) {
@@ -462,7 +461,7 @@ class SearchDescription
$sSQL .= ' ORDER BY '.$this->oNearPoint->distanceSQL('centroid')." ASC"; $sSQL .= ' ORDER BY '.$this->oNearPoint->distanceSQL('centroid')." ASC";
$sSQL .= " LIMIT $iLimit"; $sSQL .= " LIMIT $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($this->oDB->getCol($sSQL)); return chksql($oDB->getCol($sSQL));
} }
return array(); return array();
@@ -490,7 +489,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($this->oDB->getCol($sSQL)); return chksql($oDB->getCol($sSQL));
} }
public function queryNamedPlace(&$oDB, $aWordFrequencyScores, $sCountryList, $iMinAddressRank, $iMaxAddressRank, $sExcludeSQL, $sViewboxSmall, $sViewboxLarge, $iLimit) public function queryNamedPlace(&$oDB, $aWordFrequencyScores, $sCountryList, $iMinAddressRank, $iMaxAddressRank, $sExcludeSQL, $sViewboxSmall, $sViewboxLarge, $iLimit)
@@ -540,7 +539,7 @@ class SearchDescription
} }
} }
$sCountryTerm = $this->countryCodeSQL('p.country_code', $sCountryList); $sCountryTerm = $this->countryCodeSQL('country_code', $sCountryList);
if ($sCountryTerm) { if ($sCountryTerm) {
$aTerms[] = $sCountryTerm; $aTerms[] = $sCountryTerm;
} }
@@ -568,7 +567,7 @@ class SearchDescription
} }
if ($sExcludeSQL) { if ($sExcludeSQL) {
$aTerms = 'place_id not in ('.$sExcludeSQL.')'; $aTerms[] = 'place_id not in ('.$sExcludeSQL.')';
} }
if ($sViewboxSmall) { if ($sViewboxSmall) {
@@ -619,7 +618,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql( return chksql(
$this->oDB->getAll($sSQL), $oDB->getAll($sSQL),
"Could not get places for search terms." "Could not get places for search terms."
); );
} }
@@ -643,7 +642,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($oDB->getCol($sSQL));
if (sizeof($aPlaceIDs)) { if (sizeof($aPlaceIDs)) {
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1); return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
@@ -668,14 +667,14 @@ class SearchDescription
$sSQL .= $iHousenumber.">=startnumber and "; $sSQL .= $iHousenumber.">=startnumber and ";
$sSQL .= $iHousenumber."<=endnumber"; $sSQL .= $iHousenumber."<=endnumber";
if ($sExcludeSQL)) { if ($sExcludeSQL) {
$sSQL .= ' AND place_id not in ('.$sExcludeSQL.')'; $sSQL .= ' AND place_id not in ('.$sExcludeSQL.')';
} }
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0)); $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
if (sizeof($aPlaceIDs)) { if (sizeof($aPlaceIDs)) {
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber); return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
@@ -694,7 +693,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($oDB->getCol($sSQL));
if (sizeof($aPlaceIDs)) { if (sizeof($aPlaceIDs)) {
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1); return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
@@ -721,7 +720,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0)); $aPlaceIDs = chksql($oDB->getCol($sSQL, 0));
if (sizeof($aPlaceIDs)) { if (sizeof($aPlaceIDs)) {
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber); return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber);
@@ -750,18 +749,18 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aClassPlaceIDs = chksql($oDB->getCol($sSQL));
} }
// NEAR and IN are handled the same // NEAR and IN are handled the same
if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NEAR) { if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NEAR) {
$sClassTable = $this->poiTable(); $sClassTable = $this->poiTable();
$sSQL = "SELECT count(*) FROM pg_tables WHERE tablename = '$sClassTable'"; $sSQL = "SELECT count(*) FROM pg_tables WHERE tablename = '$sClassTable'";
$bCacheTable = (bool) chksql($this->oDB->getOne($sSQL)); $bCacheTable = (bool) chksql($oDB->getOne($sSQL));
$sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)"; $sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$iMaxRank = (int)chksql($this->oDB->getOne($sSQL)); $iMaxRank = (int)chksql($oDB->getOne($sSQL));
// For state / country level searches the normal radius search doesn't work very well // For state / country level searches the normal radius search doesn't work very well
$sPlaceGeom = false; $sPlaceGeom = false;
@@ -774,7 +773,7 @@ class SearchDescription
$sSQL .= " ORDER BY rank_search ASC "; $sSQL .= " ORDER BY rank_search ASC ";
$sSQL .= " LIMIT 1"; $sSQL .= " LIMIT 1";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$sPlaceGeom = chksql($this->oDB->getOne($sSQL)); $sPlaceGeom = chksql($oDB->getOne($sSQL));
} }
if ($sPlaceGeom) { if ($sPlaceGeom) {
@@ -784,7 +783,7 @@ class SearchDescription
$sSQL = 'SELECT place_id FROM placex'; $sSQL = 'SELECT place_id FROM placex';
$sSQL .= " WHERE place_id in ($sPlaceIDs) and rank_search < $iMaxRank"; $sSQL .= " WHERE place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($oDB->getCol($sSQL));
$sPlaceIDs = join(',', $aPlaceIDs); $sPlaceIDs = join(',', $aPlaceIDs);
} }
@@ -832,7 +831,7 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL))); $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
} else { } else {
if ($this->oNearPoint) { if ($this->oNearPoint) {
$fRange = $this->oNearPoint->radius(); $fRange = $this->oNearPoint->radius();
@@ -864,11 +863,25 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL))); $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL)));
} }
} }
} }
return $aClassPlaceIDs; return $aClassPlaceIDs;
} }
/////////// Sort functions
static function bySearchRank($a, $b)
{
if ($a->iSearchRank == $b->iSearchRank) {
return $a->iOperator + strlen($a->sHouseNumber)
- $b->iOperator - strlen($b->sHouseNumber);
}
return $a->iSearchRank < $b->iSearchRank ? -1 : 1;
}
}; };

8
lib/lib.php
View File

@@ -51,14 +51,6 @@ function getDatabaseDate(&$oDB)
} }
function bySearchRank($a, $b)
{
if ($a['iSearchRank'] == $b['iSearchRank'])
return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']);
return ($a['iSearchRank'] < $b['iSearchRank']?-1:1);
}
function byImportance($a, $b) function byImportance($a, $b)
{ {
if ($a['importance'] != $b['importance']) if ($a['importance'] != $b['importance'])