From c02804398932b923b82a1c78dc31c1bddd41e694 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 10 Feb 2014 13:39:51 +0000
Subject: [PATCH] Correção na impressão em SVG

---
 admin/admin.db               | Bin 263168 -> 0 bytes
 ferramentas/imprimir/svg.php | 32 +++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index e2d6572..f3e51a3 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/imprimir/svg.php b/ferramentas/imprimir/svg.php
index 27dd1bb..7619cb7 100644
--- a/ferramentas/imprimir/svg.php
+++ b/ferramentas/imprimir/svg.php
@@ -61,6 +61,7 @@ if (array_search( "MapScript", $exts) != TRUE)
 require(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
 error_reporting(0);
 $nomes = nomeRandomico();
+
 $map = ms_newMapObj($map_file);
 $temp = str_replace(".map","xxx.map",$map_file);
 $map->save($temp);
@@ -68,8 +69,10 @@ substituiCon($temp,$postgis_mapa);
 $map = ms_newMapObj($temp);
 if($interface == "googlemaps")
 {$map->setProjection("init=epsg:4618,a=6378137,b=6378137");}
-$eb = $map->scalebar;
+$v = versao();
+
 $leb = $eb->label;
+
 if($leb->type == "MS_BITMAP"){
 	$leb->set("type",MS_TRUETYPE);
 	$leb->set("font","Arial");
@@ -93,21 +96,28 @@ for ($i=0;$i < $numlayers;$i++)
 		$nclasses = $layer->numclasses;
 		if ($nclasses > 0)
 		{
-			for($i=0;$i<$nclasses;$i++)
+			for($j=0;$j<$nclasses;$j++)
 			{
-				$classe = $layer->getclass($i);
+				$classe = $layer->getclass($j);
 				$classe->set("name","classeNula");
 			}
 		}
 	}
+
 	$nclasses = $layer->numclasses;
-	if ($nclasses > 0)
-	{
-		for($i=0;$i<$nclasses;$i++)
-		{
-			$classe = $layer->getclass($i);
-			$leb = $classe->label;
-			if($leb->type == MS_BITMAP){
+	if ($nclasses > 0){
+		for($j=0;$j<$nclasses;$j++){
+			$classe = $layer->getclass($j);
+			$leb = false;
+			if($v["inteiro"] >= 60200){
+				if($classe->numlabels > 0){
+					$leb = $classe->getLabel(0);
+				}
+			}
+			else{
+				$leb = $classe->label;
+			}
+			if($leb != false && $leb->type == MS_BITMAP){
 				$leb->set("type",MS_TRUETYPE);
 				$leb->set("font","Arial");
 			}
@@ -136,4 +146,4 @@ $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageu
 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>";
 echo "<p>Arquivos gerados:</p>";
 echo "<a style=font-family:Verdana,Arial,Helvetica,sans-serif; href='$nomemapa' target=_blank >Mapa</a><br><br>";
-?>
\ No newline at end of file
+?>
--
libgit2 0.21.2