[Mapbender-commits] r8170 - in trunk/mapbender: http/print lib

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2011-09-28 04:53:19 -0700 (Wed, 28 Sep 2011)
New Revision: 8170

Modified:
   trunk/mapbender/http/print/mod_printPDF.php
   trunk/mapbender/lib/extent.js
Log:
http://trac.osgeo.org/mapbender/ticket/869

Modified: trunk/mapbender/http/print/mod_printPDF.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF.php	2011-09-28 11:52:22 UTC (rev 8169)
+++ trunk/mapbender/http/print/mod_printPDF.php	2011-09-28 11:53:19 UTC (rev 8170)
@@ -195,11 +195,15 @@
 			}
 			var pos = pt.makeClickPos2RealWorldPos(target, map_width , map_height);
 			var prevscale= pt.mb_getScale(target);
-			pt.mb_mapObj[ind].extent = new pt.Mapbender.Extent(
-				coord[0],
+
+                        /** makeExtent is a workaround function to get printPDF functions working if
+                        * printPDF is shown in a popup
+                        */
+			pt.mb_mapObj[ind].extent = pt.Mapbender.makeExtent(
+				parseFloat(coord[0]),
 				pos[1],
 				pos[0],
-				coord[3]
+				parseFloat(coord[3])
 			);
 
 			pt.mb_mapObj[ind].setDimensions(Math.round(map_width), Math.round(map_height));
@@ -247,13 +251,17 @@
 			
 			var pos = pt.makeClickPos2RealWorldPos(target, map_width , map_height);
 			var prevscale= pt.mb_getScale(target);
-			pt.mb_mapObj[ind].extent = new pt.Mapbender.Extent(
-				coord[0],
+
+                        /** makeExtent is a workaround function to get printPDF functions working if
+                        * printPDF is shown in a popup
+                        */
+			pt.mb_mapObj[ind].extent = pt.Mapbender.makeExtent(
+				parseFloat(coord[0]),
 				pos[1],
 				pos[0],
-				coord[3]
+				parseFloat(coord[3])
 			);
-	
+
 			pt.mb_mapObj[ind].width = Math.round(map_width);
 			pt.mb_mapObj[ind].height = Math.round(map_height);
 			map_el.style.width = Math.round(map_width);

Modified: trunk/mapbender/lib/extent.js
===================================================================
--- trunk/mapbender/lib/extent.js	2011-09-28 11:52:22 UTC (rev 8169)
+++ trunk/mapbender/lib/extent.js	2011-09-28 11:53:19 UTC (rev 8170)
@@ -14,6 +14,13 @@
  * http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
  */
 
+/** makeExtent is a workaround function to get printPDF functions working if
+ * printPDF is shown in a popup
+ */
+Mapbender.makeExtent = function (minx, miny, maxx, maxy) {
+    return new Mapbender.Extent(minx, miny, maxx, maxy);
+};
+
 /**
  * Constructor: Extent
  *