Commit 6d45b8438e4333858ac9c28a4cfbe722d853f9f3
1 parent
46d06676
Exists in
master
and in
7 other branches
OL3 - Opções de ligar e desligar temas na árvore de camadas
Showing
3 changed files
with
20 additions
and
14 deletions
Show diff stats
classesjs/classe_interface.js
@@ -2354,7 +2354,6 @@ i3GEO.Interface = | @@ -2354,7 +2354,6 @@ i3GEO.Interface = | ||
2354 | try { | 2354 | try { |
2355 | i3GeoMap = new google.maps.Map($i(i3GEO.Interface.IDMAPA), i3GEO.Interface.googlemaps.MAPOPTIONS); | 2355 | i3GeoMap = new google.maps.Map($i(i3GEO.Interface.IDMAPA), i3GEO.Interface.googlemaps.MAPOPTIONS); |
2356 | } catch (e) { | 2356 | } catch (e) { |
2357 | - alert(e); | ||
2358 | return; | 2357 | return; |
2359 | } | 2358 | } |
2360 | if (i3GEO.Interface.googlemaps.ESTILOS && i3GEO.Interface.googlemaps.ESTILOPADRAO != "") { | 2359 | if (i3GEO.Interface.googlemaps.ESTILOS && i3GEO.Interface.googlemaps.ESTILOPADRAO != "") { |
js/arvoredecamadas.js
@@ -809,7 +809,7 @@ i3GEO.arvoreDeCamadas = | @@ -809,7 +809,7 @@ i3GEO.arvoreDeCamadas = | ||
809 | novoel.style.top = "0px"; | 809 | novoel.style.top = "0px"; |
810 | novoel.style.zIndex = "50000"; | 810 | novoel.style.zIndex = "50000"; |
811 | novoel.style.left = ((i3GEO.parametros.w / 2) - 75) + "px"; | 811 | novoel.style.left = ((i3GEO.parametros.w / 2) - 75) + "px"; |
812 | - // novoel.style.display = "none"; | 812 | + novoel.style.display = "none"; |
813 | $i(i3GEO.Interface.IDMAPA).appendChild(novoel); | 813 | $i(i3GEO.Interface.IDMAPA).appendChild(novoel); |
814 | i3GEO.arvoreDeCamadas.progressBar = new YAHOO.widget.ProgressBar({ | 814 | i3GEO.arvoreDeCamadas.progressBar = new YAHOO.widget.ProgressBar({ |
815 | height : 5, | 815 | height : 5, |
js/interface.js
@@ -762,11 +762,9 @@ i3GEO.Interface = | @@ -762,11 +762,9 @@ i3GEO.Interface = | ||
762 | redesenha : function() { | 762 | redesenha : function() { |
763 | var openlayers = i3GEO.Interface.openlayers; | 763 | var openlayers = i3GEO.Interface.openlayers; |
764 | openlayers.criaLayers(); | 764 | openlayers.criaLayers(); |
765 | - //FIXME returns aqui | ||
766 | openlayers.ordenaLayers(); | 765 | openlayers.ordenaLayers(); |
767 | - //openlayers.recalcPar(); | ||
768 | - //i3GEO.janela.fechaAguarde(); | ||
769 | - //openlayers.sobeLayersGraficos(); | 766 | + openlayers.recalcPar(); |
767 | + i3GEO.janela.fechaAguarde(); | ||
770 | }, | 768 | }, |
771 | /** | 769 | /** |
772 | * Cria o mapa do lado do cliente (navegador) Define o que for necessario para a criacao de | 770 | * Cria o mapa do lado do cliente (navegador) Define o que for necessario para a criacao de |
@@ -803,6 +801,9 @@ i3GEO.Interface = | @@ -803,6 +801,9 @@ i3GEO.Interface = | ||
803 | // | 801 | // |
804 | // funcoes utilitarias | 802 | // funcoes utilitarias |
805 | // | 803 | // |
804 | + ol.layer.Layer.prototype.setVisibility = function(v){ | ||
805 | + this.setVisible(v); | ||
806 | + }; | ||
806 | i3geoOL.getLayersByName = function(nome) { | 807 | i3geoOL.getLayersByName = function(nome) { |
807 | var res = [], layers = this.getLayers(), n = layers.getLength(), i; | 808 | var res = [], layers = this.getLayers(), n = layers.getLength(), i; |
808 | for (i = 0; i < n; i++) { | 809 | for (i = 0; i < n; i++) { |
@@ -824,6 +825,9 @@ i3GEO.Interface = | @@ -824,6 +825,9 @@ i3GEO.Interface = | ||
824 | } | 825 | } |
825 | } | 826 | } |
826 | }; | 827 | }; |
828 | + i3geoOL.getLayersBase = function(){ | ||
829 | + return i3geoOL.getLayersBy("isBaseLayer",true); | ||
830 | + }; | ||
827 | i3geoOL.getLayersBy = function(chave, valor) { | 831 | i3geoOL.getLayersBy = function(chave, valor) { |
828 | var res = [], layers = this.getLayers(), n = layers.getLength(), i; | 832 | var res = [], layers = this.getLayers(), n = layers.getLength(), i; |
829 | for (i = 0; i < n; i++) { | 833 | for (i = 0; i < n; i++) { |
@@ -1524,18 +1528,21 @@ i3GEO.Interface = | @@ -1524,18 +1528,21 @@ i3GEO.Interface = | ||
1524 | * Ordena os layers no mapa conforme i3GEO.arvoreDeCamadas.CAMADAS | 1528 | * Ordena os layers no mapa conforme i3GEO.arvoreDeCamadas.CAMADAS |
1525 | */ | 1529 | */ |
1526 | ordenaLayers : function() { | 1530 | ordenaLayers : function() { |
1527 | - var ordem = i3GEO.arvoreDeCamadas.CAMADAS, nordem = ordem.length, layer, layers, i, maiorindice; | ||
1528 | - // maior indice | 1531 | + var ordem = i3GEO.arvoreDeCamadas.CAMADAS, |
1532 | + nordem = ordem.length, | ||
1533 | + nbase = i3geoOL.getLayersBase().length, | ||
1534 | + layer, layers, i, maiorindice; | ||
1535 | + | ||
1529 | layers = i3geoOL.getLayers(); | 1536 | layers = i3geoOL.getLayers(); |
1530 | - maiorindice = i3geoOL.getLayerIndex(layers[(layers.length) - 1]); | ||
1531 | for (i = nordem - 1; i >= 0; i--) { | 1537 | for (i = nordem - 1; i >= 0; i--) { |
1532 | - layers = i3geoOL.getLayersByName(ordem[i].name); | 1538 | + layer = i3geoOL.getLayersByName(ordem[i].name); |
1533 | layer = layers[0]; | 1539 | layer = layers[0]; |
1534 | if (layer) { | 1540 | if (layer) { |
1535 | - i3geoOL.setLayerIndex(layer, maiorindice + i); | 1541 | + layers.setAt(nordem + nbase,layer); |
1536 | } | 1542 | } |
1537 | } | 1543 | } |
1538 | - i3GEO.Interface.openlayers.sobeLayersGraficos(); | 1544 | + //TODO precisa subir os layers graficos? |
1545 | + //i3GEO.Interface.openlayers.sobeLayersGraficos(); | ||
1539 | }, | 1546 | }, |
1540 | /** | 1547 | /** |
1541 | * Sobe ou desce um layer na pilha de camadas | 1548 | * Sobe ou desce um layer na pilha de camadas |
@@ -1560,10 +1567,10 @@ i3GEO.Interface = | @@ -1560,10 +1567,10 @@ i3GEO.Interface = | ||
1560 | if (layers.length > 0) { | 1567 | if (layers.length > 0) { |
1561 | layers[0].setVisibility(obj.checked); | 1568 | layers[0].setVisibility(obj.checked); |
1562 | if (obj.checked === true) { | 1569 | if (obj.checked === true) { |
1563 | - layers[0].div.style.display = "block"; | 1570 | + //layers[0].div.style.display = "block"; |
1564 | i3GEO.pluginI3geo.ligaCamada(obj.value); | 1571 | i3GEO.pluginI3geo.ligaCamada(obj.value); |
1565 | } else { | 1572 | } else { |
1566 | - layers[0].div.style.display = "none"; | 1573 | + //layers[0].div.style.display = "none"; |
1567 | i3GEO.pluginI3geo.desligaCamada(obj.value); | 1574 | i3GEO.pluginI3geo.desligaCamada(obj.value); |
1568 | } | 1575 | } |
1569 | } | 1576 | } |