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

Merge pull request #2025 from lonvia/fix-secondary-importance-for-countries

Browse Source 
Improve secondary result ordering for administrative boundaries
This commit is contained in:
Sarah Hoffmann
2020-10-22 13:43:22 +02:00
committed by GitHub
parent ba31456278 788ba6d985
commit e0e18e2b6f
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ClassTypes.php
View File

@@ -275,6 +275,7 @@ function getImportance($aPlace)
if ($aWithImportance === null) { if ($aWithImportance === null) {
$aWithImportance = array_flip(array( $aWithImportance = array_flip(array(
'boundary:administrative',
'place:country', 'place:country',
'place:state', 'place:state',
'place:province', 'place:province',

34
lib/Geocode.php
View File

@@ -917,6 +917,24 @@ class Geocode
$aResult['lon'], $aResult['lon'],
$aResult['lat'] $aResult['lat']
); );
// secondary ordering (for results with same importance (the smaller the better):
// - approximate importance of address parts
if (isset($aResult['addressimportance']) && $aResult['addressimportance']) {
$aResult['foundorder'] = -$aResult['addressimportance']/10;
} else {
$aResult['foundorder'] = -$aResult['importance'];
}
// - number of exact matches from the query
$aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
// - importance of the class/type
$iClassImportance = ClassTypes\getImportance($aResult);
if (isset($iClassImportance)) {
$aResult['foundorder'] += 0.0001 * $iClassImportance;
} else {
$aResult['foundorder'] += 0.01;
}
// Adjust importance for the number of exact string matches in the result // Adjust importance for the number of exact string matches in the result
$iCountWords = 0; $iCountWords = 0;
$sAddress = $aResult['langaddress']; $sAddress = $aResult['langaddress'];
@@ -927,20 +945,8 @@ class Geocode
} }
} }
$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1);
// secondary ordering (for results with same importance (the smaller the better):
// - approximate importance of address parts
$aResult['foundorder'] = -$aResult['addressimportance']/10;
// - number of exact matches from the query
$aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
// - importance of the class/type
$iClassImportance = ClassTypes\getImportance($aResult);
if (isset($iClassImportance)) {
$aResult['foundorder'] += 0.0001 * $iClassImportance;
} else {
$aResult['foundorder'] += 0.01;
}
} }
$aSearchResults[$iIdx] = $aResult; $aSearchResults[$iIdx] = $aResult;
} }