Split lookupInCountry in two functions and document NOMINATIM_SEARCH_WITHIN_COUNTRIES...

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

diff --git a/lib-php/admin/warm.php b/lib-php/admin/warm.php
index d6aa3d9b0d5f0978045b037427520a059a936c3b..32f78f46614fc8ec037581a94491cadf0b9e47f4 100644 (file)
--- a/lib-php/admin/warm.php
+++ b/lib-php/admin/warm.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 @define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 @define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');


@@ -33,6 +41,7 @@ loadSettings($aCMDResult['project-dir'] ?? getcwd());
 @define('CONST_Use_US_Tiger_Data', getSettingBool('USE_US_TIGER_DATA'));
 @define('CONST_MapIcon_URL', getSetting('MAPICON_URL', false));
 @define('CONST_TokenizerDir', CONST_InstallDir.'/tokenizer');
 @define('CONST_Use_US_Tiger_Data', getSettingBool('USE_US_TIGER_DATA'));
 @define('CONST_MapIcon_URL', getSetting('MAPICON_URL', false));
 @define('CONST_TokenizerDir', CONST_InstallDir.'/tokenizer');

+@define('CONST_Search_WithinCountries', getSetting('SEARCH_WITHIN_COUNTRIES', false));

 
 require_once(CONST_LibDir.'/Geocode.php');
 
 
 require_once(CONST_LibDir.'/Geocode.php');
 


@@ -62,11 +71,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 +92,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);