Commit 7e084fed40d600ba73d4142e6f55ebfcc9223bac
1 parent
92de253a
Exists in
master
and in
7 other branches
--no commit message
Showing
2 changed files
with
4 additions
and
1 deletions
Show diff stats
ferramentas/saiku/cartograma.php
| @@ -16,7 +16,7 @@ session_start(); | @@ -16,7 +16,7 @@ session_start(); | ||
| 16 | //obtem os layers que sao do sistema metaestat, sao regioes e que possuem selecao | 16 | //obtem os layers que sao do sistema metaestat, sao regioes e que possuem selecao |
| 17 | $map_file = $_SESSION["map_file"]; | 17 | $map_file = $_SESSION["map_file"]; |
| 18 | //remove as camadas do SAIKU | 18 | //remove as camadas do SAIKU |
| 19 | -if($_POST["opcoes"] == ""){ | 19 | +if($_POST["dados"] == ""){ |
| 20 | $mapa = ms_newMapObj($map_file); | 20 | $mapa = ms_newMapObj($map_file); |
| 21 | $nlayers = $mapa->numlayers; | 21 | $nlayers = $mapa->numlayers; |
| 22 | for($i=0;$i<$nlayers;$i++){ | 22 | for($i=0;$i<$nlayers;$i++){ |
ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
| @@ -101,6 +101,9 @@ var i3GeoMap = Backbone.View.extend({ | @@ -101,6 +101,9 @@ var i3GeoMap = Backbone.View.extend({ | ||
| 101 | reiniciarMapa: function(){ | 101 | reiniciarMapa: function(){ |
| 102 | document.getElementById('formi3GeoMapOpcoes').value = "reinicia"; | 102 | document.getElementById('formi3GeoMapOpcoes').value = "reinicia"; |
| 103 | document.getElementById('formi3GeoMapdados').value = ""; | 103 | document.getElementById('formi3GeoMapdados').value = ""; |
| 104 | + this.opcoes.locaplic = parametroUrl("locaplic"); | ||
| 105 | + this.opcoes.mapext = parametroUrl("mapext"); | ||
| 106 | + document.getElementById("formi3GeoMapOpcoes").value = JSON.stringify(this.opcoes); | ||
| 104 | document.getElementById('formi3GeoMap').submit(); | 107 | document.getElementById('formi3GeoMap').submit(); |
| 105 | }, | 108 | }, |
| 106 | show: function(event, ui) { | 109 | show: function(event, ui) { |