X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a44f9c6aab386256983342f7411d1c5d5f3650a5..04134f380dfb7c558ea9f1a59ac8f5123826e528:/website/search.php

diff --git a/website/search.php b/website/search.php
index c19d1ade..d0b183ea 100755
--- a/website/search.php
+++ b/website/search.php
@@ -32,22 +32,30 @@
 
 	// Show / use polygons
 	$bShowPolygons = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
-	$bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
-	$bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
-	$bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
-	$bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
-	if ((($bShowPolygons?1:0)  
-	   + ($bAsGeoJSON?1:0) 
-	   + ($bAsKML?1:0) 
-	   + ($bAsSVG?1:0) 
-	   + ($bAsText?1:0) 
-		) > CONST_PolygonOutput_MaximumTypes) {
-		if (CONST_PolygonOutput_MaximumTypes) {
-			userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
-		} else {
-			userError("Polygon output is disabled");
+    if ($sOutputFormat == 'html') {
+		$bAsText = $bShowPolygons;
+		$bShowPolygons = false;
+		$bAsGeoJSON = false;
+		$bAsKML = false;
+		$bAsSVG = false;
+	} else {
+		$bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
+		$bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
+		$bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
+		$bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
+		if ((($bShowPolygons?1:0)
+		   + ($bAsGeoJSON?1:0)
+		   + ($bAsKML?1:0)
+		   + ($bAsSVG?1:0)
+		   + ($bAsText?1:0)
+			) > CONST_PolygonOutput_MaximumTypes) {
+			if (CONST_PolygonOutput_MaximumTypes) {
+				userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
+			} else {
+				userError("Polygon output is disabled");
+			}
+			exit;
 		}
-		exit;
 	}
 
 	// Show address breakdown
@@ -225,6 +233,7 @@
 				failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
 			}
 			$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
+			$bBoundingBoxSearch = true;
 		}
 
 		// Do we have anything that looks like a lat/lon pair?
@@ -772,7 +781,7 @@
 								{
 								$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 								if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-								$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid) and linked_place_id is null";
+								$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)";
 								if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";								
 								if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
 								$sSQL .= " limit $iLimit";
@@ -783,7 +792,7 @@
 								{
 									$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 									if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-									$sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid) and linked_place_id is null";
+									$sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid)";
 									if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";								
 									if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
 									$sSQL .= " limit $iLimit";
@@ -1058,13 +1067,13 @@
 						if ($iQueryLoop > 20) break;
 					}
 					//exit;
-					if (sizeof($aResultPlaceIDs)) break;
+					if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
 					if ($iGroupLoop > 4) break;
 					if ($iQueryLoop > 30) break;
 				}
 //exit;
 				// Did we find anything?	
-				if (sizeof($aResultPlaceIDs))
+				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
 				{
 //var_Dump($aResultPlaceIDs);exit;
 					// Get the details for display (is this a redundant extra step?)
@@ -1227,8 +1236,7 @@
 			if ($bAsGeoJSON) $sSQL .= ",ST_AsGeoJSON(geometry) as asgeojson";
 			if ($bAsKML) $sSQL .= ",ST_AsKML(geometry) as askml";
 			if ($bAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg";
-			if ($bAsText) $sSQL .= ",ST_AsText(geometry) as astext";
-			if ($bShowPolygons) $sSQL .= ",ST_AsText(geometry) as outlinestring";
+			if ($bAsText || $bShowPolygons) $sSQL .= ",ST_AsText(geometry) as astext";
 			$sSQL .= " from placex where place_id = ".$aResult['place_id'].' and st_geometrytype(Box2D(geometry)) = \'ST_Polygon\'';
 			$aPointPolygon = $oDB->getRow($sSQL);
 			if (PEAR::IsError($aPointPolygon))
@@ -1249,15 +1257,15 @@
 				if ($bShowPolygons) 
 				{
 					// Translate geometary string to point array
-					if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
+					if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
 					{
 						preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
 					}
-					elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
+					elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
 					{
 						preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
 					}
-					elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch))
+					elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
 					{
 						$fRadius = 0.01;
 						$iSteps = ($fRadius * 40000)^2;