Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / admin / Import-and-Update.md

diff --git a/docs/admin/Import-and-Update.md b/docs/admin/Import-and-Update.md
index afda83b2dc00f85a6dd4134b2df3028807a9302b..47516a2b006d19c1cc66e44df46dd8663431d6ea 100644 (file)
--- a/docs/admin/Import-and-Update.md
+++ b/docs/admin/Import-and-Update.md
@@ -45,9 +45,11 @@ This data is available as a binary download:
 
 The file is about 400MB and adds around 4GB to Nominatim database.
 
-*NOTE:* if you forgot to download the wikipedia rankings, you can also add
-them after the import by running `./utils/setup.php --import-wikipedia-articles`
-and then `./utils/update.php --recompute-importance`.
+!!! tip
+    If you forgot to download the wikipedia rankings, you can also add
+    importances after the import. Download the files, then run
+    `./utils/setup.php --import-wikipedia-articles`
+    and `./utils/update.php --recompute-importance`.
 
 ### Great Britain, USA postcodes
 
@@ -118,6 +120,9 @@ import styles available which only read selected data:
   Import all data necessary to compute addresses down to house number level.
 * **settings/import-full.style**
   Default style that also includes points of interest.
+* **settings/import-extratags.style**
+  Like the full style but also adds most of the OSM tags into the extratags
+  column.
 
 The style can be changed with the configuration `CONST_Import_Style`.
 
@@ -134,14 +139,16 @@ admin     |    5h        |  190 GB    |   20 GB
 street    |   42h        |  400 GB    |  180 GB
 address   |   59h        |  500 GB    |  260 GB
 full      |   80h        |  575 GB    |  300 GB
+extratags |   80h        |  585 GB    |  310 GB
 
 You can also customize the styles further. For a description of the
 style format see [the development section](../develop/Import.md).
 
 ## Initial import of the data
 
-**Important:** first try the import with a small extract, for example from
-[Geofabrik](https://download.geofabrik.de).
+!!! danger "Important"
+    First try the import with a small extract, for example from
+    [Geofabrik](https://download.geofabrik.de).
 
 Download the data to import and load the data with the following command
 from the build directory:
@@ -164,7 +171,7 @@ In the first step of the import Nominatim uses osm2pgsql to load the OSM data
 into the PostgreSQL database. This step is very demanding in terms of RAM usage.
 osm2pgsql and PostgreSQL are running in parallel at this point. PostgreSQL
 blocks at least the part of RAM that has been configured with the
-`shared_buffers` parameter during [PostgreSQL tuning](Installation#PostgreSQL_tuning)
+`shared_buffers` parameter during [PostgreSQL tuning](Installation#postgresql-tuning)
 and needs some memory on top of that. osm2pgsql needs at least 2GB of RAM for
 its internal data structures, potentially more when it has to process very large
 relations. In addition it needs to maintain a cache for node locations. The size
@@ -180,6 +187,15 @@ enough RAM for PostgreSQL and osm2pgsql as mentioned above. If the system starts
 swapping or you are getting out-of-memory errors, reduce the cache size or
 even consider using a flatnode file.
 
+### Verify import finished
+
+Run this script to verify all required tables and indices got created successfully.
+
+```sh
+./utils/check_import_finished.php
+```
+
+
 ## Tuning the database
 
 Accurate word frequency information for search terms helps PostgreSQL's query
@@ -208,7 +224,7 @@ need internet access for the step.
 
 ## Installing Tiger housenumber data for the US
 
-Nominatim is able to use the official [TIGER](https://www.census.gov/geo/maps-data/data/tiger.html)
+Nominatim is able to use the official [TIGER](https://www.census.gov/geographies/mapping-files/time-series/geo/tiger-line-file.html)
 address set to complement the OSM house number data in the US. You can add
 TIGER data to your own Nominatim instance by following these steps. The
 entire US adds about 10GB to your database.
@@ -243,6 +259,10 @@ There are many different ways to update your Nominatim database.
 The following section describes how to keep it up-to-date with Pyosmium.
 For a list of other methods see the output of `./utils/update.php --help`.
 
+!!! warning
+    If you have configured a flatnode file for the import, then you
+    need to keep this flatnode file around for updates as well.
+
 #### Installing the newest version of Pyosmium
 
 It is recommended to install Pyosmium via pip. Make sure to use python3.
@@ -293,9 +313,10 @@ The following command will keep your database constantly up to date:
 
     ./utils/update.php --import-osmosis-all
 
-(Note that even though the old name "import-osmosis-all" has been kept for compatibility reasons, Osmosis is not required to run this - it uses pyosmium behind the scenes.)
+(Note that even though the old name "import-osmosis-all" has been kept for
+compatibility reasons, Osmosis is not required to run this - it uses pyosmium
+behind the scenes.)
 
 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/openstreetmap/Nominatim/issues/60).
-
+up-to-date, [Advanced installations section](Advanced-Installations.md) contains instructions 
+to set up and update multiple country extracts.