[Mapbender-commits] r1377 - trunk/mapbender/http/print

[svn_mapbender at osgeo.org]

Author: sven
Date: 2007-05-30 03:35:09 -0400 (Wed, 30 May 2007)
New Revision: 1377

Modified:
   trunk/mapbender/http/print/mod_printPDF.php
   trunk/mapbender/http/print/mod_printPDF_pdf.php
Log:


Modified: trunk/mapbender/http/print/mod_printPDF.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF.php	2007-05-30 07:34:35 UTC (rev 1376)
+++ trunk/mapbender/http/print/mod_printPDF.php	2007-05-30 07:35:09 UTC (rev 1377)
@@ -266,6 +266,7 @@
 		}
 	}
 	f.map_scale.value = pt.mb_getScale(target);
+	f.epsg.value = pt.mb_mapObj[ind].epsg;
 	mod_legend_print();
 }
 function printMap(){
@@ -284,6 +285,15 @@
 		}
 		
 		// write the measured coordinates
+		
+		$mod_measure_RX = pt.mod_measure_RX;
+		$mod_measure_RY = pt.mod_measure_RY;
+		
+		alert($mod_measure_RX);
+		alert($mod_measure_RY);
+		
+		if ($mod_measure_RX != undefined && $mod_measure_RX != undefined){
+		
 		var tmp_x = '';
 		var tmp_y = '';
 		var tmp_dist = '';
@@ -301,6 +311,9 @@
 		}
 		document.forms['form1'].elements['measured_x_values'].value = tmp_x;
 		document.forms['form1'].elements['measured_y_values'].value = tmp_y;
+		
+		}
+		
 		document.form1.submit();
 	}
 	else{
@@ -385,6 +398,7 @@
 <input type='hidden' name='layers' value=''>
 <input type='hidden' name='legendurl' value=''>
 <input type='hidden' name='map_scale' value=''>
+<input type='hidden' name='epsg' value=''>
 <input type='button' name='print' value="<?php echo $label_button; ?>" onclick='printMap()'>
 <input type='hidden' name='conf' value='<?php echo $_REQUEST["conf"]; ?>'>
 <input type='hidden' name='comment1' value=''>

Modified: trunk/mapbender/http/print/mod_printPDF_pdf.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-30 07:34:35 UTC (rev 1376)
+++ trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-30 07:35:09 UTC (rev 1377)
@@ -60,6 +60,7 @@
 $format = $_REQUEST["format"];
 $map_scale = $_REQUEST["map_scale"];
 $overview_url = $_REQUEST["overview_url"];
+$epsg = $_REQUEST["epsg"];
 
 function setscalebar($scale){
     	$mb_resolution = 28.35;
@@ -304,7 +305,11 @@
 $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border, $mapOffset_left + $map_width + $border, $mapOffset_bottom -$border);
 $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border, $mapOffset_left - $border, $mapOffset_bottom - $border);
 
+if($epsg == "EPSG:4326"){
 
+	$text4 = "";
+}
+
 if($size == "A4" && $format == "portrait"){
    #header:
    $pdf->line($mapOffset_left - $border, $mapOffset_bottom  + $map_height + $border, $mapOffset_left - $border, $mapOffset_bottom  + $map_height + $border + $header_height);
@@ -383,6 +388,11 @@
    	$pdf->addPngFromFile($specialImage, $specialImage_left, $specialImage_bottom , $specialImage_width, $specialImage_height);
    }
    
+    if($epsg == "EPSG:4326"){
+
+	$text4 = "";
+	}
+	
    $pdf->setColor(0,0,0);
    $mySize = 9;
    $length = $pdf->getTextWidth($mySize, $text1);   
@@ -495,6 +505,15 @@
 	$pdf->addPngFromFile($northarrowImage, $northarrow_left, $northarrow_bottom , $northarrowImage_width, $northarrowImage_height);
 }
 
+if($epsg == "EPSG:4326"){
+
+	$scalebar = false;
+}
+else{
+
+	$scalebar = true;
+}
+
 if($scalebar == true){
 	if ($size == "A4" && $format == "portrait"){
 		$scalebar_left = $a4p_scalebar_left;