[Mapbender-commits] r8708 - trunk/mapbender/http/geoportal

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-10-04 01:05:43 -0700 (Fri, 04 Oct 2013)
New Revision: 8708

Modified:
   trunk/mapbender/http/geoportal/gaz_geom_mobile.php
Log:
New vesrion from productive geoportal.rlp

Modified: trunk/mapbender/http/geoportal/gaz_geom_mobile.php
===================================================================
--- trunk/mapbender/http/geoportal/gaz_geom_mobile.php	2013-10-04 07:50:24 UTC (rev 8707)
+++ trunk/mapbender/http/geoportal/gaz_geom_mobile.php	2013-10-04 08:05:43 UTC (rev 8708)
@@ -32,7 +32,7 @@
 } else {
 	$maxResults = 15; //set default
 	$outputFormat = 'json'; //set default
-	$epsg = 31466;
+	$epsg = 25832;
 	
 	if (isset($_REQUEST["maxResults"]) & $_REQUEST["maxResults"] != "") {
 		//validate integer to 100 - not more
@@ -40,7 +40,7 @@
 		//give max 99 entries - more will be to slow
 		$pattern = '/^([0-9]{0,1})([0-9]{1})$/';		
  		if (!preg_match($pattern,$testMatch)){ 
-			echo 'maxResults: <b>'.$testMatch.'</b> is not valid.<br/>'; 
+			echo '<b>maxResults</b> is not valid.<br/>'; 
 			die(); 		
  		}
 		$maxResults = $testMatch;
@@ -49,7 +49,7 @@
 	if (isset($_REQUEST["outputFormat"]) & $_REQUEST["outputFormat"] != "") {
 		$testMatch = $_REQUEST["outputFormat"];	
  		if (!($testMatch == 'json')){ 
-			echo 'outputFormat: <b>'.$testMatch.'</b> is not valid.<br/>'; 
+			echo '<b>outputFormat</b> is not valid.<br/>'; 
 			die(); 		
  		}
 		$outputFormat = $testMatch;
@@ -57,8 +57,8 @@
 	}
 	if (isset($_REQUEST["searchEPSG"]) & $_REQUEST["searchEPSG"] != "") {
 		$testMatch = $_REQUEST["searchEPSG"];	
- 		if (!($testMatch == '31467' or $testMatch == '31468' or $testMatch == '25832' or $testMatch == '4326')){ 
-			echo 'searchEPSG: <b>'.$testMatch.'</b> is not valid.<br/>'; 
+ 		if (!($testMatch == '31467' or $testMatch == '31466' or $testMatch == '31468' or $testMatch == '25832' or $testMatch == '4326')){ 
+			echo '<b>searchEPSG</b> is not valid.<br/>'; 
 			die(); 		
  		}
 		$searchEPSG = $testMatch;
@@ -282,7 +282,7 @@
 				$sql .= "(ymax(the_geom) + ".$bufferSTR.") as maxy ";
 				$sql .= "FROM strassenschluessel WHERE gem_schl = $1 ";
 				$sql .= " AND (strassenname_upper LIKE $2)";
-				if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+				if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 					$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 				}				
 				$res = db_prep_query($sql,$v,$t);
@@ -383,7 +383,7 @@
 					array_push($t,'i');
 				}
 				$sql .= ")";
-				if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+				if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 					$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 				}				
 
@@ -438,7 +438,7 @@
 			array_push($t,'s');
 		}
 		#$sql .= " GROUP BY the_geom, name, hausnummer, zusatz, plz, post_ortsname";	
-		if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+		if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 			$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 		}				
 		$res = db_prep_query($sql,$v,$t);
@@ -487,7 +487,7 @@
 		array_push($t,'s');
 	}
 	$sql .= "GROUP BY the_geom, gemeinde_gem_teile, gem_schl_neu, postleitzahl";	
-	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 		$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 	}				
 	$res = db_prep_query($sql,$v,$t);
@@ -523,7 +523,7 @@
 		array_push($t,'i');
 	}
 	$sql .= ") GROUP BY the_geom, gemeinde_neu";
-	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 		$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 	}				
 	$res = db_prep_query($sql,$v,$t);
@@ -543,7 +543,7 @@
 	$sql .= "(ymax(the_geom) + ".$bufferG.") as maxy ";
 	$sql .= "FROM gemeinden WHERE gemeinde_upper ILIKE $1 ";
 	#$sql .= "GROUP BY the_geom, gemeinde, gem_schl_neu";
-	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 		$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 	}				
 	$v = array("%".$str."%");
@@ -566,7 +566,7 @@
 	$sql .= "(xmax(the_geom)+".$bufferK.") as maxx, ";
 	$sql .= "(ymax(the_geom)+".$bufferK.") as maxy ";
 	$sql .= "FROM kreis_fl WHERE kreis_upper ILIKE $1 ";
-	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 		$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 	}				
 	$v = array("%".$str."%");
@@ -586,7 +586,7 @@
 	$sql .= "(xmax(the_geom)+".$bufferV.") as maxx, ";
 	$sql .= "(ymax(the_geom)+".$bufferV.") as maxy ";
 	$sql .= "FROM vg_fl WHERE vg ILIKE $1 ";
-	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 31466) {
+	if (isset($epsg) && is_numeric($epsg) && intval($epsg) != 25832) {
 		$sql = str_replace("the_geom", "transform(the_geom,".$epsg.")", $sql);
 	}				
 	$v = array("%".$str."%");