[Mapbender-commits] r1357 - trunk/mapbender/http/print
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri May 25 03:44:37 EDT 2007
Author: astrid_emde
Date: 2007-05-25 03:44:37 -0400 (Fri, 25 May 2007)
New Revision: 1357
Modified:
trunk/mapbender/http/print/mod_printPDF_pdf.php
Log:
frame around the legend was definded twice, deleted one definition
Modified: trunk/mapbender/http/print/mod_printPDF_pdf.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF_pdf.php 2007-05-24 15:42:07 UTC (rev 1356)
+++ trunk/mapbender/http/print/mod_printPDF_pdf.php 2007-05-25 07:44:37 UTC (rev 1357)
@@ -572,44 +572,6 @@
}
$my_legend = explode("___",$my_legend);
- //frames (x1, y1, x2, y2)
- if($size == "A4" && $format == "portrait"){
- #line
- $pdf->setLineStyle($linewidth, '', '', array());
- //left
- $pdf->line($mapOffset_left - $border, $mapOffset_bottom - $border - $footer_height, $mapOffset_left - $border, $mapOffset_bottom + $map_height + $border + $header_height);
- //right
- $pdf->line($mapOffset_left - $border, $mapOffset_bottom + $map_height + $border + $header_height, $mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border + $header_height);
- //top
- $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border + $header_height, $mapOffset_left + $map_width + $border, $mapOffset_bottom - $border - $footer_height);
- //bottom
- $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border - $footer_height, $mapOffset_left - $border, $mapOffset_bottom - $border - $footer_height);
-
- if ($legendImage!=''){
- //image on top of page
- $pdf->addPngFromFile($legendImage, $mapOffset_left + $map_width + $border - $legendImage_width -6, $mapOffset_bottom + $map_height + $border + $header_height - $legendImage_height - 4 , $legendImage_width, $legendImage_height);
- }
-
- } else {
- $pdf->setLineStyle($linewidth, '', '', array());
- //left
- $pdf->line($mapOffset_left - $border, $mapOffset_bottom - $border, $mapOffset_left - $border, $mapOffset_bottom + $map_height + $border);
- //right
- $pdf->line($mapOffset_left - $border, $mapOffset_bottom + $map_height + $border , $mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border);
- //top
- $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border , $mapOffset_left + $map_width + $border, $mapOffset_bottom - $border);
- //bottom
- $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border , $mapOffset_left - $border, $mapOffset_bottom - $border);
-
- if ($legendImage!=''){
- //image on top of page
- $pdf->addPngFromFile($legendImage, $mapOffset_left + $map_width + $border - $legendImage_width -6, $mapOffset_bottom + $map_height + $border - $legendImage_height -4 , $legendImage_width, $legendImage_height);
- //line under legend (only landscape)
- //$pdf->line($mapOffset_left - $border, $mapOffset_bottom + $map_height + $border - $legendImage_height - 4 , $mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border - $legendImage_height - 6);
- }
- }
-
-
//columns
if($size == "A4" && $format == "portrait"){
$pdf->ezColumnsStart(array ('num'=>2, 'gap'=>10));
@@ -631,7 +593,7 @@
//generate the legend---------------------------------------------
- // gesamth�he Legende / height of the legend
+ // Gesamthoehe Legende / height of the legend
$sum_legend_height = 0;
@@ -643,7 +605,7 @@
$wms_y_position = $pdf->ezText("<b>".$my_wms_title[$i]."</b>", 12, array('spacing'=>1.2));
$wms_zeilenhoehe = $pdf->getFontHeight(12);
- // add this to the height of the legend /addiere dies zur Gesamth�he Legende
+ // add this to the height of the legend /addiere dies zur Gesamthoehe Legende
$sum_legend_height += $wms_zeilenhoehe;
//Layer
@@ -663,10 +625,10 @@
}elseif($temp_url[$q] != '0' ){
$funktionsaufruf = new SaveLegend($temp_url[$q],$legendFilename);
$imgsize = getimagesize($legendFilename);
- // add this to the height of the legend /addiere dies zur Gesamth�he der Legende
+ // add this to the height of the legend /addiere dies zur Gesamthoehe der Legende
$sum_legend_height += $imgsize[1];
- //calculate text + picture / Berechnung Gr��e Schrift + Bild
+ //calculate text + picture / Berechnung Groesse Schrift + Bild
if($l == 0){
$y_position = $wms_y_position;
$wms_y_position = '';
@@ -682,7 +644,7 @@
$l = $l+1;
// if text + picture are smaler then the lower margin + textsize, then set a space
- //wenn Schrift + Bild kleiner der unteren Margin + Zeilenh�he, dann Abstand setzen
+ //wenn Schrift + Bild kleiner der unteren Margin + Zeilenhoehe, dann Abstand setzen
if($size == "A4" && $format == "portrait" && $next_position <= 35 +$layer_zeilenhoehe){ //90 $layer_zeilenhoehe
$space = $layer_zeilenhoehe + $imgsize[1];
$pdf->ezSetDy(-$space);
@@ -692,7 +654,7 @@
$pdf->ezSetDy(-$space);
}
- //write the header layername / �berschrift schreiben
+ //write the header layername / Ueberschrift schreiben
$legend = $temp_layers[$q]."\n"; //$layer[$j]."\n";
$pdf->ezText($legend, 11, array('spacing'=>1.2));
@@ -715,7 +677,12 @@
//top
$pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border + $header_height, $mapOffset_left + $map_width + $border, $mapOffset_bottom - $border - $footer_height);
//bottom
- $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border - $footer_height, $mapOffset_left - $border, $mapOffset_bottom - $border - $footer_height);
+ $pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border - $footer_height, $mapOffset_left - $border, $mapOffset_bottom - $border - $footer_height);
+
+ if ($legendImage!=''){
+ //image on top of page
+ $pdf->addPngFromFile($legendImage, $mapOffset_left + $map_width + $border - $legendImage_width -6, $mapOffset_bottom + $map_height + $border + $header_height - $legendImage_height - 4 , $legendImage_width, $legendImage_height);
+ }
} else {
$pdf->setLineStyle($linewidth, '', '', array());
//left
@@ -726,6 +693,13 @@
$pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border , $mapOffset_left + $map_width + $border, $mapOffset_bottom - $border);
//bottom
$pdf->line($mapOffset_left + $map_width + $border, $mapOffset_bottom -$border , $mapOffset_left - $border, $mapOffset_bottom - $border);
+
+ if ($legendImage!=''){
+ //image on top of page
+ $pdf->addPngFromFile($legendImage, $mapOffset_left + $map_width + $border - $legendImage_width -6, $mapOffset_bottom + $map_height + $border - $legendImage_height -4 , $legendImage_width, $legendImage_height);
+ //line under legend (only landscape)
+ //$pdf->line($mapOffset_left - $border, $mapOffset_bottom + $map_height + $border - $legendImage_height - 4 , $mapOffset_left + $map_width + $border, $mapOffset_bottom + $map_height + $border - $legendImage_height - 6);
+ }
}
}// for layers
} //if wms_id not 0
More information about the Mapbender_commits
mailing list