From d8b5a0907157b3ef8bd4a629915f12d14ea5880c Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 9 May 2011 22:04:53 +0000
Subject: [PATCH] 

---
 classesjs/classe_configura.js    | 2 +-
 classesjs/classe_guias.js        | 6 +++---
 classesjs/classe_interface.js    | 6 ++++--
 ferramentas/selecao/index.js.php | 2 +-
 interface/openlayers.htm         | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/classesjs/classe_configura.js b/classesjs/classe_configura.js
index d0a9255..da47c9f 100644
--- a/classesjs/classe_configura.js
+++ b/classesjs/classe_configura.js
@@ -687,7 +687,7 @@ i3GEO.configura = {
 				marcadorZoom = "";
 				if(i3GEO.Interface.ATUAL==="openlayers"){
 					if(i3GEO.Interface.TABLET === false)
-					{OLpanel.activateControl(OLpan);}
+					{OLpanel.activateControl(i3GEO.Interface.openlayers.OLpan);}
 					return;
 				}
 				panMapaInicia = function(exy){
diff --git a/classesjs/classe_guias.js b/classesjs/classe_guias.js
index d860601..caee087 100644
--- a/classesjs/classe_guias.js
+++ b/classesjs/classe_guias.js
@@ -243,9 +243,9 @@ i3GEO.guias = {
 		//
 		//obtém outras guias que podem existir no mapa
 		//
-		var nguiasreal = 0,onf,outf,guiaconteudo,id,guia,guias,nguias,g,re,ng,tituloguia,i,ins,largura,altura;
-		CONFIGURA = i3GEO.guias.CONFIGURA,
-		guias = i3GEO.util.listaChaves(CONFIGURA);
+		var nguiasreal = 0,onf,outf,guiaconteudo,id,guia,guias,nguias,g,re,ng,tituloguia,i,ins,largura,altura,
+			CONFIGURA = i3GEO.guias.CONFIGURA,
+			guias = i3GEO.util.listaChaves(CONFIGURA);
 		
 		try{
 			nguias = guias.length;
diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js
index 2826501..d722a8e 100644
--- a/classesjs/classe_interface.js
+++ b/classesjs/classe_interface.js
@@ -829,10 +829,10 @@ i3GEO.Interface = {
 				//estes controles ficam invisíveis e são usados quando os ícones default do i3geo são ativados
 				//
 				if(i3GEO.Interface.TABLET === false){
-					OLpan = new OpenLayers.Control.Navigation();
+					i3GEO.Interface.openlayers.OLpan = new OpenLayers.Control.Navigation();
 					OLzoom = new OpenLayers.Control.ZoomBox();
 					OLpanel = new OpenLayers.Control.Panel();
-					OLpanel.addControls([OLpan,OLzoom]);
+					OLpanel.addControls([i3GEO.Interface.openlayers.OLpan,OLzoom]);
 					i3geoOL.addControl(OLpanel);
 				}
 				openlayers.ativaBotoes();
@@ -1106,6 +1106,8 @@ i3GEO.Interface = {
 				p = e.xy;
 				//altera o indicador de localizacao
 				lonlat = i3geoOL.getLonLatFromPixel(p);
+				if(!lonlat)
+				{return;}
 				d = i3GEO.calculo.dd2dms(lonlat.lon,lonlat.lat);
 				try{
 					objposicaocursor.ddx = lonlat.lon;
diff --git a/ferramentas/selecao/index.js.php b/ferramentas/selecao/index.js.php
index 160854a..470d42a 100644
--- a/ferramentas/selecao/index.js.php
+++ b/ferramentas/selecao/index.js.php
@@ -398,7 +398,7 @@ i3GEOF.selecao = {
 			{alert("Escolha um tema");return;}
 			if(g_tipoacao !== 'selecaobox')
 			{return;}
-			i3geoOL.removeControl(OLpanel);
+			i3geoOL.removeControl(i3GEO.Interface.openlayers.OLpan);
 			i3GEOF.selecao.box.criaBox();
 			adicionaxyBox = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
 			var i = $i("i3geoboxSel").style;
diff --git a/interface/openlayers.htm b/interface/openlayers.htm
index 7ce4ecd..aa208ed 100644
--- a/interface/openlayers.htm
+++ b/interface/openlayers.htm
@@ -145,7 +145,7 @@
 	</td>
 </tr>
 </table>
-<script src="../classesjs/i3geo.js"></script>
+<script src="../classesjs/i3geonaocompacto.js"></script>
 <script src="../pacotes/openlayers/OpenLayers29.js.php"></script>
 <script>
 /*
@@ -252,6 +252,7 @@ OpenLayers.ImgPath = "../pacotes/openlayers/img/";
 		{layers:""},
 		{isBaseLayer:true,visibility:false}
 	);
+	
 	i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ims,wsm,bra,osm];
 })();
 //
--
libgit2 0.21.2