update docs for new country grid location

Also updates some dependencies.

diff --git a/docs/Installation.md b/docs/Installation.md
index 7f108160a25e40324e855bea2d83e532cd6ed3e9..c4678ed90fcc3e853a6e9ab0283fd6b222b1f3bb 100644 (file)
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -28,8 +28,7 @@ required for compiling osm2pgsql.
 
 For running tests:
 
 
 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)
   * [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 e6b7c9460563066964f8aeda2744d0155b3a0d8d..40e8a4042e749b4602752531e2ee3e4cdce0020d 100644 (file)
--- 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:
 
 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 2baacc81718646a810ddf071a9b28af3a458de58..66d82cf0090f2145ddbf0aec9889bf1dd557b0eb 100644 (file)
--- 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:
 
 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 62e718e5d8c9c9074938c392e8ec04d43070d566..02c7d943fda703e8f975a7f9e1201add88b36df9 100755 (executable)
--- 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:
 
     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:
 
 # 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 4e90e2eb8566230cb83263bc60b22df096104418..44faa614e5de7bcba05172c5f3fd349ab23592fa 100755 (executable)
--- 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
 
 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
 
 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');
  @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 87cf185548aa75d6b1e26b7ceede8d5033a1c0ed..c347923fcf0f53ca784138fb7d5d44d637d599f1 100755 (executable)
--- 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:
 
     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:
 
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there: