X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a7e0d652b1d40a397e1c1386d500101796676c4..78a87ad16b4672f4c79ecb7a2d0146ec7e9e8670:/docs/admin/Advanced-Installations.md diff --git a/docs/admin/Advanced-Installations.md b/docs/admin/Advanced-Installations.md index d5e6e889..3b98fec3 100644 --- a/docs/admin/Advanced-Installations.md +++ b/docs/admin/Advanced-Installations.md @@ -5,107 +5,102 @@ your Nominatim database. It is assumed that you have already successfully installed the Nominatim software itself, if not return to the [installation page](Installation.md). -## Importing multiple regions +## Importing multiple regions (without updates) -To import multiple regions in your database, you need to configure and run `utils/import_multiple_regions.sh` file. This script will set up the update directory which has the following structure: +To import multiple regions in your database you can simply give multiple +OSM files to the import command: -```bash -update -    ├── europe -    │   ├── andorra -    │   │   └── sequence.state -    │   └── monaco -    │   └── sequence.state -    └── tmp - ├── combined.osm.pbf - └── europe - ├── andorra-latest.osm.pbf - └── monaco-latest.osm.pbf +``` +nominatim import --osm-file file1.pbf --osm-file file2.pbf +``` +If you already have imported a file and want to add another one, you can +use the add-data function to import the additional data as follows: +``` +nominatim add-data --file +nominatim refresh --postcodes +nominatim index -j ``` -The `sequence.state` files will contain the sequence ID, which will be used by pyosmium to get updates. The tmp folder is used for import dump. - -### Configuring multiple regions +Please note that adding additional data is always significantly slower than +the original import. -The file `import_multiple_regions.sh` needs to be edited as per your requirement: +## Importing multiple regions (with updates) -1. List of countries. eg: +If you want to import multiple regions _and_ be able to keep them up-to-date +with updates, then you can use the scripts provided in the `utils` directory. - COUNTRIES="europe/monaco europe/andorra" +These scripts will set up an `update` directory in your project directory, +which has the following structure: -2. Path to Build directory. eg: +```bash +update + ├── europe + │ ├── andorra + │ │ └── sequence.state + │ └── monaco + │ └── sequence.state + └── tmp + └── europe + ├── andorra-latest.osm.pbf + └── monaco-latest.osm.pbf - NOMINATIMBUILD="/srv/nominatim/build" +``` -3. Path to Update directory. eg: - - UPDATEDIR="/srv/nominatim/update" +The `sequence.state` files contain the sequence ID for each region. They will +be used by pyosmium to get updates. The `tmp` folder is used for import dump and +can be deleted once the import is complete. -4. Replication URL. eg: - - BASEURL="https://download.geofabrik.de" - DOWNCOUNTRYPOSTFIX="-latest.osm.pbf" ### Setting up multiple regions -!!! tip - If your database already exists and you want to add more countries, - replace the setting up part - `${SETUPFILE} --osm-file ${UPDATEDIR}/tmp/combined.osm.pbf --all 2>&1` - with `${UPDATEFILE} --import-file ${UPDATEDIR}/tmp/combined.osm.pbf --index --index-instances N 2>&1` - where N is the numbers of CPUs in your system. - -Run the following command from your Nominatim directory after configuring the file. - - bash ./utils/import_multiple_regions.sh - -!!! danger "Important" - This file uses osmium-tool. It must be installed before executing the import script. - Installation instructions can be found [here](https://osmcode.org/osmium-tool/manual.html#installation). +Create a project directory as described for the +[simple import](Import.md#creating-the-project-directory). If necessary, +you can also add an `.env` configuration with customized options. In particular, +you need to make sure that `NOMINATIM_REPLICATION_UPDATE_INTERVAL` and +`NOMINATIM_REPLICATION_RECHECK_INTERVAL` are set according to the update +interval of the extract server you use. -### Updating multiple regions +Copy the scripts `utils/import_multiple_regions.sh` and `utils/update_database.sh` +into the project directory. -To import multiple regions in your database, you need to configure and run ```utils/update_database.sh```. -This uses the update directory set up while setting up the DB. +Now customize both files as per your requirements -### Configuring multiple regions - -The file `update_database.sh` needs to be edited as per your requirement: - -1. List of countries. eg: +1. List of countries. e.g. COUNTRIES="europe/monaco europe/andorra" -2. Path to Build directory. eg: - - NOMINATIMBUILD="/srv/nominatim/build" +2. URL to the service providing the extracts and updates. eg: -3. Path to Update directory. eg: - - UPDATEDIR="/srv/nominatim/update" - -4. Replication URL. eg: - BASEURL="https://download.geofabrik.de" - DOWNCOUNTRYPOSTFIX="-updates" + DOWNCOUNTRYPOSTFIX="-latest.osm.pbf" -5. Followup can be set according to your installation. eg: For Photon, +5. Followup in the update script can be set according to your installation. + E.g. for Photon, FOLLOWUP="curl http://localhost:2322/nominatim-update" will handle the indexing. + +To start the initial import, change into the project directory and run + +``` + bash import_multiple_regions.sh +``` + ### Updating the database -Run the following command from your Nominatim directory after configuring the file. +Change into the project directory and run the following command: - bash ./utils/update_database.sh + bash update_database.sh -This will get diffs from the replication server, import diffs and index the database. The default replication server in the script([Geofabrik](https://download.geofabrik.de)) provides daily updates. +This will get diffs from the replication server, import diffs and index +the database. The default replication server in the +script ([Geofabrik](https://download.geofabrik.de)) provides daily updates. -## Importing Nominatim to an external PostgreSQL database +## Using an external PostgreSQL database You can install Nominatim using a database that runs on a different server when you have physical access to the file system on the other server. Nominatim @@ -113,6 +108,11 @@ uses a custom normalization library that needs to be made accessible to the PostgreSQL server. This section explains how to set up the normalization library. +!!! note + The external module is only needed when using the legacy tokenizer. + If you have chosen the ICU tokenizer, then you can ignore this section + and follow the standard import documentation. + ### Option 1: Compiling the library on the database server The most sure way to get a working library is to compile it on the database @@ -170,4 +170,46 @@ NOMINATIM_DATABASE_MODULE_PATH="