diff --git a/ferramentas/saiku/cartograma.php b/ferramentas/saiku/cartograma.php index f40a216..68234ce 100755 --- a/ferramentas/saiku/cartograma.php +++ b/ferramentas/saiku/cartograma.php @@ -10,9 +10,13 @@ if(!isset($dir_tmp)){ include(dirname(__FILE__)."/../../ms_configura.php"); } if(isset($statusFerramentas) && $statusFerramentas["saiku"] != true){ - exit; + echo "A ferramenta SAIKU não está ativada em ms_configura.php"; + exit; } include(dirname(__FILE__)."/../blacklist.php"); +if(in_array("saiku",$i3geoBlFerramentas)){ + echo "Ferramenta bloqueada em ms_configura.php"; +} verificaBlFerramentas(basename(dirname(__FILE__)),$i3geoBlFerramentas,false); //error_reporting(E_ALL); @@ -252,7 +256,7 @@ else{ } } -header("Location:".$opcoes["locaplic"]."/mashups/openlayers.php?temas=".$map_file."&DESLIGACACHE=sim&botoes=legenda,pan,zoombox,zoomtot,zoomin,zoomout,distancia,area,identifica&controles=navigation,layerswitcher,scaleline,mouseposition,overviewmap,keyboarddefaults&tiles=false&mapext=".$opcoes["mapext"]); +header("Location:".$opcoes["locaplic"]."/mashups/openlayers.php?temas=".$map_file."&DESLIGACACHE=sim&botoes=legenda,analise,catalogo,camadas,identifica&controles=navigation,layerswitcher,scaleline,mouseposition,keyboarddefaults&fundo=eng&tiles=false&mapext=".$opcoes["mapext"]); function mapaBarras($colunas,$metadataItens){ global $opcoes; diff --git a/ferramentas/saiku/index.js b/ferramentas/saiku/index.js index 469c433..9f1ab96 100755 --- a/ferramentas/saiku/index.js +++ b/ferramentas/saiku/index.js @@ -193,6 +193,6 @@ i3GEOF.saiku = + "&locaplic=" + i3GEO.configura.locaplic + "&mapext=" + mapext); }, atualizaMapa : function() { - i3GEO.atualiza(""); + i3GEO.atualiza(); } }; diff --git a/interface/openlayersdebug.htm b/interface/openlayersdebug.htm index 0d0f34a..8266fab 100755 --- a/interface/openlayersdebug.htm +++ b/interface/openlayersdebug.htm @@ -793,7 +793,7 @@ }); i3GEO.eventos.adicionaEventos("RESIZE", $( ".guiaOverflow").css("height", - i3GEO.parametros.h - 60)) + i3GEO.parametros.h - 60)); //setTimeout(function() { // $('.iconeGuiaMovel').tooltip('destroy'); diff --git a/mashups/openlayers.php b/mashups/openlayers.php index a274a48..d46dcef 100755 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -11,9 +11,9 @@ include_once (dirname(__FILE__) . "/../classesphp/funcoes_gerais.php"); error_reporting(0); // variaveis utilizadas $parurl = array_merge($_GET, $_POST); -if(count($parurl) == 0){ +if (count($parurl) == 0) { ajuda(); - exit; + exit(); } if (isset($parurl["opacidade"])) { @@ -36,18 +36,18 @@ if (! isset($parurl["temas"]) && isset($parurl["layers"])) { $parurl["temas"] = $parurl["layers"]; } $temas = explode(",", str_replace(" ", ",", $parurl["temas"])); -if(!isset($parurl["visiveis"])){ +if (! isset($parurl["visiveis"])) { $parurl["visiveis"] = $parurl["temas"]; } $visiveis = explode(",", str_replace(" ", ",", $parurl["visiveis"])); $off = array_diff($temas, $visiveis); -//filtros +// filtros $filtros = array(); -foreach($temas as $tema){ - if(isset($parurl["map_layer_".$tema."_filter"])){ +foreach ($temas as $tema) { + if (isset($parurl["map_layer_" . $tema . "_filter"])) { $filtros[] = array( - "layer"=>$tema, - "expression"=>$parurl["map_layer_".$tema."_filter"] + "layer" => $tema, + "expression" => $parurl["map_layer_" . $tema . "_filter"] ); } } @@ -267,7 +267,6 @@ if (isset($parurl["botoes"])) { $objBotoes[] = "'frente':true"; $botoes = "{" . implode(",", $objBotoes) . "}"; - } if (isset($parurl["kml"])) { $kml = $parurl["kml"]; @@ -297,28 +296,26 @@ if (isset($parurl["pontos"])) { } else { $pontos = ""; } -if(isset($parurl["marca"])){ +if (isset($parurl["marca"])) { $marca = $parurl["marca"]; } else { - $marca = "../pacotes/openlayers/img/marker-gold.png"; + $marca = "../pacotes/openlayers/img/marker-gold.png"; } -if(isset($parurl["tiles"])){ +if (isset($parurl["tiles"])) { $tiles = $parurl["tiles"]; +} else { + $tiles = "true"; } -else{ - $tiles = "true"; -} -if(isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false"){ +if (isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false") { $ativarodadomouse = ""; -} -else{ +} else { $ativarodadomouse = "new ol.interaction.MouseWheelZoom(),"; } -if(!isset($parurl["legendahtml"])){ +if (! isset($parurl["legendahtml"])) { $parurl["legendahtml"] = ""; } $legendahtml = $parurl["legendahtml"]; -if(!isset($parurl["layerDefault"])){ +if (! isset($parurl["layerDefault"])) { $parurl["layerDefault"] = ""; } $layerDefault = $parurl["layerDefault"]; @@ -457,10 +454,10 @@ function ajuda() - +
@@ -553,8 +550,7 @@ function ajuda() -
+
" data-idconteudo="guia8obj" data-idLinks="listaFerramentasLinks" data-idMigalha="migalhaFerramentas" data-idLista="listaFerramentas" onclick="i3GEO.guias.ativa('ferramentas',this)"> -
@@ -574,8 +570,8 @@ function ajuda() do metadata existente na camada. Deixe vazio para nao ativar a operacao. -->
" onclick="i3GEO.guias.ativa('temas',this)" data-verificaAbrangencia="" data-idconteudo="guia1obj" data-idListaFundo="listaFundo" - data-idListaDeCamadas="listaTemas" style="margin-top: 3px;"> -
@@ -589,50 +585,55 @@ function ajuda() i3GEO.catalogoMenus.IDSMENUS - (array) apenas os menus com idmenu que constem nessa lista serao mostrados. Por default e vazio. -->
" onclick="i3GEO.guias.ativa('adiciona',this)" data-idconteudo="guia2obj" data-idMigalha="catalogoMigalha" - data-idNavegacao="catalogoNavegacao" data-idCatalogo="catalogoPrincipal" data-idMenus="catalogoMenus" style="margin-top: 3px;"> -
-
" onclick="i3GEO.guias.ativa('legenda',this)" data-idconteudo="guia4obj" data-idLegenda="legendaHtml" style="margin-top: 3px;"> -
-
" onclick="i3GEO.guias.ativa('buscaRapida',this)" data-idconteudo="guia7obj" style="margin-top: 3px;"> -
-
" onclick="i3GEO.guias.ativa('identificaBalao',this)" style="margin-top: 3px;"> -
- + - - -
-
- - + + + +
+
+ +