From 1101229cc6f3c08b6b8541fe2de7078ef373835a Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 28 Oct 2017 00:55:43 -0200
Subject: [PATCH] Correção nas funções que aplicam opacidade nos layers em função da versão 7 do Mapserver

---
 ferramentas/blacklist.php                                   |   2 +-
 ferramentas/carregamapa/upload.php                          |   7 +++++--
 ferramentas/heatmap/exec.php                                |  11 ++++++++++-
 ferramentas/markercluster/exec.php                          |   7 ++++++-
 ferramentas/metaestat/analise.php                           |  19 ++++++++++++++++---
 ferramentas/safe.php                                        |   3 +++
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/ga.js |   0
 mashups/listaDeFerramentas.js                               | 618 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mashups/openlayers.php                                      |   2 +-
 ms_configura.php                                            |   2 +-
 10 files changed, 661 insertions(+), 10 deletions(-)
 create mode 100644 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/ga.js
 create mode 100644 mashups/listaDeFerramentas.js

diff --git a/ferramentas/blacklist.php b/ferramentas/blacklist.php
index a90908f..2dfc530 100755
--- a/ferramentas/blacklist.php
+++ b/ferramentas/blacklist.php
@@ -4,7 +4,7 @@
 //no conteudo da variavel $i3geoBlFerramentas
 //
 function verificaBlFerramentas($dir,$i3geoBlFerramentas="",$js=true){
-	if($i3geoBlFerramentas == ""){
+    if($i3geoBlFerramentas == ""){
 		if(file_exists(dirname(__FILE__)."/../ms_configura.php")){
 			include_once(dirname(__FILE__)."/../ms_configura.php");
 		} else {
diff --git a/ferramentas/carregamapa/upload.php b/ferramentas/carregamapa/upload.php
index 4be6354..59d88ac 100755
--- a/ferramentas/carregamapa/upload.php
+++ b/ferramentas/carregamapa/upload.php
@@ -140,8 +140,11 @@ if (isset($_FILES['i3GEOcarregamapafilemap']['name']) && strlen(basename($_FILES
 				else{
 					$layero->set("status",MS_OFF);
 				}
-
-				$layero->set("opacity",$layert->opacity);
+				if(ms_GetVersionInt() >= 7){
+				    $layero->updateFromString('LAYER COMPOSITE OPACITY '.$layert->opacity.'END END');
+				} else {
+				    $layero->set("opacity",$layert->opacity);
+				}
 				$layero->setmetadata("TEMA",$layert->getmetadata("TEMA"));
 				//
 				//adiciona o layer ao mapa atual
diff --git a/ferramentas/heatmap/exec.php b/ferramentas/heatmap/exec.php
index cc358b6..f9aad1c 100755
--- a/ferramentas/heatmap/exec.php
+++ b/ferramentas/heatmap/exec.php
@@ -1,9 +1,13 @@
 <?php
+
 include_once(dirname(__FILE__)."/../safe.php");
+
 verificaBlFerramentas(basename(dirname(__FILE__)),$i3geoBlFerramentas,false);
+
 //
 //faz a busca da fun&ccedil;&atilde;o que deve ser executada
 //
+
 $retorno = ""; //string que ser&aacute; retornada ao browser via JSON
 switch (strtoupper($funcao))
 {
@@ -19,12 +23,17 @@ Adiciona ao mapa uma nova camada para calculo do mapa de calor
 		$novolayer = ms_newLayerObj($map, $layer);
 		$novolayer->setmetadata("tema",$_GET["titulo"]);
 		$parametros = '{"plugin":"heatmap","parametros":{"max":10,"tipoGradiente":"default","valorPonto":"'.$_GET["valorPonto"].'","coluna":"'.$_GET["coluna"].'","radius":"'.$_GET["raio"].'"}}';
+
 		$novolayer->setmetadata("PLUGINI3GEO",$parametros);
 		$novolayer->set("name",$nameLayer);
 		$novolayer->set("group","");
 
 		if(!empty($_GET["opacidade"])){
-			$novolayer->set("opacity",$_GET["opacidade"]);
+		    if(ms_GetVersionInt() >= 7){
+		      $novolayer->updateFromString('LAYER COMPOSITE OPACITY '.$_GET["opacidade"].'END END');
+			} else {
+			    $novolayer->set("opacity",$_GET["opacidade"]);
+			}
 		}
 		$map->save($map_file);
 		$retorno = $nameLayer;
diff --git a/ferramentas/markercluster/exec.php b/ferramentas/markercluster/exec.php
index a30cc9d..80fd6d1 100755
--- a/ferramentas/markercluster/exec.php
+++ b/ferramentas/markercluster/exec.php
@@ -22,7 +22,12 @@ Adiciona ao mapa uma nova camada para calculo do mapa de cluster
 		$novolayer->setmetadata("PLUGINI3GEO",$parametros);
 		$novolayer->set("name",$nameLayer);
 		$novolayer->setmetadata("tema",$_GET["titulo"]);
-		$novolayer->set("opacity",$_GET["opacidade"]);
+		if(ms_GetVersionInt() >= 7){
+		    $novolayer->updateFromString('LAYER COMPOSITE OPACITY '.$_GET["opacidade"].'END END');
+		} else {
+		    $novolayer->set("opacity",$_GET["opacidade"]);
+		}
+
 		$novolayer->set("group","");
 		$map->save($map_file);
 		$retorno = $nameLayer;
diff --git a/ferramentas/metaestat/analise.php b/ferramentas/metaestat/analise.php
index 3e94a82..0b7a156 100755
--- a/ferramentas/metaestat/analise.php
+++ b/ferramentas/metaestat/analise.php
@@ -266,7 +266,12 @@ function classes2preenchimento($map_file,$tema,$tipo){
 	$layer = ms_newLayerObj($mapa,$l);
 	$l->set("status",MS_OFF);
 	$layer->set("status",MS_DEFAULT);
-	$layer->set("opacity",50);
+
+	if(ms_GetVersionInt() >= 7){
+	    $layer->updateFromString('LAYER COMPOSITE OPACITY 50 END END');
+	} else {
+	    $layer->set("opacity",50);
+	}
 	$layer->set("name",$nome);
 	if($layer->type != MS_LAYER_POLYGON){
 		return "";
@@ -336,7 +341,11 @@ function classes2circulos($map_file,$tema,$tipo){
 	$layer = ms_newLayerObj($mapa,$l);
 	$l->set("status",MS_OFF);
 	$layer->set("status",MS_DEFAULT);
-	$layer->set("opacity",50);
+	if(ms_GetVersionInt() >= 7){
+	    $layer->updateFromString('LAYER COMPOSITE OPACITY 50 END END');
+	} else {
+	    $layer->set("opacity",50);
+	}
 
 	$layer->set("name",$nome);
 	$meta = new MetaestatInfo();
@@ -388,7 +397,11 @@ function classes2circulos($map_file,$tema,$tipo){
 		$max = max($valores);
 		$layer->setmetadata("tema",$layer->getmetadata("tema")." - cont");
 		$layer->set("type",MS_LAYER_CHART);
-		$layer->set("opacity",60);
+		if(ms_GetVersionInt() >= 7){
+		    $layer->updateFromString('LAYER COMPOSITE OPACITY 60 END END');
+		} else {
+		    $layer->set("opacity",60);
+		}
 		$layer->setprocessing("CHART_TYPE=pie");
 		$layer->setprocessing("CHART_SIZE_RANGE=".$medidavariavel["colunavalor"]." 10 150 ".$min." ".$max);
 		if ($numclasses > 0){
diff --git a/ferramentas/safe.php b/ferramentas/safe.php
index 87b9dda..fa7856a 100755
--- a/ferramentas/safe.php
+++ b/ferramentas/safe.php
@@ -1,5 +1,6 @@
 <?php
 include_once (dirname(__FILE__)."/../classesphp/sani_request.php");
+
 $_GET = array_merge($_GET,$_POST);
 //
 //$fingerprint e usado para verificar se o usuario veio do i3geo
@@ -30,6 +31,7 @@ else{
 	$g_sid = "";
 	$fingerprint = "";
 }
+
 //variaveis mais utilizadas
 $tema = $_GET["tema"];
 if(isset($_GET["ext"])){
@@ -47,6 +49,7 @@ if(!empty($fingerprint) && !empty($g_sid))	{
 		return;
 	}
 }
+
 include_once(dirname(__FILE__)."/../ms_configura.php");
 include_once(dirname(__FILE__)."/blacklist.php");
 include_once(dirname(__FILE__)."/../classesphp/classe_vermultilayer.php");
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/ga.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/ga.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/ga.js
diff --git a/mashups/listaDeFerramentas.js b/mashups/listaDeFerramentas.js
new file mode 100644
index 0000000..888d845
--- /dev/null
+++ b/mashups/listaDeFerramentas.js
@@ -0,0 +1,618 @@
+if (typeof (i3GEO) === 'undefined') {
+	var i3GEO = {};
+}
+i3GEO.listaDeFerramentas = {
+			menu : [
+				{
+					nome : $trad("s1"),
+					descricao: $trad("descMenuAjuda"),
+					id : "ajudaMenu"
+				},
+				{
+					nome : $trad("s2"),
+					descricao: $trad("descMenuAnalise"),
+					id : "analise"
+				},
+				{
+					nome : $trad("s4"),
+					descricao: $trad("descArquivos"),
+					id : "arquivos"
+				},
+				{
+					nome : $trad("operacoesMapaTema"),
+					descricao:  $trad("descOperacoesMapaTema"),
+					id : "ferramentas"
+				}
+			],
+			submenus : {
+				"ajudaMenu" : [
+					{
+						id : "omenudataAjudamenu9",
+						text : $trad("x68"),
+						url : "javascript:i3GEO.janela.tempoMsg(i3GEO.parametros.mensageminicia)"
+					},
+					{
+						id : "omenudataAjudamenu2",
+						text : $trad("u2"),
+						url : "javascript:i3GEO.ajuda.abreDoc()"
+					},
+					{
+						id : "omenudataAjudamenu3",
+						text : $trad("u4a"),
+						url : "javascript:i3GEO.ajuda.abreDoc('/documentacao/manual-i3geo-6_0-pt.pdf')"
+					},
+					{
+						id : "omenudataAjudamenu4",
+						text : "Youtube",
+						url : "https://www.youtube.com/results?search_query=i3geo",
+						target : "_blank"
+					},
+					{
+						id : "omenudataAjudamenu5",
+						text : $trad("u5a"),
+						url : "http://www.softwarepublico.gov.br",
+						target : "_blank"
+					},
+					{
+						id : "omenudataAjudamenu1",
+						text : $trad("x67"),
+						url : "https://softwarepublico.gov.br/social/i3geo",
+						target : "_blank"
+					},
+					{
+						id : "omenudataAjudamenu7",
+						text : "Git",
+						url : "https://softwarepublico.gov.br/gitlab/groups/i3geo",
+						target : "_blank"
+					}
+				],
+				"analise" : [
+					{
+						id : "omenudataMedir",
+						text : $trad("medir"),
+						submenu : {
+							id : "subAnaliseMedir",
+							itemdata : [
+								[
+									{
+										id : "omenudataMedirArea",
+										text : $trad("d21at"),
+										url : "javascript:i3GEO.analise.dialogo.area()"
+									},
+									{
+										id : "omenudataMedirDist",
+										text : $trad("d21t"),
+										url : "javascript:i3GEO.analise.dialogo.distancia()"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataAnalise1",
+						text : $trad("u22"),
+						submenu : {
+							id : "subAnalise1",
+							itemdata : [
+								[
+									{
+										id : "omenudataAnalise2",
+										text : $trad("u7"),
+										url : "javascript:i3GEO.analise.dialogo.gradePol()"
+									},
+									{
+										id : "omenudataAnalise3",
+										text : $trad("u8"),
+										url : "javascript:i3GEO.analise.dialogo.gradePontos()"
+									},
+									{
+										id : "omenudataAnalise4",
+										text : $trad("u9"),
+										url : "javascript:i3GEO.analise.dialogo.gradeHex()"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataAnalise5",
+						text : $trad("u23"),
+						submenu : {
+							id : "subAnalise2",
+							itemdata : [
+								[
+									{
+										id : "omenudataAnalise6",
+										text : $trad("u11a"),
+										url : "javascript:i3GEO.analise.dialogo.distanciaptpt()"
+									},
+									{
+										id : "omenudataAnalise7",
+										text : $trad("u12"),
+										url : "javascript:i3GEO.analise.dialogo.nptPol()"
+									},
+									{
+										id : "omenudataAnalise8",
+										text : $trad("u13"),
+										url : "javascript:i3GEO.analise.dialogo.pontoempoligono()"
+									},
+									{
+										id : "omenudataAnalise9",
+										text : $trad("u14"),
+										url : "javascript:i3GEO.analise.dialogo.pontosdistri()"
+									},
+									{
+										id : "omenudataAnalise9a",
+										text : $trad("u28"),
+										url : "javascript:i3GEO.analise.dialogo.centromassa()"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataAnalise10",
+						text : $trad("u24"),
+						submenu : {
+							id : "subAnalise3",
+							itemdata : [
+								[
+									{
+										id : "omenudataAnalise11",
+										text : $trad("u25"),
+										url : "javascript:i3GEO.analise.dialogo.dissolve()"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataAnalise12",
+						text : $trad("u27"),
+						submenu : {
+							id : "subAnalise5",
+							itemdata : [
+								[
+									{
+										id : "omenudataAnalise13",
+										text : $trad("u6"),
+										url : "javascript:i3GEO.analise.dialogo.analisaGeometrias()"
+									},
+									{
+										id : "omenudataAnalise14",
+										text : $trad("u10"),
+										url : "javascript:i3GEO.analise.dialogo.buffer()"
+									},
+									{
+										id : "omenudataAnalise15",
+										text : $trad("u26"),
+										url : "javascript:i3GEO.analise.dialogo.agrupaElementos()"
+									},
+									{
+										id : "omenudataAnalise16",
+										text : $trad("u11"),
+										url : "javascript:i3GEO.analise.dialogo.centroide()"
+									},
+									{
+										id : "omenudataAnalise17",
+										text : $trad("t37b"),
+										url : "javascript:i3GEO.analise.dialogo.graficoInterativo1()"
+									},
+									{
+										id : "omenudataAnalise21",
+										text : $trad("x102"),
+										url : "javascript:i3GEO.analise.dialogo.heatmap()"
+									},
+									{
+										id : "omenudataAnalise22",
+										text : $trad("x104"),
+										url : "javascript:i3GEO.analise.dialogo.markercluster()"
+									},
+									{
+										id : "omenudataAnalise24",
+										text : $trad("melhorcaminho"),
+										url : "javascript:i3GEO.analise.dialogo.melhorcaminho()"
+									}
+								]
+							]
+						}
+					}
+				],
+				"arquivos" : [
+					{
+						id : "omenudataArquivos1",
+						text : $trad("u17"),
+						url : "javascript:i3GEO.mapa.dialogo.salvaMapa()"
+					},
+					{
+						id : "omenudataArquivos2",
+						text : $trad("u18"),
+						url : "javascript:i3GEO.mapa.dialogo.carregaMapa()"
+					},
+					{
+						id : "omenudataArquivos6",
+						text : $trad("x72"),
+						url : "javascript:i3GEO.mapa.dialogo.listaDeMapasBanco()"
+					},
+					{
+						id : "omenudataArquivos4",
+						text : $trad("u20"),
+						url : "javascript:i3GEO.mapa.dialogo.convertews()"
+					},
+					{
+						id : "omenudataArquivos5",
+						text : $trad("u20a"),
+						url : "javascript:i3GEO.mapa.dialogo.convertekml()"
+					}
+				],
+				"interface" : [
+					{
+						id : "omenudataInterface0a",
+						text : $trad("d27"),
+						submenu : {
+							id : "subInt1",
+							itemdata : [
+								[
+									{
+										id : "omenudataInterface2",
+										text : "OpenLayers",
+										url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid"
+									},
+									{
+										id : "omenudataInterface2a",
+										text : "OpenLayers OSM",
+										url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid"
+									},
+									{
+										id : "omenudataInterface4",
+										text : "Google Maps",
+										url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataInterface0b",
+						text : $trad("u27"),
+						submenu : {
+							id : "subInt2",
+							itemdata : [
+								[
+									{
+										id : "omenudataInterface6",
+										text : $trad("u21"),
+										url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')"
+									},
+									{
+										id : "omenudataInterface7",
+										text : "Servi&ccedil;os WMS",
+										url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')"
+									},
+									{
+										id : "omenudataInterface9",
+										text : "Download de dados",
+										url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')"
+									}
+								]
+							]
+						}
+					}
+				],
+				"ferramentas" : [
+					// mapas
+					// apos modificar, veja se a ferramenta i3GEO.mapa.dialogo.ferramentas() vai funcionar
+					// essa ferramenta faz um parser das strings existentes em text e url
+					// text deve sempre ter a tag </span> e url deve sempre ter javascript:
+					//
+					{
+						id : "omenudataFerramentas0a",
+						text : $trad("g4a"),
+						submenu : {
+							id : "mapa",
+							itemdata : [
+								[
+									{
+										id : "omenudataFerramentas5a",
+										text : $trad("x59"),
+										url : "javascript:i3GEO.mapa.dialogo.locregiao()"
+									},
+									{
+										id : "omenudataFerramentas6a",
+										text : $trad("x61"),
+										url : "javascript:i3GEO.mapa.dialogo.filtraregiao()"
+									},
+									{
+										id : "omenudataFerramentas1a",
+										text : $trad("t20"),
+										url : "javascript:i3GEO.mapa.dialogo.opacidade()"
+									},
+									{
+										id : "omenudataFerramentas2a",
+										text : $trad("p21"),
+										url : "javascript:i3GEO.mapa.dialogo.animacao()"
+									},
+									{
+										id : "omenudataFerramentas3a",
+										text : $trad("d24t"),
+										url : "javascript:i3GEO.mapa.dialogo.selecao();"
+									},
+									{
+										id : "omenudataFerramentas11",
+										text : $trad("d22t"),
+										url : "javascript:i3GEO.mapa.dialogo.cliquePonto()"
+									},
+									{
+										id : "omenudataFerramentas12",
+										text : $trad("d25t"),
+										url : "javascript:i3GEO.mapa.dialogo.cliqueTexto()"
+									},
+									{
+										id : "omenudataImprimir",
+										text : $trad("d12"),
+										url : "javascript:i3GEO.mapa.dialogo.imprimir()"
+									},
+									{
+										id : "omenudataTipoImg",
+										text : $trad("p2"),
+										url : "javascript:i3GEO.mapa.dialogo.tipoimagem()"
+									},
+									{
+										id : "omenudataCorFundo",
+										text : $trad("p9"),
+										url : "javascript:i3GEO.mapa.dialogo.corFundo()"
+									},
+									{
+										id : "gradeCoordenadas",
+										text : $trad("p10"),
+										url : "javascript:i3GEO.mapa.dialogo.gradeCoord()"
+									},
+									{
+										id : "mascara",
+										text : $trad("mascara"),
+										url : "javascript:i3GEO.mapa.dialogo.mascara()"
+									},
+									{
+										id : "wkt2layer",
+										text : $trad("wkt2layer"),
+										url : "javascript:i3GEO.mapa.dialogo.wkt2layer()"
+									},
+									{
+										id : "omenudataFerramentasCliqueGrafico",
+										text : $trad("d23t"),
+										url : "javascript:i3GEO.mapa.dialogo.cliqueGrafico()"
+									}
+								]
+							]
+						}
+					},
+					// temas
+					{
+						id : "omenudataFerramentas0b",
+						text : $trad("a7"),
+						submenu : {
+							id : "camada",
+							itemdata : [
+								[
+									{
+										id : "omenudataFerramentas1b",
+										text : $trad("t31"),
+										url : "javascript:i3GEO.tema.dialogo.tabela()"
+									},
+									{
+										id : "omenudataFerramentas2b",
+										text : $trad("t23"),
+										url : "javascript:i3GEO.tema.dialogo.procuraratrib()" //feramentas/busca
+									},
+									{
+										id : "omenudataFerramentas3b",
+										text : $trad("t25"),
+										url : "javascript:i3GEO.tema.dialogo.toponimia()"
+									},
+									{
+										id : "omenudataFerramentas4b",
+										text : $trad("t27"),
+										url : "javascript:i3GEO.tema.dialogo.etiquetas()"
+									},
+									{
+										id : "omenudataFerramentas5b",
+										text : $trad("t29"),
+										url : "javascript:i3GEO.tema.dialogo.filtro()"
+									},
+									{
+										id : "omenudataFerramentas6b",
+										text : $trad("t33"),
+										url : "javascript:i3GEO.tema.dialogo.editaLegenda()"
+									},
+									/*
+									{
+										id : "omenudataFerramentas7b",
+										text : $trad("t42"),
+										url : "javascript:i3GEO.tema.dialogo.cortina()"
+									},
+									*/
+									{
+										id : "omenudataFerramentas8b",
+										text : $trad("t37a"),
+										url : "javascript:i3GEO.tema.dialogo.graficotema()"
+									},
+									{
+										id : "omenudataFerramentas9b",
+										text : $trad("t37b"),
+										url : "javascript:i3GEO.analise.dialogo.graficoInterativo1()"
+									},
+									{
+										id : "omenudataFerramentasmmscale",
+										text : $trad("variaEscala"),
+										url : "javascript:i3GEO.tema.dialogo.mmscale()"
+									},
+									{
+										id : "omenudataFerramentas3e",
+										text : $trad("t49"),
+										url : "javascript:i3GEO.tema.dialogo.tme()"
+									},
+									{
+										id : "omenudataFerramentasStoryMap",
+										text : "StoryMap",
+										url : "javascript:i3GEO.tema.dialogo.storymap()"
+									},
+									{
+										id : "omenudataFerramentasAnimagif",
+										text : "Anima Gif",
+										url : "javascript:i3GEO.tema.dialogo.animagif()"
+									}
+								]
+							]
+						}
+					},
+					// cartogramas
+					{
+						id : "omenudataFerramentas0e",
+						text : $trad("x60"),
+						submenu : {
+							id : "subFerr3",
+							itemdata : [
+								[
+									{
+										id : "omenudataFerramentas1e",
+										text : $trad("x57"),
+										url : "javascript:i3GEO.mapa.dialogo.metaestat()"
+									}
+									/* TODO ver se reativa isso
+									,
+									{
+										id : "omenudataFerramentas4e",
+										text : $trad("x71"),
+										url : "javascript:i3GEO.mapa.dialogo.metaestatListaMapas()"
+									}
+									*/
+								]
+							]
+						}
+					},
+					// conexoes
+					{
+						id : "omenudataFerramentas0c",
+						text : $trad("a15"),
+						submenu : {
+							id : "subFerr4",
+							itemdata : [
+								[
+									{
+										id : "omenudataFerramentas14",
+										text : $trad("conexaoServicoGeo"),
+										url : "javascript:i3GEO.arvoreDeTemas.dialogo.conectaservico()"
+									}
+									/* TODO reativar?,
+									{
+										id : "omenudataFerramentas9i",
+										text : $trad("x85"),
+										url : "javascript:i3GEO.arvoreDeTemas.dialogo.vinde()"
+									}
+									*/
+								]
+							]
+						}
+					},
+					// upload
+					{
+						id : "omenudataFerramentas0d",
+						text : 'Upload',
+						submenu : {
+							id : "subFerr5",
+							itemdata : [
+								[
+									{
+										id : "omenudataFerramentas13",
+										text : $trad("uploadArquivoGeo"),
+										url : "javascript:i3GEO.arvoreDeTemas.dialogo.uploadarquivo()"
+									}
+								]
+							]
+						}
+					},
+					//navegacao
+					{
+						id : "omenudataNavegacao1",
+						text : $trad("x105"),
+						submenu : {
+							id : "subAnalise4",
+							itemdata : [
+								[
+									{
+										id : "omenudataAnalise18",
+										text : $trad("d30"),
+										url : "javascript:i3GEO.analise.dialogo.linhaDoTempo()"
+									},
+									{
+										id : "omenudataNavegacao2",
+										text : $trad("d15t"),
+										url : "javascript:i3GEO.navega.dialogo.google()"
+									},
+									/*
+									{
+										id : "omenudataNavegacao3",
+										text : $trad("d9t"),
+										url : "javascript:i3GEO.maparef.inicia()"
+									},
+									*/
+									{
+										id : "omenudataNavegacao4",
+										text : $trad("d8t"),
+										url : "javascript:i3GEO.mapa.dialogo.mostraExten()"
+									},
+									{
+										id : "omenudataNavegacaoWiki",
+										text : $trad("d11t"),
+										url : "javascript:i3GEO.navega.dialogo.wiki()"
+									},
+									{
+										id : "omenudataNavegacaoMetar",
+										text : $trad("d29"),
+										url : "javascript:i3GEO.navega.dialogo.metar()"
+									},
+									{
+										id : "omenudataNavegacaoFotos",
+										text : "Fotos",
+										url : "javascript:i3GEO.navega.dialogo.buscaFotos()"
+									},
+									{
+										id : "omenudataNavegacaoConfluence",
+										text : $trad("d17t"),
+										url : "javascript:i3GEO.navega.dialogo.confluence()"
+									},
+									/*
+									{
+										id : "omenudataNavegacaoLente",
+										text : $trad("d18t"),
+										url : "javascript:i3GEO.navega.lente.inicia()"
+									},
+									*/
+									{
+										id : "omenudataFerramentas7a",
+										text : $trad("x64a"),
+										url : "javascript:i3GEO.mapa.dialogo.congelaMapa();"
+									},
+									{
+										id : "omenudataFerramentas8a",
+										text : $trad("p12"),
+										url : "javascript:i3GEO.mapa.dialogo.autoredesenha()"
+									},
+									{
+										id : "omenudataFerramentas10",
+										text : $trad("x93"),
+										url : "javascript:i3GEO.mapa.dialogo.geolocal()"
+									}
+								]
+							]
+						}
+					},
+					{
+						id : "omenudataBarraEdicao",
+						text : $trad("u29"),
+						url : "javascript:i3GEO.editor.inicia()",
+						Interface : "openlayers" //so para a interface openlayers
+					}
+				]
+			}
+};
\ No newline at end of file
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index d46dcef..0272bdd 100755
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -441,7 +441,7 @@ function ajuda()
 <script src="../pacotes/ol4/ol.js"></script>
 <script src="../js/i3geo.js"></script>
 <!-- lista com os links que serao mostrados na guia ferramentas -->
-<script src="../js/listaDeFerramentas.js"></script>
+<script src="listaDeFerramentas.js"></script>
 <!-- configuracoes default tipo pode ser OL (openLayers) ou GM (googlemaps) -->
 <script src="../interface/config.php?tipo=OL"></script>
 <script src="../ferramentas/editorol/editorol.js"></script>
diff --git a/ms_configura.php b/ms_configura.php
index 5c2a187..1b5e583 100755
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -318,7 +318,7 @@ inseretxt,mostraexten,outputformat,perfil,tipoimagem
 
 */
 //$i3geoBlFerramentas = array("saiku");
-$i3geoBlFerramentas = array("");
+$i3geoBlFerramentas = array();
 /*
 Variable: $ogrOutput
 
--
libgit2 0.21.2