X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/753d2ac79fab5dab71ab4890fe16916d33decb5c..e70dfa18fa10ef220799905cde86fae039a2a75d:/website/search.php

diff --git a/website/search.php b/website/search.php
index e2ef1d3c..ee7979dc 100755
--- a/website/search.php
+++ b/website/search.php
@@ -36,6 +36,19 @@
 	$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;
+	}
 
 	// Show address breakdown
 	$bShowAddressDetails = isset($_GET['addressdetails']) && $_GET['addressdetails'];
@@ -178,7 +191,7 @@
 			$aPoints = explode(',',$_GET['route']);
 			if (sizeof($aPoints) % 2 != 0)
 			{
-				echo "Uneven number of points";
+				userError("Uneven number of points");
 				exit;
 			}
 			$sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
@@ -338,7 +351,7 @@
 				$aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
 				if (PEAR::isError($aPhrase))
 				{
-					echo "Illegal query string (not an UTF-8 string): ".$sPhrase;
+					userError("Illegal query string (not an UTF-8 string): ".$sPhrase);
 					if (CONST_Debug) var_dump($aPhrase);
 					exit;
 				}