Correções na ferramenta de geração de KML 3d (TME)

Edmar Moretti
1 parent 61c03a21
Showing 12 changed files with 202 additions and 84 deletions Show diff stats
admin/admin.db
admin/js/core.js
admin/js/editormapfile.js
admin/php/editormapfile.php
classesjs/classe_gadgets.js
classesjs/classe_janela.js
ferramentas/metaestat/index.js
ferramentas/tme/index.js
pacotes/tme/TME_Engine.php
pacotes/tme/TME_i3geo.php
pacotes/tme/TME_i3geo_DataConnector.php
temas/bairros.map
@@ -953,7 +953,7 @@ function core_menuCheckBox(valores,textos,selecionados,target,record,key){
 			{ label: "Cancel", value: "CANCEL", checked: false }
 		]);
 		og_core.on("checkedButtonChange", on_menuCheckBoxChange);
-		YAHOO.admin.container.panelCK = new YAHOO.widget.Overlay("core_menuCK", { zindex:"100",close:false,underlay:false,width:"300px", height:"200px",overflow:"auto", visible:false,constraintoviewport:true } );
+		YAHOO.admin.container.panelCK = new YAHOO.widget.Overlay("core_menuCK", { zindex:"100",close:false,underlay:false,width:"300px", height:"200px",overflow:"auto", visible:false,constraintoviewport:false } );
 		YAHOO.admin.container.panelCK.render();
 	}
 	onde = $i("core_menuCK_bd");
@@ -1428,7 +1428,7 @@ function core_montaEditor(funcaoOK,w,h,funcaoClose,titulo,modal)
 				}}}
 			);
 		}
-		YAHOO.admin.container.panelEditor = new YAHOO.widget.Panel("janela_editor", { fixedcenter:true,close:true,width:w, overflow:"auto",modal: modal,visible:false,constraintoviewport:true } );
+		YAHOO.admin.container.panelEditor = new YAHOO.widget.Panel("janela_editor", { fixedcenter:"contained",close:true,width:w, overflow:"auto",modal: modal,visible:false,constraintoviewport:true } );
 		YAHOO.admin.container.panelEditor.render();
 	}
 	else
@@ -1479,16 +1479,24 @@ function core_abreCor(janela,elemento)
 }
 function core_desativaforms(lista){
 	var n = lista.length,
-		i;
+		i,t;
 	for (i=0;i<n;i++){
-		$i(lista[i]).style.background = "pink";
+		t = $i(lista[i]);
+		if(t){
+			//t.style.background = "pink";
+			t.disabled = true;
+		}
 	}
 }
 function core_ativaforms(lista){
 	var n = lista.length,
-		i;
+		i,t;
 	for (i=0;i<n;i++){
-		$i(lista[i]).style.background = "white";
+		t = $i(lista[i]);
+		if(t){
+			//t.style.background = "white";
+			t.disabled = false;
+		}
 	}
 }
 function core_listaDeLetras(onde,nomeFuncao){
@@ -183,6 +183,10 @@ function ativaBotaoAdicionaMapfile(idBotao)
 		core_montaEditor("adicionaNovoMapfile()","450px","660px","","","Mapfile");
 		ins = "<p><b>Nome do novo arquivo mapfile (sem .map) </b>n&atilde;o utilize caracteres acentuados ou espa&ccedil;os em branco</p>";
 		ins += "<input size=50 type=text id='Ecodigo' value='' /></p>";
+		ins += "<p><b>Esse mapfile baseia-se no sistema de metadados estat&iacute;sticos?</b> Caso escolha sim, a conex&atilde;o com o banco e o sql de acesso aos dados ser&atilde;o constru&iacute;dos de forma din&acirc;mica</p>";
+		ins += "<select id='Emetaestat' >";
+		ins += core_combosimnao("nao");
+		ins += "</select>";
 		ins += "<p><b>T&iacute;tulo do novo tema</b></p>";
 		ins += "<p>Em portugu&ecirc;s: </p>";
 		ins += "<input size=50 type=text id='Etitulo' value='' /></p>";
@@ -657,17 +661,17 @@ Adiciona um novo mapfile
 */
 function adicionaNovoMapfile()
 {
-	var nome = $i("Etitulo").value;
-	var it = $i("EtituloIT").value;
-	var es = $i("EtituloES").value;
-	var en = $i("EtituloEN").value;
-	var codigo = $i("Ecodigo").value;
+	var nome = $i("Etitulo").value,
+		it = $i("EtituloIT").value,
+		es = $i("EtituloES").value,
+		en = $i("EtituloEN").value,
+		codigo = $i("Ecodigo").value,
+		metaestat = $i("Emetaestat").value;
 	if(codigo === "")
 	{alert("Digite o nome do arquivo");return;}
-	sUrl = "../php/editormapfile.php?funcao=criarNovoMap&nome="+nome+"&codigo="+codigo+"&it="+it+"&en="+en+"&es="+es;
+	sUrl = "../php/editormapfile.php?funcao=criarNovoMap&nome="+nome+"&codigo="+codigo+"&it="+it+"&en="+en+"&es="+es+"&metaestat="+metaestat;
 	core_carregando("ativa");
 	core_carregando(" adicionando um novo mapfile");
-
 	var callback =
 	{
 		success:function(o)
@@ -1443,8 +1447,11 @@ function montaEditorDispo(dados)
 function montaEditorDados(dados)
 {
 	var idsForms = ["connection","data","tileitem","tileindex","type","tipooriginal"];
+	var idsMetaestat = ["connection","data","tileitem","tileindex","tipooriginal"];
 	var param = {
 		"linhas":[
+		{ajuda:"Indica se as defini&ccedil;&otilde;es da camada est&atilde;o relacionadas ao sistema de metadados estat&iacute;sticos. Se estiver, alguns par&acirc;metros s&atilde;o obtidos de forma autom&aacute;tica, como a conex&atilde;o e o SQL de acesso aos dados.",
+		titulo:"Esse mapfile est&aacute; integrado ao sistema de metadados estat&iacute;sticos?",id:"",value:dados.metaestat,tipo:"text",div:"<div id=cMetaestat ></div>"},
 		{ajuda:"Type of connection. Default is local.",
 		titulo:"Connectiontype",id:"",value:"",div:"<div id=cConnectiontype ></div>",tipo:"text"},
 		{ajuda:"Aplica a convers&atilde;o de caracteres nas ferramentas que obt&eacute;m os dados descritivos referentes aos elementos do LAYER. Em alguns casos, a convers&atilde;o pode provocar problemas de acentua&ccedil;&atilde;o. Se isso ocorrer, na ferramenta tabela por exemplo, experimente marcar essa op&ccedil;&atilde;o como 'nao'",
@@ -1468,7 +1475,7 @@ function montaEditorDados(dados)
 		{ajuda:"Name of the tileindex file or layer. A tileindex is similar to an ArcInfo library index. The tileindex contains polygon features for each tile. The item that contains the location of the tiled data is given using the TILEITEM parameter. When a file is used as the tileindex for shapefile or raster layers, the tileindex should be a shapefile. For CONNECTIONTYPE OGR layers, any OGR supported datasource can be a tileindex. Normally the location should contain the path to the tile file relative to the shapepath, not relative to the tileindex itself. If the DATA parameter contains a value then it is added to the end of the location. When a tileindex layer is used, it works similarly to directly referring to a file, but any supported feature source can be used (ie. postgres, oracle).NOTE: All files in the tileindex should have the same coordinate system, and for vector files the same set of attributes in the same order.",
 		titulo:"tileindex",id:"tileindex",value:dados.tileindex,tipo:"text"},
 		{ajuda:"Tipo de representa&ccedil;&atilde;o das fei&ccedil;&otilde;es mostradas da camada. &Eacute; importante definir esse par&acirc;metro para que as fun&ccedil;&otilde;es de gera&ccedil;&atilde;o de SLD funcionem corretamente.",
-		titulo:"Tipo de representa&ccedil;&atilde;o (tipooriginal) - para temas do tipo WMS",id:"",value:dados.tipooriginal,tipo:"text",div:"<div id=cTipooriginal ></div>"}
+		titulo:"Tipo de representa&ccedil;&atilde;o (tipooriginal) - para temas do tipo WMS",id:"",value:dados.tipooriginal,tipo:"text",div:"<div id=cTipoOriginal ></div>"}
 		]
 	};
 	var ins = "<input type=button title='Salvar' value='Salvar' id=salvarEditor />";
@@ -1488,17 +1495,24 @@ function montaEditorDados(dados)
 	ins += core_geraLinhas(param);
 	ins += "<br><br><br>";
 	$i("editor_bd").innerHTML = ins;
+
+	if($i("cMetaestat")){
+		temp = "<select id='metaestat' >";
+		temp += core_combosimnao(dados.metaestat);
+		temp += "</select>";
+		$i("cMetaestat").innerHTML = temp;
+	}
 	if($i("cCache")){
 		temp = "<select id='cache' >";
 		temp += core_combosimnao(dados.cache);
 		temp += "</select>";
 		$i("cCache").innerHTML = temp;
 	}
-	if($i("cTipooriginal")){
+	if($i("cTipoOriginal")){
 		temp = "<select id='tipooriginal' >";
 		temp += core_comboObjeto(objtipooriginal,"valor","texto",dados.tipooriginal);
 		temp += "</select>";
-		$i("cTipooriginal").innerHTML = temp;
+		$i("cTipoOriginal").innerHTML = temp;
 	}
 	temp = "<select id='connectiontype' >";
@@ -1526,7 +1540,6 @@ function montaEditorDados(dados)
 	{salvarDadosEditor('conexao',dados.codigoMap,dados.codigoLayer,"","",true);};
 	new YAHOO.widget.Button("testarEditor",{ onclick: { fn: temp }});
-	core_desativaforms(idsForms);
 	$i("connectiontype").onchange = function(){
 		core_desativaforms(idsForms);
 		var valor = $i("connectiontype").value,
@@ -1546,7 +1559,26 @@ function montaEditorDados(dados)
 		{d = ["connection","type","tipooriginal"];}
 		core_ativaforms(d);
 	};
-	$i("connectiontype").onchange.call();
+	$i("metaestat").onchange = function(){
+		core_desativaforms(idsMetaestat);
+		var valor = $i("metaestat").value,
+			d = [];
+		if(valor === "SIM"){
+			d = [];
+		}
+		else{
+			core_desativaforms(idsForms);
+			$i("connectiontype").onchange.call();
+		}
+		core_ativaforms(d);
+	};
+	if(dados.metaestat === "SIM"){
+		core_desativaforms(idsMetaestat);
+	}
+	else{
+		core_desativaforms(idsForms);
+		$i("connectiontype").onchange.call();
+	}
 }
 function montaEditorMetadados(dados)
@@ -1979,7 +2011,7 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
 	}
 	if(tipo == "conexao")
 	{
-		campos = new Array("cache","projection","type","connection","data","connectiontype","tileitem","tileindex","filteritem","filter","tipooriginal","convcaracter");
+		campos = new Array("metaestat","cache","projection","type","connection","data","connectiontype","tileitem","tileindex","filteritem","filter","tipooriginal","convcaracter");
 		par = "&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
 		prog = "../php/editormapfile.php?funcao=alterarConexao";
 	}
@@ -2018,8 +2050,13 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
 	prog += "&testar="+testar;
 	try{
 		for (var i=0;i<campos.length;i++){
-			if($i(campos[i]))
-			{par += "&"+campos[i]+"="+($i(campos[i]).value);}
+			if($i(campos[i])){
+				var valor = "";
+				if($i(campos[i]).disabled === false){
+					valor = $i(campos[i]).value;
+				}
+				par += "&"+campos[i]+"="+ valor;
+			}
 		}
 	}catch(e){alert(e);}
 	core_carregando("ativa");
@@ -1160,7 +1160,7 @@ function sobeDesce()
 }
 function criarNovoMap()
 {
-	global $nome,$codigo,$locaplic,$it,$en,$es,$esquemaadmin;
+	global $nome,$codigo,$locaplic,$it,$en,$es,$esquemaadmin,$metaestat;
 	$arq = $locaplic."/temas/".$codigo.".map";
 	if(!file_exists($arq))
 	{
@@ -1169,11 +1169,21 @@ function criarNovoMap()
 		$dados[] = 'FONTSET   "../symbols/fontes.txt"';
 		$dados[] = "LAYER";
 		$dados[] = "	NAME $codigo";
-		$dados[] = "	TYPE line";
+		$dados[] = '	TEMPLATE "none.htm"';
+		if(!empty($metaestat) && $metaestat == "SIM"){
+			$dados[] = '	CONNECTIONTYPE POSTGIS';
+			$dados[] = "	TYPE polygon";
+		}
+		else{
+			$dados[] = "	TYPE line";
+		}
 		$dados[] = '	DATA ""';
 		$dados[] = '	METADATA';
 		$dados[] = '		TEMA "'.$nome.'"';
 		$dados[] = '		CLASSE "SIM"';
+		if(!empty($metaestat) && $metaestat == "SIM"){
+			$dados[] = '		METAESTAT "SIM"';
+		}
 		$dados[] = '	END';
 		$dados[] = '    CLASS';
 		$dados[] = '        NAME ""';
@@ -1575,6 +1585,12 @@ function pegaConexao()
 	}
 	$dados["projection"] = str_replace("+i","i",$dados["projection"]);
 	$dados["convcaracter"] = $layer->getmetadata("convcaracter");
+	//informacoes sobre a integracao com o sistema de metadados estatisticos
+	$dados["metaestat"] = $layer->getmetadata("metaestat");
+	if($dados["metaestat"] == ""){
+		$dados["metaestat"] = "NAO";
+	}
+
 	$dados["colunas"] = implode(",",pegaItens($layer));
 	if($layer->connectiontype == 7 || $layer->connectiontype == 9){
 		$dados["tipooriginal"] = $layer->getmetadata("tipooriginal");
@@ -1583,17 +1599,29 @@ function pegaConexao()
 }
 function alterarConexao()
 {
-	global $convcaracter,$cache,$tipooriginal,$filteritem,$filter,$projection,$type,$dir_tmp,$testar,$codigoMap,$codigoLayer,$locaplic,$connection,$connectiontype,$data,$tileitem,$tileindex;
+	global $metaestat,$convcaracter,$cache,$tipooriginal,$filteritem,$filter,$projection,$type,$dir_tmp,$testar,$codigoMap,$codigoLayer,$locaplic,$connection,$connectiontype,$data,$tileitem,$tileindex;
 	$mapfile = $locaplic."/temas/".$codigoMap.".map";
 	$mapa = ms_newMapObj($mapfile);
 	$layer = $mapa->getlayerbyname($codigoLayer);
+	//quando o layer estiver conectado com o METAESTAT, alguns parametros sao default
+	if(strtoupper($metaestat) == "SIM"){
+		$connectiontype = 6;
+		$filteritem = "";
+		$filter = "";
+		$data = "";
+		$connection = "";
+	}
+	else{
+		$layer->setmetadata("METAESTAT_CODIGO_TIPO_REGIAO","");
+		$layer->setmetadata("ID_MEDIDA_VARIAVEL","");
+	}
+	$layer->setmetadata("metaestat",$metaestat);
 	$layer->set("connection",$connection);
-	if(ms_GetVersionInt() > 50201)
-	{
+	if(ms_GetVersionInt() > 50201){
 		$layer->setconnectiontype($connectiontype);
 	}
-	else
-	{$layer->set("connectiontype",$connectiontype);
+	else{
+		$layer->set("connectiontype",$connectiontype);
 	}
 	$layer->set("data",$data);
 	$layer->set("tileitem",$tileitem);
@@ -550,7 +550,7 @@ i3GEO.gadgets = {
 					if(!temp.style.height || parseInt(temp.style.height) === 0)
 					{temp.style.height = "21px";}
 				}
-				ins += '<div class="bd" style="top:0px;'+alinhamento+'display:block;align:right;border: 0px solid white;z-index:6000;line-height:1.4" >' +
+				ins += '<div class="bd" style="top:0px;'+alinhamento+'display:block;align:right;border: 0px solid white;z-index:3;line-height:1.4" >' +
 					'<ul class="first-of-type" style="display:block;border:0px solid white;top:10px;">';
 				n = confm.menu.length;
 				estilo = "padding-bottom:3px;top:0px;border: 0px solid white;";
@@ -188,7 +188,7 @@ i3GEO.janela = {
 	Cada vez que uma janela flutuante &eacute; criada, esse valor &eacute; acrescido de 1
 	*/
-	ULTIMOZINDEX : 0,
+	ULTIMOZINDEX : 5,
 	/*
 	Function: prepara
@@ -274,7 +274,7 @@ i3GEO.janela = {
 			i3GEO.janela.TRANSICAOSUAVE = false;
 			ifr = true;
 		}
-		fix = false;
+		fix = "contained";
 		if(nx === "" || nx === "center")
 		{fix = true;}
 		//no IE, com CSS3, a sombra n&atilde;o funciona
@@ -324,8 +324,8 @@ i3GEO.janela = {
 		}
 		//cria a janela
 		if(waltura === "auto")
-		{janela = new YAHOO.widget.Panel(id, { iframe:ifr,modal:modal, width: wlargurA,underlay:"none", fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );}
-		else{janela = new YAHOO.widget.ResizePanel(id, { hideMode:'offsets',iframe:ifr,underlay:underlay, modal:modal, width: wlargurA, fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );}
+		{janela = new YAHOO.widget.Panel(id, { iframe:ifr,modal:modal, width: wlargurA,underlay:"none", fixedcenter: fix, constraintoviewport: true, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );}
+		else{janela = new YAHOO.widget.ResizePanel(id, { hideMode:'offsets',iframe:ifr,underlay:underlay, modal:modal, width: wlargurA, fixedcenter: fix, constraintoviewport: true, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );}
 		if(nx !== "" && nx !== "center"){
 			janela.moveTo(nx,ny + 50);
 		}
@@ -335,14 +335,14 @@ i3GEO.janela = {
 					{effect:YAHOO.widget.ContainerEffect.FADE,duration:0.5}
 			]);
 		}
-		janela.cfg.setProperty("zIndex",[10000]);
+		janela.cfg.setProperty("zIndex",[4]);
 		janela.render();
 		janela.bringToTop();
 		//ajusta estilos e outras caracter&iacute;sticas da janela criada
 		if(navm && id !== "i3geo_janelaMensagens" && i3GEO.Interface.ATUAL === "googleearth")
 		{janela.moveTo(0,0);}
 		if(ifr === true)
-		{janela.iframe.style.zIndex = 0;}
+		{janela.iframe.style.zIndex = 4;}
 		temp = $i(id+"_corpo");
 		if(temp){
 			if(navm)
@@ -355,7 +355,8 @@ i3GEO.janela = {
 		if(funcaoMinimiza)
 		{$i(id+"_minimizaCabecalho").onclick = funcaoMinimiza;}
 		YAHOO.util.Event.addListener(janela.close, "click", i3GEO.janela.fecha,janela,{id:id},true);
-		return([janela,$i(id+"_cabecalho"),$i(id+"_corpo")]);
+		$i(id+"_c").style.zIndex = 20000;
+		return([janela,$i(id+"_cabecalho"),temp]);
 	},
 	/*
 	function: minimiza
@@ -647,10 +647,14 @@ i3GEOF.metaestat = {
 			temp = function(retorno){
 				if(i3GEO.arvoreDeCamadas.pegaTema(retorno.layer) == ""){
 					i3GEOF.metaestat.comum.desligaCamadas();
-					i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile);
-					i3GEOF.metaestat.CAMADAS.push(retorno.layer);
-					i3GEO.mapa.ativaTema(retorno.layer);
-					i3GEOF.metaestat.analise.comboCamadas();
+					var atualiza = function(){
+						i3GEO.atualiza();
+						i3GEOF.metaestat.CAMADAS.push(retorno.layer);
+						i3GEO.mapa.ativaTema(retorno.layer);
+						i3GEOF.metaestat.analise.comboCamadas();
+					};
+					i3GEO.php.adtema(atualiza,retorno.mapfile);
+
 				}
 			};
 			if(v != true){
@@ -140,19 +140,23 @@ i3GEOF.tme = {
 	*/
 	html:function(){
 		var ins = '' +
-		'<div style="text-align:left;" id=i3GEOTMEresultado ></div>' +
+		'<div style="text-align:left;background:yellow;" id=i3GEOTMEresultado ></div>' +
+		'<input id=i3GEOtmebotao1 size=35  type=button value="Gerar KML" /><br><br>' +
 		'<p class="paragrafo" >' +
 		'T&iacute;tulo que ser&aacute; mostrado no mapa';
 		ins += $inputText("","","i3GEOTMEtitulo","",48,"") +
 		'<br><br>Descri&ccedil;&atilde;o do mapa';
 		ins += $inputText("","","i3GEOTMEdesc","",48,"") +
+		'<br><br>Altura m&aacute;xima das barras (em metros)';
+		ins += $inputText("","","i3GEOTMEbarSize","",20,"50000") +
+		'<br><br>Largura m&aacute;xima das barras (em metros)';
+		ins += $inputText("","","i3GEOTMEmaxHeight","",20,"100") +
 		'<br><br>Coluna que cont&eacute;m os nomes das regi&otilde;es (exemplo: nomes dos Estados ou nomes dos munic&iacute;pios):' +
 		'<div id="i3GEOTMEregioeslista" style="text-align:left;" ></div>' +
 		'<p class="paragrafo" >' +
 		'<br>Escolha uma ou mais colunas com os dados estat&iacute;sticos que ser&atilde;o representados:' +
 		'<div id=i3GEOtmelistai class=digitar style="text-align:left;left:0px;top:0px;330px;height:80px;overflow:auto;display:block;"></div>' +
 		'<br>' +
-		'<input id=i3GEOtmebotao1 size=35  type=button value="Aplicar" />' +
 		'<div id=i3GEOtmemen1 style=top:15px;left:0px; ><p class=paragrafo >Ser&aacute; criado um arquivo KML que pode ser aberto com o Google Earth. A coluna com os nomes das regi&otilde;es define o nome que ser&aacute; mostrado para cada elemento mapeado. Quando os nomes das colunas com os valores corresponderem a um determinado ano, ser&aacute; mostrado um bot&atilde;o do tipo slide no Google Earth, mas isso s&oacute; ocorre se o nome da coluna for o mesmo nome do ano, exemplo, para o ano de 1980 o nome da coluna dever&aacute; ser 1980</div>';
 		return ins;
 	},
@@ -284,9 +288,8 @@ i3GEOF.tme = {
 				var ins = "<p class=paragrafo >Clique no arquivo para fazer o download:<br><a href='"+retorno.data.url+"' target=new >"+retorno.data.url+"</a><br>";
 				ins += "<br>Ou clique para abrir no i3Geo:<br><a href='"+i3GEO.configura.locaplic+"/ms_criamapa.php?interface=googleearth.phtml&kmlurl="+retorno.data.url+"' target='new' >interface Google Earth</a><br>";
 				$i("i3GEOTMEresultado").innerHTML = ins;
-
 			};
-			p = i3GEO.configura.locaplic+"/pacotes/tme/TME_i3geo.php?sid="+i3GEO.configura.sid+"&nomelayer="+i3GEO.temaAtivo+"&colunasvalor="+lista.toString(",")+"&colunanomeregiao="+colunanomeregiao+"&titulo="+$i("i3GEOTMEtitulo").value+"&descricao="+$i("i3GEOTMEdesc").value;
+			p = i3GEO.configura.locaplic+"/pacotes/tme/TME_i3geo.php?maxHeight="+$i("i3GEOTMEmaxHeight").value+"&barSize="+$i("i3GEOTMEbarSize").value+"&sid="+i3GEO.configura.sid+"&nomelayer="+i3GEO.temaAtivo+"&colunasvalor="+lista.toString(",")+"&colunanomeregiao="+colunanomeregiao+"&titulo="+$i("i3GEOTMEtitulo").value+"&descricao="+$i("i3GEOTMEdesc").value;
 			cp.set_response_type("JSON");
 			cp.call(p,"tme",temp);
 		}catch(e){i3GEO.janela.tempoMsg("Erro: "+e);i3GEOF.tme.aguarde.visibility = "hidden";}
@@ -40,7 +40,7 @@ class ThematicMap
     public $showNames = false;
     public $timeType = 'year';              // year / series / slider
     public $maxHeight = 2000000;        // Prism / Bar
-	public $symbolMaxSize;                    // Symbol
+	public $symbolMaxSize;                    // Symbol$imgBrand
     public $barSize = 50000;
     public $maxValue;
     public $minValue;
@@ -105,7 +105,9 @@ class ThematicMap
         else $this->mapDescription = $this->indicator['description']; // Use default from indicator
         if (isset($paramArray['mapSource'])) $this->mapSource = $paramArray['mapSource'];
-        else $this->mapSource = 'Statistics from ' . $this->indicator['source']; // Use default from indicator
+        else {
+        	//$this->mapSource = 'Statistics from ' . $this->indicator['source']; // Use default from indicator
+        }
         // Other optional parameters
         if (isset($paramArray['timeType']))       $this->timeType       = $paramArray['timeType'];
@@ -172,7 +174,7 @@ class ThematicMap
         include(__DIR__."/../kmlmapserver/classes/zip.class.php");
         $zip = new zipfile();
         // Add balloon logo to archieve (300 x 30 px)
-       	$zip->addFile($this->logoline, 'files/balloonlogo.png');
+        $zip->addFile($this->logoline, 'files/balloonlogo.png');
         // KML header
         $kml = "<?xml version='1.0' encoding='UTF-8'?>" . PHP_EOL
@@ -186,12 +188,12 @@ class ThematicMap
              . "    <open>1</open>" . PHP_EOL
              . "    <Snippet maxLines='1'>$this->mapSource</Snippet>" . PHP_EOL
              . "    <description><![CDATA[ $this->mapDescription <p>$this->mapSource</p>$this->engine ]]></description>" . PHP_EOL;
-
+//TODO logomarca?
         // Add style for indicator balloon
         $kmlStyles = "    <Style id='balloonStyle'>" . PHP_EOL
                    . "      <BalloonStyle>" . PHP_EOL
                    . "        <text><![CDATA[" . PHP_EOL
-                   . "          <a href='http://thematicmapping.org'><img src='files/balloonlogo.png'></a>" . PHP_EOL
+                   . "          <a href='http://thematicmapping.org'><img src='http://localhost/ms_tmp/balloonlogo.png'></a>" . PHP_EOL
                    . "          <p><b><font size='+2'>$[name]</font></b></p>" . PHP_EOL
                    . "          <p>$[description]</p>" . PHP_EOL
                    . "        ]]></text>" . PHP_EOL
@@ -210,7 +212,8 @@ class ThematicMap
             // Add colour legend to KMZ archieve
             if ($this->showLegend) {
-                $zip->addFile(self::getColourLegend(), 'files/legend.png');
+                $imgLegenda = self::getColourLegend();
+            	$zip->addFile($imgLegenda,'files/legend.png');
             }
             $kmlSingleColour = ''; // Colours needs to be defined for each feature
             //$kmlColour = self::rgb2bgr($this->noDataColour); // Not in use, only so the variable has a value
@@ -342,10 +345,10 @@ class ThematicMap
                 } // switch symbol
         } // switch type
-
+//TODO corrigir logo
         $kmlStyles .= "      <BalloonStyle>" . PHP_EOL
                     . "        <text><![CDATA[" . PHP_EOL
-                    . "          <a href='http://thematicmapping.org'><img src='files/balloonlogo.png'></a>" . PHP_EOL
+                    . "          <a href='http://thematicmapping.org'><img src='http://localhost/ms_tmp/balloonlogo.png'></a>" . PHP_EOL
                     . "          <p><b><font size='+2'>$[name]</font></b></p>" . PHP_EOL
                     . "          <p>$this->mapTitle: $[Snippet]</p>" . PHP_EOL
                     . "          <p>$this->mapDescription</p>" . PHP_EOL
@@ -408,6 +411,7 @@ class ThematicMap
             foreach ($this->dataStore['features'] as $featureID => $feature)
             {
     			$name = $feature['name'];
+    			//TODO corrigir acentuacao
 				//if (!mb_detect_encoding($name,"UTF-8",true))
 				//{$name = mb_convert_encoding($name,"UTF-8","ISO-8859-1");}
 				$name = "<![CDATA[ ".$name." ]]>";
@@ -428,8 +432,7 @@ class ThematicMap
                 if (isset($this->indicator['values'][$year][$featureID])) {
     			    // Extract value from dataStore
        				$value = $this->indicator['values'][$year][$featureID];
-       				$valueText = $valueLabel = number_format($value);
-
+       				$valueText = $valueLabel = number_format($value, 2, ',', '.');
                     // Colour scale
                     if ($this->colourType == 'scale') {
                         if ($this->classification != 'unclassed') {
@@ -607,11 +610,19 @@ $z-&gt;close();age&#39;:
         // Close Years folder
         $kmlFolder .= "    </Folder>" . PHP_EOL;
+        // Create logo with title and source and add to archieve
+        if ($this->showTitle) {
+        	$imgBrand = self::mapTitleImage();
+        	$zip->addFile($imgBrand, 'files/brand.png');
+        }
+        else {
+        	$zip->addFile($this->logo, 'files/brand.png');
+        }
         // Add title
         $kml .= "    <ScreenOverlay>" . PHP_EOL
               . "      <name>Título</name>" . PHP_EOL
               . "      <Icon>" . PHP_EOL
-              . "        <href>files/brand.png</href>" . PHP_EOL
+              . "        <href>http://localhost/ms_tmp/".basename($imgBrand)."</href>" . PHP_EOL
               . "      </Icon>" . PHP_EOL
               . "      <overlayXY x='0.01' y='0.99' xunits='fraction' yunits='fraction'/>" . PHP_EOL
               . "      <screenXY x='0.01' y='0.99' xunits='fraction' yunits='fraction'/>" . PHP_EOL
@@ -623,7 +634,7 @@ $z-&gt;close();age&#39;:
             $kml .= "    <ScreenOverlay>" . PHP_EOL
                   . "      <name>Legenda</name>" . PHP_EOL
                   . "      <Icon>" . PHP_EOL
-                  . "        <href>files/legend.png</href>" . PHP_EOL
+                  . "        <href>http://localhost/ms_tmp/".basename($imgLegenda)."</href>" . PHP_EOL
                   . "      </Icon>" . PHP_EOL
                   . "      <overlayXY x='0.01' y='0.14' xunits='fraction' yunits='fraction'/>" . PHP_EOL
                   . "      <screenXY x='0.01' y='0.14' xunits='fraction' yunits='fraction'/>" . PHP_EOL
@@ -652,13 +663,7 @@ $z-&gt;close();age&#39;:
         //$zip->addFromString("doc.kml", $kml);
         $zip->addFile($kml, 'doc.kml');//edmar
-        // Create logo with title and source and add to archieve
-        if ($this->showTitle) {
-            $zip->addFile(self::mapTitleImage(), 'files/brand.png');
-        }
-        else {
-            $zip->addFile($this->logo, 'files/brand.png');
-        }
+
         //$zip->close();
         $zip->output($file);//edmar
         if($download){
@@ -875,8 +880,11 @@ $z-&gt;close();age&#39;:
                 }
                 // print min and max values
-                imagestring($legend, 3, $width+29, $height-6, number_format($this->minValue, $this->precision), $fontColour);
-                imagestring($legend, 3, $width+29, -3, number_format($this->maxValue, $this->precision), $fontColour);
+                //number_format(($s / $ocorrencias),2,",",".")
+                //imagestring($legend, 3, $width+29, $height-6, number_format($this->minValue, $this->precision), $fontColour);
+                //imagestring($legend, 3, $width+29, -3, number_format($this->maxValue, $this->precision), $fontColour);
+                imagestring($legend, 3, $width+29, $height-6, number_format($this->minValue, 2,",","."), $fontColour);
+                imagestring($legend, 3, $width+29, -3, number_format($this->maxValue, 2,",","."), $fontColour);
                 break;
@@ -884,7 +892,8 @@ $z-&gt;close();age&#39;:
             default:
                $ypos = 0;
                $interval = $height / $this->numClasses;
-               foreach($this->classColours as $key => $colour){
+               $v = $this->classColours;
+               foreach($v as $key => $colour){
                     $red   = hexdec(substr($colour, 0, 2));
                     $green = hexdec(substr($colour, 2, 2));
                     $blue  = hexdec(substr($colour, 4, 2));
@@ -892,11 +901,14 @@ $z-&gt;close();age&#39;:
                     $classColour = imagecolorallocate($legend, $red, $green, $blue);
                     imagefilledrectangle($legend, 21, $height-$ypos+2, $width+20, $height-$ypos-$interval, $classColour);
-                    imagestring($legend, 3, $width+29, $height-$ypos-5, number_format($this->classBreaks[$key], $this->precision), $fontColour);
+                    //imagestring($legend, 3, $width+29, $height-$ypos-5, number_format($this->classBreaks[$key], $this->precision), $fontColour);
+                    imagestring($legend, 3, $width+29, $height-$ypos-5, number_format($this->classBreaks[$key], 2,",","."), $fontColour);
                     $ypos += $interval;
                }
-               imagestring($legend, 3, $width+29, -3, number_format($this->classBreaks[$key+1], $this->precision), $fontColour);
+               //imagestring($legend, 3, $width+29, -3, number_format($this->classBreaks[$key+1], $this->precision), $fontColour);
+               imagestring($legend, 3, $width+29, -3, number_format($this->classBreaks[$key+1], 2,",","."), $fontColour);
+
         }
         // Border around colour scale
@@ -904,7 +916,7 @@ $z-&gt;close();age&#39;:
         imagerectangle($legend, 20, 1, $width+21, $height+3, $white);
         // Legend title
-        imagestringup($legend, 3, 0, ($height/2)+(strlen($this->mapTitle)/2)*7, $this->mapTitle, $white);
+        //imagestringup($legend, 3, 0, ($height/2)+(strlen($this->mapTitle)/2)*7, $this->mapTitle, $white);
         // Save legend
         $file = $this->dirtmp.'/legend'. time() .'.png';
@@ -944,6 +956,7 @@ $z-&gt;close();age&#39;:
             case 'quantile':
                 $values = array_values($this->indicator['values'][$this->year]);
+                sort($values);
                 $numValues = count($values);
                 $classNum = $numValues / $numClasses; // Number in each class
                 for ($i = 0; $i < $numClasses; $i++) {
@@ -966,6 +979,7 @@ $z-&gt;close();age&#39;:
     function getClass($value){
         $class = 0;
+        //var_dump($this->classBreaks);exit;
         for ($i = 1; $i < count($this->classBreaks); $i++) {
             if ($value > $this->classBreaks[$i] && $value <= $this->classBreaks[$i+1]) {
                 $class = $i;
@@ -39,7 +39,9 @@ if(!isset($download)){
 	$download = false;
 }
 if(!isset($_GET["sid"]) && $verificaSID == true)
-{echo "Erro. Acesso não permitido";exit;}
+{
+	echo "Erro. Acesso não permitido";exit;
+}
 if(!isset($dir_tmp)){
 	include(__DIR__."/../../ms_configura.php");
 }
@@ -54,15 +56,22 @@ if(!isset($parametersTME)){
 		$ano = $colunas[0];
 		$tipo = "year";
 	}
-	$parametersTME = array( 'mapType'        => 'bar',
-	   			  	     'indicator'      => 'valores',
-					     'year'           => $ano,
-					     'classification' => 'equal',
-						 'mapTitle' => $_GET["titulo"],
-						 'timeType' => $tipo, //para mais de um ano, escolha slider ou series
-						 'dirtmp' => $dir_tmp,
-						 'barSize'=> 5000
-	                   );
+	if(empty($barSize)){
+		$barSize = 5000;
+	}
+	if(empty($maxHeight)){
+		$maxHeight = 2000000;
+	}
+	$parametersTME = array( 'mapType' => 'bar',
+			'indicator' => 'valores',
+			'year' => $ano,
+			'classification' => 'quantile',
+			'mapTitle' => $_GET["titulo"],
+			'timeType' => $tipo, //para mais de um ano, escolha slider ou series
+			'dirtmp' => $dir_tmp,
+			'barSize'=> $barSize,
+			'maxHeight' => $maxHeight
+	);
 }
 $dataConnector = new DataConnector($_GET["sid"],$verificaSID);
 $dataStore = $dataConnector->getDataStore($_GET["nomelayer"],$colunas,$_GET["colunanomeregiao"],$_GET["titulo"],$_GET["descricao"],"");
@@ -72,7 +81,9 @@ $map = new ThematicMap($dataStore, $parametersTME);
 $file = $map->getKML($dataConnector->url,$download);
 if(!$download){
 	if(!function_exists("cpjson"))
-	{require(__DIR__."/../../classesphp/funcoes_gerais.php");}
+	{
+		require(__DIR__."/../../classesphp/funcoes_gerais.php");
+	}
 	cpjson(array('url' => $file));
 }
 //echo "<p><a href='$file'>$file</a>";
@@ -169,9 +169,15 @@ class DataConnector
 			{$shape = $layer->getShape($layer->getResult($i));}
 			else{$shape = $layer->getFeature($layer->getResult($i)->shapeindex);}
 			$pt = $shape->getCentroid();
+			$texto = $shape->values[$colunanomeregiao];
+			/*
+			if(!mb_detect_encoding($texto,"ISO-8859-1",true)){
+				$texto = mb_convert_encoding($texto,"ISO-8859-1","UTF-8");
+			}
+			*/
 			$dataStore['features'][$i] = array(
 				"featureID"=>$i,
-				"name"=>$shape->values[$colunanomeregiao],
+				"name"=>$texto,
 				"lon"=>$pt->x,
 				"lat"=>$pt->y,
 				"wkt"=>$shape->toWkt()
 MAP
   FONTSET "/var/www/i3geo/symbols/fontes.txt"
   SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym"
-LAYER
+  LAYER
     CONNECTION "user=postgres password=postgres dbname=geosaude host=localhost port=5432"
     CONNECTIONTYPE POSTGIS
     DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326"
     METADATA
+      "ID_MEDIDA_VARIAVEL"	""
+      "cache"	""
       "CLASSE"	"SIM"
+      "METAESTAT_CODIGO_TIPO_REGIAO"	""
+      "metaestat"	"NAO"
+      "convcaracter"	""
       "TEMA"	"Bairros IBGE"
     END # METADATA
     NAME "bairros"
     STATUS DEFAULT
     TEMPLATE "none.htm"
-    TILEITEM "location"
     TYPE POLYGON
     UNITS METERS
     CLASS
@@ -30,4 +34,6 @@ LAYER
       END # STYLE
     END # CLASS
   END # LAYER
-END
 \ No newline at end of file
+
+END # MAP
+
	@@ -550,7 +550,7 @@ i3GEO.gadgets = {		@@ -550,7 +550,7 @@ i3GEO.gadgets = {
550	if(!temp.style.height \|\| parseInt(temp.style.height) === 0)	550	if(!temp.style.height \|\| parseInt(temp.style.height) === 0)
551	{temp.style.height = "21px";}	551	{temp.style.height = "21px";}
552	}	552	}
553	- ins += '<div class="bd" style="top:0px;'+alinhamento+'display:block;align:right;border: 0px solid white;z-index:6000;line-height:1.4" >' +	553	+ ins += '<div class="bd" style="top:0px;'+alinhamento+'display:block;align:right;border: 0px solid white;z-index:3;line-height:1.4" >' +
554	'<ul class="first-of-type" style="display:block;border:0px solid white;top:10px;">';	554	'<ul class="first-of-type" style="display:block;border:0px solid white;top:10px;">';
555	n = confm.menu.length;	555	n = confm.menu.length;
556	estilo = "padding-bottom:3px;top:0px;border: 0px solid white;";	556	estilo = "padding-bottom:3px;top:0px;border: 0px solid white;";
1	MAP	1	MAP
2	FONTSET "/var/www/i3geo/symbols/fontes.txt"	2	FONTSET "/var/www/i3geo/symbols/fontes.txt"
3	SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym"	3	SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym"
4	-LAYER	4	+ LAYER
5	CONNECTION "user=postgres password=postgres dbname=geosaude host=localhost port=5432"	5	CONNECTION "user=postgres password=postgres dbname=geosaude host=localhost port=5432"
6	CONNECTIONTYPE POSTGIS	6	CONNECTIONTYPE POSTGIS
7	DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326"	7	DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326"
8	METADATA	8	METADATA
		9	+ "ID_MEDIDA_VARIAVEL" ""
		10	+ "cache" ""
9	"CLASSE" "SIM"	11	"CLASSE" "SIM"
		12	+ "METAESTAT_CODIGO_TIPO_REGIAO" ""
		13	+ "metaestat" "NAO"
		14	+ "convcaracter" ""
10	"TEMA" "Bairros IBGE"	15	"TEMA" "Bairros IBGE"
11	END # METADATA	16	END # METADATA
12	NAME "bairros"	17	NAME "bairros"
13	STATUS DEFAULT	18	STATUS DEFAULT
14	TEMPLATE "none.htm"	19	TEMPLATE "none.htm"
15	- TILEITEM "location"
16	TYPE POLYGON	20	TYPE POLYGON
17	UNITS METERS	21	UNITS METERS
18	CLASS	22	CLASS
	@@ -30,4 +34,6 @@ LAYER		@@ -30,4 +34,6 @@ LAYER
30	END # STYLE	34	END # STYLE
31	END # CLASS	35	END # CLASS
32	END # LAYER	36	END # LAYER
33	-END
34	\ No newline at end of file	37	\ No newline at end of file
		38	+
		39	+END # MAP
		40	+