Merge pull request #660 from mtmail/new-github-URL

[nominatim.git] / docs / Import_and_update.md

diff --git a/docs/Import_and_update.md b/docs/Import_and_update.md
index 2f40312aa0b8e56e2cb1d2d0040f7aead55299af..cd9ff697193fd7e9f8c49703d0df837469ed5614 100644 (file)
--- a/docs/Import_and_update.md
+++ b/docs/Import_and_update.md
@@ -3,7 +3,7 @@ Importing a new database
 
 The following instructions explain how to create a Nominatim database
 from an OSM planet file and how to keep the database up to date. It
 
 The following instructions explain how to create a Nominatim database
 from an OSM planet file and how to keep the database up to date. It

-is assumed that you have already sucessfully installed the Nominatim
+is assumed that you have already successfully installed the Nominatim

 software itself, if not return to the [installation page](Installation.md).
 
 Configuration setup in settings/local.php
 software itself, if not return to the [installation page](Installation.md).
 
 Configuration setup in settings/local.php


@@ -15,10 +15,12 @@ If you plan to import a large dataset (e.g. Europe, North America, planet),
 you should also enable flatnode storage of node locations. With this
 setting enabled, node coordinates are stored in a simple file instead
 of the database. This will save you import time and disk storage.
 you should also enable flatnode storage of node locations. With this
 setting enabled, node coordinates are stored in a simple file instead
 of the database. This will save you import time and disk storage.

-Add to your settings/local.php:
+Add to your `settings/local.php`:

 
     @define('CONST_Osm2pgsql_Flatnode_File', '/path/to/flatnode.file');
 
 
     @define('CONST_Osm2pgsql_Flatnode_File', '/path/to/flatnode.file');
 

+Replace the second part with a suitable path on your system and make sure
+the directory exists. There should be at least 35GB of free space.

 
 Downloading additional data
 ---------------------------
 
 Downloading additional data
 ---------------------------


@@ -55,9 +57,9 @@ Download the data to import and load the data with the following command:
 
     ./utils/setup.php --osm-file <your data file> --all [--osm2pgsql-cache 28000] 2>&1 | tee setup.log
 
 
     ./utils/setup.php --osm-file <your data file> --all [--osm2pgsql-cache 28000] 2>&1 | tee setup.log
 

-The --osm2pgsql-cache parameter is optional but strongly recommended for
+The `--osm2pgsql-cache` parameter is optional but strongly recommended for

 planet imports. It sets the node cache size for the osm2pgsql import part
 planet imports. It sets the node cache size for the osm2pgsql import part

-(see -C parameter in osm2pgsql help). 28GB are recommended for a full planet
+(see `-C` parameter in osm2pgsql help). 28GB are recommended for a full planet

 import, for excerpts you can use less. Adapt to your available RAM to
 avoid swapping, never give more than 2/3 of RAM to osm2pgsql.
 
 import, for excerpts you can use less. Adapt to your available RAM to
 avoid swapping, never give more than 2/3 of RAM to osm2pgsql.
 


@@ -65,10 +67,8 @@ avoid swapping, never give more than 2/3 of RAM to osm2pgsql.
 Loading additional datasets
 ---------------------------
 
 Loading additional datasets
 ---------------------------
 

-The following commands will create additional entries for countries and POI searches:
+The following commands will create additional entries for POI searches:

 
 

-    ./utils/specialphrases.php --countries > specialphrases_countries.sql
-    psql -d nominatim -f specialphrases_countries.sql

     ./utils/specialphrases.php --wiki-import > specialphrases.sql
     psql -d nominatim -f specialphrases.sql
 
     ./utils/specialphrases.php --wiki-import > specialphrases.sql
     psql -d nominatim -f specialphrases.sql
 


@@ -102,8 +102,16 @@ instance by following these steps:
 
          ./utils/setup.php --import-tiger-data
 
 
          ./utils/setup.php --import-tiger-data
 

+  5. Enable use of the Tiger data in your `settings/local.php` by adding:
+
+         @define('CONST_Use_US_Tiger_Data', true);
+
+  6. Apply the new settings:
+
+        ./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
+

 Be warned that the import can take a very long time, especially if you
 Be warned that the import can take a very long time, especially if you

-import all of the US.
+import all of the US. The entire US adds about 10GB to your database.

 
 
 Updates
 
 
 Updates


@@ -170,5 +178,5 @@ The following command will keep your database constantly up to date:
 
 If you have imported multiple country extracts and want to keep them
 up-to-date, have a look at the script in
 
 If you have imported multiple country extracts and want to keep them
 up-to-date, have a look at the script in

-(issue #60)[https://github.com/twain47/Nominatim/issues/60].
+[issue #60](https://github.com/openstreetmap/Nominatim/issues/60).