From: Marc Tobias Metten Date: Tue, 2 Aug 2016 23:10:30 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' into travis-ci X-Git-Tag: v3.0.0~146^2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cb68a2cdd26d9c013a02dc4403991d3fb76dea7c?hp=3499ed7b82a50758de70e90abf98fb54514c6125 Merge remote-tracking branch 'upstream/master' into travis-ci --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1aaf05f0..65254b1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,6 @@ include_directories(${LIBXML2_INCLUDE_DIR}) #----------------------------------------------------------------------------- set(CUSTOMFILES - settings/settings.php settings/phrase_settings.php website/deletable.php website/details.php @@ -92,6 +91,8 @@ foreach (cfile ${CUSTOMFILES}) configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile}) endforeach() +configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php) + set(WEBPATHS css images js) foreach (wp ${WEBPATHS}) diff --git a/VAGRANT.md b/VAGRANT.md index e6a0fbb3..cd3ed311 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -45,11 +45,12 @@ is. ``` # inside the virtual machine: - cd Nominatim - wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf - ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log - ./utils/specialphrases.php --countries > data/specialphrases_countries.sql - psql -d nominatim -f data/specialphrases_countries.sql + mkdir data + cd build + wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf + ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log + ./utils/specialphrases.php --countries > ../data/specialphrases_countries.sql + psql -d nominatim -f ../data/specialphrases_countries.sql ``` To repeat an import you'd need to delete the database first diff --git a/settings/defaults.php b/settings/defaults.php new file mode 100644 index 00000000..cdb02924 --- /dev/null +++ b/settings/defaults.php @@ -0,0 +1,105 @@ +://:@:/ + @define('CONST_Database_Web_User', 'www-data'); + @define('CONST_Max_Word_Frequency', '50000'); + @define('CONST_Limit_Reindexing', true); + // Set to false to avoid importing extra postcodes for the US. + @define('CONST_Use_Extra_US_Postcodes', true); + // Set to true after importing Tiger house number data for the US. + // Note: The tables must already exist or queries will throw errors. + // After changing this setting run ./utils/setup --create-functions + // again. + @define('CONST_Use_US_Tiger_Data', false); + // Set to true after importing other external house number data. + // Note: the aux tables must already exist or queries will throw errors. + // After changing this setting run ./utils/setup --create-functions + // again. + @define('CONST_Use_Aux_Location_data', false); + + // Proxy settings + @define('CONST_HTTP_Proxy', false); + @define('CONST_HTTP_Proxy_Host', 'proxy.mydomain.com'); + @define('CONST_HTTP_Proxy_Port', '3128'); + @define('CONST_HTTP_Proxy_Login', ''); + @define('CONST_HTTP_Proxy_Password', ''); + + // Paths + @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql'); + @define('CONST_Osmosis_Binary', '/usr/bin/osmosis'); + @define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger'); + + // osm2pgsql settings + @define('CONST_Osm2pgsql_Flatnode_File', null); + + // tablespace settings + // osm2pgsql caching tables (aka slim mode tables) - update only + @define('CONST_Tablespace_Osm2pgsql_Data', false); + @define('CONST_Tablespace_Osm2pgsql_Index', false); + // osm2pgsql output tables (aka main table) - update only + @define('CONST_Tablespace_Place_Data', false); + @define('CONST_Tablespace_Place_Index', false); + // address computation tables - update only + @define('CONST_Tablespace_Address_Data', false); + @define('CONST_Tablespace_Address_Index', false); + // search tables - needed for lookups + @define('CONST_Tablespace_Search_Data', false); + @define('CONST_Tablespace_Search_Index', false); + // additional data, e.g. TIGER data, type searches - needed for lookups + @define('CONST_Tablespace_Aux_Data', false); + @define('CONST_Tablespace_Aux_Index', false); + + // Replication settings + @define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute'); + @define('CONST_Replication_MaxInterval', '3600'); + @define('CONST_Replication_Update_Interval', '60'); // How often upstream publishes diffs + @define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet + + // Website settings + @define('CONST_NoAccessControl', true); + + @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); + // Language to assume when none is supplied with the query. + // When set to false, the local language (i.e. the name tag without suffix) + // will be used. + @define('CONST_Default_Language', false); + // Appearance of the map in the debug interface. + @define('CONST_Default_Lat', 20.0); + @define('CONST_Default_Lon', 0.0); + @define('CONST_Default_Zoom', 2); + @define('CONST_Map_Tile_URL', 'http://{s}.tile.osm.org/{z}/{x}/{y}.png'); + @define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org + + @define('CONST_Search_AreaPolygons', true); + + @define('CONST_Search_BatchMode', false); + + @define('CONST_Search_TryDroppedAddressTerms', false); + @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500); + // If set to true, then reverse order of queries will be tried by default. + // When set to false only selected languages alloow reverse search. + @define('CONST_Search_ReversePlanForAll', true); + + // Maximum number of OSM ids that may be queried at once + // for the places endpoint. + @define('CONST_Places_Max_ID_count', 50); + + // Number of different geometry formats that may be queried in parallel. + // Set to zero to disable polygon output. + @define('CONST_PolygonOutput_MaximumTypes', 1); + + // Log settings + // Set to true to log into new_query_log table. + // You should set up a cron job that regularly clears out this table. + @define('CONST_Log_DB', false); + // Set to a file name to enable logging to a file. + @define('CONST_Log_File', false); + + diff --git a/settings/settings.php b/settings/settings.php index cdb02924..3475ae7b 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -1,105 +1,4 @@ ://:@:/ - @define('CONST_Database_Web_User', 'www-data'); - @define('CONST_Max_Word_Frequency', '50000'); - @define('CONST_Limit_Reindexing', true); - // Set to false to avoid importing extra postcodes for the US. - @define('CONST_Use_Extra_US_Postcodes', true); - // Set to true after importing Tiger house number data for the US. - // Note: The tables must already exist or queries will throw errors. - // After changing this setting run ./utils/setup --create-functions - // again. - @define('CONST_Use_US_Tiger_Data', false); - // Set to true after importing other external house number data. - // Note: the aux tables must already exist or queries will throw errors. - // After changing this setting run ./utils/setup --create-functions - // again. - @define('CONST_Use_Aux_Location_data', false); - - // Proxy settings - @define('CONST_HTTP_Proxy', false); - @define('CONST_HTTP_Proxy_Host', 'proxy.mydomain.com'); - @define('CONST_HTTP_Proxy_Port', '3128'); - @define('CONST_HTTP_Proxy_Login', ''); - @define('CONST_HTTP_Proxy_Password', ''); - - // Paths - @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql'); - @define('CONST_Osmosis_Binary', '/usr/bin/osmosis'); - @define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger'); - - // osm2pgsql settings - @define('CONST_Osm2pgsql_Flatnode_File', null); - - // tablespace settings - // osm2pgsql caching tables (aka slim mode tables) - update only - @define('CONST_Tablespace_Osm2pgsql_Data', false); - @define('CONST_Tablespace_Osm2pgsql_Index', false); - // osm2pgsql output tables (aka main table) - update only - @define('CONST_Tablespace_Place_Data', false); - @define('CONST_Tablespace_Place_Index', false); - // address computation tables - update only - @define('CONST_Tablespace_Address_Data', false); - @define('CONST_Tablespace_Address_Index', false); - // search tables - needed for lookups - @define('CONST_Tablespace_Search_Data', false); - @define('CONST_Tablespace_Search_Index', false); - // additional data, e.g. TIGER data, type searches - needed for lookups - @define('CONST_Tablespace_Aux_Data', false); - @define('CONST_Tablespace_Aux_Index', false); - - // Replication settings - @define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute'); - @define('CONST_Replication_MaxInterval', '3600'); - @define('CONST_Replication_Update_Interval', '60'); // How often upstream publishes diffs - @define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet - - // Website settings - @define('CONST_NoAccessControl', true); - - @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); - // Language to assume when none is supplied with the query. - // When set to false, the local language (i.e. the name tag without suffix) - // will be used. - @define('CONST_Default_Language', false); - // Appearance of the map in the debug interface. - @define('CONST_Default_Lat', 20.0); - @define('CONST_Default_Lon', 0.0); - @define('CONST_Default_Zoom', 2); - @define('CONST_Map_Tile_URL', 'http://{s}.tile.osm.org/{z}/{x}/{y}.png'); - @define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org - - @define('CONST_Search_AreaPolygons', true); - - @define('CONST_Search_BatchMode', false); - - @define('CONST_Search_TryDroppedAddressTerms', false); - @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500); - // If set to true, then reverse order of queries will be tried by default. - // When set to false only selected languages alloow reverse search. - @define('CONST_Search_ReversePlanForAll', true); - - // Maximum number of OSM ids that may be queried at once - // for the places endpoint. - @define('CONST_Places_Max_ID_count', 50); - - // Number of different geometry formats that may be queried in parallel. - // Set to zero to disable polygon output. - @define('CONST_PolygonOutput_MaximumTypes', 1); - - // Log settings - // Set to true to log into new_query_log table. - // You should set up a cron job that regularly clears out this table. - @define('CONST_Log_DB', false); - // Set to a file name to enable logging to a file. - @define('CONST_Log_File', false); - + echo "ERROR: Scripts must be run from build directory.\n"; + exit;