[Mapbender-commits] r7975 - branches/2.7/http/print/classes

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2011-07-19 06:07:06 -0700 (Tue, 19 Jul 2011)
New Revision: 7975

Modified:
   branches/2.7/http/print/classes/mbLegendDecorator.php
   branches/2.7/http/print/classes/mbMapDecorator.php
   branches/2.7/http/print/classes/mbOverviewDecorator.php
Log:
merged with trunk

Modified: branches/2.7/http/print/classes/mbLegendDecorator.php
===================================================================
--- branches/2.7/http/print/classes/mbLegendDecorator.php	2011-07-19 13:05:26 UTC (rev 7974)
+++ branches/2.7/http/print/classes/mbLegendDecorator.php	2011-07-19 13:07:06 UTC (rev 7975)
@@ -86,7 +86,7 @@
 
 			}
 		}
-                $this->pdf->unlink($legendFilename);
+                $this->pdf->unlink($legendFilename); 
 	}
 }
 

Modified: branches/2.7/http/print/classes/mbMapDecorator.php
===================================================================
--- branches/2.7/http/print/classes/mbMapDecorator.php	2011-07-19 13:05:26 UTC (rev 7974)
+++ branches/2.7/http/print/classes/mbMapDecorator.php	2011-07-19 13:07:06 UTC (rev 7975)
@@ -92,8 +92,8 @@
 		}
 
                 $this->pdf->logWmsRequests("maps", $array_urls);
-
-                if ($this->angle != 0) {
+		
+		if ($this->angle != 0) {
 			if (class_exists('weldMaps2PNG_rotate')) {
 				$i = new weldMaps2PNG_rotate(implode("___",$array_urls), $this->filename, $this->angle, false);
 			} else {
@@ -124,7 +124,7 @@
 
 		}
 
-                $this->pdf->unlink($this->filename);
+                $this->pdf->unlink($this->filename); 
 	}
 	
 }

Modified: branches/2.7/http/print/classes/mbOverviewDecorator.php
===================================================================
--- branches/2.7/http/print/classes/mbOverviewDecorator.php	2011-07-19 13:05:26 UTC (rev 7974)
+++ branches/2.7/http/print/classes/mbOverviewDecorator.php	2011-07-19 13:07:06 UTC (rev 7975)
@@ -77,7 +77,7 @@
 		$array_urls = $newArray_urls;
 
                 $this->pdf->logWmsRequests("overview", $array_urls);
-
+                
 		$myURL = new stripRequest($array_urls[0]);
 		$myURL->set('bbox', $this->pdf->getMapExtent());
 		if ($this->angle != 0) {
@@ -96,7 +96,7 @@
 		
 		$this->pdf->objPdf->Image($this->filename, $this->conf->x_ul, $this->conf->y_ul, $width, $height, 'png');
 
-                 $this->pdf->unlink($this->filename);
+                $this->pdf->unlink($this->filename);
 	}
 	
 	protected function rotate($point, $center, $angle) {