Revert "ICU: additional ranking by matching of normalised term"

[nominatim.git] / lib-php / admin / warm.php

diff --git a/lib-php/admin/warm.php b/lib-php/admin/warm.php
index d6aa3d9b0d5f0978045b037427520a059a936c3b..338ec2da64f6668d03caee6e450637186561e804 100644 (file)
--- a/lib-php/admin/warm.php
+++ b/lib-php/admin/warm.php
@@ -62,11 +62,15 @@ if (!$aResult['search-only']) {
     $oPlaceLookup->setLanguagePreference(array('en'));
 
     echo 'Warm reverse: ';
     $oPlaceLookup->setLanguagePreference(array('en'));
 
     echo 'Warm reverse: ';

-    if ($bVerbose) echo "\n";
+    if ($bVerbose) {
+        echo "\n";
+    }

     for ($i = 0; $i < 1000; $i++) {
         $fLat = rand(-9000, 9000) / 100;
         $fLon = rand(-18000, 18000) / 100;
     for ($i = 0; $i < 1000; $i++) {
         $fLat = rand(-9000, 9000) / 100;
         $fLon = rand(-18000, 18000) / 100;

-        if ($bVerbose) echo "$fLat, $fLon = ";
+        if ($bVerbose) {
+            echo "$fLat, $fLon = ";
+        }

 
         $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
         $aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null;
 
         $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
         $aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null;


@@ -79,10 +83,19 @@ if (!$aResult['reverse-only']) {
     $oGeocode = new Nominatim\Geocode($oDB);
 
     echo 'Warm search: ';
     $oGeocode = new Nominatim\Geocode($oDB);
 
     echo 'Warm search: ';

-    if ($bVerbose) echo "\n";
+    if ($bVerbose) {
+        echo "\n";
+    }
+
+    $oTokenizer = new \Nominatim\Tokenizer($oDB);
+
+    $aWords = $oTokenizer->mostFrequentWords(1000);
+

     $sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000';
     $sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000';

-    foreach ($oDB->getCol($sSQL) as $sWord) {
-        if ($bVerbose) echo "$sWord = ";
+    foreach ($aWords as $sWord) {
+        if ($bVerbose) {
+            echo "$sWord = ";
+        }

 
         $oGeocode->setLanguagePreference(array('en'));
         $oGeocode->setQuery($sWord);
 
         $oGeocode->setLanguagePreference(array('en'));
         $oGeocode->setQuery($sWord);