add wiki link to osm2psql README

[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 35306a4df17ea6a35587f5521d4a8472cc86e675..246fcddab1ad615cb127af75317de3579505c762 100644 (file)
--- a/docs/admin/Import-and-Update.md
+++ b/docs/admin/Import-and-Update.md
@@ -33,7 +33,7 @@ the directory exists. There should be at least 40GB of free space.
 
 ## Downloading additional data
 
 
 ## Downloading additional data
 

-### Wikipedia rankings
+### Wikipedia/Wikidata rankings

 
 Wikipedia can be used as an optional auxiliary data source to help indicate
 the importance of OSM features. Nominatim will work without this information
 
 Wikipedia can be used as an optional auxiliary data source to help indicate
 the importance of OSM features. Nominatim will work without this information


@@ -41,22 +41,22 @@ but it will improve the quality of the results if this is installed.
 This data is available as a binary download:
 
     cd $NOMINATIM_SOURCE_DIR/data
 This data is available as a binary download:
 
     cd $NOMINATIM_SOURCE_DIR/data

-    wget https://www.nominatim.org/data/wikipedia_article.sql.bin
-    wget https://www.nominatim.org/data/wikipedia_redirect.sql.bin
+    wget https://www.nominatim.org/data/wikimedia-importance.sql.gz

 
 

-Combined the 2 files are around 1.5GB and add around 30GB to the install
-size of Nominatim. They also increase the install time by an hour or so.
+The file is about 400MB and adds around 4GB to Nominatim database.

 
 

-*NOTE:* you'll need to download the Wikipedia rankings before performing
-the initial import of the data if you want the rankings applied to the
-loaded data.
+*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`.

 
 

-### UK postcodes
+### Great Britain, USA postcodes

 
 

-Nominatim can use postcodes from an external source to improve searches that involve a UK postcode. This data can be optionally downloaded:
+Nominatim can use postcodes from an external source to improve searches that
+involve a GB or US postcode. This data can be optionally downloaded:

 
     cd $NOMINATIM_SOURCE_DIR/data
     wget https://www.nominatim.org/data/gb_postcode_data.sql.gz
 
     cd $NOMINATIM_SOURCE_DIR/data
     wget https://www.nominatim.org/data/gb_postcode_data.sql.gz

+    wget https://www.nominatim.org/data/us_postcode_data.sql.gz

 
 ## Choosing the Data to Import
 
 
 ## Choosing the Data to Import
 


@@ -186,28 +186,22 @@ 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.
 
 TIGER data to your own Nominatim instance by following these steps. The
 entire US adds about 10GB to your database.
 

-  1. Get preprocessed TIGER 2018 data and unpack it into the
+  1. Get preprocessed TIGER 2019 data and unpack it into the

      data directory in your Nominatim sources:
 
      data directory in your Nominatim sources:
 

-```sh
-    cd Nominatim/data
-    wget https://nominatim.org/data/tiger2018-nominatim-preprocessed.tar.gz
-    tar xf tiger2018-nominatim-preprocessed.tar.gz
-```
+        cd Nominatim/data
+        wget https://nominatim.org/data/tiger2019-nominatim-preprocessed.tar.gz
+        tar xf tiger2019-nominatim-preprocessed.tar.gz

 
     `data-source/us-tiger/README.md` explains how the data got preprocessed.
 
   2. Import the data into your Nominatim database:
 
 
     `data-source/us-tiger/README.md` explains how the data got preprocessed.
 
   2. Import the data into your Nominatim database:
 

-```sh
-    ./utils/setup.php --import-tiger-data
-```
+        ./utils/setup.php --import-tiger-data

 
   3. Enable use of the Tiger data in your `settings/local.php` by adding:
 
 
   3. Enable use of the Tiger data in your `settings/local.php` by adding:
 

-```

          @define('CONST_Use_US_Tiger_Data', true);
          @define('CONST_Use_US_Tiger_Data', true);

-```

 
   4. Apply the new settings:
 
 
   4. Apply the new settings:
 


@@ -224,14 +218,14 @@ For a list of other methods see the output of `./utils/update.php --help`.
 
 #### Installing the newest version of Pyosmium
 
 
 #### Installing the newest version of Pyosmium
 

-It is recommended to install Pyosmium via pip. Run (as the same user who
-will later run the updates):
+It is recommended to install Pyosmium via pip. Make sure to use python3.
+Run (as the same user who will later run the updates):

 
 ```sh
 
 ```sh

-pip install --user osmium
+pip3 install --user osmium

 ```
 
 ```
 

-Nominatim needs a tool called `pyosmium-get-updates`, which comes with
+Nominatim needs a tool called `pyosmium-get-updates` which comes with

 Pyosmium. You need to tell Nominatim where to find it. Add the
 following line to your `settings/local.php`:
 
 Pyosmium. You need to tell Nominatim where to find it. Add the
 following line to your `settings/local.php`: