Merge branch 'master' of github.com:twain47/Nominatim

Conflicts:
	munin/nominatim_importlag
	utils/setup.php

diff --git a/munin/nominatim_importlag b/munin/nominatim_importlag
index 657938dbd2672a1fcfd95aab951f251f7c7f756b..a118e0b652972e47b5bb09f62badc91202d40665 100755 (executable)
--- a/munin/nominatim_importlag
+++ b/munin/nominatim_importlag
@@ -21,7 +21,7 @@ if [ "$1" = "config" ]; then
 fi
  
 
-delay=`psql -d nominatim -c 'copy (select extract(epoch from timezone('utc', now())-lastimportdate)::int from import_status) to stdout'`
+delay=`psql -d nominatim -c "copy (select extract(epoch from timezone('utc', now())-lastimportdate)::int from import_status) to stdout"`
  
  
 echo "age.value $delay"

diff --git a/website/search.php b/website/search.php
index a2d8729f5cde4190264175f240c32b2f52b8f131..59d57d58a2620f4ed87622c33179d86dcfa92387 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -730,7 +730,7 @@
                                                        else
                                                        {
                                                                $sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-                                                               $sSQL .= " and st_contains($sViewboxSmallSQL, centroid)";
+                                                               $sSQL .= " and st_contains($sViewboxSmallSQL, geometry)";
                                                                if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             
                                                                if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
                                                                $sSQL .= " limit $iLimit";