Merge pull request #1612 from mtmail/cleanup-wiki-scripts

refactor import_wiki* script for readability

diff --git a/.travis.yml b/.travis.yml
index 259b9d5b95d3f6578f8b660d173025234e635bd1..25f7d8b4c9e12a4f1776004ebc47c48c52f44d47 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,5 +30,6 @@ script:
   - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/check_import_finished.php; fi
 notifications:
   email: false

diff --git a/docs/admin/Import-and-Update.md b/docs/admin/Import-and-Update.md
index afda83b2dc00f85a6dd4134b2df3028807a9302b..3c6f11d0f2cd8488ab2977eba19f08bd0c8bc97d 100644 (file)
--- a/docs/admin/Import-and-Update.md
+++ b/docs/admin/Import-and-Update.md
@@ -180,6 +180,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.
 
+### 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
@@ -293,7 +302,9 @@ 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.)
+(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