if ((!$bStructuredPhrases || $iPhrase > 0)
&& (!empty($this->aName))
- && strpos($sToken, ' ') === false
) {
+ $oSearch = clone $this;
+ $oSearch->iSearchRank++;
+ if (preg_match('#^[0-9 ]+$#', $sToken)) {
+ $oSearch->iSearchRank++;
+ }
if ($oSearchTerm->iSearchNameCount < CONST_Max_Word_Frequency) {
- $oSearch = clone $this;
- $oSearch->iSearchRank += $oSearchTerm->iTermCount + 1;
- if (empty($this->aName)) {
- $oSearch->iSearchRank++;
- }
- if (preg_match('#^[0-9]+$#', $sToken)) {
- $oSearch->iSearchRank++;
- }
$oSearch->aAddress[$iWordID] = $iWordID;
- $aNewSearches[] = $oSearch;
} else {
- $oSearch = clone $this;
- $oSearch->iSearchRank += $oSearchTerm->iTermCount + 1;
$oSearch->aAddressNonSearch[$iWordID] = $iWordID;
if (!empty($aFullTokens)) {
$oSearch->iSearchRank++;
}
- $aNewSearches[] = $oSearch;
-
- // revert to the token version?
- foreach ($aFullTokens as $oSearchTermToken) {
- if (is_a($oSearchTermToken, '\Nominatim\Token\Word')) {
- $oSearch = clone $this;
- $oSearch->iSearchRank += 3;
- $oSearch->aAddress[$oSearchTermToken->iId]
- = $oSearchTermToken->iId;
- $aNewSearches[] = $oSearch;
- }
- }
}
+ $aNewSearches[] = $oSearch;
}
if ((!$this->sPostcode && !$this->aAddress && !$this->aAddressNonSearch)
- && (empty($this->aName) || $this->iNamePhrase == $iPhrase)
+ && ((empty($this->aName) && empty($this->aNameNonSearch)) || $this->iNamePhrase == $iPhrase)
) {
$oSearch = clone $this;
- $oSearch->iSearchRank += 2;
- if (empty($this->aName)) {
- $oSearch->iSearchRank += 1;
+ $oSearch->iSearchRank++;
+ if (empty($this->aName) && empty($this->aNameNonSearch)) {
+ $oSearch->iSearchRank++;
}
- if (preg_match('#^[0-9]+$#', $sToken)) {
- $oSearch->iSearchRank += 2;
+ if (preg_match('#^[0-9 ]+$#', $sToken)) {
+ $oSearch->iSearchRank++;
}
if ($oSearchTerm->iSearchNameCount < CONST_Max_Word_Frequency) {
if (empty($this->aName)
}
$oSearch->aName[$iWordID] = $iWordID;
} else {
+ if (!empty($aFullTokens)) {
+ $oSearch->iSearchRank++;
+ }
$oSearch->aNameNonSearch[$iWordID] = $iWordID;
}
$oSearch->iNamePhrase = $iPhrase;
// Downgrade the rank of the street results, they are missing
// the housenumber.
foreach ($aResults as $oRes) {
- $oRes->iResultRank++;
+ if ($oRes->iAddressRank >= 26) {
+ $oRes->iResultRank++;
+ } else {
+ $oRes->iResultRank += 2;
+ }
}
$aHnResults = $this->queryHouseNumber($oDB, $aResults);
$aResults = array();
if (!empty($aTerms)) {
- $sSQL = 'SELECT place_id,'.$sExactMatchSQL;
+ $sSQL = 'SELECT place_id, address_rank,'.$sExactMatchSQL;
$sSQL .= ' FROM search_name';
$sSQL .= ' WHERE '.join(' and ', $aTerms);
$sSQL .= ' ORDER BY '.join(', ', $aOrder);
foreach ($aDBResults as $aResult) {
$oResult = new Result($aResult['place_id']);
$oResult->iExactMatches = $aResult['exactmatch'];
+ $oResult->iAddressRank = $aResult['address_rank'];
$aResults[$aResult['place_id']] = $oResult;
}
}