[Mapbender-commits] r8211 - branches/2.7/http/print
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Nov 22 06:59:59 EST 2011
Author: verenadiewald
Date: 2011-11-22 03:59:59 -0800 (Tue, 22 Nov 2011)
New Revision: 8211
Modified:
branches/2.7/http/print/mod_printPDF.php
branches/2.7/http/print/mod_printPDF_pdf.php
Log:
some corrections for printing temporary objects in pdf
Modified: branches/2.7/http/print/mod_printPDF.php
===================================================================
--- branches/2.7/http/print/mod_printPDF.php 2011-11-21 11:22:31 UTC (rev 8210)
+++ branches/2.7/http/print/mod_printPDF.php 2011-11-22 11:59:59 UTC (rev 8211)
@@ -309,8 +309,8 @@
var permanentImage_width = objImage.width;
var permanentImage_height = objImage.height;
if(permanentImage_x && permanentImage_y){
- var x_pos = permanentImage_x.slice(0,-2);
- var y_pos = permanentImage_y.slice(0,-2);
+ var x_pos = permanentImage_x;
+ var y_pos = permanentImage_y;
document.forms[0].mypermanentImage.value = permanentHighlightImage + '___' +x_pos+'___'+y_pos+'___'+permanentImage_width+'___'+permanentImage_height;
}
}
Modified: branches/2.7/http/print/mod_printPDF_pdf.php
===================================================================
--- branches/2.7/http/print/mod_printPDF_pdf.php 2011-11-21 11:22:31 UTC (rev 8210)
+++ branches/2.7/http/print/mod_printPDF_pdf.php 2011-11-22 11:59:59 UTC (rev 8211)
@@ -174,25 +174,6 @@
}
$coord = mb_split(",",$map_extent);
-# mypermanentImage (highlight symbol from geometry.js)
-if ($_REQUEST["mypermanentImage"]){
- $array_permanentImage = explode("___", $_REQUEST["mypermanentImage"]);
-
- if(count($array_permanentImage)>0){
- $permanentImage = $array_permanentImage[0] ;
- if($permanentImage=='false'){
- $permanentImage='';
- }
- $permanentImage_x = $array_permanentImage[1] ;
- $permanentImage_y = $array_permanentImage[2] ;
- $permanentImage_width = $array_permanentImage[3] ;
- $permanentImage_height = $array_permanentImage[4] ;
-
- $pdf->addPngFromFile($permanentImage, $permanentImage_x + $mapOffset_left , $mapOffset_bottom + $map_height - $permanentImage_y - $permanentImage_height, $permanentImage_width , $permanentImage_height);
-
- }
-}
-
if($overview === true){
// analyse overview url and draw rectangle with position
$o_url = new stripRequest($overview_url);
@@ -368,6 +349,25 @@
* user drawn elements
*/
+# mypermanentImage (highlight symbol from geometry.js)
+if ($_REQUEST["mypermanentImage"]){
+ $array_permanentImage = explode("___", $_REQUEST["mypermanentImage"]);
+
+ if(count($array_permanentImage)>0){
+ $permanentImage = $array_permanentImage[0] ;
+ if($permanentImage=='false'){
+ $permanentImage='';
+ }
+ $permanentImage_x = $array_permanentImage[1] ;
+ $permanentImage_y = $array_permanentImage[2] ;
+ $permanentImage_width = $array_permanentImage[3] ;
+ $permanentImage_height = $array_permanentImage[4] ;
+
+ $pdf->addPngFromFile($permanentImage, $permanentImage_x + $mapOffset_left , $mapOffset_bottom + $map_height - $permanentImage_y - $permanentImage_height, $permanentImage_width , $permanentImage_height);
+
+ }
+}
+
$theMeasureConfigArray = array(
"do_fill" => FALSE,
"fill_color" => array(
More information about the Mapbender_commits
mailing list