From 770ec7d9e71852e22bce4231e865aebd2b0e9b6a Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 18 Dec 2008 19:04:25 +0000
Subject: [PATCH] 

---
 admin/js/arvore.js                            |  3 ++-
 admin/js/editormapfile.js                     | 16 +++++++++++++++-
 admin/php/arvore.php                          |  4 ++--
 admin/php/editormapfile.php                   | 24 +++++++++++++++++++-----
 admin/php/menutemas.php                       | 12 +++++++++---
 aplicmap/geral.htm                            |  4 ++--
 classesjs/classe_arvoredecamadas.js           |  3 ++-
 classesjs/compactados/depreciados_compacto.js |  2 +-
 classesjs/i3geo_tudo_compacto.js              |  2 +-
 classesjs/i3geo_tudo_compacto.js.php          |  2 +-
 ferramentas/googlemaps/index.php              | 17 ++++++++++++++---
 geradordelinks.htm                            |  3 ++-
 12 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/admin/js/arvore.js b/admin/js/arvore.js
index 6ff51e5..5ced054 100644
--- a/admin/js/arvore.js
+++ b/admin/js/arvore.js
@@ -530,7 +530,8 @@ function montaDivTema(i)
 	ins += "<select id='Epublicado' >"
 	ins += core_combosimnao(i.publicado)
 	ins += "</select>"
-	ins += "<input type=hidden value="+i.ordem+" id='Eordem' />"
+	ins += "<br>Ordem<br>"
+	ins += "<input size=10 type=text value="+i.ordem+" id='Eordem' />"
 	return(ins)
 }
 function montaDivRaiz(i)
diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index 2cd29ff..2dbfc1f 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -844,6 +844,12 @@ function montaEditorGeral(dados)
 }
 function montaEditorClasseGeral(dados)
 {
+	var re = /C_/g;
+	dados.expression = dados.expression.replace(re,"]");
+	var re = /_C/g;
+	dados.expression = dados.expression.replace(re,"[");
+	var re = /_A_/g;
+	dados.expression = dados.expression.replace(re,"'");
 	var param = {
 		"linhas":[
 		{ajuda:"Nome da classe para ser mostrada na legenda",
@@ -1042,8 +1048,16 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo)
 	}
 	if(tipo == "classeGeral")
 	{
-		var campos = new Array("status","minscale","maxscale","name","expression","keyimage")
+		var campos = new Array("status","minscale","maxscale","name","keyimage")
 		var par = "&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer+"&indiceClasse="+indiceClasse
+		var temp = $i("expression").value;
+		var re = /]/g;
+		var temp = temp.replace(re,"C_");
+		var re = "[";
+		var temp = temp.replace(re,"_C");
+		var re = /'/g;
+		var temp = temp.replace(re,"_A_");
+		par += "&expression="+temp;
 		var prog = "../php/editormapfile.php?funcao=alterarClasseGeral"	
 	}
 	if(tipo == "classeLabel")
diff --git a/admin/php/arvore.php b/admin/php/arvore.php
index 80b4762..8cc4a9e 100644
--- a/admin/php/arvore.php
+++ b/admin/php/arvore.php
@@ -161,13 +161,13 @@ Altera o registro de um nível 3 (temas)
 */
 function alteraN3()
 {
-	global $publicado,$n3_perfil,$id,$id_n2,$id_tema;
+	global $publicado,$n3_perfil,$id,$id_n2,$id_tema,$ordem;
 	try 
 	{
     	require_once("conexao.php");
     	if($id != "")
     	{
-    		$dbhw->query("UPDATE i3geoadmin_n3 SET publicado = '$publicado',id_tema = '$id_tema', n3_perfil = '$n3_perfil' WHERE id_n3 = $id");
+    		$dbhw->query("UPDATE i3geoadmin_n3 SET ordem = $ordem, publicado = '$publicado',id_tema = '$id_tema', n3_perfil = '$n3_perfil' WHERE id_n3 = $id");
     		$retorna = $id;
     	}
     	else
diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index b782084..0fd0674 100644
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -452,6 +452,7 @@ function alterarMetadados()
 function pegaGeral()
 {
 	global $codigoMap,$codigoLayer,$locaplic;
+	$v = versao();
 	$dados = array();
 	$mapfile = $locaplic."/temas/".$codigoMap.".map";
 	$mapa = ms_newMapObj($mapfile);
@@ -470,7 +471,7 @@ function pegaGeral()
 	$dados["maxscale"] = $layer->maxscale;
 	$dados["minscale"] = $layer->minscale;
 	$dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue;
-	$dados["opacity"] = $layer->opacity;
+	$v["principal"] == "4" ? $dados["opacity"] = $layer->transparency : $dados["opacity"] = $layer->opacity;
 	$dados["symbolscale"] = $layer->symbolscale;
 	$dados["tolerance"] = $layer->tolerance;
 	$dados["toleranceunits"] = $layer->toleranceunits;
@@ -488,6 +489,8 @@ function pegaGeral()
 function alterarGeral()
 {
 	global $codigoMap,$codigoLayer,$locaplic,$name,$projection,$sizeunits,$status,$toleranceunits,$tolerance,$symbolscale,$opacity,$offsite,$minscale,$maxscale,$labelsizeitem,$labelminscale,$labelmaxscale,$labelitem,$group,$filteritem,$type,$filter;
+	error_reporting(E_ALL);
+	$v = versao();
 	$dados = array();
 	$mapfile = $locaplic."/temas/".$codigoMap.".map";
 	$mapa = ms_newMapObj($mapfile);
@@ -513,7 +516,8 @@ function alterarGeral()
 	$c = explode(" ",$offsite);
 	$cor->setrgb($c[0],$c[1],$c[2]);
 	$layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue;
-	$layer->set("opacity",$opacity);
+	$v["principal"] == "4" ? $layer->set("transparency",$opacity) : $layer->set("opacity",$opacity);
+
 	$layer->set("symbolscale",$symbolscale);
 	$layer->set("tolerance",$tolerance);
 	$layer->set("toleranceunits",$toleranceunits);
@@ -532,18 +536,25 @@ function alterarGeral()
 function pegaClasseGeral()
 {
 	global $codigoMap,$codigoLayer,$indiceClasse,$locaplic;
+	
+	error_reporting(E_ALL);
 	$dados = array();
 	$mapfile = $locaplic."/temas/".$codigoMap.".map";
 	$mapa = ms_newMapObj($mapfile);
 	$layer = $mapa->getlayerbyname($codigoLayer);
 	$classe = $layer->getclass($indiceClasse);
 	$dados["name"] = $classe->name;
-	$dados["expression"] = $classe->getExpression();
+	$temp = $classe->getExpression();
+	$temp = str_replace("[","_C",$temp);
+	$temp = str_replace("]","C_",$temp);
+	$temp = str_replace("'","_A_",$temp);
+	//substitui caracteres que dão problemas
+	$dados["expression"] = $temp;
 	$dados["keyimage"] = $classe->keyimage;
 	$dados["maxscale"] = $classe->maxscale;
 	$dados["minscale"] = $classe->minscale;
 	$dados["status"] = $classe->status;
-	$dados["text"] = $classe->getTextString();
+	//$dados["text"] = $classe->getTextString();
 	$dados["codigoMap"] = $codigoMap;
 	$dados["codigoLayer"] = $codigoLayer;
 	$dados["indiceClasse"] = $indiceClasse;
@@ -559,7 +570,10 @@ function alterarClasseGeral()
 	$layer = $mapa->getlayerbyname($codigoLayer);
 	$classe = $layer->getclass($indiceClasse);
 	$classe->set("name",$name);
-	$classe->setexpression($expression);
+	$temp = str_replace("_C","[",$expression);
+	$temp = str_replace("C_","]",$temp);
+	$temp = str_replace("_A_","'",$temp);	
+	$classe->setexpression($temp);
 	$classe->set("keyimage",$keyimage);
 	$classe->set("maxscale",$maxscale);
 	$classe->set("minscale",$minscale);
diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php
index a87b98d..c9a75ed 100644
--- a/admin/php/menutemas.php
+++ b/admin/php/menutemas.php
@@ -977,6 +977,7 @@ function importarXmlMenu()
 	//
 	//registra o restante
 	//
+	$contaGrupo = 0;
 	foreach($xml->GRUPO as $grupo)
 	{
 		$gtipo = html_entity_decode(ixml($grupo,"GTIPO"));
@@ -984,7 +985,8 @@ function importarXmlMenu()
 		$n1_perfil = ixml($grupo,"PERFIL");
 		$r = $dbhw->query("select id_grupo from i3geoadmin_grupos where nome_grupo = '$gtipo'");
 		$id_grupo = $r->fetchColumn();
-		$dbhw->query("INSERT INTO i3geoadmin_n1 (ordem,publicado,id_menu,id_grupo,n1_perfil) VALUES ('0','SIM','$id_menu','$id_grupo','$n1_perfil')");
+		$dbhw->query("INSERT INTO i3geoadmin_n1 (ordem,publicado,id_menu,id_grupo,n1_perfil) VALUES ($contaGrupo,'SIM','$id_menu','$id_grupo','$n1_perfil')");
+		$contaGrupo++;
 		$id_n1 = $dbhw->query("SELECT id_n1 FROM i3geoadmin_n1");
 		$id_n1 = $id_n1->fetchAll();
 		$id_n1 = intval($id_n1[count($id_n1)-1]['id_n1']);
@@ -996,6 +998,7 @@ function importarXmlMenu()
 			$id_tema = $r->fetchColumn();
 			$dbhw->query("INSERT INTO i3geoadmin_raiz (id_tema,id_menu,id_nivel,nivel,perfil,ordem) VALUES ('$id_tema','$id_menu','$id_n1','1','$perfil','0')");		
 		}
+		$contaSubGrupo = 0;
 		foreach($grupo->SGRUPO as $subgrupo)
 		{
 			$sdtipo = html_entity_decode(ixml($subgrupo,"SDTIPO"));
@@ -1004,17 +1007,20 @@ function importarXmlMenu()
 			$r = $dbhw->query("select id_subgrupo from i3geoadmin_subgrupos where nome_subgrupo = '$sdtipo'");
 			$id_subgrupo = $r->fetchColumn();
 
-			$dbhw->query("INSERT INTO i3geoadmin_n2 (publicado,ordem,id_n1,id_subgrupo,n2_perfil) VALUES ('SIM','0','$id_n1','$id_subgrupo','$n2_perfil')");
+			$dbhw->query("INSERT INTO i3geoadmin_n2 (publicado,ordem,id_n1,id_subgrupo,n2_perfil) VALUES ('SIM',$contaSubGrupo,'$id_n1','$id_subgrupo','$n2_perfil')");
+			$contaSubGrupo++;
 			$id_n2 = $dbhw->query("SELECT id_n2 FROM i3geoadmin_n2");
 			$id_n2 = $id_n2->fetchAll();
 			$id_n2 = intval($id_n2[count($id_n2)-1]['id_n2']);
+			$contaTema = 0;
 			foreach($subgrupo->TEMA as $tema)
 			{
 				$codigo = ixml($tema,"TID");
 				$perfil = ixml($tema,"PERFIL");
 				$r = $dbhw->query("select id_tema from i3geoadmin_temas where codigo_tema = '$codigo'");
 				$id_tema = $r->fetchColumn();
-				$dbhw->query("INSERT INTO i3geoadmin_n3 (publicado,ordem,id_n2,id_tema,n3_perfil) VALUES ('SIM','0','$id_n2','$id_tema','$perfil')");		
+				$dbhw->query("INSERT INTO i3geoadmin_n3 (publicado,$contaTema,id_n2,id_tema,n3_perfil) VALUES ('SIM','0','$id_n2','$id_tema','$perfil')");		
+				$contaTema++;
 			}		
 		}
 	}	
diff --git a/aplicmap/geral.htm b/aplicmap/geral.htm
index 3472018..6d76d0b 100644
--- a/aplicmap/geral.htm
+++ b/aplicmap/geral.htm
@@ -593,12 +593,12 @@ Idioma:
 ******************************************************************************/
 
 //Log
-/*
+
 var myContainer = document.body.appendChild(document.createElement("div")); 
 myContainer.style.textAlign="left";
 i3geoLog = new YAHOO.widget.LogReader(myContainer);
 i3geoLog.show();
-*/
+
 
 /*
 	Inicializa o mapa
diff --git a/classesjs/classe_arvoredecamadas.js b/classesjs/classe_arvoredecamadas.js
index be048d9..c2dc91f 100644
--- a/classesjs/classe_arvoredecamadas.js
+++ b/classesjs/classe_arvoredecamadas.js
@@ -304,7 +304,7 @@ i3GEO.arvoreDeCamadas = {
 	                		DDM.refreshCache();
 	                		//exclui tema
    		             		if(DDM.getDDById(id).id == "i3geo_lixeira"){
-                				i3GEO.janela.abreAguarde("ajaxCorpoMapa1",$trad("o1"));
+                				i3GEO.janela.abreAguarde("ajaxCorpoMapa",$trad("o1"));
                 				var tema = (this.getEl()).id.split("arrastar_")[1];
 								var p = i3GEO.arvoreDeCamadas.LOCAPLIC+"/classesphp/mapa_controle.php?funcao=excluitema&temas="+tema+"&g_sid="+g_sid;
 								var cp = new cpaint();
@@ -683,6 +683,7 @@ i3GEO.arvoreDeCamadas = {
 		//
 		var temp = function(){
 			objmapa.atualizaCorpoMapa();
+			i3GEO.janela.fechaAguarde("redesenha");
 		};
 		clearTimeout(objmapa.tempo);
 		objmapa.tempo = "";
diff --git a/classesjs/compactados/depreciados_compacto.js b/classesjs/compactados/depreciados_compacto.js
index 0fa120b..bd592fa 100644
--- a/classesjs/compactados/depreciados_compacto.js
+++ b/classesjs/compactados/depreciados_compacto.js
@@ -1 +1 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('k(26(4)==\'25\'){4=27 28()}3 2a(t,13){4.5.29(t,13)}3 24(t){4.5.23(t)}3 1W(l){4.1Y.1Z(l)}3 21(){4.H.20()}3 1e(2b){6("19 1e 9 g. s 4.16")}3 2m(r,q,v,D,C,a){b c=4.c.1h(r,q,v,D,C,a)}3 2l(w,h){4.c.2n(w,h)}3 2o(r,q,v,D,C,a){b F=2p.5.2k.2j();4.c.1h(r,q,v,D,C,a,F,2g)}3 1k(2i){6("1k 9 g")}3 2h(2q,1f,1P){4.H.1B(1f)}3 1a(1z,O,1C){6("1a 9 g")}3 1E(a){}3 1F(I){b d=I.1y("1u");k(d.1v==2){1x=I;d=d[1];b p=u+"/1A/1U.1Q?1G=1R&1S=1T.1O&d="+d+"&o="+o;1N.1I(p,"1H",1J)}}3 18(1K){6("19 18 9 2r - 1d 4.16")}3 2D(35){}3 17(1c){1m(4.5.17(1c))}3 36(){6("1d 4.H")}3 39(){}3 1l(m){38{k(!$i("8")){b n=A.33("32");n.F=\'8\';n.2X=\'<V 2W="2Y" 7="3b: 31 30 #3a;"> <U> <z 3d="1l()" 7="B-J:K;3h:3e" M="1g"> <L 3f="\'+u+\'/3c/3g.3j" /> </z> <z 7="B-J:K" M="1g"> <2Z 7="B-J:K" M="2C" 2V="B" F="W" 2y="2t" X="" /> </z></U> </V>\';k($i("T")){$i("T").S(n)}R{A.2x.S(n)}}k(m==2G){$i("8").7.12="2Q"}R{$i("W").X=m;$i("8").7.12="2O"}b j=P($i("L"));j[1]=j[1]+2I($i("L").7.2J)-22;11(\'A.Y("8").7.\'+2K+\' = j[0] + 1t\');11(\'A.Y("8").7.\'+1L+\' = j[1] + 1t\')}2L(e){6("2M 2H 8."+e)}}3 2S(){1o.2R=3(E,a){4.c.2P(E,a)};1o.2v=3(E){4.c.2u(E)}}3 2A(){4.f.2B(u,o)}3 2U(){4.f.3i(u,o)}3 37(1r,1q,1s){1m(4.5.34(1r,1q,1s))}3 1M(){6("1w 4.f.1D")}3 N(){6("N 9 g. s 4.f.N")}3 1p(){6("1p 9 g. s 4.f.1V")}3 G(2e,w,h,2c){6("G 9 g. s 4.f.G")}3 1n(){4.5.1n()}3 1X(){}3 P(O){4.5.P(O)}3 3k(e){4.5.2z(e)}3 2F(1j,Z,10){4.5.2T(1j,Z,10,Q.2N,Q.2w)}3 2s(x,y){4.5.2E(x,y)}3 2f(1b,1i,15,14){4.5.2d(1b,1i,15,14)}',62,207,'|||function|i3GEO|util|alert|style|mensagem|foi|texto|var|janela|tema||navega|depreciado|||pos|if|||novoel|g_sid||waltura|wlargura|Utilize|nome|g_locaplic|wsrc||||td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|objmapa|else|appendChild|i3geo|tr|table|mensagemt|value|getElementById|vy|docmapa|eval|visibility|valor|imgext|g_celula|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|pegalistademenus|dica|tdclara|cria|yfign|vx|wdocafechaf|mensagemf|return|protocolo|this|zoomtot|cm|cd|cs|g_postpx|legenda|length|utilize|g_arvoreClick|split|tipo|classesphp|mostraJanela|nomeFuncao|zoomponto|procurartemas|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|zoomExt|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|odoca|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|convdmsf|70|fechaAguarde|fecha|cellsize|body|size|pegaElementoPai|zoomiauto|zoomin|textocb|processevent1|dd2dms|convddtela|null|criar|parseInt|height|g_tipoleft|catch|Impossivel|extent|visible|abreAguarde|hidden|abre|aguarde|dd2tela|zoomoauto|type|width|innerHTML|50|input|solid|1px|div|createElement|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|try|mensagemBanner|000000|border|imagens|onclick|pointer|src|excluir|cursor|zoomout|png|i3geo_pegaElementoPai'.split('|'),0,{}))
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o(26(4)==\'25\'){4=27 28()}3 2a(u,12){4.5.29(u,12)}3 24(u){4.5.23(u)}3 1W(l){4.1Y.1Z(l)}3 21(){4.I.20()}3 1g(2b){6("1a 1g 9 d. t 4.17")}3 2m(s,r,z,E,D,a){j g=4.g.1h(s,r,z,E,D,a)}3 2l(w,h){4.g.2n(w,h)}3 2o(s,r,z,E,D,a){j G=2p.5.2k.2j();4.g.1h(s,r,z,E,D,a,G,2g)}3 1k(1V){6("1k 9 d")}3 2h(2q,16,1P){4.I.1B(16)}3 1b(1A,P,1D){6("1b 9 d")}3 1z(a){}3 1F(J){j f=J.1x("1u");o(f.1y==2){1v=J;f=f[1];j p=v+"/1C/1U.1Q?1G=1R&1S=1T.1O&f="+f+"&q="+q;1N.1I(p,"1H",1J)}}3 19(1K){6("1a 19 9 2r - 1e 4.17")}3 2D(35){}3 18(1d){8(4.5.18(1d))}3 36(){6("1e 4.I")}3 38(){}3 1l(m){33{o(!$i("b")){j n=B.32("2X");n.G=\'b\';n.2W=\'<U 2Y="3b" 7="31: 30 3a #3e;"> <W> <A 3k="1l()" 7="C-K:L;3f:3g" N="1f"> <M 3d="\'+v+\'/3c/3j.3i" /> </A> <A 7="C-K:L" N="1f"> <2U 7="C-K:L" N="2V" 2E="C" G="Y" 2t="2s" 13="" /> </A></W> </U>\';o($i("T")){$i("T").R(n)}X{B.2x.R(n)}}o(m==2Q){$i("b").7.14="2P"}X{$i("Y").13=m;$i("b").7.14="2N"}j k=Q($i("M"));k[1]=k[1]+2H($i("M").7.2K)-22;11(\'B.10("b").7.\'+2M+\' = k[0] + 1t\');11(\'B.10("b").7.\'+1L+\' = k[1] + 1t\')}2L(e){6("2J 2O b."+e)}}3 2S(){1o.2R=3(F,a){4.g.2G(F,a)};1o.2v=3(F){4.g.2y(F)}}3 2A(){4.c.2B(v,q)}3 2Z(){4.c.3h(v,q)}3 37(1p,1n,1s){8(4.5.34(1p,1n,1s))}3 1M(){6("1w 4.c.1E")}3 O(){6("O 9 d. t 4.c.O")}3 1m(){6("1m 9 d. t 4.c.2i")}3 H(2e,w,h,2c){6("H 9 d. t 4.c.H")}3 1q(){8(4.5.1q())}3 1X(){}3 Q(P){8(4.5.Q(P))}3 39(e){8(4.5.2C(e))}3 2w(1r,1j,Z){8(4.5.2T(1r,1j,Z,S.2I,S.2F))}3 2u(x,y){8(4.5.2z(x,y))}3 2f(1c,1i,15,V){8(4.5.2d(1c,1i,15,V))}',62,207,'|||function|i3GEO|util|alert|style|return|foi|texto|mensagem|navega|depreciado||tema|janela|||var|pos|||novoel|if||g_sid|waltura|wlargura|Utilize|nome|g_locaplic||||wsrc|td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|appendChild|objmapa|i3geo|table|imgext|tr|else|mensagemt|docmapa|getElementById|eval|valor|value|visibility|g_celula|dica|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|tdclara|pegalistademenus|cria|yfign|vy|wdocafechaf|mensagemf|zoomtot|cm|this|cd|protocolo|vx|cs|g_postpx|legenda|g_arvoreClick|utilize|split|length|procurartemas|tipo|mostraJanela|classesphp|nomeFuncao|zoomponto|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|odoca|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|zoomExt|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|70|size|convdmsf|fecha|convddtela|body|fechaAguarde|dd2dms|zoomiauto|zoomin|pegaElementoPai|processevent1|type|cellsize|abreAguarde|parseInt|extent|Impossivel|height|catch|g_tipoleft|visible|criar|hidden|null|abre|aguarde|dd2tela|input|textocb|innerHTML|div|width|zoomoauto|1px|border|createElement|try|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|mensagemBanner|i3geo_pegaElementoPai|solid|50|imagens|src|000000|cursor|pointer|zoomout|png|excluir|onclick'.split('|'),0,{}))
diff --git a/classesjs/i3geo_tudo_compacto.js b/classesjs/i3geo_tudo_compacto.js
index cdf6da6..9782152 100644
--- a/classesjs/i3geo_tudo_compacto.js
+++ b/classesjs/i3geo_tudo_compacto.js
@@ -241,5 +241,5 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
 
 eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('L 1m(o){l($i(o)){$i(o).Z="1n";l(M.1l){e 6="";6+=\'<P b="1k" 3="1h:B;5: 2 7 8;z-1i:1j;S-T:1.4" >\';6+=\'<X b="W-V-U" 3="5:2 7 8;m:1o;">\';e h="";l(1p){e h="S-T:2;"}l(R.w>=Q){6+=\'<9 b="g W-V-U" 3="\'+h+\'D:E;5: 2 7 8;" >\';6+=\'&c;<G  3="5: C 7 8;d:0 2;m:-H;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1t\\\')" f="1s" s="1q"/>\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1g\\\')" s"1w" f="1f" />\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'14\\\')" f="15" s="16" />\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1R\\\')" f="1Q" s="1P" />\';6+=\'</9>\'}6+=\'<9 b="g" 3="d-A:k" ><a 3="5: 2 7 8;" y="#" b="x" f="1V" >&c;&c;\'+$t("1U")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="20" >&c;&c;\'+$t("1Y")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="1W" >&c;&c;\'+$t("1Z")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="1B" >&c;&c;\'+$t("1z")+\'</a></9>\';6+=\'</X>\';6+=\'</P>\';$i("10").1L=6}L 11(1I,1G){l(R.w>=Q){e n=4}1r{e n=0}1H(e N 1J M){e v="1K.1E("+n+").1y.1A(\'1N\',{f:\'"+N+"\',1C: M[\'"+N+"\']})";1M(v);e n=n+1}}e O=1X 1O.1T.1S(o,{1D:1x,1a:19,18:1b,1c:1e});O.1d.17(11);O.13();e j=$i("10").3;j.12="2 -k";j.5="2 7 8";e j=$i(o).3;j.12="2 -k";j.5="2 7 8";l($i("Y")){$i("Y").Z="1v-1u"}}}L 1F(){}',62,125,'||0px|style||border|ins|solid|white|li||class|nbsp|padding|var|id|yuimenubaritem|sobe||temp|5px|if|top|conta|iddiv|trocaIdioma|idioma|i3GEO|alt|trad|onclick|||yuimenubaritemlabel|href||bottom|right|1px|float|left|gif|img|7px|branco|im|src|function|oMenuData|nomeMenu|oMenuBar|div|500|objmapa|line|height|type|of|first|ul|contemMenu|className|menus|onMenuBarBeforeRender|backgroundPosition|render|es|espanhol|Espanhol|subscribe|hidedelay|150|showdelay|250|lazyload|beforeRenderEvent|false|uk|en|align|index|6000|bd|ajudas|montaMenuSuspenso|yuimenubar|10px|navn|Portugues|else|brasil|pt|navset|yui|Ingles|true|cfg|s4|setProperty|menuarquivos|itemdata|autosubmenudisplay|getItem|testamenususpenso|p_sArgs|for|p_sType|in|this|innerHTML|eval|submenu|YAHOO|Italiano|italiano|it|MenuBar|widget|s1|menuajuda|menujanelas|new|s2|s3|menuanalise'.split('|'),0,{}))
 
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('k(26(4)==\'25\'){4=27 28()}3 2a(t,13){4.5.29(t,13)}3 24(t){4.5.23(t)}3 1W(l){4.1Y.1Z(l)}3 21(){4.H.20()}3 1e(2b){6("19 1e 9 g. s 4.16")}3 2m(r,q,v,D,C,a){b c=4.c.1h(r,q,v,D,C,a)}3 2l(w,h){4.c.2n(w,h)}3 2o(r,q,v,D,C,a){b F=2p.5.2k.2j();4.c.1h(r,q,v,D,C,a,F,2g)}3 1k(2i){6("1k 9 g")}3 2h(2q,1f,1P){4.H.1B(1f)}3 1a(1z,O,1C){6("1a 9 g")}3 1E(a){}3 1F(I){b d=I.1y("1u");k(d.1v==2){1x=I;d=d[1];b p=u+"/1A/1U.1Q?1G=1R&1S=1T.1O&d="+d+"&o="+o;1N.1I(p,"1H",1J)}}3 18(1K){6("19 18 9 2r - 1d 4.16")}3 2D(35){}3 17(1c){1m(4.5.17(1c))}3 36(){6("1d 4.H")}3 39(){}3 1l(m){38{k(!$i("8")){b n=A.33("32");n.F=\'8\';n.2X=\'<V 2W="2Y" 7="3b: 31 30 #3a;"> <U> <z 3d="1l()" 7="B-J:K;3h:3e" M="1g"> <L 3f="\'+u+\'/3c/3g.3j" /> </z> <z 7="B-J:K" M="1g"> <2Z 7="B-J:K" M="2C" 2V="B" F="W" 2y="2t" X="" /> </z></U> </V>\';k($i("T")){$i("T").S(n)}R{A.2x.S(n)}}k(m==2G){$i("8").7.12="2Q"}R{$i("W").X=m;$i("8").7.12="2O"}b j=P($i("L"));j[1]=j[1]+2I($i("L").7.2J)-22;11(\'A.Y("8").7.\'+2K+\' = j[0] + 1t\');11(\'A.Y("8").7.\'+1L+\' = j[1] + 1t\')}2L(e){6("2M 2H 8."+e)}}3 2S(){1o.2R=3(E,a){4.c.2P(E,a)};1o.2v=3(E){4.c.2u(E)}}3 2A(){4.f.2B(u,o)}3 2U(){4.f.3i(u,o)}3 37(1r,1q,1s){1m(4.5.34(1r,1q,1s))}3 1M(){6("1w 4.f.1D")}3 N(){6("N 9 g. s 4.f.N")}3 1p(){6("1p 9 g. s 4.f.1V")}3 G(2e,w,h,2c){6("G 9 g. s 4.f.G")}3 1n(){4.5.1n()}3 1X(){}3 P(O){4.5.P(O)}3 3k(e){4.5.2z(e)}3 2F(1j,Z,10){4.5.2T(1j,Z,10,Q.2N,Q.2w)}3 2s(x,y){4.5.2E(x,y)}3 2f(1b,1i,15,14){4.5.2d(1b,1i,15,14)}',62,207,'|||function|i3GEO|util|alert|style|mensagem|foi|texto|var|janela|tema||navega|depreciado|||pos|if|||novoel|g_sid||waltura|wlargura|Utilize|nome|g_locaplic|wsrc||||td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|objmapa|else|appendChild|i3geo|tr|table|mensagemt|value|getElementById|vy|docmapa|eval|visibility|valor|imgext|g_celula|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|pegalistademenus|dica|tdclara|cria|yfign|vx|wdocafechaf|mensagemf|return|protocolo|this|zoomtot|cm|cd|cs|g_postpx|legenda|length|utilize|g_arvoreClick|split|tipo|classesphp|mostraJanela|nomeFuncao|zoomponto|procurartemas|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|zoomExt|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|odoca|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|convdmsf|70|fechaAguarde|fecha|cellsize|body|size|pegaElementoPai|zoomiauto|zoomin|textocb|processevent1|dd2dms|convddtela|null|criar|parseInt|height|g_tipoleft|catch|Impossivel|extent|visible|abreAguarde|hidden|abre|aguarde|dd2tela|zoomoauto|type|width|innerHTML|50|input|solid|1px|div|createElement|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|try|mensagemBanner|000000|border|imagens|onclick|pointer|src|excluir|cursor|zoomout|png|i3geo_pegaElementoPai'.split('|'),0,{}))
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o(26(4)==\'25\'){4=27 28()}3 2a(u,12){4.5.29(u,12)}3 24(u){4.5.23(u)}3 1W(l){4.1Y.1Z(l)}3 21(){4.I.20()}3 1g(2b){6("1a 1g 9 d. t 4.17")}3 2m(s,r,z,E,D,a){j g=4.g.1h(s,r,z,E,D,a)}3 2l(w,h){4.g.2n(w,h)}3 2o(s,r,z,E,D,a){j G=2p.5.2k.2j();4.g.1h(s,r,z,E,D,a,G,2g)}3 1k(1V){6("1k 9 d")}3 2h(2q,16,1P){4.I.1B(16)}3 1b(1A,P,1D){6("1b 9 d")}3 1z(a){}3 1F(J){j f=J.1x("1u");o(f.1y==2){1v=J;f=f[1];j p=v+"/1C/1U.1Q?1G=1R&1S=1T.1O&f="+f+"&q="+q;1N.1I(p,"1H",1J)}}3 19(1K){6("1a 19 9 2r - 1e 4.17")}3 2D(35){}3 18(1d){8(4.5.18(1d))}3 36(){6("1e 4.I")}3 38(){}3 1l(m){33{o(!$i("b")){j n=B.32("2X");n.G=\'b\';n.2W=\'<U 2Y="3b" 7="31: 30 3a #3e;"> <W> <A 3k="1l()" 7="C-K:L;3f:3g" N="1f"> <M 3d="\'+v+\'/3c/3j.3i" /> </A> <A 7="C-K:L" N="1f"> <2U 7="C-K:L" N="2V" 2E="C" G="Y" 2t="2s" 13="" /> </A></W> </U>\';o($i("T")){$i("T").R(n)}X{B.2x.R(n)}}o(m==2Q){$i("b").7.14="2P"}X{$i("Y").13=m;$i("b").7.14="2N"}j k=Q($i("M"));k[1]=k[1]+2H($i("M").7.2K)-22;11(\'B.10("b").7.\'+2M+\' = k[0] + 1t\');11(\'B.10("b").7.\'+1L+\' = k[1] + 1t\')}2L(e){6("2J 2O b."+e)}}3 2S(){1o.2R=3(F,a){4.g.2G(F,a)};1o.2v=3(F){4.g.2y(F)}}3 2A(){4.c.2B(v,q)}3 2Z(){4.c.3h(v,q)}3 37(1p,1n,1s){8(4.5.34(1p,1n,1s))}3 1M(){6("1w 4.c.1E")}3 O(){6("O 9 d. t 4.c.O")}3 1m(){6("1m 9 d. t 4.c.2i")}3 H(2e,w,h,2c){6("H 9 d. t 4.c.H")}3 1q(){8(4.5.1q())}3 1X(){}3 Q(P){8(4.5.Q(P))}3 39(e){8(4.5.2C(e))}3 2w(1r,1j,Z){8(4.5.2T(1r,1j,Z,S.2I,S.2F))}3 2u(x,y){8(4.5.2z(x,y))}3 2f(1c,1i,15,V){8(4.5.2d(1c,1i,15,V))}',62,207,'|||function|i3GEO|util|alert|style|return|foi|texto|mensagem|navega|depreciado||tema|janela|||var|pos|||novoel|if||g_sid|waltura|wlargura|Utilize|nome|g_locaplic||||wsrc|td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|appendChild|objmapa|i3geo|table|imgext|tr|else|mensagemt|docmapa|getElementById|eval|valor|value|visibility|g_celula|dica|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|tdclara|pegalistademenus|cria|yfign|vy|wdocafechaf|mensagemf|zoomtot|cm|this|cd|protocolo|vx|cs|g_postpx|legenda|g_arvoreClick|utilize|split|length|procurartemas|tipo|mostraJanela|classesphp|nomeFuncao|zoomponto|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|odoca|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|zoomExt|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|70|size|convdmsf|fecha|convddtela|body|fechaAguarde|dd2dms|zoomiauto|zoomin|pegaElementoPai|processevent1|type|cellsize|abreAguarde|parseInt|extent|Impossivel|height|catch|g_tipoleft|visible|criar|hidden|null|abre|aguarde|dd2tela|input|textocb|innerHTML|div|width|zoomoauto|1px|border|createElement|try|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|mensagemBanner|i3geo_pegaElementoPai|solid|50|imagens|src|000000|cursor|pointer|zoomout|png|excluir|onclick'.split('|'),0,{}))
 
diff --git a/classesjs/i3geo_tudo_compacto.js.php b/classesjs/i3geo_tudo_compacto.js.php
index 51bf812..5932967 100644
--- a/classesjs/i3geo_tudo_compacto.js.php
+++ b/classesjs/i3geo_tudo_compacto.js.php
@@ -241,7 +241,7 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
 

 eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('L 1m(o){l($i(o)){$i(o).Z="1n";l(M.1l){e 6="";6+=\'<P b="1k" 3="1h:B;5: 2 7 8;z-1i:1j;S-T:1.4" >\';6+=\'<X b="W-V-U" 3="5:2 7 8;m:1o;">\';e h="";l(1p){e h="S-T:2;"}l(R.w>=Q){6+=\'<9 b="g W-V-U" 3="\'+h+\'D:E;5: 2 7 8;" >\';6+=\'&c;<G  3="5: C 7 8;d:0 2;m:-H;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1t\\\')" f="1s" s="1q"/>\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1g\\\')" s"1w" f="1f" />\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'14\\\')" f="15" s="16" />\';6+=\'</9><9 b="g" 3="\'+h+\'D:E;5: C 7 8;" >&c;<G  3="d:0 2;m:-H;5: 2 7 8;d-B:2;" K="\'+$J("I.F")+\'" u="r.q.p(\\\'1R\\\')" f="1Q" s="1P" />\';6+=\'</9>\'}6+=\'<9 b="g" 3="d-A:k" ><a 3="5: 2 7 8;" y="#" b="x" f="1V" >&c;&c;\'+$t("1U")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="20" >&c;&c;\'+$t("1Y")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="1W" >&c;&c;\'+$t("1Z")+\'</a></9>\';6+=\'<9 b="g" 3="d-A:k"><a 3="5: 2 7 8;" y="#" b="x" f="1B" >&c;&c;\'+$t("1z")+\'</a></9>\';6+=\'</X>\';6+=\'</P>\';$i("10").1L=6}L 11(1I,1G){l(R.w>=Q){e n=4}1r{e n=0}1H(e N 1J M){e v="1K.1E("+n+").1y.1A(\'1N\',{f:\'"+N+"\',1C: M[\'"+N+"\']})";1M(v);e n=n+1}}e O=1X 1O.1T.1S(o,{1D:1x,1a:19,18:1b,1c:1e});O.1d.17(11);O.13();e j=$i("10").3;j.12="2 -k";j.5="2 7 8";e j=$i(o).3;j.12="2 -k";j.5="2 7 8";l($i("Y")){$i("Y").Z="1v-1u"}}}L 1F(){}',62,125,'||0px|style||border|ins|solid|white|li||class|nbsp|padding|var|id|yuimenubaritem|sobe||temp|5px|if|top|conta|iddiv|trocaIdioma|idioma|i3GEO|alt|trad|onclick|||yuimenubaritemlabel|href||bottom|right|1px|float|left|gif|img|7px|branco|im|src|function|oMenuData|nomeMenu|oMenuBar|div|500|objmapa|line|height|type|of|first|ul|contemMenu|className|menus|onMenuBarBeforeRender|backgroundPosition|render|es|espanhol|Espanhol|subscribe|hidedelay|150|showdelay|250|lazyload|beforeRenderEvent|false|uk|en|align|index|6000|bd|ajudas|montaMenuSuspenso|yuimenubar|10px|navn|Portugues|else|brasil|pt|navset|yui|Ingles|true|cfg|s4|setProperty|menuarquivos|itemdata|autosubmenudisplay|getItem|testamenususpenso|p_sArgs|for|p_sType|in|this|innerHTML|eval|submenu|YAHOO|Italiano|italiano|it|MenuBar|widget|s1|menuajuda|menujanelas|new|s2|s3|menuanalise'.split('|'),0,{}))

 

-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('k(26(4)==\'25\'){4=27 28()}3 2a(t,13){4.5.29(t,13)}3 24(t){4.5.23(t)}3 1W(l){4.1Y.1Z(l)}3 21(){4.H.20()}3 1e(2b){6("19 1e 9 g. s 4.16")}3 2m(r,q,v,D,C,a){b c=4.c.1h(r,q,v,D,C,a)}3 2l(w,h){4.c.2n(w,h)}3 2o(r,q,v,D,C,a){b F=2p.5.2k.2j();4.c.1h(r,q,v,D,C,a,F,2g)}3 1k(2i){6("1k 9 g")}3 2h(2q,1f,1P){4.H.1B(1f)}3 1a(1z,O,1C){6("1a 9 g")}3 1E(a){}3 1F(I){b d=I.1y("1u");k(d.1v==2){1x=I;d=d[1];b p=u+"/1A/1U.1Q?1G=1R&1S=1T.1O&d="+d+"&o="+o;1N.1I(p,"1H",1J)}}3 18(1K){6("19 18 9 2r - 1d 4.16")}3 2D(35){}3 17(1c){1m(4.5.17(1c))}3 36(){6("1d 4.H")}3 39(){}3 1l(m){38{k(!$i("8")){b n=A.33("32");n.F=\'8\';n.2X=\'<V 2W="2Y" 7="3b: 31 30 #3a;"> <U> <z 3d="1l()" 7="B-J:K;3h:3e" M="1g"> <L 3f="\'+u+\'/3c/3g.3j" /> </z> <z 7="B-J:K" M="1g"> <2Z 7="B-J:K" M="2C" 2V="B" F="W" 2y="2t" X="" /> </z></U> </V>\';k($i("T")){$i("T").S(n)}R{A.2x.S(n)}}k(m==2G){$i("8").7.12="2Q"}R{$i("W").X=m;$i("8").7.12="2O"}b j=P($i("L"));j[1]=j[1]+2I($i("L").7.2J)-22;11(\'A.Y("8").7.\'+2K+\' = j[0] + 1t\');11(\'A.Y("8").7.\'+1L+\' = j[1] + 1t\')}2L(e){6("2M 2H 8."+e)}}3 2S(){1o.2R=3(E,a){4.c.2P(E,a)};1o.2v=3(E){4.c.2u(E)}}3 2A(){4.f.2B(u,o)}3 2U(){4.f.3i(u,o)}3 37(1r,1q,1s){1m(4.5.34(1r,1q,1s))}3 1M(){6("1w 4.f.1D")}3 N(){6("N 9 g. s 4.f.N")}3 1p(){6("1p 9 g. s 4.f.1V")}3 G(2e,w,h,2c){6("G 9 g. s 4.f.G")}3 1n(){4.5.1n()}3 1X(){}3 P(O){4.5.P(O)}3 3k(e){4.5.2z(e)}3 2F(1j,Z,10){4.5.2T(1j,Z,10,Q.2N,Q.2w)}3 2s(x,y){4.5.2E(x,y)}3 2f(1b,1i,15,14){4.5.2d(1b,1i,15,14)}',62,207,'|||function|i3GEO|util|alert|style|mensagem|foi|texto|var|janela|tema||navega|depreciado|||pos|if|||novoel|g_sid||waltura|wlargura|Utilize|nome|g_locaplic|wsrc||||td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|objmapa|else|appendChild|i3geo|tr|table|mensagemt|value|getElementById|vy|docmapa|eval|visibility|valor|imgext|g_celula|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|pegalistademenus|dica|tdclara|cria|yfign|vx|wdocafechaf|mensagemf|return|protocolo|this|zoomtot|cm|cd|cs|g_postpx|legenda|length|utilize|g_arvoreClick|split|tipo|classesphp|mostraJanela|nomeFuncao|zoomponto|procurartemas|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|zoomExt|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|odoca|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|convdmsf|70|fechaAguarde|fecha|cellsize|body|size|pegaElementoPai|zoomiauto|zoomin|textocb|processevent1|dd2dms|convddtela|null|criar|parseInt|height|g_tipoleft|catch|Impossivel|extent|visible|abreAguarde|hidden|abre|aguarde|dd2tela|zoomoauto|type|width|innerHTML|50|input|solid|1px|div|createElement|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|try|mensagemBanner|000000|border|imagens|onclick|pointer|src|excluir|cursor|zoomout|png|i3geo_pegaElementoPai'.split('|'),0,{}))

+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o(26(4)==\'25\'){4=27 28()}3 2a(u,12){4.5.29(u,12)}3 24(u){4.5.23(u)}3 1W(l){4.1Y.1Z(l)}3 21(){4.I.20()}3 1g(2b){6("1a 1g 9 d. t 4.17")}3 2m(s,r,z,E,D,a){j g=4.g.1h(s,r,z,E,D,a)}3 2l(w,h){4.g.2n(w,h)}3 2o(s,r,z,E,D,a){j G=2p.5.2k.2j();4.g.1h(s,r,z,E,D,a,G,2g)}3 1k(1V){6("1k 9 d")}3 2h(2q,16,1P){4.I.1B(16)}3 1b(1A,P,1D){6("1b 9 d")}3 1z(a){}3 1F(J){j f=J.1x("1u");o(f.1y==2){1v=J;f=f[1];j p=v+"/1C/1U.1Q?1G=1R&1S=1T.1O&f="+f+"&q="+q;1N.1I(p,"1H",1J)}}3 19(1K){6("1a 19 9 2r - 1e 4.17")}3 2D(35){}3 18(1d){8(4.5.18(1d))}3 36(){6("1e 4.I")}3 38(){}3 1l(m){33{o(!$i("b")){j n=B.32("2X");n.G=\'b\';n.2W=\'<U 2Y="3b" 7="31: 30 3a #3e;"> <W> <A 3k="1l()" 7="C-K:L;3f:3g" N="1f"> <M 3d="\'+v+\'/3c/3j.3i" /> </A> <A 7="C-K:L" N="1f"> <2U 7="C-K:L" N="2V" 2E="C" G="Y" 2t="2s" 13="" /> </A></W> </U>\';o($i("T")){$i("T").R(n)}X{B.2x.R(n)}}o(m==2Q){$i("b").7.14="2P"}X{$i("Y").13=m;$i("b").7.14="2N"}j k=Q($i("M"));k[1]=k[1]+2H($i("M").7.2K)-22;11(\'B.10("b").7.\'+2M+\' = k[0] + 1t\');11(\'B.10("b").7.\'+1L+\' = k[1] + 1t\')}2L(e){6("2J 2O b."+e)}}3 2S(){1o.2R=3(F,a){4.g.2G(F,a)};1o.2v=3(F){4.g.2y(F)}}3 2A(){4.c.2B(v,q)}3 2Z(){4.c.3h(v,q)}3 37(1p,1n,1s){8(4.5.34(1p,1n,1s))}3 1M(){6("1w 4.c.1E")}3 O(){6("O 9 d. t 4.c.O")}3 1m(){6("1m 9 d. t 4.c.2i")}3 H(2e,w,h,2c){6("H 9 d. t 4.c.H")}3 1q(){8(4.5.1q())}3 1X(){}3 Q(P){8(4.5.Q(P))}3 39(e){8(4.5.2C(e))}3 2w(1r,1j,Z){8(4.5.2T(1r,1j,Z,S.2I,S.2F))}3 2u(x,y){8(4.5.2z(x,y))}3 2f(1c,1i,15,V){8(4.5.2d(1c,1i,15,V))}',62,207,'|||function|i3GEO|util|alert|style|return|foi|texto|mensagem|navega|depreciado||tema|janela|||var|pos|||novoel|if||g_sid|waltura|wlargura|Utilize|nome|g_locaplic||||wsrc|td|document|text|ny|nx|aguardeId|id|panFixo|ajuda|itemID|align|left|img|class|zoomIP|obj|pegaPosicaoObjeto|appendChild|objmapa|i3geo|table|imgext|tr|else|mensagemt|docmapa|getElementById|eval|valor|value|visibility|g_celula|dica|arvoreDeTemas|removeAcentos|pegavalSistemas|Funcao|mudaboxnf|xfign|palavra|veja|tdclara|pegalistademenus|cria|yfign|vy|wdocafechaf|mensagemf|zoomtot|cm|this|cd|protocolo|vx|cs|g_postpx|legenda|g_arvoreClick|utilize|split|length|procurartemas|tipo|mostraJanela|classesphp|nomeFuncao|zoomponto|expandeTema|funcao|criaLegenda|call|expandeLegendaVer|sis|g_tipotop|zoomPonto|cpObj|htm|hlpt|php|criaLegendaHTML|template|legenda2|mapa_controle|odoca|trocalingua|borra|idioma|trocaIdioma|abreJanela|initJanelaMen||pegaCookie|pCookie|undefined|typeof|new|Array|insereCookie|iCookie|retorno|escala|tela2dd|direcao|calcddf|true|mostradicasf|zoomExt|generateId|Dom|redimwdocaf|wdocaf|alteraTamanho|wdocaf2|YAHOO|objeto|depreciada|70|size|convdmsf|fecha|convddtela|body|fechaAguarde|dd2dms|zoomiauto|zoomin|pegaElementoPai|processevent1|type|cellsize|abreAguarde|parseInt|extent|Impossivel|height|catch|g_tipoleft|visible|criar|hidden|null|abre|aguarde|dd2tela|input|textocb|innerHTML|div|width|zoomoauto|1px|border|createElement|try|dsm2dd|exy1|ativaMensagemBanner|convdmsddf|mensagemBanner|i3geo_pegaElementoPai|solid|50|imagens|src|000000|cursor|pointer|zoomout|png|excluir|onclick'.split('|'),0,{}))

 

 
 <?php if(extension_loaded('zlib')){ob_end_flush();}?>
\ No newline at end of file
diff --git a/ferramentas/googlemaps/index.php b/ferramentas/googlemaps/index.php
index 4b1c145..df11c08 100644
--- a/ferramentas/googlemaps/index.php
+++ b/ferramentas/googlemaps/index.php
@@ -237,7 +237,12 @@ include_once("../../ms_configura.php");
         			'<b>Country code:</b> ' + place.AddressDetails.Country.CountryNameCode);
     			*/
     			endereco2 = place.address;
-    			montaRota()
+    			endereco2 = window.prompt("Endereco do final",endereco2)
+    			if (endereco2!=null && endereco2!="")
+    			{
+    				map.addOverlay(marker);
+    				montaRota();
+    			}
     		}
     	}
     	
@@ -250,7 +255,7 @@ include_once("../../ms_configura.php");
     			place = response.Placemark[0];
     			point = new GLatLng(place.Point.coordinates[1],place.Point.coordinates[0]);
     			marker = new GMarker(point);
-    			map.addOverlay(marker);
+    			
     			/*
     			marker.openInfoWindowHtml(
         			'<b>orig latlng:</b>' + response.name + '<br/>' + 
@@ -262,8 +267,14 @@ include_once("../../ms_configura.php");
         			'<b>Country code:</b> ' + place.AddressDetails.Country.CountryNameCode);
     			*/
     			endereco1 = place.address;
+    			endereco1 = window.prompt("Endereco do inicio",endereco1)
+    			if (endereco1!=null && endereco1!="")
+    			{
+    				map.addOverlay(marker);
+    				geocoder.getLocations(pontoRota2, pt2);
+    			}
     		}
-    		geocoder.getLocations(pontoRota2, pt2);
+    		
     		
     	}
     	geocoder.getLocations(pontoRota1, pt1);
diff --git a/geradordelinks.htm b/geradordelinks.htm
index e94baa2..f16c5fa 100644
--- a/geradordelinks.htm
+++ b/geradordelinks.htm
@@ -10,6 +10,7 @@
 P 
 {COLOR: #2F4632;text-align: justify;font-size: 12px;font-family: Verdana, Arial, Helvetica, sans-serif;}
 </style>
+<script type="text/javascript" src="classesjs/classe_util.js"></script>
 <script type="text/javascript" src="classesjs/geradordelinks.js"></script>
 </head>
 <body style="background-color:white;text-align:left;left:0px;">
@@ -120,7 +121,7 @@ Veja:
 File: i3geo/geradordelinks.htm
 
 */
-var g_locaplic = protocolo()+"://"+window.location.host+"/i3geo";
+var g_locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
 var i3geo_gl_configura = new i3geo_gl_configura(
 	g_locaplic,
 	"estadosl",
--
libgit2 0.21.2