hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

missed some postcode use cases

Browse Source
This commit is contained in:
Brian Quinion
2013-06-13 17:19:27 +01:00
parent 464fb913a8
commit c5c44f9a07
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
website/search.php
View File

@@ -466,7 +466,6 @@
/* /*
Calculate all searches using aValidTokens i.e. Calculate all searches using aValidTokens i.e.
'Wodsworth Road, Sheffield' => 'Wodsworth Road, Sheffield' =>
Phrase Wordset Phrase Wordset
@@ -533,13 +532,38 @@
elseif ($sPhraseType == 'postalcode') elseif ($sPhraseType == 'postalcode')
{ {
// We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
if (sizeof($aSearch['aName'])) if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
{ {
$aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']); // If we already have a name try putting the postcode first
$aSearch['aName'] = array(); if (sizeof($aSearch['aName']))
$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; {
$aNewSearch = $aSearch;
$aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
$aNewSearch['aName'] = array();
$aNewSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
}
if (sizeof($aSearch['aName']))
{
if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false))
{
$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
}
else
{
$aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
$aSearch['iSearchRank'] += 1000; // skip;
}
}
else
{
$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
//$aSearch['iNamePhrase'] = $iPhrase;
}
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
} }
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
} }
elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house') elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house')
{ {
@@ -708,6 +732,7 @@
//if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
} }
} }
else else
{ {