From 78a6e8cd1dc4cffe03d8e9d9bf688e49cdf3a31d Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 5 Nov 2010 01:30:21 +0000
Subject: [PATCH] Conclusão da interface Flamingo

---
 aplicmap/flamingo.htm               |  5 +----
 classesjs/classe_arvoredecamadas.js |  4 ++--
 classesjs/classe_interface.js       |  2 ++
 classesjs/classe_janela.js          | 13 +++++--------
 classesphp/flamingo.inc             | 11 ++++++-----
 menutemas/admin.db                  | Bin 67584 -> 0 bytes
 ms_configura.php                    |  2 +-
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/aplicmap/flamingo.htm b/aplicmap/flamingo.htm
index 563657e..0b07e58 100644
--- a/aplicmap/flamingo.htm
+++ b/aplicmap/flamingo.htm
@@ -29,14 +29,12 @@
 	 <div id=guia1 class=guia value="Mostra os temas atualmente inseridos no mapa e que podem estar visíveis ou não." >&nbsp;Temas&nbsp;</div>
 	 <div id=guia2 class=guia value="Mostra a lista de temas disponíveis no servidor de dados, possibilitando que novos temas sejam adicionados ao mapa.">&nbsp;Adiciona&nbsp;</div>
 	 <div id=guia4 class=guia value="Mostra a legnda do mapa atual." >&nbsp;Legenda&nbsp;</div>
-	 <div id=guia5 class=guia value="Lista mapas já preparados, com temáticas específicas,que podem ser abertos no I3Geo">&nbsp;Mapas&nbsp;</div>
     </div>
    </td></tr>
   </table>
   <div id='guia1obj' ><div id=listaTemas ></div></div>
   <div id='guia2obj' style='display:none;'>Aguarde...<img alt="" src="../imagens/branco.gif" width=248 /></div>
   <div id='guia4obj' style='display:none;text-align:left'><div id='legenda' style='text-align:left'></div></div>
-  <div id='guia5obj' style='display:none;text-align:left'><div id='banners' style='overflow:auto;text-align:left'>Aguarde...</div></div>
  </td>
  <td class=verdeclaro style="background-color:white;vertical-align:top;border-width:0px;">
   <table width="100%" style="vertical-align:top;">
@@ -50,12 +48,11 @@
  </tr>
 <tr style="border:0px"><td colspan=2 style="background-image:url('../imagens/visual/default/rodape.png');height:10px"></td></tr>
 </table>
-<a style=text-align:center;color:white href="mailto:edmar.moretti@mma.gov.br">Cr&iacute;ticas e sugest&otilde;es</a>
 </center>
 <!-- Variáveis globais e inicialização do mapa-->
 <script type="text/javascript">
 /*
-Title: Flamingo (experimental)
+Title: Flamingo
 
 Abre o i3geo com a navegação controlada pelo Flamingo.
 
diff --git a/classesjs/classe_arvoredecamadas.js b/classesjs/classe_arvoredecamadas.js
index 5fdb465..467cc90 100644
--- a/classesjs/classe_arvoredecamadas.js
+++ b/classesjs/classe_arvoredecamadas.js
@@ -768,10 +768,10 @@ i3GEO.arvoreDeCamadas = {
 		if (ltema.type < 4){
 			i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t32"),$trad("t33"),'i3GEO.tema.dialogo.editaLegenda(\"'+ltema.name+'\")',node);
 		}
-		if(i3GEO.Interface.ATUAL !== "googlemaps" && i3GEO.Interface.ATUAL !== "googleearth"){
+		if(i3GEO.Interface.ATUAL !== "googlemaps" && i3GEO.Interface.ATUAL !== "googleearth" && i3GEO.Interface.ATUAL !== "flamingo"){
 			i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t34"),$trad("t35"),'i3GEO.navega.destacaTema.inicia(\"'+ltema.name+'\")',node);
 		}
-		if(i3GEO.Interface.ATUAL !== "padrao" &&  i3GEO.Interface.ATUAL !== "googleearth"){
+		if(i3GEO.Interface.ATUAL !== "padrao" &&  i3GEO.Interface.ATUAL !== "googleearth"  && i3GEO.Interface.ATUAL !== "flamingo"){
 			i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t42"),$trad("t42"),'i3GEO.tema.dialogo.cortina(\"'+ltema.name+'\")',node);
 		}	
 		i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t38"),$trad("t39"),'i3GEO.tema.dialogo.sld(\"'+ltema.name+'\")',node);
diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js
index e781815..3f2b935 100644
--- a/classesjs/classe_interface.js
+++ b/classesjs/classe_interface.js
@@ -566,6 +566,7 @@ i3GEO.Interface = {
 			};
 			i3GEO.php.flamingo(monta);
 			i3GEO.eventos.ativa($i("flamingo"));
+			/*
 			i3GEO.maparef.atualiza();
 			if (i3GEO.configura.mapaRefDisplay !== "none")
 			{
@@ -573,6 +574,7 @@ i3GEO.Interface = {
 				{i3GEO.configura.mapaRefDisplay = i3GEO.util.pegaCookie("i3GEO.configura.mapaRefDisplay");}
 				if (i3GEO.configura.mapaRefDisplay === "block"){i3GEO.maparef.inicia();}
 			}
+			*/
 			//
 			//i3GEO.arvoreDeCamadas.CAMADAS é definido na inicialização (classe_i3geo)
 			//
diff --git a/classesjs/classe_janela.js b/classesjs/classe_janela.js
index dc2d112..ab23341 100644
--- a/classesjs/classe_janela.js
+++ b/classesjs/classe_janela.js
@@ -272,7 +272,7 @@ i3GEO.janela = {
 		}
 		YAHOO.janelaDoca.xp.manager.register(YAHOO.janelaDoca.xp.panel);
 		YAHOO.janelaDoca.xp.panel.render();
-		if(navm && id !== "i3geo_janelaMensagens")
+		if(navm && id !== "i3geo_janelaMensagens" && i3GEO.Interface.ATUAL == "googleearth")
 		{YAHOO.janelaDoca.xp.panel.moveTo(0,0);}
 		if(ifr == true)
 		{YAHOO.janelaDoca.xp.panel.iframe.style.zIndex = 0;}
@@ -341,14 +341,14 @@ i3GEO.janela = {
 	fecha: function(event){
 		if(typeof(console) !== 'undefined'){console.info("i3GEO.janela.fecha()");}
 		var i,old,id;
-		//esconde o box do google
+		//esconde elementos gráficos q a ferramenta pode ter aberto
 		i3GEO.util.escondePin();
 		i3GEO.util.escondeBox();
 		//fecha o container de desenho de elementos na tela
 		if($i("divGeometriasTemp"))
 		{i3GEO.desenho.richdraw.fecha();}
-		if($i("flamingoi"))
-		{$i("flamingoi").style.display="block";}
+		//if($i("flamingoi"))
+		//{$i("flamingoi").style.display="block";}
 		//executa as funções de fechamento
 		if(i3GEO.janela.ANTESFECHA){
 			for(i=0;i<i3GEO.janela.ANTESFECHA.length;i++)
@@ -450,10 +450,7 @@ i3GEO.janela = {
 		if(i3GEO.janela.ESTILOAGUARDE === "normal" || i3GEO.janela.ESTILOAGUARDE === "minima")
 		{eval ('YAHOO.aguarde.'+id+'.setHeader("<span><img id=aguardeGifAberto src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' /></span>&nbsp;<span style=font-size:8px >'+contador+'</span>")');}
 		eval ('YAHOO.aguarde.'+id+'.render(document.body)');
-		if($i("flamingo"))
-		{eval ('YAHOO.aguarde.'+id+'.moveTo(0,0)');}
-		else
-		{eval ('YAHOO.aguarde.'+id+'.moveTo('+pos[0]+','+pos[1]+')');}
+		eval ('YAHOO.aguarde.'+id+'.moveTo('+pos[0]+','+pos[1]+')');
 		eval ('YAHOO.aguarde.'+id+'.show()');
 		if($i(id+"_mask"))
 		{$i(id+"_mask").style.zIndex=5000;}
diff --git a/classesphp/flamingo.inc b/classesphp/flamingo.inc
index c87f670..7f763f0 100644
--- a/classesphp/flamingo.inc
+++ b/classesphp/flamingo.inc
@@ -36,6 +36,9 @@ Arquivo:
 i3geo/classesphp/flamingo.inc
 */
 $string1 = "<?xml version='1.0' encoding='UTF-8'?>";
+$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
+$host = $protocolo[0]."://".$_SERVER['HTTP_HOST'];
+
 $string1 .= 
 '<FLAMINGO xmlns:fmc="fmc" lang="en" languages="en" tooltipdelay="500">
 <fmc:Logo id="logo"/>
@@ -75,7 +78,8 @@ $string1 .=
 </fmc:MonitorLayer>
 <fmc:Map id="overview" movequality="HIGH" right="right" bottom="bottom" width="150" height="150" extent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401" fullextent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401">
 <fmc:LayerOverview listento="map" followfactor="10000"/>
-<fmc:LayerImage id="brasil" imageurl="../imagens/referencia1.png" extent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401" />
+<fmc:LayerImage id="brasil" imageurl="';
+$string0 = $host.'/i3geo/imagens/referencia1.png" extent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401" />
 </fmc:Map>
 
 <fmc:Container borderwidth="0" bordercolor="#b8b8b8" left="left" top="top" bottom="bottom" right="right">
@@ -89,15 +93,12 @@ $string1 .=
 		<fmc:LayerGrid gridwidth="0.5" gridheight="0.5" minscale="100" maxscale="500"/>
 		<fmc:LayerGrid gridwidth="0.1" gridheight="0.1" maxscale="100"/>
 		<fmc:LayerOGWMS id="OG3"  format="PNG" url="';
-	$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
-	$host = $protocolo[0]."://".$_SERVER['HTTP_HOST'];
-	//include_once("../ms_configura.php");
 	$string2 = $host."/i3geo/classesphp/flamingoogc.php?g_sid=".$g_sid;
 	$string3 = '&WMS=OGC:WMS&SERVICE=WMS&VERSION=1.1.0&SRS=EPSG:4291&EXCEPTIONS=INIMAGE&BGCOLOR=0xF0F0F0" LAYERS="copyright"/>
 	</fmc:Map>
 </fmc:Container>
 </FLAMINGO>';
-	$stringFinal = $string1.$string2.$string3;
+	$stringFinal = $string1.$string0.$string2.$string3;
 	$arq = dirname($map_file)."/flamingo.xml";
 	$fp = fopen($arq,"w");
 	fwrite($fp,$stringFinal);
diff --git a/menutemas/admin.db b/menutemas/admin.db
index fe06013..6342a65 100644
Binary files a/menutemas/admin.db and b/menutemas/admin.db differ
diff --git a/ms_configura.php b/ms_configura.php
index 8335c5c..180c70a 100644
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -374,7 +374,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
 	 Tipo:
 	 {string}
 	*/
-	$interfacePadrao = "googleearth.phtml";
+	$interfacePadrao = "flamingo.htm";
 }
 else //se for linux
 {
--
libgit2 0.21.2