From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 13 Oct 2012 07:19:42 +0000 (+0200)
Subject: Merge branch 'master' of github.com:twain47/Nominatim
X-Git-Tag: deploy~668
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7fba4ec99738cc69ee773e7f79418a9353029aaa?hp=1bcc40b1e5e20006f32b3889e14d4867e8df84a2

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 657938db..a118e0b6 100755
--- 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 a2d8729f..59d57d58 100755
--- 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";