Download as
Browse Code »

Commit 35f0454e4c8cce98b733acc9ac39a1ea3f24649d

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

--no commit message

Showing 6 changed files with 24 additions and 9 deletions   Show diff stats
admin/admin.db
View file @35f0454
No preview for this file type
classesjs/classe_i3geo.js
  Diff comments   View file @35f0454
@@ -758,4 +758,4 @@ var i3GEO = { @@ -758,4 +758,4 @@ var i3GEO = {
758 i3GEO.parametros.editor = "nao"; 758 i3GEO.parametros.editor = "nao";
759 } 759 }
760 } 760 }
761 -};  
762 \ No newline at end of file 761 \ No newline at end of file
  762 +};
classesjs/classe_interface.js
  Diff comments   View file @35f0454
@@ -752,7 +752,9 @@ i3GEO.Interface = { @@ -752,7 +752,9 @@ i3GEO.Interface = {
752 if(i3GEO.finalizaAPI != "") 752 if(i3GEO.finalizaAPI != "")
753 {eval(i3GEO.finalizaAPI);} 753 {eval(i3GEO.finalizaAPI);}
754 } 754 }
  755 + //verifica se nas preferencias existem ferramentas que devem ser abertas
755 i3GEO.configura.iniciaFerramentas.executa(); 756 i3GEO.configura.iniciaFerramentas.executa();
  757 + i3GEO.Interface.openlayers.sobeLayersGraficos();
756 }, 758 },
757 aplicaOpacidade: function(opacidade,layer){ 759 aplicaOpacidade: function(opacidade,layer){
758 var nlayers = i3GEO.arvoreDeCamadas.CAMADAS.length, 760 var nlayers = i3GEO.arvoreDeCamadas.CAMADAS.length,
@@ -1177,6 +1179,7 @@ i3GEO.Interface = { @@ -1177,6 +1179,7 @@ i3GEO.Interface = {
1177 if(layer) 1179 if(layer)
1178 {i3geoOL.setLayerIndex(layer,maiorindice+i);} 1180 {i3geoOL.setLayerIndex(layer,maiorindice+i);}
1179 } 1181 }
  1182 + i3GEO.Interface.openlayers.sobeLayersGraficos();
1180 }, 1183 },
1181 sobeDesceLayer:function(tema,tipo){ 1184 sobeDesceLayer:function(tema,tipo){
1182 var layer = i3geoOL.getLayersByName(tema)[0], 1185 var layer = i3geoOL.getLayersByName(tema)[0],
@@ -1188,6 +1191,7 @@ i3GEO.Interface = { @@ -1188,6 +1191,7 @@ i3GEO.Interface = {
1188 else 1191 else
1189 {i3geoOL.setLayerIndex(layer,indice - 1);} 1192 {i3geoOL.setLayerIndex(layer,indice - 1);}
1190 } 1193 }
  1194 + i3GEO.Interface.openlayers.sobeLayersGraficos();
1191 }, 1195 },
1192 ligaDesliga:function(obj){ 1196 ligaDesliga:function(obj){
1193 var layers = i3geoOL.getLayersByName(obj.value), 1197 var layers = i3geoOL.getLayersByName(obj.value),
@@ -1233,6 +1237,7 @@ i3GEO.Interface = { @@ -1233,6 +1237,7 @@ i3GEO.Interface = {
1233 } 1237 }
1234 } 1238 }
1235 } 1239 }
  1240 + i3GEO.Interface.openlayers.sobeLayersGraficos();
1236 }, 1241 },
1237 atualizaTema:function(retorno,tema){ 1242 atualizaTema:function(retorno,tema){
1238 var layer = i3geoOL.getLayersByName(tema)[0]; 1243 var layer = i3geoOL.getLayersByName(tema)[0];
classesjs/classe_util.js
  Diff comments   View file @35f0454
@@ -2790,7 +2790,7 @@ i3GEO.util = { @@ -2790,7 +2790,7 @@ i3GEO.util = {
2790 re = new RegExp("%3A", "g"); 2790 re = new RegExp("%3A", "g");
2791 sUrl = sUrl.replace(re,':'); 2791 sUrl = sUrl.replace(re,':');
2792 var falhou = function(e){ 2792 var falhou = function(e){
2793 - alert(e); 2793 + if(typeof(console) !== 'undefined'){console.info(e);}
2794 }, 2794 },
2795 callback = { 2795 callback = {
2796 success:function(o){ 2796 success:function(o){
ferramentas/vinde/index.js
  Diff comments   View file @35f0454
@@ -91,13 +91,18 @@ i3GEOF.vinde = { @@ -91,13 +91,18 @@ i3GEOF.vinde = {
91 } 91 }
92 var p = i3GEO.configura.locaplic+"/ferramentas/vinde/wmsindejson.php", 92 var p = i3GEO.configura.locaplic+"/ferramentas/vinde/wmsindejson.php",
93 funcao = function(retorno){ 93 funcao = function(retorno){
94 - if(iddiv && iddiv != ""){  
95 - $i(iddiv).innerHTML = i3GEOF.vinde.html(); 94 + try{
  95 + if(iddiv && iddiv != ""){
  96 + $i(iddiv).innerHTML = i3GEOF.vinde.html();
  97 + }
  98 + if($i("i3GEOF.vinde_imagemCabecalho")){
  99 + i3GEOF.vinde.aguarde.visibility = "hidden";
  100 + }
  101 + i3GEOF.vinde.arvore(retorno,arvore);
96 } 102 }
97 - if($i("i3GEOF.vinde_imagemCabecalho")){  
98 - i3GEOF.vinde.aguarde.visibility = "hidden"; 103 + catch(e){
  104 + if(typeof(console) !== 'undefined'){console.info("Erro ao acessar a INDE");}
99 } 105 }
100 - i3GEOF.vinde.arvore(retorno,arvore);  
101 }; 106 };
102 i3GEO.util.ajaxGet(p,funcao); 107 i3GEO.util.ajaxGet(p,funcao);
103 }, 108 },
@@ -232,4 +237,4 @@ i3GEOF.vinde = { @@ -232,4 +237,4 @@ i3GEOF.vinde = {
232 i3GEOF.vinde.aguarde = $i("i3GEOF.vinde_imagemCabecalho").style; 237 i3GEOF.vinde.aguarde = $i("i3GEOF.vinde_imagemCabecalho").style;
233 i3GEOF.vinde.inicia(divid); 238 i3GEOF.vinde.inicia(divid);
234 } 239 }
235 -};  
236 \ No newline at end of file 240 \ No newline at end of file
  241 +};
mashups/openlayers.js
  Diff comments   View file @35f0454
@@ -223,6 +223,7 @@ i3GEO.editorOL = { @@ -223,6 +223,7 @@ i3GEO.editorOL = {
223 else{ 223 else{
224 i3GEO.editorOL.mapa.zoomToMaxExtent(); 224 i3GEO.editorOL.mapa.zoomToMaxExtent();
225 } 225 }
  226 + i3GEO.Interface.openlayers.sobeLayersGraficos();
226 }, 227 },
227 criaLayerGrafico: function(){ 228 criaLayerGrafico: function(){
228 var sketchSymbolizers = { 229 var sketchSymbolizers = {
@@ -886,6 +887,7 @@ i3GEO.editorOL = { @@ -886,6 +887,7 @@ i3GEO.editorOL = {
886 i3GEO.editorOL.layergrafico.addFeatures([f]); 887 i3GEO.editorOL.layergrafico.addFeatures([f]);
887 if(document.getElementById("panellistagEditor")) 888 if(document.getElementById("panellistagEditor"))
888 {i3GEO.editorOL.listaGeometrias();} 889 {i3GEO.editorOL.listaGeometrias();}
  890 + i3GEO.Interface.openlayers.sobeLayersGraficos();
889 } 891 }
890 } 892 }
891 } 893 }
@@ -916,6 +918,7 @@ i3GEO.editorOL = { @@ -916,6 +918,7 @@ i3GEO.editorOL = {
916 i3GEO.editorOL.layergrafico.addFeatures([f]); 918 i3GEO.editorOL.layergrafico.addFeatures([f]);
917 if(document.getElementById("panellistagEditor")) 919 if(document.getElementById("panellistagEditor"))
918 {i3GEO.editorOL.listaGeometrias();} 920 {i3GEO.editorOL.listaGeometrias();}
  921 + i3GEO.Interface.openlayers.sobeLayersGraficos();
919 } 922 }
920 } 923 }
921 } 924 }
@@ -947,6 +950,7 @@ i3GEO.editorOL = { @@ -947,6 +950,7 @@ i3GEO.editorOL = {
947 i3GEO.editorOL.layergrafico.addFeatures([f]); 950 i3GEO.editorOL.layergrafico.addFeatures([f]);
948 if(document.getElementById("panellistagEditor")) 951 if(document.getElementById("panellistagEditor"))
949 {i3GEO.editorOL.listaGeometrias();} 952 {i3GEO.editorOL.listaGeometrias();}
  953 + i3GEO.Interface.openlayers.sobeLayersGraficos();
950 } 954 }
951 } 955 }
952 } 956 }
@@ -983,6 +987,7 @@ i3GEO.editorOL = { @@ -983,6 +987,7 @@ i3GEO.editorOL = {
983 }; 987 };
984 if(texto && texto !== "") 988 if(texto && texto !== "")
985 {i3GEO.editorOL.layergrafico.addFeatures([label]);} 989 {i3GEO.editorOL.layergrafico.addFeatures([label]);}
  990 + i3GEO.Interface.openlayers.sobeLayersGraficos();
986 } 991 }
987 } 992 }
988 } 993 }
@@ -1753,4 +1758,4 @@ i3GEO.editorOL = { @@ -1753,4 +1758,4 @@ i3GEO.editorOL = {
1753 var controls = i3GEO.editorOL.mapa.getControlsByClass('OpenLayers.Control.Navigation'); 1758 var controls = i3GEO.editorOL.mapa.getControlsByClass('OpenLayers.Control.Navigation');
1754 for(var i = 0; i<controls.length; ++i){controls[i].disableZoomWheel();} 1759 for(var i = 0; i<controls.length; ++i){controls[i].disableZoomWheel();}
1755 } 1760 }
1756 -};  
1757 \ No newline at end of file 1761 \ No newline at end of file
  1762 +};