Merge remote-tracking branch 'upstream/master'

diff --git a/docs/api/Search.md b/docs/api/Search.md
index df39bba800a51e40ff3ff804cab2750d870e9f42..ace6cc8de7df34571c334bd0d396f611703c17d3 100644 (file)
--- a/docs/api/Search.md
+++ b/docs/api/Search.md
@@ -112,7 +112,8 @@ Limit the number of returned results. (Default: 10, Maximum: 50)
 * `viewbox=<x1>,<y1>,<x2>,<y2>`
 
 The preferred area to find search results. Any two corner points of the box
-are accepted in any order as long as they span a real box.
+are accepted in any order as long as they span a real box. `x` is longitude,
+`y` is latitude.
 
 
 * `bounded=[0|1]`

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index b6705968752abdecd81a06b8682072b1b44d7dea..489552486caa2e04909501d6ff8e7611554e1cb5 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -725,9 +725,7 @@ class SetupFunctions
         }
         foreach ($aDropTables as $sDrop) {
             if ($this->bVerbose) echo "Dropping table $sDrop\n";
-            $this->oDB->exec("DROP TABLE $sDrop CASCADE");
-            // ignore warnings/errors as they might be caused by a table having
-            // been deleted already by CASCADE
+            $this->oDB->exec("DROP TABLE IF EXISTS $sDrop CASCADE");
         }
 
         if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {

diff --git a/sql/functions.sql b/sql/functions.sql
index 039c03a3645602a8c7a212b2ad5da8e824b63f27..c7d96cdc6e2a8daef3b4bc2199a6118fcead26b3 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -2386,7 +2386,7 @@ BEGIN
 
   -- postcode table
   IF for_place_id IS NULL THEN
-    SELECT parent_place_id, country_code, rank_address, postcode, 'place', 'postcode'
+    SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode'
       FROM location_postcode
       WHERE place_id = in_place_id
       INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,

diff --git a/website/search.php b/website/search.php
index 26c10122924dc9329ea288d06a40687d75a33dfc..557056566c1065f30146c6c7b448af88fb90efaa 100644 (file)
--- a/website/search.php
+++ b/website/search.php
@@ -50,6 +50,7 @@ $oGeocode->setQueryFromParams($oParams);
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])
+    && strlen($_SERVER['PATH_INFO']) > 0
     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);