update docs for new country grid location

Also updates some dependencies.

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)

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:
 

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:
 

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:
 

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
+EOF
+

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: