From 8913d43807231343b42133f5958b33e53b4327e2 Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Mon, 31 Jul 2017 12:18:53 -0300
Subject: [PATCH] Correção na inclusão de labels em classes no editor de legenda

---
 classesphp/classe_temas.php     | 1 +
 classesphp/classe_toponimia.php | 6 +-----
 css/i3geo7.css.php              | 0
 ferramentas/legenda/exec.php    | 2 +-
 js/i3geo_tudo_compacto7.js.php  | 0
 5 files changed, 3 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 css/i3geo7.css.php
 mode change 100644 => 100755 js/i3geo_tudo_compacto7.js.php

diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php
index 9b912de..7e93851 100755
--- a/classesphp/classe_temas.php
+++ b/classesphp/classe_temas.php
@@ -1256,6 +1256,7 @@ Adiciona LABEL em uma classe de um tema
 			}
 			else{
 				$s = "CLASS LABEL TEXT '".$texto."' END END";
+				//$s = "CLASS LABEL TEXT '[".$texto."]' END END";
 				$novac->updateFromString($s);
 			}
 		}
diff --git a/classesphp/classe_toponimia.php b/classesphp/classe_toponimia.php
index 3a99942..1a41b96 100755
--- a/classesphp/classe_toponimia.php
+++ b/classesphp/classe_toponimia.php
@@ -176,7 +176,7 @@ $novotema sim|nao Cria um novo tema ou n&atilde;o, nesse &uacute;ltimo caso, a t
 
 Retorno:
 
-{string} - c�digo do layer criado
+{string} - codigo do layer criado
 */
 	function criaToponimia($item,$position,$partials,$offsetx,$offsety,$minfeaturesize,$mindistance,$force,$shadowcolor,$shadowsizex,$shadowsizey,$outlinecolor,$cor,$sombray,$sombrax,$sombra,$fundo,$angulo,$tamanho,$fonte,$tipo,$wrap,$novotema="sim")
 	{
@@ -216,7 +216,6 @@ Retorno:
 		}
 		else
 		{
-			//$novac = $this->layer->getclass(0);
 			$nomer = $this->layer->name;
 		}
 		if(!($this->vi >= 60200)){
@@ -226,7 +225,6 @@ Retorno:
 		for ($i=0; $i < $nclasses; ++$i){
 			$novac = $this->layer->getclass($i);
 			if($this->vi >= 60200){
-				//$indiceLabel = $novac->addLabel(new labelObj());
 				$s = "CLASS LABEL TEXT '[".$item."]' END END";
 				$novac->updateFromString($s);
 				$label = $novac->getLabel($indiceLabel);
@@ -279,8 +277,6 @@ Retorno:
 			corE($label,$cor,"color");
 			corE($label,$fundo,"backgroundcolor");
 			corE($label,$sombra,"backgroundshadowcolor",$sombrax,$sombray);
-			//$label->set("backgroundshadowsizex",$sombrax);
-			//$label->set("backgroundshadowsizey",$sombray);
 			corE($label,$outlinecolor,"outlinecolor");
 			corE($label,$shadowcolor,"shadowcolor");
 			$label->set("shadowsizex",$shadowsizex);
diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php
old mode 100644
new mode 100755
index 7321a98..7321a98
--- a/css/i3geo7.css.php
+++ b/css/i3geo7.css.php
diff --git a/ferramentas/legenda/exec.php b/ferramentas/legenda/exec.php
index f48a1b5..232b8f7 100755
--- a/ferramentas/legenda/exec.php
+++ b/ferramentas/legenda/exec.php
@@ -67,7 +67,7 @@ Adiciona LABEL em uma classe de um layer
 		include_once(dirname(__FILE__)."/../../classesphp/classe_temas.php");
 		$m = new Temas($map_file,$tema);
 		$l = $m->mapa->getlayerbyname($tema);
-		if(empty($item))
+		if(empty($_GET["item"]))
 		{$retorno = "erro";}
 		else{
 			//$l->set("labelitem",$item);
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100644
new mode 100755
index 1f2e15b..1f2e15b
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
--
libgit2 0.21.2