From f587489b9c4c5b07d143af40b1ecca60285cd067 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 30 Sep 2015 22:05:06 +0000
Subject: [PATCH] 

---
 ferramentas/editorol/editorol.js | 5 +++++
 ferramentas/identifica/index.js  | 2 +-
 js/analise.js                    | 2 ++
 js/configura.js                  | 2 ++
 js/interface.js                  | 3 +++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ferramentas/editorol/editorol.js b/ferramentas/editorol/editorol.js
index ecf069e..3ac39ec 100755
--- a/ferramentas/editorol/editorol.js
+++ b/ferramentas/editorol/editorol.js
@@ -1106,12 +1106,14 @@ i3GEO.editorOL =
 				temp.className = "editorOLlinhaItemInactive olButton";
 				temp.title = $trad("dlinha");
 				temp.onclick = function(){
+					i3GEO.eventos.cliquePerm.desativa();
 					i3GEO.editorOL.marcaBotao("editorOLlinha");
 					var draw = new ol.interaction.Draw({
 						type : "LineString"
 					});
 					//adiciona a interacao para poder ser removida
 					i3GEO.editorOL.interacoes.push(draw);
+					//desativa ol.interaction.DoubleClickZoom
 					i3GEO.Interface.openlayers.interacoes[0].setActive(false);
 					draw.on("drawend", function(evt) {
 						evt.feature.setStyle(
@@ -1138,10 +1140,12 @@ i3GEO.editorOL =
 			}
 			//TODO falta definir imagem
 			if (botoes.ponto === true) {
+				i3GEO.eventos.cliquePerm.desativa();
 				temp = document.createElement("div");
 				temp.className = "editorOLpontoItemInactive olButton";
 				temp.title = $trad("dponto");
 				temp.onclick = function(){
+					i3GEO.eventos.cliquePerm.desativa();
 					i3GEO.editorOL.marcaBotao("editorOLponto");
 					var draw = new ol.interaction.Draw({
 						type : "Point"
@@ -1176,6 +1180,7 @@ i3GEO.editorOL =
 				i3GEOpanelEditor.appendChild(temp);
 			}
 			if (botoes.poligono === true) {
+				i3GEO.eventos.cliquePerm.desativa();
 				temp = document.createElement("div");
 				temp.className = "editorOLpoligonoItemInactive olButton";
 				temp.title = $trad("dpoligono");
diff --git a/ferramentas/identifica/index.js b/ferramentas/identifica/index.js
index 0caebd8..b7667fb 100644
--- a/ferramentas/identifica/index.js
+++ b/ferramentas/identifica/index.js
@@ -434,7 +434,7 @@ i3GEOF.identifica =
 		 */
 		ativaFoco : function(id) {
 			i3GEOF.identifica.listaTemas("ligados");
-			i3GEO.util.mudaCursor(i3GEO.configura.cursores, temp, i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
+			i3GEO.util.mudaCursor(i3GEO.configura.cursores, "identifica", i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
 			// i3GEOF.identifica.mostraImagemPonto(id);
 		},
 		mostraImagemPonto : function(id) {
diff --git a/js/analise.js b/js/analise.js
index 828702e..1d1da66 100644
--- a/js/analise.js
+++ b/js/analise.js
@@ -713,6 +713,7 @@ i3GEO.analise =
 				 * atributo "origem" Os raios e pontos sao sempre removidos
 				 */
 				fechaJanela : function() {
+					i3GEO.Interface.openlayers.interacoes[0].setActive(false);
 					var m = i3GEO.analise.medeDistancia.openlayers;
 					ol.Observable.unByKey(m.featureListener);
 					m.featureListener = null;
@@ -1300,6 +1301,7 @@ i3GEO.analise =
 				 * atributo "origem" Os raios e pontos sao sempre removidos
 				 */
 				fechaJanela : function() {
+					i3GEO.Interface.openlayers.interacoes[0].setActive(true);
 					var m = i3GEO.analise.medeArea.openlayers;
 					ol.Observable.unByKey(m.featureListener);
 					m.featureListener = null;
diff --git a/js/configura.js b/js/configura.js
index 70f02ab..a7bd4b6 100755
--- a/js/configura.js
+++ b/js/configura.js
@@ -1382,6 +1382,7 @@ i3GEO.configura =
 							i3GEO.util.mudaCursor(i3GEO.configura.cursores, temp, i3GEO.Interface.IDMAPA, i3GEO.configura.locaplic);
 						}
 						i3GEO.barraDeBotoes.ativaIcone("identifica");
+						i3GEO.eventos.cliquePerm.desativa();
 						if (i3GEO.eventos.cliquePerm.ativo === false) {
 							// caso seja um clique para desativar
 							if (i3GEO.eventos.MOUSECLIQUE.toString().search(i3GEO.configura.funcaoIdentifica) >= 0) {
@@ -1428,6 +1429,7 @@ i3GEO.configura =
 							i3GEO.eventos.removeEventos("MOUSECLIQUEPERM",[i3GEO.configura.funcaoIdentifica]);
 							i3GEO.eventos.adicionaEventos("MOUSECLIQUEPERM",[i3GEO.configura.funcaoTip]);
 						}
+						i3GEO.eventos.cliquePerm.ativa();
 					}
 				},
 				{
diff --git a/js/interface.js b/js/interface.js
index aff6d8e..b7245fa 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -751,6 +751,9 @@ i3GEO.Interface =
 				if (p.classeCadeado === "i3GEOiconeAberto") {
 					removeBaloes();
 				}
+				if (i3GEO.eventos.cliquePerm.ativo === false) {
+					return;
+				}
 				painel = document.createElement("div");
 				painel.style.minWidth = p.minWidth;
 				painel.className = "ol-popup";
--
libgit2 0.21.2