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 b06c67ea91b421303ea5c2bf951c027da6070de4..7524a29b761716fe38dc49dff4e5760fb5fd0f20 100644 (file)
--- 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 8a286b11eb4234d273bd1699e4e07fb33cc88437..297e6ecdb2f79f31d52c9a53c7e388dff6eb8f81 100644 (file)
--- 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);