safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

consider possibility that values with number in near start of search might be a house number (even if we have never seen them before). Also add better label for building:yes

Browse Source
This commit is contained in:
Brian Quinion
2011-04-05 14:51:32 +00:00
parent 5202e86022
commit 942ed125d4
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/lib.php
View File

@@ -568,6 +568,7 @@
'amenity:shopping' => array('label'=>'Shopping','frequency'=>21,'icon'=>'',), 'amenity:shopping' => array('label'=>'Shopping','frequency'=>21,'icon'=>'',),
'natural:scrub' => array('label'=>'Scrub','frequency'=>20,'icon'=>'',), 'natural:scrub' => array('label'=>'Scrub','frequency'=>20,'icon'=>'',),
'natural:fen' => array('label'=>'Fen','frequency'=>20,'icon'=>'',), 'natural:fen' => array('label'=>'Fen','frequency'=>20,'icon'=>'',),
'building:yes' => array('label'=>'Building','frequency'=>200,'icon'=>'',),
'amenity:parking' => array('label'=>'Parking','frequency'=>3157,'icon'=>'',), 'amenity:parking' => array('label'=>'Parking','frequency'=>3157,'icon'=>'',),
'highway:bus_stop' => array('label'=>'Bus Stop','frequency'=>35777,'icon'=>'transport_bus_stop2',), 'highway:bus_stop' => array('label'=>'Bus Stop','frequency'=>35777,'icon'=>'transport_bus_stop2',),

5
lib/template/search-html.php
View File

@@ -372,7 +372,10 @@ target="_blank">FAQ</a></td>
echo ' <span class="name">'.$aResult['name'].'</span>'; echo ' <span class="name">'.$aResult['name'].'</span>';
echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>'; echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>';
echo ' <span class="place_id">'.$aResult['place_id'].'</span>'; echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>'; if (isset($aResult['label']))
echo ' <span class="type">('.$aResult['label'].')</span>';
else
echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
echo ' <span class="details">(<a href="details.php?place_id='.$aResult['place_id'].'">details</a>)</span>'; echo ' <span class="details">(<a href="details.php?place_id='.$aResult['place_id'].'">details</a>)</span>';
echo '</div>'; echo '</div>';
} }

18
website/search.php
View File

@@ -278,7 +278,7 @@
{ {
unset($aPhrases[$iPhrase]); unset($aPhrases[$iPhrase]);
} }
} }
// reindex phrases - we make assumptions later on // reindex phrases - we make assumptions later on
$aPhrases = array_values($aPhrases); $aPhrases = array_values($aPhrases);
@@ -366,6 +366,16 @@
} }
} }
*/ */
foreach($aTokens as $sToken)
{
// 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))
{
$aValidTokens[' '.$sToken] = array('class'=>'place','type'=>'house');
}
}
// Any words that have failed completely? // Any words that have failed completely?
// TODO: suggestions // TODO: suggestions
@@ -1094,6 +1104,12 @@
$aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png'; $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
} }
if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
&& $aClassType[$aResult['class'].':'.$aResult['type']]['label'])
{
$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
}
if ($bShowAddressDetails) if ($bShowAddressDetails)
{ {
$aResult['address'] = getAddressDetails($oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']); $aResult['address'] = getAddressDetails($oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);