hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 02:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake-port' into master

Browse Source 
Conflicts:
	CMakeLists.txt
	lib/init.php
	settings/settings.php
This commit is contained in:
Sarah Hoffmann
2016-03-16 19:45:18 +01:00
parent 279ea25e7d 5ccb499a6f
commit 6fc32d9645
20 changed files with 78 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CMakeLists.txt
View File

@@ -33,6 +33,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
set(BUILD_TESTS on) set(BUILD_TESTS on)
set(WITH_LUA off)
add_subdirectory(osm2pgsql) add_subdirectory(osm2pgsql)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@@ -60,19 +61,41 @@ include_directories(${LIBXML2_INCLUDE_DIR})
# #
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
configure_file( set(CUSTOMFILES
${PROJECT_SOURCE_DIR}/settings/settings.php settings/settings.php
${PROJECT_BINARY_DIR}/settings/settings.php settings/phrase_settings.php
) website/deletable.php
website/details.php
website/hierarchy.php
website/lookup.php
website/polygons.php
website/reverse.php
website/search.php
website/status.php
utils/blocks.php
utils/country_languages.php
utils/imports.php
utils/importWikipedia.php
utils/query.php
utils/server_compare.php
utils/setup.php
utils/specialphrases.php
utils/update.php
utils/warm.php
)
configure_file( foreach (cfile ${CUSTOMFILES})
${PROJECT_SOURCE_DIR}/settings/phrase_settings.php configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
${PROJECT_BINARY_DIR}/settings/phrase_settings.php endforeach()
)
set(WEBPATHS css images js)
foreach (wp ${WEBPATHS})
execute_process(
COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
)
endforeach()
execute_process(
COMMAND ln -s -t ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/utils
)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# #

3
lib/init.php
View File

@@ -1,8 +1,5 @@
<?php <?php
@define('CONST_BasePath', dirname(dirname(__FILE__)));
require_once('settings/settings.php');
require_once(CONST_BasePath.'/lib/lib.php'); require_once(CONST_BasePath.'/lib/lib.php');
require_once(CONST_BasePath.'/lib/leakybucket.php'); require_once(CONST_BasePath.'/lib/leakybucket.php');
require_once(CONST_BasePath.'/lib/db.php'); require_once(CONST_BasePath.'/lib/db.php');

3
settings/settings.php
View File

@@ -1,5 +1,6 @@
<?php <?php
@define('CONST_InstallPath', dirname(dirname(__FILE__))); @define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php'); if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true); if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);

5
utils/blocks.php
View File

@@ -1,8 +1,9 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
ini_set('memory_limit', '800M'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(
"Manage service blocks / restrictions", "Manage service blocks / restrictions",

4
utils/country_languages.php
View File

@@ -1,7 +1,9 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');
ini_set('display_errors', 'stderr'); ini_set('display_errors', 'stderr');

3
utils/importWikipedia.php
View File

@@ -1,7 +1,8 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(

3
utils/imports.php
View File

@@ -1,7 +1,8 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(

7
utils/query.php
View File

@@ -1,9 +1,10 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/Geocode.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); require_once(CONST_BasePath.'/lib/Geocode.php');
ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(
"Query database from command line. Returns search result as JSON.", "Query database from command line. Returns search result as JSON.",

3
utils/setup.php
View File

@@ -1,7 +1,8 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(

7
utils/specialphrases.php
View File

@@ -1,9 +1,10 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
ini_set('memory_limit', '800M'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('display_errors', 'stderr'); ini_set('memory_limit', '800M');
ini_set('display_errors', 'stderr');
$aCMDOptions = array( $aCMDOptions = array(
"Import and export special phrases", "Import and export special phrases",

5
utils/update.php
View File

@@ -1,8 +1,9 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
ini_set('memory_limit', '800M'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(
"Import / update / index osm data", "Import / update / index osm data",

5
utils/warm.php
View File

@@ -1,8 +1,9 @@
#!/usr/bin/php -Cq #!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
ini_set('memory_limit', '800M'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M');
$aCMDOptions = array( $aCMDOptions = array(
"Tools to warm nominatim db", "Tools to warm nominatim db",

3
website/deletable.php
View File

@@ -1,5 +1,6 @@
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
$sOutputFormat = 'html'; $sOutputFormat = 'html';

3
website/details.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Details'); @define('CONST_ConnectionBucket_PageType', 'Details');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
$sOutputFormat = 'html'; $sOutputFormat = 'html';

3
website/hierarchy.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Details'); @define('CONST_ConnectionBucket_PageType', 'Details');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');

3
website/lookup.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Reverse'); @define('CONST_ConnectionBucket_PageType', 'Reverse');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');

3
website/polygons.php
View File

@@ -1,5 +1,6 @@
<?php <?php
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
$sOutputFormat = 'html'; $sOutputFormat = 'html';

3
website/reverse.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Reverse'); @define('CONST_ConnectionBucket_PageType', 'Reverse');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');
require_once(CONST_BasePath.'/lib/ReverseGeocode.php'); require_once(CONST_BasePath.'/lib/ReverseGeocode.php');

3
website/search.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Search'); @define('CONST_ConnectionBucket_PageType', 'Search');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/Geocode.php'); require_once(CONST_BasePath.'/lib/Geocode.php');

3
website/status.php
View File

@@ -1,7 +1,8 @@
<?php <?php
@define('CONST_ConnectionBucket_PageType', 'Status'); @define('CONST_ConnectionBucket_PageType', 'Status');
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
function statusError($sMsg) function statusError($sMsg)
{ {