From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 12 May 2017 22:13:56 +0000 (+0200)
Subject: update docs for new country grid location
X-Git-Tag: v3.0.0~33^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e7c8b498d18129e3d31498136237a3edc20da486?ds=sidebyside;hp=b15b996cc4a9c34c451032a526d412f51d87160c

update docs for new country grid location

Also updates some dependencies.
---

diff --git a/docs/Installation.md b/docs/Installation.md
index 7f108160..c4678ed9 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -28,8 +28,7 @@ required for compiling osm2pgsql.
 
 For running tests:
 
-  * [lettuce](http://lettuce.it)
-  * [Shapely](http://toblerity.org/shapely/index.html)
+  * [behave](http://pythonhosted.org/behave/)
   * [Psycopg2](http://initd.org/psycopg)
   * [nose](https://nose.readthedocs.io)
   * [phpunit](https://phpunit.de)
diff --git a/docs/install-on-centos-7.md b/docs/install-on-centos-7.md
index e6b7c946..40e8a404 100644
--- a/docs/install-on-centos-7.md
+++ b/docs/install-on-centos-7.md
@@ -150,6 +150,13 @@ Get the source code from Github and change into the source directory
 
 
 
+When installing the latest source from github, you also need to
+download the country grid:
+
+
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+
+
 The code must be built in a separate directory. Create this directory,
 then configure and build Nominatim in there:
 
diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md
index 2baacc81..66d82cf0 100644
--- a/docs/install-on-ubuntu-16.md
+++ b/docs/install-on-ubuntu-16.md
@@ -137,6 +137,13 @@ Get the source code from Github and change into the source directory
 
 
 
+When installing the latest source from github, you also need to
+download the country grid:
+
+
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+
+
 The code must be built in a separate directory. Create this directory,
 then configure and build Nominatim in there:
 
diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index 62e718e5..02c7d943 100755
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -151,6 +151,13 @@ else                               #DOCS:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 
+# When installing the latest source from github, you also need to
+# download the country grid:
+
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+fi                                 #DOCS:
+
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index 4e90e2eb..44faa614 100755
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -45,6 +45,7 @@ EOFAPACHECONF
 sudo a2enconf nominatim
 sudo service apache2 restart
 
+wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
 
 mkdir build
 cd build
@@ -57,4 +58,5 @@ tee settings/local.php << EOF
  @define('CONST_Website_BaseURL', '/nominatim/');
  @define('CONST_Database_DSN', 'pgsql://@/test_api_nominatim');
  @define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb');
-EOF
\ No newline at end of file
+EOF
+
diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index 87cf1855..c347923f 100755
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -138,6 +138,13 @@ else                               #DOCS:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 
+# When installing the latest source from github, you also need to
+# download the country grid:
+
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+fi                                 #DOCS:
+
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there: