osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-25 05:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

No longer install phrase configuration

Browse Source 
Instead add it as a configurable path with the one from
the source directory as the default.

Also reinstates that settings/defaults.php is installed as
settings/settings.php.
This commit is contained in:
Sarah Hoffmann 2018-12-02 11:50:44 +01:00
parent fe6a2e9f14
commit 56839ba50f
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -125,14 +125,8 @@ foreach (script_source ${WEBSITESCRIPTS})
${PROJECT_BINARY_DIR}/${script_source}) ${PROJECT_BINARY_DIR}/${script_source})
endforeach() endforeach()
set(CONFIGUREFILES configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
settings/phrase_settings.php ${PROJECT_BINARY_DIR}/settings/settings.php)
settings/defaults.php
)
foreach (cfile ${CONFIGUREFILES})
configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
endforeach()
set(WEBPATHS css images js) set(WEBPATHS css images js)

1
settings/defaults.php
View File

@ -49,6 +49,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
@define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@'); @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
@define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger'); @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath); @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
@define('CONST_Phrase_Config', CONST_BasePath.'/settings/phrase_settings.php');
@define('CONST_Address_Level_Config', CONST_BasePath.'/settings/address-levels.json'); @define('CONST_Address_Level_Config', CONST_BasePath.'/settings/address-levels.json');
// osm2pgsql settings // osm2pgsql settings

2
utils/country_languages.php
View File

@ -14,7 +14,7 @@ $aCMDOptions
); );
getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
include(CONST_InstallPath.'/settings/phrase_settings.php'); include(CONST_Phrase_Config);
if (true) { if (true) {
$sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes'; $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';

2
utils/specialphrases.php
View File

@ -14,7 +14,7 @@ $aCMDOptions
); );
getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
include(CONST_InstallPath.'/settings/phrase_settings.php'); include(CONST_Phrase_Config);
if ($aCMDResult['wiki-import']) { if ($aCMDResult['wiki-import']) {
$oNormalizer = Transliterator::createFromRules(CONST_Term_Normalization_Rules); $oNormalizer = Transliterator::createFromRules(CONST_Term_Normalization_Rules);