update osm2pgsql (gazetteer output tests)

[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 16f9b1350e68361c9a2c1ca150ae867774cc932f..3c18312fc13602391c71b2f953b8512fc24cd3cc 100644 (file)
--- a/docs/admin/Import-and-Update.md
+++ b/docs/admin/Import-and-Update.md
@@ -118,6 +118,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.
   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`.
 
 
 The style can be changed with the configuration `CONST_Import_Style`.
 


@@ -134,6 +137,7 @@ admin     |    5h        |  190 GB    |   20 GB
 street    |   42h        |  400 GB    |  180 GB
 address   |   59h        |  500 GB    |  260 GB
 full      |   80h        |  575 GB    |  300 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).
 
 You can also customize the styles further. For a description of the
 style format see [the development section](../develop/Import.md).


@@ -163,7 +167,7 @@ configuration as it may not be optimal for the import.
 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
 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

-blockes at least the part of RAM that has been configured with the
+blocks at least the part of RAM that has been configured with the

 `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
 `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


@@ -180,6 +184,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.
 
 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
 ## Tuning the database
 
 Accurate word frequency information for search terms helps PostgreSQL's query


@@ -293,7 +306,9 @@ The following command will keep your database constantly up to date:
 
     ./utils/update.php --import-osmosis-all
 
 
     ./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
 
 If you have imported multiple country extracts and want to keep them
 up-to-date, have a look at the script in