Commit 091285a123334d48ff069633e8bd393c6cfff988
1 parent
d6d2a5c6
Exists in
master
and in
7 other branches
v6 - correção no mapa da ferramenta SAIKU qd o mapa usa o OSM
Showing
3 changed files
with
6 additions
and
4 deletions
Show diff stats
classesjs/classe_util.js
| @@ -2940,7 +2940,7 @@ i3GEO.util = { | @@ -2940,7 +2940,7 @@ i3GEO.util = { | ||
| 2940 | return ext; | 2940 | return ext; |
| 2941 | }, | 2941 | }, |
| 2942 | /* | 2942 | /* |
| 2943 | - Function: extGeo2OSM | 2943 | + Function: extOSM2Geo |
| 2944 | 2944 | ||
| 2945 | Converte string xmin ymin xmax ymax de geo para a projecao OSM | 2945 | Converte string xmin ymin xmax ymax de geo para a projecao OSM |
| 2946 | */ | 2946 | */ |
ferramentas/saiku/index.js
| @@ -150,7 +150,8 @@ i3GEOF.saiku = { | @@ -150,7 +150,8 @@ i3GEOF.saiku = { | ||
| 150 | i3GEOF.saiku.inicia(divid); | 150 | i3GEOF.saiku.inicia(divid); |
| 151 | }, | 151 | }, |
| 152 | aplicar: function(){ | 152 | aplicar: function(){ |
| 153 | - window.open(i3GEO.configura.locaplic+"/ferramentas/saiku/esquemaxml.php?g_sid="+i3GEO.configura.sid+"&locaplic="+i3GEO.configura.locaplic+"&mapext="+i3GEO.parametros.mapexten); | 153 | + var mapext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); |
| 154 | + window.open(i3GEO.configura.locaplic+"/ferramentas/saiku/esquemaxml.php?g_sid="+i3GEO.configura.sid+"&locaplic="+i3GEO.configura.locaplic+"&mapext="+mapext); | ||
| 154 | }, | 155 | }, |
| 155 | atualizaMapa: function(){ | 156 | atualizaMapa: function(){ |
| 156 | i3GEO.atualiza(""); | 157 | i3GEO.atualiza(""); |
mashups/openlayers.php
| @@ -459,8 +459,9 @@ if(isset($maxextent)){ | @@ -459,8 +459,9 @@ if(isset($maxextent)){ | ||
| 459 | $maxextent = str_replace(" ",",",$maxextent); | 459 | $maxextent = str_replace(" ",",",$maxextent); |
| 460 | echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(".$maxextent.");"; | 460 | echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(".$maxextent.");"; |
| 461 | } | 461 | } |
| 462 | -else | ||
| 463 | -{echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);";} | 462 | +else{ |
| 463 | + echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);"; | ||
| 464 | +} | ||
| 464 | if(isset($mapext)){ | 465 | if(isset($mapext)){ |
| 465 | $mapext = str_replace(" ",",",$mapext); | 466 | $mapext = str_replace(" ",",",$mapext); |
| 466 | echo "i3GEO.editorOL.mapext = new OpenLayers.Bounds(".$mapext.");"; | 467 | echo "i3GEO.editorOL.mapext = new OpenLayers.Bounds(".$mapext.");"; |