Download as
Browse Code »

Commit 78a6e8cd1dc4cffe03d8e9d9bf688e49cdf3a31d

Authored by Edmar Moretti
1 parent 5a382387
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Conclusão da interface Flamingo

Showing 7 changed files with 17 additions and 20 deletions   Show diff stats
aplicmap/flamingo.htm
  Diff comments   View file @78a6e8c
... ... @@ -29,14 +29,12 @@
29 29 <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>
30 30 <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>
31 31 <div id=guia4 class=guia value="Mostra a legnda do mapa atual." >&nbsp;Legenda&nbsp;</div>
32   - <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>
33 32 </div>
34 33 </td></tr>
35 34 </table>
36 35 <div id='guia1obj' ><div id=listaTemas ></div></div>
37 36 <div id='guia2obj' style='display:none;'>Aguarde...<img alt="" src="../imagens/branco.gif" width=248 /></div>
38 37 <div id='guia4obj' style='display:none;text-align:left'><div id='legenda' style='text-align:left'></div></div>
39   - <div id='guia5obj' style='display:none;text-align:left'><div id='banners' style='overflow:auto;text-align:left'>Aguarde...</div></div>
40 38 </td>
41 39 <td class=verdeclaro style="background-color:white;vertical-align:top;border-width:0px;">
42 40 <table width="100%" style="vertical-align:top;">
... ... @@ -50,12 +48,11 @@
50 48 </tr>
51 49 <tr style="border:0px"><td colspan=2 style="background-image:url('../imagens/visual/default/rodape.png');height:10px"></td></tr>
52 50 </table>
53   -<a style=text-align:center;color:white href="mailto:edmar.moretti@mma.gov.br">Cr&iacute;ticas e sugest&otilde;es</a>
54 51 </center>
55 52 <!-- Variáveis globais e inicialização do mapa-->
56 53 <script type="text/javascript">
57 54 /*
58   -Title: Flamingo (experimental)
  55 +Title: Flamingo
59 56  
60 57 Abre o i3geo com a navegação controlada pelo Flamingo.
61 58  
... ...
classesjs/classe_arvoredecamadas.js
  Diff comments   View file @78a6e8c
... ... @@ -768,10 +768,10 @@ i3GEO.arvoreDeCamadas = {
768 768 if (ltema.type < 4){
769 769 i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t32"),$trad("t33"),'i3GEO.tema.dialogo.editaLegenda(\"'+ltema.name+'\")',node);
770 770 }
771   - if(i3GEO.Interface.ATUAL !== "googlemaps" && i3GEO.Interface.ATUAL !== "googleearth"){
  771 + if(i3GEO.Interface.ATUAL !== "googlemaps" && i3GEO.Interface.ATUAL !== "googleearth" && i3GEO.Interface.ATUAL !== "flamingo"){
772 772 i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t34"),$trad("t35"),'i3GEO.navega.destacaTema.inicia(\"'+ltema.name+'\")',node);
773 773 }
774   - if(i3GEO.Interface.ATUAL !== "padrao" && i3GEO.Interface.ATUAL !== "googleearth"){
  774 + if(i3GEO.Interface.ATUAL !== "padrao" && i3GEO.Interface.ATUAL !== "googleearth" && i3GEO.Interface.ATUAL !== "flamingo"){
775 775 i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t42"),$trad("t42"),'i3GEO.tema.dialogo.cortina(\"'+ltema.name+'\")',node);
776 776 }
777 777 i3GEO.arvoreDeCamadas.adicionaOpcaoTema($trad("t38"),$trad("t39"),'i3GEO.tema.dialogo.sld(\"'+ltema.name+'\")',node);
... ...
classesjs/classe_interface.js
  Diff comments   View file @78a6e8c
... ... @@ -566,6 +566,7 @@ i3GEO.Interface = {
566 566 };
567 567 i3GEO.php.flamingo(monta);
568 568 i3GEO.eventos.ativa($i("flamingo"));
  569 + /*
569 570 i3GEO.maparef.atualiza();
570 571 if (i3GEO.configura.mapaRefDisplay !== "none")
571 572 {
... ... @@ -573,6 +574,7 @@ i3GEO.Interface = {
573 574 {i3GEO.configura.mapaRefDisplay = i3GEO.util.pegaCookie("i3GEO.configura.mapaRefDisplay");}
574 575 if (i3GEO.configura.mapaRefDisplay === "block"){i3GEO.maparef.inicia();}
575 576 }
  577 + */
576 578 //
577 579 //i3GEO.arvoreDeCamadas.CAMADAS é definido na inicialização (classe_i3geo)
578 580 //
... ...
classesjs/classe_janela.js
  Diff comments   View file @78a6e8c
... ... @@ -272,7 +272,7 @@ i3GEO.janela = {
272 272 }
273 273 YAHOO.janelaDoca.xp.manager.register(YAHOO.janelaDoca.xp.panel);
274 274 YAHOO.janelaDoca.xp.panel.render();
275   - if(navm && id !== "i3geo_janelaMensagens")
  275 + if(navm && id !== "i3geo_janelaMensagens" && i3GEO.Interface.ATUAL == "googleearth")
276 276 {YAHOO.janelaDoca.xp.panel.moveTo(0,0);}
277 277 if(ifr == true)
278 278 {YAHOO.janelaDoca.xp.panel.iframe.style.zIndex = 0;}
... ... @@ -341,14 +341,14 @@ i3GEO.janela = {
341 341 fecha: function(event){
342 342 if(typeof(console) !== 'undefined'){console.info("i3GEO.janela.fecha()");}
343 343 var i,old,id;
344   - //esconde o box do google
  344 + //esconde elementos gráficos q a ferramenta pode ter aberto
345 345 i3GEO.util.escondePin();
346 346 i3GEO.util.escondeBox();
347 347 //fecha o container de desenho de elementos na tela
348 348 if($i("divGeometriasTemp"))
349 349 {i3GEO.desenho.richdraw.fecha();}
350   - if($i("flamingoi"))
351   - {$i("flamingoi").style.display="block";}
  350 + //if($i("flamingoi"))
  351 + //{$i("flamingoi").style.display="block";}
352 352 //executa as funções de fechamento
353 353 if(i3GEO.janela.ANTESFECHA){
354 354 for(i=0;i<i3GEO.janela.ANTESFECHA.length;i++)
... ... @@ -450,10 +450,7 @@ i3GEO.janela = {
450 450 if(i3GEO.janela.ESTILOAGUARDE === "normal" || i3GEO.janela.ESTILOAGUARDE === "minima")
451 451 {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>")');}
452 452 eval ('YAHOO.aguarde.'+id+'.render(document.body)');
453   - if($i("flamingo"))
454   - {eval ('YAHOO.aguarde.'+id+'.moveTo(0,0)');}
455   - else
456   - {eval ('YAHOO.aguarde.'+id+'.moveTo('+pos[0]+','+pos[1]+')');}
  453 + eval ('YAHOO.aguarde.'+id+'.moveTo('+pos[0]+','+pos[1]+')');
457 454 eval ('YAHOO.aguarde.'+id+'.show()');
458 455 if($i(id+"_mask"))
459 456 {$i(id+"_mask").style.zIndex=5000;}
... ...
classesphp/flamingo.inc
  Diff comments   View file @78a6e8c
... ... @@ -36,6 +36,9 @@ Arquivo:
36 36 i3geo/classesphp/flamingo.inc
37 37 */
38 38 $string1 = "<?xml version='1.0' encoding='UTF-8'?>";
  39 +$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
  40 +$host = $protocolo[0]."://".$_SERVER['HTTP_HOST'];
  41 +
39 42 $string1 .=
40 43 '<FLAMINGO xmlns:fmc="fmc" lang="en" languages="en" tooltipdelay="500">
41 44 <fmc:Logo id="logo"/>
... ... @@ -75,7 +78,8 @@ $string1 .=
75 78 </fmc:MonitorLayer>
76 79 <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">
77 80 <fmc:LayerOverview listento="map" followfactor="10000"/>
78   -<fmc:LayerImage id="brasil" imageurl="../imagens/referencia1.png" extent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401" />
  81 +<fmc:LayerImage id="brasil" imageurl="';
  82 +$string0 = $host.'/i3geo/imagens/referencia1.png" extent="-79.8713331401,-41.7736536401,-26.2264448599,11.8712346401" />
79 83 </fmc:Map>
80 84  
81 85 <fmc:Container borderwidth="0" bordercolor="#b8b8b8" left="left" top="top" bottom="bottom" right="right">
... ... @@ -89,15 +93,12 @@ $string1 .=
89 93 <fmc:LayerGrid gridwidth="0.5" gridheight="0.5" minscale="100" maxscale="500"/>
90 94 <fmc:LayerGrid gridwidth="0.1" gridheight="0.1" maxscale="100"/>
91 95 <fmc:LayerOGWMS id="OG3" format="PNG" url="';
92   - $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
93   - $host = $protocolo[0]."://".$_SERVER['HTTP_HOST'];
94   - //include_once("../ms_configura.php");
95 96 $string2 = $host."/i3geo/classesphp/flamingoogc.php?g_sid=".$g_sid;
96 97 $string3 = '&WMS=OGC:WMS&SERVICE=WMS&VERSION=1.1.0&SRS=EPSG:4291&EXCEPTIONS=INIMAGE&BGCOLOR=0xF0F0F0" LAYERS="copyright"/>
97 98 </fmc:Map>
98 99 </fmc:Container>
99 100 </FLAMINGO>';
100   - $stringFinal = $string1.$string2.$string3;
  101 + $stringFinal = $string1.$string0.$string2.$string3;
101 102 $arq = dirname($map_file)."/flamingo.xml";
102 103 $fp = fopen($arq,"w");
103 104 fwrite($fp,$stringFinal);
... ...
menutemas/admin.db
View file @78a6e8c
No preview for this file type
ms_configura.php
  Diff comments   View file @78a6e8c
... ... @@ -374,7 +374,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == &#39;WIN&#39;))
374 374 Tipo:
375 375 {string}
376 376 */
377   - $interfacePadrao = "googleearth.phtml";
  377 + $interfacePadrao = "flamingo.htm";
378 378 }
379 379 else //se for linux
380 380 {
... ...