Merge remote-tracking branch 'upstream/master'

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

diff --git a/docs/admin/Update.md b/docs/admin/Update.md
index 98f5244afd51c6f7bad6563a3c69566e17cd0c0a..a2323cfeec931ff985551cde7f220cd1aaa792b6 100644 (file)
--- a/docs/admin/Update.md
+++ b/docs/admin/Update.md
@@ -1,8 +1,10 @@
 # Updating the Database
 
 There are many different ways to update your Nominatim database.
 # Updating the Database
 
 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`.
+The following section describes how to keep it up-to-date using
+an [online replication service for OpenStreetMap data](https://wiki.openstreetmap.org/wiki/Planet.osm/diffs)
+For a list of other methods to add or update data see the output of
+`nominatim add-data --help`.

 
 !!! important
     If you have configured a flatnode file for the import, then you
 
 !!! important
     If you have configured a flatnode file for the import, then you


@@ -17,15 +19,6 @@ Run (as the same user who will later run the updates):
 pip3 install --user osmium
 ```
 
 pip3 install --user osmium
 ```
 

-Nominatim needs a tool called `pyosmium-get-changes` which comes with
-Pyosmium. You need to tell Nominatim where to find it. Add the
-following line to your `.env`:
-
-    NOMINATIM_PYOSMIUM_BINARY=/home/user/.local/bin/pyosmium-get-changes
-
-The path above is fine if you used the `--user` parameter with pip.
-Replace `user` with your user name.
-

 #### Setting up the update process
 
 Next the update needs to be initialised. By default Nominatim is configured
 #### Setting up the update process
 
 Next the update needs to be initialised. By default Nominatim is configured


@@ -37,30 +30,26 @@ diffs for Ireland from Geofabrik add the following:
 
     # base URL of the replication service
     NOMINATIM_REPLICATION_URL="https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates"
 
     # base URL of the replication service
     NOMINATIM_REPLICATION_URL="https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates"

-    # How often upstream publishes diffs
+    # How often upstream publishes diffs (in seconds)

     NOMINATIM_REPLICATION_UPDATE_INTERVAL=86400
     NOMINATIM_REPLICATION_UPDATE_INTERVAL=86400

-    # How long to sleep if no update found yet
+    # How long to sleep if no update found yet (in seconds)

     NOMINATIM_REPLICATION_RECHECK_INTERVAL=900
 
 To set up the update process now run the following command:
 
     NOMINATIM_REPLICATION_RECHECK_INTERVAL=900
 
 To set up the update process now run the following command:
 

-    ./utils/update.php --init-updates
+    nominatim replication --init

 
 It outputs the date where updates will start. Recheck that this date is
 what you expect.
 
 
 It outputs the date where updates will start. Recheck that this date is
 what you expect.
 

-The `--init-updates` command needs to be rerun whenever the replication service
-is changed.
+The `replication --init` command needs to be rerun whenever the replication
+service is changed.

 
 #### Updating Nominatim
 
 The following command will keep your database constantly up to date:
 
 
 #### Updating Nominatim
 
 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.)
+    nominatim replication

 
 If you have imported multiple country extracts and want to keep them
 up-to-date, [Advanced installations section](Advanced-Installations.md) contains instructions 
 
 If you have imported multiple country extracts and want to keep them
 up-to-date, [Advanced installations section](Advanced-Installations.md) contains instructions