Merge remote-tracking branch 'upstream/master'

diff --git a/cmake/website.tmpl b/cmake/website.tmpl
index 8b94658485ac7f7daabc89397a246defffbf7780..268ded39f12284f51a8ae25842f3d3eecca01b0f 100755 (executable)
--- a/cmake/website.tmpl
+++ b/cmake/website.tmpl
@@ -1,5 +1,5 @@
 <?php
 @define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
-require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
+require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
 
 require_once(CONST_BasePath.'/@script_source@');

diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php
index bb478b29b88af4fbcef3a174d8e5405cedd616ea..33b766a5f5fcacbe09f596d6221370ca49456ef9 100644 (file)
--- a/lib/SearchDescription.php
+++ b/lib/SearchDescription.php
@@ -657,7 +657,7 @@ class SearchDescription
         }
 
         if ($this->sHouseNumber) {
-            $aTerms[] = 'address_rank between 16 and 27';
+            $aTerms[] = 'address_rank between 16 and 30';
         } elseif (!$this->sClass || $this->iOperator == Operator::NAME) {
             if ($iMinAddressRank > 0) {
                 $aTerms[] = "((address_rank between $iMinAddressRank and $iMaxAddressRank) or (search_rank between $iMinAddressRank and $iMaxAddressRank))";

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 0ffb9f35427a6aa79105493ac060b7bb1b71d338..805f877391ac8be894d8b0ba55a3b3a9564707c2 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -701,7 +701,7 @@ class SetupFunctions
      */
     public function setupWebsite()
     {
-        $rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w');
+        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php
 @define('CONST_BasePath', '".CONST_BasePath."');
@@ -715,7 +715,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 @define('CONST_Map_Tile_URL', '".CONST_Map_Tile_URL."');
 @define('CONST_Map_Tile_Attribution', '".CONST_Map_Tile_Attribution."'); // Set if tile source isn't osm.org
 @define('CONST_Log_DB', ".(CONST_Log_DB ? 'true' : 'false').");
-@define('CONST_Log_File', ".(CONST_Log_File ? 'true' : 'false').");
+@define('CONST_Log_File', ".(CONST_Log_File ? ("'".CONST_Log_File."'")  : 'false').");
 @define('CONST_Max_Word_Frequency', '".CONST_Max_Word_Frequency."');
 @define('CONST_NoAccessControl', ".CONST_NoAccessControl.");
 @define('CONST_Places_Max_ID_count', ".CONST_Places_Max_ID_count.");
@@ -729,7 +729,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 @define('CONST_Use_US_Tiger_Data', ".(CONST_Use_US_Tiger_Data ? 'true' : 'false').");
 @define('CONST_Website_BaseURL', '".CONST_Website_BaseURL."');
 ");
-        info(CONST_InstallPath.'/website/settings-frontend.php has been set up successfully');
+        info(CONST_InstallPath.'/settings/settings-frontend.php has been set up successfully');
     }
 
     private function removeFlatnodeFile()