[Mapbender-commits] r4500 - branches/print_dev/http/print/classes

[svn_mapbender at osgeo.org]

Author: mschulz
Date: 2009-08-06 09:35:32 -0400 (Thu, 06 Aug 2009)
New Revision: 4500

Modified:
   branches/print_dev/http/print/classes/mbTemplatePdf.php
Log:
...

Modified: branches/print_dev/http/print/classes/mbTemplatePdf.php
===================================================================
--- branches/print_dev/http/print/classes/mbTemplatePdf.php	2009-08-06 13:09:35 UTC (rev 4499)
+++ branches/print_dev/http/print/classes/mbTemplatePdf.php	2009-08-06 13:35:32 UTC (rev 4500)
@@ -42,14 +42,13 @@
 		return $this->mapinfo["extent"];
 	}	
 
-	public function adjustBbox($mapWidthPx, $mapHeightPx, $aBboxArray, $aSrsString, $mapResolution) {
+	public function adjustBbox($elementConf, $aBboxArray, $aSrsString) {
 		$aMbBbox = new Mapbender_bbox($aBboxArray[0],$aBboxArray[1],$aBboxArray[2],$aBboxArray[3],$aSrsString);
 		$aMap = new Map();
-		$aMap->setWidth($mapWidthPx);
-		$aMap->setHeight($mapHeightPx);
+		$aMap->setWidth($elementConf->width);
+		$aMap->setHeight($elementConf->height);
 		$aMap->calculateExtent($aMbBbox);
-		$this->mapinfo["scale"] = $aMap->getScale($mapResolution);
-		$e = new mb_notice("mbTemplatePdf: setting mapScale to ".$this->mapinfo["scale"]);
+		$this->mapinfo["scale"] = $aMap->getScale($elementConf->res_dpi);
 		$adjustedMapExt = $aMap->getExtentInfo();
 		return implode(",",$adjustedMapExt);
 	}