Ajustes na codificação de caracteres da legenda

Edmar Moretti
1 parent f3ef944a
Showing 4 changed files with 37 additions and 28 deletions Show diff stats
admin/admin.db
aplicmap/legenda6.htm
classesphp/classe_alteraclasse.php
classesphp/classe_legenda.php
 <!--
-
 [leg_layer_html opt_flag=1]
-
 	</div><div style='display:block;' id='legendaLayer_[leg_layer_name]' >
-
-	<table class=legendatemas cellspacing=0 width=248 >
 	[if name=TEMA oper=neq value=NAO]
 		<table [if name=CLASSE oper=eq value=NAO] style=display:none;  [/if] >
 			<tr><td style=text-align:left >
@@ -22,22 +18,18 @@
 [/leg_layer_html]
 [leg_class_html]
-
+<table style=margin-top:5px;position:relative;left:15px; >
 	[if name=CLASSE oper=neq value=NAO]
-		<table style=margin-top:5px;position:relative;left:15px; >
 			<tr>
 				<td style=width:20px;text-align:left; ><input type=checkbox CHECKED title=liga/desliga class=inputsb style='border: 0px solid red;cursor:pointer;opacity:0.3;' value=[leg_class_index] name=[leg_layer_name] id='legendack_[leg_layer_name]_[leg_class_index]' onclick='i3GEO.arvoreDeCamadas.inverteStatusClasse(this)' />
 				</td>
 				<td style=text-align:left >
 					<img src=[leg_icon  width=16 height=16 ] />
 				</td>
-				<td width=195 style=text-align:left; ><span style=font-size:9px;position:relative;left:2px; >[leg_class_name]</span></td>
+				<td style="text-align:left;width:195px" ><span style="font-size:9px;position:relative;left:2px;" >[leg_class_name]</span></td>
 			</tr>
-		</table>
 	[/if]
-	</table>
+</table>
 [/leg_class_html]
-
--->
-
+-->
 \ No newline at end of file
@@ -195,7 +195,7 @@ class Alteraclasse
 		$ids = explode(";",$ids);
 		$minScales = explode(";",$minScales);
 		$maxScales = explode(";",$maxScales);
-		//$nomes = mb_convert_encoding($nomes,"ISO-8859-1","UTF-8");
+		$nomes = $this->converteTexto($nomes);
 		$nomes = explode(";",$nomes);
 		//$exps = mb_convert_encoding($exps,"ISO-8859-1","UTF-8");
 		$exps = explode(";",$exps);
@@ -576,8 +576,8 @@ class Alteraclasse
 		{
 			$ns = $vs;
 		}
-		else
-		{$ns = $this->pegaValores($this->mapa,$this->layer,$itemNome,false,$ignorar);
+		else{
+			$ns = $this->pegaValores($this->mapa,$this->layer,$itemNome,false,$ignorar);
 		}
 		$lista = array();
 		for ($i = 0; $i < count($vs); ++$i){
@@ -1064,14 +1064,14 @@ class Alteraclasse
 	{string}
 	*/
 	function converteTexto($texto)
-	{
-		if (function_exists("mb_convert_encoding"))
-		{
-			if (!mb_detect_encoding($texto,"ISO-8859-1",true))
-			{
-				$texto = mb_convert_encoding($texto,"ISO-8859-1","UTF-8");
-			}
-		}
+	{
+		if (function_exists("mb_convert_encoding"))
+		{
+			if (!mb_detect_encoding($texto,"UTF-8",true))
+			{
+				$texto = mb_convert_encoding($texto,"UTF-8","ISO-8859-1");
+			}
+		}
 		return $texto;
 	}
 }
@@ -252,9 +252,13 @@ string com a legenda HTML
 		if(!$l = @$this->mapa->processlegendtemplate($tmparray)){
 			return ("erro");
 		}
-		if (function_exists("mb_convert_encoding")){
-			$l = mb_convert_encoding($l,"UTF-8","ISO-8859-1");
+		//e necessario explodir as partes da legenda para converter os caracteres
+		$pedacos = explode("<tr>",$l);
+		$n = count($pedacos);
+		for($i=0;$i<$n;$i++){
+			$pedacos[$i] = $this->converte($pedacos[$i]);
 		}
+		$l = implode("<tr>",$pedacos);
 		return (array("legenda"=>$l,"desativar"=>$desligar));
 	}
 /*
@@ -355,11 +359,14 @@ array
 					$imgi->saveImage($nomer);
 					$i = ($imgi->imageurl).basename($nomer);
 					$nomeclasse = $classe->name;
-					if (function_exists("mb_convert_encoding"))
-					{$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");}
+					
+					//if (function_exists("mb_convert_encoding"))
+					//{$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");}
+					$nomeclasse = $this->converte($nomeclasse);
 					$nomeexp = $classe->getExpressionString();
 					if (function_exists("mb_convert_encoding"))
 					{$nomeexp = mb_convert_encoding($nomeexp,"UTF-8","ISO-8859-1");}
+					
 					$linhas[] = array("tema"=>$l,"idclasse"=>$c,"nomeclasse"=>$nomeclasse,"expressao"=>$nomeexp,"imagem"=>$i,"proc"=>"","minScale"=>$classe->minscaledenom,"maxScale"=>$classe->maxscaledenom);
 				}
 				if (($totaliza=="sim") && ($nc > 1)){
@@ -918,6 +925,16 @@ $width
 		$this->layer->setMetaData("cache","");
 		return "ok";
 	}
-
+	function converte($texto)
+	{
+		if (function_exists("mb_convert_encoding"))
+		{
+			if (!mb_detect_encoding($texto,"UTF-8",true))
+			{
+				$texto = mb_convert_encoding($texto,"UTF-8","ISO-8859-1");
+			}
+		}
+		return $texto;
+	}
 }
 ?>
 \ No newline at end of file