Merge remote-tracking branch 'upstream/master'

diff --git a/README.md b/README.md
index 1ae0dab029ab6c194e59f468eb2030a3b799ff3d..7a75fe9371f84b9df162420578e348c3fe0e80ab 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
+[![Build Status](https://travis-ci.org/osm-search/Nominatim.svg?branch=master)](https://travis-ci.org/osm-search/Nominatim)
 
 Nominatim
 =========

diff --git a/VAGRANT.md b/VAGRANT.md
index 0cab24faa26250836bb12f1ff24697478d76d22d..4c8eb724e5fbad5c227b2aad111562cae22db1e7 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -141,7 +141,7 @@ No. Long running Nominatim installations will differ once new import features (o
 bug fixes) get added since those usually only get applied to new/changed data.
 
 Also this document skips the optional Wikipedia data import which affects ranking
-of search results. See [Nominatim installation](http://nominatim.org/release-docs/latest/Installation) for details.
+of search results. See [Nominatim installation](https://nominatim.org/release-docs/latest/admin/Installation) for details.
 
 ##### Why Ubuntu? Can I test CentOS/Fedora/CoreOS/FreeBSD?
 

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index 60f18d959aca35252d6851529da36cb0f4991cb3..a7c2cd4f8e25159d1d9a15a31d76511ef55202ab 100644 (file)
--- a/lib/ClassTypes.php
+++ b/lib/ClassTypes.php
@@ -268,7 +268,7 @@ function getList()
             'tourism:caravan_site' => array('label' => 'Caravan Site', 'frequency' => 183, 'icon' => 'accommodation_caravan_park'),
             'amenity:bus_station' => array('label' => 'Bus Station', 'frequency' => 181, 'icon' => 'transport_bus_station'),
             'amenity:kindergarten' => array('label' => 'Kindergarten', 'frequency' => 179),
-            'highway:construction' => array('label' => 'Construction', 'frequency' => 176),
+            'highway:construction' => array('label' => 'Construction', 'frequency' => 176, 'simplelabel' => 'road'),
             'amenity:atm' => array('label' => 'Atm', 'frequency' => 172, 'icon' => 'money_atm2'),
             'amenity:emergency_phone' => array('label' => 'Emergency Phone', 'frequency' => 164),
             'waterway:lock' => array('label' => 'Lock', 'frequency' => 146),

diff --git a/nominatim/nominatim.py b/nominatim/nominatim.py
index 14643770a6642662be283b0d21b3d36b556ac407..0db0777dc17d20b87413a2bf55d08432dc55de24 100755 (executable)
--- a/nominatim/nominatim.py
+++ b/nominatim/nominatim.py
@@ -304,7 +304,7 @@ class Indexer(object):
             else:
                 ready, _, _ = select.select(self.threads, [], [])
 
-        assert(False, "Unreachable code")
+        assert False, "Unreachable code"
 
 
 def nominatim_arg_parser():

diff --git a/settings/address-levels.json b/settings/address-levels.json
index 9f32fc985696cc96cc593ec4752eb4a1b8d056bf..10cbf307464f46aeb0ef255614e8afedeeafc27b 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -63,7 +63,11 @@
           "sea" : [4, 0]
       },
       "waterway" : {
-          "" : [17, 0]
+          "river" : [19, 0],
+          "stream" : [22, 0],
+          "ditch" : [22, 0],
+          "drain" : [22, 0],
+          "" : [20, 0]
       },
       "highway" : {
           "" : 26,

diff --git a/test/bdd/api/reverse/addressdetails.feature b/test/bdd/api/reverse/addressdetails.feature
new file mode 100644 (file)
index 0000000..5aa3846
--- /dev/null
+++ b/test/bdd/api/reverse/addressdetails.feature
@@ -0,0 +1,10 @@
+@APIDB
+Feature: Reverse addressdetails
+    Tests for addressdetails in reverse queries
+
+    #github #1763
+    Scenario: Correct translation of highways under construction
+        When sending jsonv2 reverse coordinates -34.0290514,-53.5832235
+        Then result addresses contain
+        | road |
+        | Ruta 9 Coronel Leonardo Olivera |

diff --git a/utils/update.php b/utils/update.php
index 2fa773fe3dbbb46d53cb0ccb58cc4dfb50e6384b..7b9338d5c03f43fcbfc0a2c578925e88cd59ae5e 100644 (file)
--- a/utils/update.php
+++ b/utils/update.php
@@ -355,7 +355,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     //
     if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
         fail('Error: Update interval too low for download.geofabrik.de. ' .
-             "Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n");
+             "Please check install documentation (https://nominatim.org/release-docs/latest/admin/Import-and-Update#setting-up-the-update-process)\n");
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';