[Mapbender-commits] r9410 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-02-23 07:28:07 -0800 (Tue, 23 Feb 2016)
New Revision: 9410

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Fix for wfs 1.0 based INSPIRE ATOM Feeds

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-02-23 15:27:34 UTC (rev 9409)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-02-23 15:28:07 UTC (rev 9410)
@@ -1241,44 +1241,44 @@
 					//calculate further bboxes if the # of hits extents some value
 					//minimum number of single tiles:
 					$countTiles = ceil($featureHits[$i]/$maxFeatureCount);
-					//calculate number of rows and columns from x / y ratio
-					if ($epsgId == '4326' && $alterAxisOrder) {
-						//no transformation needed only change order
-						$minx = $mapbenderMetadata[$i]->miny;
-						$miny = $mapbenderMetadata[$i]->minx;
-						$maxx = $mapbenderMetadata[$i]->maxy;
-						$maxy = $mapbenderMetadata[$i]->maxx;
+				} else {
+					$countTiles = 1;
+				}
+				//calculate number of rows and columns from x / y ratio
+				if ($epsgId == '4326' && $alterAxisOrder) {
+					//no transformation needed only change order
+					$minx = $mapbenderMetadata[$i]->miny;
+					$miny = $mapbenderMetadata[$i]->minx;
+					$maxx = $mapbenderMetadata[$i]->maxy;
+					$maxy = $mapbenderMetadata[$i]->maxx;
+				} else {
+					//no transformation needed normal order
+					if ($epsgId == '4326') {
+						$minx = $mapbenderMetadata[$i]->minx;
+						$miny = $mapbenderMetadata[$i]->miny;
+						$maxx = $mapbenderMetadata[$i]->maxx;
+						$maxy = $mapbenderMetadata[$i]->maxy;
 					} else {
-						//no transformation needed normal order
-						if ($epsgId == '4326') {
-							$minx = $mapbenderMetadata[$i]->minx;
-							$miny = $mapbenderMetadata[$i]->miny;
-							$maxx = $mapbenderMetadata[$i]->maxx;
-							$maxy = $mapbenderMetadata[$i]->maxy;
-						} else {
-							//transformation needed and axis order changed
-							if ($alterAxisOrder) {
-								$e = new mb_exception("axis_order_altered");
-								$minxI = $mapbenderMetadata[$i]->miny;
-								$minyI = $mapbenderMetadata[$i]->minx;
-								$maxxI = $mapbenderMetadata[$i]->maxy;
-								$maxyI = $mapbenderMetadata[$i]->maxx;
-								$mapbenderMetadata[$i]->miny = $minyI;
-								$mapbenderMetadata[$i]->minx = $minxI;
-								$mapbenderMetadata[$i]->maxy = $maxyI;
-								$mapbenderMetadata[$i]->maxx = $maxxI;
-							}
-							$sqlExtent = "SELECT X(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->minx." ".$mapbenderMetadata[$i]->miny.")',4326),".$epsgId.")) as minx, Y(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->minx." ".$mapbenderMetadata[$i]->miny.")',4326),".$epsgId.")) as miny, X(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->maxx." ".$mapbenderMetadata[$i]->maxy.")',4326),".$epsgId.")) as maxx, Y(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->maxx." ".$mapbenderMetadata[$i]->maxy.")',4326),".$epsgId.")) as maxy";
-							$resExtent =  db_query($sqlExtent);
-							$minx = floatval(db_result($resExtent,0,"minx"));
-							$miny = floatval(db_result($resExtent,0,"miny"));
-							$maxx = floatval(db_result($resExtent,0,"maxx"));
-							$maxy = floatval(db_result($resExtent,0,"maxy"));
+						//transformation needed and axis order changed
+						if ($alterAxisOrder) {
+							$e = new mb_exception("axis_order_altered");
+							$minxI = $mapbenderMetadata[$i]->miny;
+							$minyI = $mapbenderMetadata[$i]->minx;
+							$maxxI = $mapbenderMetadata[$i]->maxy;
+							$maxyI = $mapbenderMetadata[$i]->maxx;
+							$mapbenderMetadata[$i]->miny = $minyI;
+							$mapbenderMetadata[$i]->minx = $minxI;
+							$mapbenderMetadata[$i]->maxy = $maxyI;
+							$mapbenderMetadata[$i]->maxx = $maxxI;
 						}
+						$sqlExtent = "SELECT X(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->minx." ".$mapbenderMetadata[$i]->miny.")',4326),".$epsgId.")) as minx, Y(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->minx." ".$mapbenderMetadata[$i]->miny.")',4326),".$epsgId.")) as miny, X(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->maxx." ".$mapbenderMetadata[$i]->maxy.")',4326),".$epsgId.")) as maxx, Y(transform(GeometryFromText('POINT(".$mapbenderMetadata[$i]->maxx." ".$mapbenderMetadata[$i]->maxy.")',4326),".$epsgId.")) as maxy";
+						$resExtent =  db_query($sqlExtent);
+						$minx = floatval(db_result($resExtent,0,"minx"));
+						$miny = floatval(db_result($resExtent,0,"miny"));
+						$maxx = floatval(db_result($resExtent,0,"maxx"));
+						$maxy = floatval(db_result($resExtent,0,"maxy"));
 					}
-				} else {
-					$countTiles = 1;
-				}		
+				}	
 				//only calculate new boxes if countTiles > 1
 				if ($countTiles > 1) {
 					$diffX = $maxx - $minx; //in m - depends on given epsg code