From b675796ec7a916e9cc61739fee8a6e837bef7d88 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 15 Nov 2014 13:16:27 +0000
Subject: [PATCH] Correção na listagem das classes e acentuação no editor de mapfiles

---
 admin/admin.db                    | Bin 276480 -> 0 bytes
 admin/js/editormapfile.js         | 14 +++++++++-----
 admin/js/editormapfile_classes.js | 28 +++++++++++++++++-----------
 admin/php/editormapfile.php       |  4 +++-
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 8853a94..c816bea 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index f9e9d4b..1c9d1f6 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -614,12 +614,16 @@ function salvarDadosEditorPlugin(onde,plugin,codigoMap,codigoLayer){
 		par = [],
 		prog = "../php/editormapfile.php?funcao=gravaPlugin",
 		i;
-
-	for(i=0; i<n; i++){
-		par.push('"'+campos[i].name+'":"'+campos[i].value+'"');
+	if(!i3GEO.pluginI3geo[plugin].parametrosFormAdmin){
+		for(i=0; i<n; i++){
+			par.push('"'+campos[i].name+'":"'+campos[i].value+'"');
+		}
+		if(plugin != ""){
+			plugin = '{"plugin":"'+plugin+'","parametros":{' + par.join(",") + '}}';
+		}
 	}
-	if(plugin != ""){
-		plugin = '{"plugin":"'+plugin+'","parametros":{' + par.join(",") + '}}';
+	else{
+		plugin = i3GEO.pluginI3geo[plugin].parametrosFormAdmin(onde);
 	}
 	core_carregando("ativa");
 	core_carregando(" gravando o registro do layer= "+codigoLayer);
diff --git a/admin/js/editormapfile_classes.js b/admin/js/editormapfile_classes.js
index e7477b5..766b256 100755
--- a/admin/js/editormapfile_classes.js
+++ b/admin/js/editormapfile_classes.js
@@ -41,7 +41,7 @@ function conteudoNoClasse(codigoMap,codigoLayer,indice,nome){
 	var conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('sobe','classe','"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=sobe src=\"../imagens/34.png\" />";
 	conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('desce','classe','"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=desce src=\"../imagens/33.png\" />";
 	conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluirClasse('"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />&nbsp;<span>"+indice+" "+i3GEO.util.base64decode(nome)+"</span>";
-	var d = {classes:codigoMap+"_"+codigoLayer,html:conteudo,id:codigoMap+"_"+codigoLayer+"_"+indice,codigoMap:codigoMap,codigoLayer:codigoLayer,indiceClasse:indice};
+	var d = {type:'html',classes:codigoMap+"_"+codigoLayer,html:conteudo,id:codigoMap+"_"+codigoLayer+"_"+indice,codigoMap:codigoMap,codigoLayer:codigoLayer,indiceClasse:indice};
 	return d;
 }
 function montaParametrosClasses(no,dados,redesenha)
@@ -156,19 +156,25 @@ function classesAuto(codigoMap,codigoLayer)
 			var callback2 = {
 					success:function(o) {
 						try {
-							var nos = tree.getNodesByProperty("classes",codigoMap+"_"+codigoLayer);
-							/*
-							var dados = YAHOO.lang.JSON.parse(o.responseText);
-
+							var n,tempNode,d,i,nos = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer);
 							if(nos){
-								for (var i=0, j=nos.length; i<j; i++)
-								{tree.removeNode(nos[i],false);}
+								n = nos.children.length;
+								for (i=3; i<n; i++){
+									tree.removeNode(nos.children[3],true);
+								}
+							}
+							//tree.draw();
+							var dados = YAHOO.lang.JSON.parse(o.responseText);
+							n = dados.length;
+							for (i=0; i < n; i++)	{
+								d = conteudoNoClasse(codigoMap,codigoLayer,dados[i].indice,dados[i].nome);
+								tempNode = new YAHOO.widget.HTMLNode(d,nos, false,true);
+								tempNode.setDynamicLoad(loadClasseData, iconMode);
+								tempNode.isLeaf = false;
+								tempNode.enableHighlight = false;
 							}
-							tree.draw();
-							var no = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer);
-							*/
 							nos.refresh();
-							//montaParametrosTemas(no,dados);
+							tree.draw();
 							core_carregando("desativa");
 							YAHOO.admin.container.panelEditorAutoClasses.destroy();
 							YAHOO.admin.container.panelEditorAutoClasses = null;
diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index c82d1d0..a5c3733 100644
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -137,6 +137,7 @@ switch (strtoupper($funcao))
 		retornaJSON($layer->getmetadata("PLUGINI3GEO"));
 	break;
 	case "GRAVAPLUGIN":
+		//echo $plugin;exit;
 		$mapfile = $locaplic."/temas/".$codigoMap.".map";
 		$mapa = ms_newMapObj($mapfile);
 		$layer = $mapa->getlayerbyname($codigoLayer);
@@ -1485,7 +1486,8 @@ function listaClasses()
 	for($i=0;$i<$nclasses;++$i)
 	{
 		$classe = $layer->getclass($i);
-		$dados[] = array("indice"=>$i,"nome"=>base64_encode((mb_convert_encoding($classe->name,"UTF-8","ISO-8859-1"))));
+		$texto = $classe->name;
+		$dados[] = array("indice"=>$i,"nome"=>base64_encode($texto));
 	}
 	return $dados;
 }
--
libgit2 0.21.2