From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 27 Nov 2018 21:32:27 +0000 (+0100)
Subject: Move address level config into settings/
X-Git-Tag: v3.3.0~55^2~2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7611aa2f654cc6e9c725502735ae780a59146b4c?ds=sidebyside

Move address level config into settings/
---

diff --git a/data/address-levels.json b/settings/address-levels.json
similarity index 97%
rename from data/address-levels.json
rename to settings/address-levels.json
index b06c67ea..7524a29b 100644
--- a/data/address-levels.json
+++ b/settings/address-levels.json
@@ -57,8 +57,7 @@
           "peak" : [18, 0],
           "volcano" : [18, 0],
           "mountain_range" : [18, 0],
-          "sea" : [4, 0],
-          "" : [22, 0]
+          "sea" : [4, 0]
       },
       "waterway" : {
           "" : [17, 0]
diff --git a/settings/defaults.php b/settings/defaults.php
index 8a286b11..297e6ecd 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -49,7 +49,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
-@define('CONST_Address_Level_Config', CONST_ExtraDataPath.'/address-levels.json');
+@define('CONST_Address_Level_Config', CONST_BasePath.'/settings/address-levels.json');
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);