From 04336c5069fd4bb852914db611f257f8501b1040 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 22 Dec 2012 18:09:56 +0000
Subject: [PATCH] 

---
 classesjs/classe_analise.js       |  1 -
 classesjs/classe_interface.js     | 16 +++++++++++-----
 classesjs/classe_util.js          |  7 ++++---
 ferramentas/identifica/index.js   |  4 ++++
 pacotes/google/keydragzoom.js.php |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/classesjs/classe_analise.js b/classesjs/classe_analise.js
index 4d03498..7ff262b 100644
--- a/classesjs/classe_analise.js
+++ b/classesjs/classe_analise.js
@@ -388,7 +388,6 @@ i3GEO.analise = {
 						}
 						if(i3GEO.Interface.ATUAL === "googleearth")
 						{i3GEO.Interface.googleearth.insereMarca(d+" km",objposicaocursor.ddx,objposicaocursor.ddy,"","divGeometriasTemp");}
-
 					}
 					//cria a linha ligando os dois ultimos pontos
 					if(i3GEO.Interface.ATUAL === "googleearth"){
diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js
index d5d567c..215b0a5 100644
--- a/classesjs/classe_interface.js
+++ b/classesjs/classe_interface.js
@@ -1463,6 +1463,16 @@ i3GEO.Interface = {
 				catch(e){alert(e);return;}
 				if(dobra)
 				{$i(i3GEO.Interface.IDMAPA).appendChild(dobra);}
+
+				i3GeoMap.setMapTypeId(i3GEO.Interface.googlemaps.TIPOMAPA);
+				sw = new google.maps.LatLng(ret[1],ret[0]);
+				ne = new google.maps.LatLng(ret[3],ret[2]);
+
+				i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
+
+				//FIXME Isso provoca um loop infinito e trava
+				//i3GeoMap.setZoom(i3GeoMap.getZoom()+1);
+
 				//
 				//carrega o javascript que permite fazer o zoom por box
 				//
@@ -1470,11 +1480,6 @@ i3GEO.Interface = {
 					js = i3GEO.configura.locaplic+"/pacotes/google/keydragzoom.js.php";
 					i3GEO.util.scriptTag(js,"i3GEO.Interface.googlemaps.ativaZoomBox()","keydragzoom_script");
 				}
-				i3GeoMap.setMapTypeId(i3GEO.Interface.googlemaps.TIPOMAPA);
-				sw = new google.maps.LatLng(ret[1],ret[0]);
-				ne = new google.maps.LatLng(ret[3],ret[2]);
-				i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
-
 				i3GeoMapOverlay = new google.maps.OverlayView();
 				i3GeoMapOverlay.draw = function() {};
 
@@ -1785,6 +1790,7 @@ i3GEO.Interface = {
 				sw = new google.maps.LatLng(ret[1],ret[0]),
 				ne = new google.maps.LatLng(ret[3],ret[2]);
 			i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
+			//i3GeoMap.setZoom(i3GeoMap.getZoom()+1);
 		},
 		pan2ponto: function(x,y){
 			i3GeoMap.panTo(new google.maps.LatLng(y,x));
diff --git a/classesjs/classe_util.js b/classesjs/classe_util.js
index d0546b8..a332615 100644
--- a/classesjs/classe_util.js
+++ b/classesjs/classe_util.js
@@ -671,7 +671,7 @@ i3GEO.util = {
 	array[top,left] - valores em pixel da posicao calculada da imagem
 	*/
 	posicionaImagemNoMapa: function(id,x,y){
-		if(typeof(console) !== 'undefined'){console.info("i3GEO.util.posicionaImagemNoMapa()");}
+		if(typeof(console) !== 'undefined'){console.warn("i3GEO.util.posicionaImagemNoMapa()");}
 		var i,mx,my;
 		if(x && x != "")
 		{objposicaocursor.telax = x;}
@@ -680,10 +680,11 @@ i3GEO.util = {
 		i = $i(id);
 		mx = parseInt(i.style.width,10) / 2;
 		my = parseInt(i.style.height,10) / 2;
+		//alert(objposicaocursor.telax+" "+objposicaocursor.telay)
 		i.style.position = "absolute";
-		i.style.top = objposicaocursor.telay - my + "px";
+		i.style.top = objposicaocursor.telay + "px";
 		i.style.left = objposicaocursor.telax - mx + "px";
-		return [objposicaocursor.telay - my,objposicaocursor.telax - mx];
+		return [objposicaocursor.telay + my,objposicaocursor.telax - mx];
 	},
 	/*
 	Function: escondePin
diff --git a/ferramentas/identifica/index.js b/ferramentas/identifica/index.js
index 29d3c5b..092dc7b 100644
--- a/ferramentas/identifica/index.js
+++ b/ferramentas/identifica/index.js
@@ -547,6 +547,10 @@ i3GEOF.identifica = {
 	*/
 	buscaDadosTema: function(tema){
 		var res,opcao,resolucao,listaDeTemas="",temp;
+		if(tema == ""){
+			i3GEOF.identifica.criaJanelaFlutuante();
+			return;
+		}
 		try{
 			$i("i3GEOidentificaocorrencia").innerHTML = "<img src='"+i3GEO.configura.locaplic+"/imagens/aguarde.gif' />";
 			res = $i("i3GEOidentificaresolucao");
diff --git a/pacotes/google/keydragzoom.js.php b/pacotes/google/keydragzoom.js.php
index 201875d..c3b4729 100644
--- a/pacotes/google/keydragzoom.js.php
+++ b/pacotes/google/keydragzoom.js.php
@@ -461,9 +461,9 @@
    */
   DragZoom.prototype.onMouseUp_ = function (e) {
     this.mouseDown_ = false;
+    if (this.dragging_) {
       //desativa o clique permanente
       i3GEO.eventos.cliquePerm.ativa();
-    if (this.dragging_) {
       var left = Math.min(this.startPt_.x, this.endPt_.x);
       var top = Math.min(this.startPt_.y, this.endPt_.y);
       var width = Math.abs(this.startPt_.x - this.endPt_.x);
--
libgit2 0.21.2