Merge pull request #661 from mtmail/travis-ci-badge

add travis-ci badge ("build passing") to README file

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d23b33928698eeb97975ac0fe4b188856d8acc81..276137f6d9c9b0c8ace6ac8832f42460a46b8d6d 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,11 +38,11 @@ The coding style is enforced with PHPCS and can be tested with:
 Before submitting a pull request make sure that the following tests pass:
 
 ```
-  cd tests
-  NOMINATIM_DIR=<builddir> lettuce -t -Fail -t -Tiger features/db features/osm2pgsql
+  cd test/bdd
+  behave -DBUILDDIR=<builddir> db osm2pgsql
 ```
 
 ```
-  cd test-php
+  cd test/php
   phpunit ./
 ```

diff --git a/README.md b/README.md
index 83b4d379ac6ea1360b201de413b9a4995a83a2bc..46c419fab644d62d0b926ac3efe5a981bf774cdd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -58,4 +58,4 @@ For questions you can join the geocoding mailinglist, see
 http://lists.openstreetmap.org/listinfo/geocoding
 
 Bugs may be reported on the github project site:
-https://github.com/twain47/Nominatim
+https://github.com/openstreetmap/Nominatim

diff --git a/VAGRANT.md b/VAGRANT.md
index 6a680b5347431124c80010972971da5afcbb2945..56a634325691a1e76bf8edc4bece91aa1b95d6c5 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -17,7 +17,7 @@ is.
 
 3. Nominatim 
 
-        git clone --recursive https://github.com/twain47/Nominatim.git
+        git clone --recursive https://github.com/openstreetmap/Nominatim.git
 
     If you haven't used `--recursive`, then you can load the submodules using
     

diff --git a/docs/Import_and_update.md b/docs/Import_and_update.md
index 8340b59e1fb378276aaa88576cc749a491bda34f..cd9ff697193fd7e9f8c49703d0df837469ed5614 100644 (file)
--- a/docs/Import_and_update.md
+++ b/docs/Import_and_update.md
@@ -3,7 +3,7 @@ Importing a new database
 
 The following instructions explain how to create a Nominatim database
 from an OSM planet file and how to keep the database up to date. It
-is assumed that you have already sucessfully installed the Nominatim
+is assumed that you have already successfully installed the Nominatim
 software itself, if not return to the [installation page](Installation.md).
 
 Configuration setup in settings/local.php
@@ -178,5 +178,5 @@ The following command will keep your database constantly up to date:
 
 If you have imported multiple country extracts and want to keep them
 up-to-date, have a look at the script in
-[issue #60](https://github.com/twain47/Nominatim/issues/60).
+[issue #60](https://github.com/openstreetmap/Nominatim/issues/60).
 

diff --git a/docs/install-on-centos-7.md b/docs/install-on-centos-7.md
index 3a563541d2396046dd606e3c6f72c0976ebf4a65..037f41beb536d8f9eb3977379e937868c682ede6 100644 (file)
--- a/docs/install-on-centos-7.md
+++ b/docs/install-on-centos-7.md
@@ -141,7 +141,7 @@ Get the source code from Github and change into the source directory
 
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim
 
 

diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md
index 8ddad65e8e7494427a3369fd609ee3e747c724e3..b03685cf2303e3efddb50e95bdb678596f511f10 100644 (file)
--- a/docs/install-on-ubuntu-16.md
+++ b/docs/install-on-ubuntu-16.md
@@ -127,7 +127,7 @@ Get the source code from Github and change into the source directory
 
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim
 
 

diff --git a/lib/init-website.php b/lib/init-website.php
index 967c6cce7c4ea7b2dcca0da0a38badef5fc6f3dc..7d5cef1a8f61fc129137ad9f7442f0095cee9010 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -27,7 +27,7 @@ function chksql($oSql, $sMsg = "Database request failed")
     <p>Nominatim has encountered an internal error while accessing the database.
        This may happen because the database is broken or because of a bug in
        the software. If you think it is a bug, feel free to report
-       it over on <a href="https://github.com/twain47/Nominatim/issues">
+       it over on <a href="https://github.com/openstreetmap/Nominatim/issues">
        Github</a>. Please include the URL that caused the problem and the
        complete error details below.</p>
     <p><b>Message:</b> $sMsg</p>
@@ -52,7 +52,7 @@ function failInternalError($sError, $sSQL = false, $vDumpVar = false)
     echo "<html><body><h1>Internal Server Error</h1>";
     echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
     echo "<p><b>Details:</b> ".$sError,"</p>";
-    echo '<p>Feel free to file an issue on <a href="https://github.com/twain47/Nominatim/issues">Github</a>. ';
+    echo '<p>Feel free to file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
     echo 'Please include the error message above and the URL you used.</p>';
     if (CONST_Debug) {
         echo "<hr><h2>Debugging Information</h2><br>";
@@ -77,7 +77,7 @@ function userError($sError)
     echo "<html><body><h1>Bad Request</h1>";
     echo '<p>Nominatim has encountered an error with your request.</p>';
     echo "<p><b>Details:</b> ".$sError."</p>";
-    echo '<p>If you feel this error is incorrect feel file an issue on <a href="https://github.com/twain47/Nominatim/issues">Github</a>. ';
+    echo '<p>If you feel this error is incorrect feel file an issue on <a href="https://github.com/openstreetmap/Nominatim/issues">Github</a>. ';
     echo 'Please include the error message above and the URL you used.</p>';
     echo "\n</body></html>\n";
     exit;

diff --git a/lib/template/includes/report-errors.php b/lib/template/includes/report-errors.php
index a6a9be62a1afadac5e778ed586fc6bbcbd2d0877..5d0ac9049b730340573a809ecff491cdd868b2e8 100644 (file)
--- a/lib/template/includes/report-errors.php
+++ b/lib/template/includes/report-errors.php
@@ -7,7 +7,7 @@
     to check how the address was generated before reporting a problem.
 </p>
 <p>
-    Use <a target="_blank" href="https://github.com/twain47/nominatim/issues">Nominatim issues on github</a>
+    Use <a target="_blank" href="https://github.com/openstreetmap/nominatim/issues">Nominatim issues on github</a>
     to report problems.
 <!-- You can search for existing bug reports
     <a href="http://trac.openstreetmap.org/query?status=new&amp;status=assigned&amp;status=reopened&amp;component=nominatim&amp;order=priority">here</a>.</p>

diff --git a/nominatim/nominatim.h b/nominatim/nominatim.h
index 710361995caa853a369bf270559c295b4541690a..a98f3bf946a6456d76586f004a59849ed457c6fe 100644 (file)
--- a/nominatim/nominatim.h
+++ b/nominatim/nominatim.h
@@ -20,7 +20,7 @@ struct output_options
     int expire_tiles_zoom_min;    /* Minimum zoom level for tile expiry list */
     const char *expire_tiles_filename;    /* File name to output expired tiles list to */
     int enable_hstore; /* add an additional hstore column with objects key/value pairs */
-    int enable_multi; /* Output multi-geometries intead of several simple geometries */
+    int enable_multi; /* Output multi-geometries instead of several simple geometries */
     char** hstore_columns; /* list of columns that should be written into their own hstore column */
     int n_hstore_columns; /* number of hstore columns */
 };

diff --git a/test/bdd/api/reverse/params.feature b/test/bdd/api/reverse/params.feature
index 0d35cdc7f3dbee839824e9c9599a4a4cbd080f7a..765c91c39d3dd5d1885bc0a1071d99ffe74e8b7d 100644 (file)
--- a/test/bdd/api/reverse/params.feature
+++ b/test/bdd/api/reverse/params.feature
@@ -1,6 +1,6 @@
 @APIDB
 Feature: Parameters for Reverse API
-    Testing diferent parameter options for reverse API.
+    Testing different parameter options for reverse API.
 
     Scenario Outline: Reverse-geocoding without address
         When sending <format> reverse coordinates 53.603,10.041

diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature
index b0b76438f9d377c8167181bffa7fdc3114b5691a..2650f6f06aa3313e57a57b025af8cec872a4324a 100644 (file)
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -1,6 +1,6 @@
 @DB
 Feature: Parenting of objects
-    Tests that the correct parent is choosen
+    Tests that the correct parent is chosen
 
     Scenario: Address inherits postcode from its street unless it has a postcode
         Given the scene roads-with-pois

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index fa66cd4df260765ce9d44ef676bc556a3a319ec1..869cf829825fce1212ffea6acc437a1cf3266d53 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -243,7 +243,14 @@ def update_place_table(context):
         col.db_insert(cur)
 
     context.db.commit()
-    context.nominatim.run_update_script('index')
+
+    while True:
+        context.nominatim.run_update_script('index')
+
+        cur = context.db.cursor()
+        cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1")
+        if cur.rowcount == 0:
+            break
 
 @when("marking for delete (?P<oids>.*)")
 def delete_places(context, oids):
@@ -254,7 +261,14 @@ def delete_places(context, oids):
         where, params = NominatimID(oid).table_select()
         cur.execute("DELETE FROM place WHERE " + where, params)
     context.db.commit()
-    context.nominatim.run_update_script('index')
+
+    while True:
+        context.nominatim.run_update_script('index')
+
+        cur = context.db.cursor()
+        cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1")
+        if cur.rowcount == 0:
+            break
 
 @then("placex contains(?P<exact> exactly)?")
 def check_placex_contents(context, exact):

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index fd50bc52f531eade29083c2d9dc1c974003e9039..62e718e5d8c9c9074938c392e8ec04d43070d566 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -144,7 +144,7 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
 #DOCS:    cd Nominatim
 
 else                               #DOCS:

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index 30e94b450ae84b9b7beb046bf4455717c2ab3ed0..4e90e2eb8566230cb83263bc60b22df096104418 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -4,7 +4,7 @@
 # https://docs.travis-ci.com/user/trusty-ci-environment/
 # Ubuntu 14 (trusty)
 # user 'travis'
-# $TRAVIS_BUILD_DIR is /home/travis/build/twain47/Nominatim/, for others see
+# $TRAVIS_BUILD_DIR is /home/travis/build/openstreetmap/Nominatim/, for others see
 #   https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
 # Postgres 9.6 installed and started. role 'travis' already superuser
 # Python 3.6

diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index 81a8a92620162e5be2f833ac671f7e56378da69e..87cf185548aa75d6b1e26b7ceede8d5033a1c0ed 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -131,7 +131,7 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
 if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
 #DOCS:    cd Nominatim
 
 else                               #DOCS: