From 091285a123334d48ff069633e8bd393c6cfff988 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 24 Apr 2014 19:41:56 +0000 Subject: [PATCH] v6 - correção no mapa da ferramenta SAIKU qd o mapa usa o OSM --- classesjs/classe_util.js | 2 +- ferramentas/saiku/index.js | 3 ++- mashups/openlayers.php | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/classesjs/classe_util.js b/classesjs/classe_util.js index 8ec0747..befae15 100644 --- a/classesjs/classe_util.js +++ b/classesjs/classe_util.js @@ -2940,7 +2940,7 @@ i3GEO.util = { return ext; }, /* - Function: extGeo2OSM + Function: extOSM2Geo Converte string xmin ymin xmax ymax de geo para a projecao OSM */ diff --git a/ferramentas/saiku/index.js b/ferramentas/saiku/index.js index 78d2c33..9da4a4c 100755 --- a/ferramentas/saiku/index.js +++ b/ferramentas/saiku/index.js @@ -150,7 +150,8 @@ i3GEOF.saiku = { i3GEOF.saiku.inicia(divid); }, aplicar: function(){ - window.open(i3GEO.configura.locaplic+"/ferramentas/saiku/esquemaxml.php?g_sid="+i3GEO.configura.sid+"&locaplic="+i3GEO.configura.locaplic+"&mapext="+i3GEO.parametros.mapexten); + var mapext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + window.open(i3GEO.configura.locaplic+"/ferramentas/saiku/esquemaxml.php?g_sid="+i3GEO.configura.sid+"&locaplic="+i3GEO.configura.locaplic+"&mapext="+mapext); }, atualizaMapa: function(){ i3GEO.atualiza(""); diff --git a/mashups/openlayers.php b/mashups/openlayers.php index 6ebca46..32f7e9f 100644 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -459,8 +459,9 @@ if(isset($maxextent)){ $maxextent = str_replace(" ",",",$maxextent); echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(".$maxextent.");"; } -else -{echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);";} +else{ + echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);"; +} if(isset($mapext)){ $mapext = str_replace(" ",",",$mapext); echo "i3GEO.editorOL.mapext = new OpenLayers.Bounds(".$mapext.");"; -- libgit2 0.21.2