Merge pull request #3463 from lonvia/sqlalchemy14-with-psycopg

[nominatim.git] / docs / admin / Import.md

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 7eb4d403acdb438b29d0fcd3d568e2a5103e2128..38cd0b740ff4ea37f90098f43dd8f461d590b733 100644 (file)
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@ -14,15 +14,15 @@ to a single Nominatim setup: configuration, extra data, etc. Create a project
 directory apart from the Nominatim software and change into the directory:
 
 ```
 directory apart from the Nominatim software and change into the directory:
 
 ```

-mkdir ~/nominatim-planet
-cd ~/nominatim-planet
+mkdir ~/nominatim-project
+cd ~/nominatim-project

 ```
 
 In the following, we refer to the project directory as `$PROJECT_DIR`. To be
 able to copy&paste instructions, you can export the appropriate variable:
 
 ```
 ```
 
 In the following, we refer to the project directory as `$PROJECT_DIR`. To be
 able to copy&paste instructions, you can export the appropriate variable:
 
 ```

-export PROJECT_DIR=~/nominatim-planet
+export PROJECT_DIR=~/nominatim-project

 ```
 
 The Nominatim tool assumes per default that the current working directory is
 ```
 
 The Nominatim tool assumes per default that the current working directory is


@@ -75,14 +75,17 @@ This data is available as a binary download. Put it into your project directory:
 
     cd $PROJECT_DIR
     wget https://nominatim.org/data/wikimedia-importance.sql.gz
 
     cd $PROJECT_DIR
     wget https://nominatim.org/data/wikimedia-importance.sql.gz

+    wget -O secondary_importance.sql.gz https://nominatim.org/data/wikimedia-secondary-importance.sql.gz

 
 

-The file is about 400MB and adds around 4GB to the Nominatim database.
+The files are about 400MB and add around 4GB to the Nominatim database. For
+more information about importance,
+see [Importance Customization](../customize/Importance.md).

 
 !!! tip
     If you forgot to download the wikipedia rankings, then you can
     also add importances after the import. Download the SQL files, then
 
 !!! tip
     If you forgot to download the wikipedia rankings, then you can
     also add importances after the import. Download the SQL files, then

-    run `nominatim refresh --wiki-data --importance`. Updating
-    importances for a planet will take a couple of hours.
+    run `nominatim refresh --wiki-data --secondary-importance --importance`.
+    Updating importances for a planet will take a couple of hours.

 
 ### External postcodes
 
 
 ### External postcodes
 


@@ -153,7 +156,7 @@ if you plan to use the installation only for exports to a
 [photon](https://photon.komoot.io/) database, then you can set up a database
 without search indexes. Add `--reverse-only` to your setup command above.
 
 [photon](https://photon.komoot.io/) database, then you can set up a database
 without search indexes. Add `--reverse-only` to your setup command above.
 

-This saves about 5% of disk space.
+This saves about 5% of disk space, import time won't be significant faster.

 
 ### Filtering Imported Data
 
 
 ### Filtering Imported Data
 


@@ -228,7 +231,7 @@ 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
 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.md#postgresql-tuning)
+[PostgreSQL tuning](Installation.md#tuning-the-postgresql-database)

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


@@ -268,18 +271,26 @@ nominatim reverse --lat 51 --lon 45
 ```
 
 If you want to run Nominatim as a service, you need to make a choice between
 ```
 
 If you want to run Nominatim as a service, you need to make a choice between

-running the traditional PHP frontend or the new experimental Python frontend.
+running the modern Python frontend and the legacy PHP frontend.

 Make sure you have installed the right packages as per
 [Installation](Installation.md#software).
 
 Make sure you have installed the right packages as per
 [Installation](Installation.md#software).
 

-#### Testing the PHP frontend
+#### Testing the Python frontend

 
 

-You can run a small test server with the PHP frontend like this:
+To run the test server against the Python frontend, you must choose a
+web framework to use, either starlette or falcon. Make sure the appropriate
+packages are installed. Then run

 
 

-```sh
+``` sh

 nominatim serve
 ```
 
 nominatim serve
 ```
 

+or, if you prefer to use Starlette instead of Falcon as webserver,
+
+``` sh
+nominatim serve --engine starlette
+```
+

 Go to `http://localhost:8088/status.php` and you should see the message `OK`.
 You can also run a search query, e.g. `http://localhost:8088/search.php?q=Berlin`
 or, for reverse-only installations a reverse query,
 Go to `http://localhost:8088/status.php` and you should see the message `OK`.
 You can also run a search query, e.g. `http://localhost:8088/search.php?q=Berlin`
 or, for reverse-only installations a reverse query,


@@ -287,22 +298,14 @@ e.g. `http://localhost:8088/reverse.php?lat=27.1750090510034&lon=78.04209025`.
 
 Do not use this test server in production.
 To run Nominatim via webservers like Apache or nginx, please continue reading
 
 Do not use this test server in production.
 To run Nominatim via webservers like Apache or nginx, please continue reading

-[Deploy the PHP frontend](Deployment-PHP.md).
-
-#### Testing the Python frontend
-
-To run the test server against the Python frontend, you must choose a
-web framework to use, either starlette or falcon. Make sure the appropriate
-packages are installed. Then run
+[Deploy the Python frontend](Deployment-Python.md).

 
 

-``` sh
-nominatim serve --engine falcon
-```
+#### Testing the PHP frontend

 
 

-or
+You can run a small test server with the PHP frontend like this:

 
 

-``` sh
-nominatim serve --engine starlette
+```sh
+nominatim serve --engine php

 ```
 
 Go to `http://localhost:8088/status.php` and you should see the message `OK`.
 ```
 
 Go to `http://localhost:8088/status.php` and you should see the message `OK`.


@@ -312,12 +315,13 @@ e.g. `http://localhost:8088/reverse.php?lat=27.1750090510034&lon=78.04209025`.
 
 Do not use this test server in production.
 To run Nominatim via webservers like Apache or nginx, please continue reading
 
 Do not use this test server in production.
 To run Nominatim via webservers like Apache or nginx, please continue reading

-[Deploy the Python frontend](Deployment-Python.md).
+[Deploy the PHP frontend](Deployment-PHP.md).
+

 
 
 ## Enabling search by category phrases
 
 
 
 ## Enabling search by category phrases
 

-If you want to be able to search for places by their type using
+To be able to search for places by their type using

 [special phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
 you also need to import these key phrases like this:
 
 [special phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
 you also need to import these key phrases like this: