From 330a1da28f915b098922e549a62f006e951d6d3b Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 30 Nov 2015 14:45:17 +0000
Subject: [PATCH] 

---
 interface/osmdebug.htm | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------
 js/util.js             |  42 +++++++++++++++++-------------------------
 2 files changed, 162 insertions(+), 174 deletions(-)
diff --git a/interface/osmdebug.htm b/interface/osmdebug.htm
index d402045..be0649d 100755
--- a/interface/osmdebug.htm
+++ b/interface/osmdebug.htm
@@ -1,13 +1,15 @@
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
 <meta http-equiv="Category" content="i3Geo Mapa interativo MMA geoprocessamento sig mobile">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>i3GEO - OpenLayers+OSM</title>
-<script type="text/javascript" src="../classesjs/i3geonaocompacto.js"></script>
-<script src="../pacotes/openlayers/OpenLayers2131.js.php"></script>
+<title>i3GEO - OpenLayers</title>
+<script src="../pacotes/ol3/ol-debug.js"></script>
+<script src="../js/i3geonaocompacto.js"></script>
 <link rel="stylesheet" type="text/css" href="../css/black.css">
+<link rel="stylesheet" type="text/css" href="../pacotes/ol3/ol.css">
 <style>
 .ol-zoom {
 	padding-left: 4px;
@@ -26,17 +28,21 @@
 .ol-attribution.ol-uncollapsible {
 	height: 2.1em;
 	right: 24px;
+	background: none;
+	margin-bottom: 15px;
 }
+
 </style>
 </head>
 <body id="i3geo" style='margin-left: 7px; background: white;'>
+
 	<!-- inclui o nome do usuario logado -->
 	<div id="i3GEONomeLogin" style="position: absolute; left: 10px; top: 12px; font-size: 11px; z-index: 50000"></div>
 	<table id='mst' summary="" style='display: none;' width=100% cellspacing='0'>
 		<tr>
 			<td id="contemMenu" style="background: black; height: 30px; text-align: right; border-width: 0pt 0pt 1px; border-color: rgb(240, 240, 240)">
 				<!--menu suspenso-->
-				<div id="menus" style="height: 0px;"></div>
+				<div id="menus" style="height: 30px;"></div>
 			</td>
 		</tr>
 		<tr>
@@ -66,6 +72,7 @@
 						<td class=fundoRodape style="width: 20%">
 							<!-- bot&atilde;o de compartilhamento em redes sociais-->
 							<!--<div id=i3GEOcompartilhar style="width: 170px; margin: auto; text-align: left; padding-top: 1px"></div> -->
+							<!-- aqui ser&aacute; inclu&iacute;do o contador de tempo quando o temporizador de redesenho do mapa estiver ativo -->
 							<div id=tempoRedesenho style="z-index: 100; position: absolute; top: 0px; color: green; background-color: black; width: 50px; display: none"></div>
 						</td>
 						<!-- aqui ser&atilde;o inclu&iacute;das as bandeiras que permitem a troca de idioma -->
@@ -79,10 +86,10 @@
 	</table>
 	<table id="i3GEOlogoMarca" style='margin: 0px auto; box-shadow: 0 1px 13px gray; border-radius: 5px;'>
 		<tr>
-			<td>
+			<td style="height: 30px">
 				<div id=versaoi3geo></div>
-				<h2 style="font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para cria&ccedil;&atilde;o de mapas interativos e geoprocessamento</h2>
-				<h3 style="font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, &eacute; licenciado sob GPL e integra o Portal do Software P&uacute;blico Brasileiro</h3>
+				<h2 style="font-weight: normal; font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para cria&ccedil;&atilde;o de mapas interativos e geoprocessamento</h2>
+				<h3 style="font-weight: normal; font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, &eacute; licenciado sob GPL e integra o Portal do Software P&uacute;blico Brasileiro</h3>
 			</td>
 		</tr>
 		<tr>
@@ -99,16 +106,20 @@
 		</tr>
 	</table>
 
-	<div id="i3GEOguiaMovel" style="position: absolute; display: block; border: 0px solid white; text-align: left; z-index: 2000; background-color: none">
-		<img id="i3GEOguiaMovelPuxador" onclick='i3GEO.guias.guiaMovel.abreFecha()' style='z-index: 2; border: solid 0px white; left: 0px; position: absolute; top: 0px' width='0px' src='../imagens/openbars.png'>
-		<div id="i3GEOguiaMovelMolde" style="box-shadow: -2px 0 2px gray; position: absolute; display: none; border: 0px solid white; text-align: left; z-index: 1000; background-color: gray">
-			<div id="i3GEOguiaMovelIcones" style='overflow: none; left: 0px; display: none; position: absolute; top: 0px; text-align: center; height: 0px; width: 0px; border: solid 0px white; background-color: white'></div>
-			<div id="i3GEOguiaMovelConteudo" style='overflow: auto; display: none; position: absolute; border-color: gray; border-width: 0px 0 0px 0px; left: 0px; height: 0px; background-color: white'>
+	<div id="i3GEOguiaMovel" style="visibility: hidden; position: absolute; display: block; border: 0px solid white; text-align: left; z-index: 2000; background-color: none">
+		<div style="cursor: pointer; position: absolute; top: 50%; margin-top: -65px; width: 30px; z-index: 5000; left: 18px;">
+			<div id="iconeGuia_temas"></div>
+			<div id="iconeGuia_adiciona" style="margin-top: 3px;"></div>
+			<div id="iconeGuia_legenda" style="margin-top: 3px;"></div>
+			<div id="iconeGuia_dobraPagina" style="margin-top: 3px;"></div>
+		</div>
+		<div id="i3GEOguiaMovelMolde" style="top: 0px; box-shadow: 0 2px 10px 0 #888888; position: absolute; display: none; border: 0px solid white; text-align: left; z-index: 1000; background-color: gray">
+			<div id="i3GEOguiaMovelConteudo" style='top: 10px; overflow: auto; display: none; position: absolute; border-color: gray; border-width: 0px 0 0px 0px; left: 0px; height: 0px; background-color: white'>
 				<div id='guia1obj' style='display: none;'>
 					<!-- Esta div acrescenta a op&ccedil;&atilde;o de busca r&aacute;pida, caso vc queira coloc&aacute;-la em um lugar espec&iacute;fico -->
 					<div style='left: 5px; top: 10px; width: 150px;' id=buscaRapida></div>
 					<!--	Esta div acrescenta a lista de propriedades do mapa -->
-					<div id=listaPropriedades style='top: 15px;'></div>
+					<!--<div id=listaPropriedades style='top:15px;' ></div>-->
 					<!--	Esta div acrescenta a lista de de camadas do tipo 'baselayers' espec&iacute;ficas da interface Openlayers. Veja tamb&eacute;m a op&ccedil;&atilde;o i3GEO.Interface.openlayers.GADGETS.LayerSwitcher -->
 					<div id=listaLayersBase style='top: 15px;'></div>
 					<!--	Esta div acrescenta a lista de de camadas dispon&iacute;veis no mapa atual -->
@@ -121,33 +132,37 @@
 				<div id='guia4obj' style='display: none; text-align: left'>
 					<div id='legenda' style='text-align: left'></div>
 				</div>
-				<div id='guia5obj' style='display: none; text-align: left'>
-					<div id='banners' style='overflow: auto; text-align: left'>Aguarde...</div>
-				</div>
+				<!--
+			<div id='guia5obj' style='display:none;text-align:left'><div id='banners' style='overflow:auto;text-align:left'>Aguarde...</div></div>
+			 -->
 			</div>
 		</div>
 	</div>
-
-
 	<script>
-		i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://"
-				+ window.location.host + "/i3geo";
+		i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/i3geo";
 		i3GEO.configura.autotamanho = false;
 		i3GEO.Interface.ATUAL = "openlayers";
 		i3GEO.Interface.IDCORPO = "contemImg";
+		i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.permiteLogin = true;
+
 		i3GEO.Interface.openlayers.TILES = true;
-		i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
+		i3GEO.Interface.openlayers.googleLike = true;
+
+		i3GEO.configura.guardaExtensao = true;
+		i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza =
+			'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
 
 		i3GEO.cria();
 		i3GEO.configura.mapaRefDisplay = "none";
+		i3GEO.barraDeBotoes.ATIVA = true;
 		i3GEO.barraDeBotoes.TIPO = "olhodepeixe";
 		//ajusta o deslocamento da barra de botoes
 		i3GEO.barraDeBotoes.OFFSET = 11;
 		//ajusta a posicao da barra de botoes no IE
-		if(navm){
+		if (navm) {
 			i3GEO.barraDeBotoes.OFFSET = 5;
 		}
-		if(chro){
+		if (chro) {
 			i3GEO.barraDeBotoes.OFFSET = 15;
 		}
 
@@ -159,6 +174,7 @@
 		i3GEO.arvoreDeTemas.OPCOESADICIONAIS.comentarios = true;
 		i3GEO.arvoreDeCamadas.VERIFICAABRANGENCIATEMAS = true;
 		i3GEO.arvoreDeCamadas.MOSTRALISTAKML = false;
+		i3GEO.arvoreDeCamadas.MOSTRATITULO = true;
 		i3GEO.mapa.AUTORESIZE = true;
 		i3GEO.guias.TIPO = "movel";
 		i3GEO.guias.guiaMovel.config.topGuiaMovel = 36;
@@ -167,33 +183,14 @@
 			if ($i("i3GEOlogoMarca")) {
 				$i("i3GEOlogoMarca").style.display = "none";
 			}
-			i3GEO.mapa.insereDobraPagina("googlemaps",
-					"../imagens/dobragooglemaps.png");
+			//i3GEO.mapa.insereDobraPagina("googlemaps", "../imagens/dobragooglemaps.png");
 		};
+		//indica se a opcao de navegacao nas pastas do servidor sera ativada
 		i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true;
 		i3GEO.janela.TRANSICAOSUAVE = true;
-		OpenLayers.ImgPath = "../pacotes/openlayers/img/";
+		//desliga a camada com o mapa mundi
+		i3GEO.configura.mashuppar = "&desligar=mundo";
 		(function() {
-			function getTileURL(bounds) {
-		        console.info(bounds)   
-				var res = this.map.getResolution();
-		           //var m = i3GEO.util.projGeo2OSM(i3geoOL.maxExtent);
-		           //bounds = i3GEO.util.projGeo2OSM(bounds)
-		           //this.map.zoomIn()
-		           var m = (this.maxExtent);
-		            var x = Math.round((bounds.left - m.left) / ((res) * 256));
-		            var y = Math.round((m.top - bounds.top) / ((res) * 256));
-		            var z = this.map.getZoom();
-		            var limit = Math.pow(2, z);
-		            
-		            //if (y < 0 || y >= limit) {
-		            //    return OpenLayers.Util.getImagesLocation() + "404.png";
-		            //} else {
-		                x = ((x % limit) + limit) % limit;
-		                return this.url + "x=" + x + "&y=" + y + "&z=" + (z);    //+ "&ss=" + x + "-" + y + "-" + z
-		            //}
-			}
-			
 			var attribOSMData = 'Map Data: &copy; <a href="http://www.openstreetmap.org/">OpenStreetMap</a> contributors';
 			var attribMapQuestOSM = attribOSMData + ', Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
 			var attribMapQuestAerial = 'Map Data: &copy; Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
@@ -201,119 +198,118 @@
 			var attribDEMData = '<a href="http://srtm.csi.cgiar.org/">SRTM</a>; ASTER GDEM is a product of <a href="http://www.meti.go.jp/english/press/data/20090626_03.html">METI</a> and <a href="https://lpdaac.usgs.gov/products/aster_policies">NASA</a>';
 			var attribStamen = 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA';
 			var mapSurfer = 'Map data © OpenStreetMap contributors, Imagery GIScience Research Group @ Heidelberg University';
-			
-			var aquarela = new OpenLayers.Layer.OSM("Aquarela",
-					"http://tile.stamen.com/watercolor/${z}/${x}/${y}.jpg", {
-						isBaseLayer : true,
-						visibility : false,
-						attribution: attribStamen,
-						tileOptions: {crossOriginKeyword: "anonymous"}
-					});
-			
-			var toner = new OpenLayers.Layer.OSM("Toner",
-				"http://tile.stamen.com/toner/${z}/${x}/${y}.jpg", {
-					isBaseLayer : true,
-					visibility : false,
-					attribution: attribStamen,
-					tileOptions: {crossOriginKeyword: "anonymous"}
-				});
-			
-			var tonerlite = new OpenLayers.Layer.OSM("Toner lite",
-				"http://tile.stamen.com/toner-lite/${z}/${x}/${y}.jpg", {
-					isBaseLayer : true,
-					visibility : false,
-					attribution: attribStamen,
-					tileOptions: {crossOriginKeyword: "anonymous"}
-				});
-			
-			var osm = new OpenLayers.Layer.OSM("OSM",
-					"http://tile.openstreetmap.org/${z}/${x}/${y}.png", {
-						isBaseLayer : true,
-						visibility : true,
-						attribution: attribOSMData,
-						tileOptions: {crossOriginKeyword: "anonymous"}
-					});
-			
-			var arrayMapQuestAerial = ["http://oatile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg",
-				"http://oatile2.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg",
-				"http://oatile3.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg",
-				"http://oatile4.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg"
-			];
 
-			var layMapQuestAerial = new OpenLayers.Layer.OSM("MapQuest Open Aerial", arrayMapQuestAerial,{
-				displayOutsideMaxExtent: true,
-				attribution: attribMapQuestAerial,
+			var osm = new ol.layer.Tile({
+				title : "OSM",
+				visible : true,
 				isBaseLayer : true,
-				visibility : false,
-				tileOptions: {crossOriginKeyword: "anonymous"}
-			});
+				name : "osm",
+				source: new ol.source.OSM({
+			    	  attributions : [new ol.Attribution({html: attribOSMData})],
+			    	  crossOrigin : "anonymous",
+			    	  url : "http://tile.openstreetmap.org/${z}/${x}/${y}.png"
+			      })
+			    });
+			i3GEO.Interface.openlayers.LAYERSADICIONAIS = [osm];
 
-			var layMSNOsmRoad = new OpenLayers.Layer.OSM("OSM Roads", ["http://korona.geog.uni-heidelberg.de/tiles/roads/x=${x}&y=${y}&z=${z}"], {
-				displayOutsideMaxExtent: true,
-				type : 'png',
-				//getURL : getTileURL,
+			/*
+
+			var eng = new ol.layer.Tile({
+				title : "ESRI National Geographic",
+				visible : true,
 				isBaseLayer : true,
-				visibility : false,
-				attribution : mapSurfer,
-				tileOptions: {crossOriginKeyword: "anonymous"}
+				name : "eng",
+				source : new ol.source.TileArcGISRest({
+					url : "http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer",
+					attributions: [
+						new ol.Attribution({
+							html: 'Tiles &copy; <a href="http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer">ArcGIS</a>'
+						})
+					]
+				})
 			});
-			
-			var layMSNOsmRoadsGray =
-				new OpenLayers.Layer.TMS("OSM Roads Grayscale", "http://korona.geog.uni-heidelberg.de/tiles/roadsg/", {
-					type : 'png',
-					getURL : getTileURL,
-					displayOutsideMaxExtent : true,
-					isBaseLayer : true,
-					visibility : false,
-					attribution : mapSurfer
-				});
-			
-			var layMSNOsmBoundariesOverlay =
-				new OpenLayers.Layer.TMS("OSM Admin Boundaries (experimental)", "http://korona.geog.uni-heidelberg.de/tiles/adminb/", {
-					type : 'png',
-					getURL : getTileURL,
-					displayOutsideMaxExtent : true,
-					isBaseLayer : true,
-					visibility : false,
-					attribution : mapSurfer
-				});
-			
-			var layMSNOsmHybrid = new OpenLayers.Layer.OSM("OSM Semitransparent", "http://korona.geog.uni-heidelberg.de/tiles/hybrid/x=${x}&y=${y}&z=${z}", {
-				displayOutsideMaxExtent: true,
-				visibility : false,
+			var oce = new ol.layer.Tile({
+				title : "ESRI Ocean Basemap",
+				visible : false,
 				isBaseLayer : true,
-				attribution : mapSurfer,
-				tileOptions: {crossOriginKeyword: "anonymous"}
+				name : "oce",
+				source : new ol.source.TileArcGISRest({
+					url : "http://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer",
+					attributions: [
+						new ol.Attribution({
+							html: 'Tiles &copy; <a href="http://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer">ArcGIS</a>'
+						})
+					]
+				})
+			});
+			var ims = new ol.layer.Tile({
+				title : "ESRI Imagery World 2D",
+				visible : false,
+				isBaseLayer : true,
+				name : "ims",
+				source : new ol.source.TileArcGISRest({
+					url : "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer",
+					attributions: [
+						new ol.Attribution({
+							html: 'Tiles &copy; <a href="http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer">ArcGIS</a>'
+						})
+					]
+				})
+			});
+			var wsm = new ol.layer.Tile({
+				title : "ESRI World Street Map",
+				visible : false,
+				isBaseLayer : true,
+				name : "wsm",
+				source : new ol.source.TileArcGISRest({
+					url : "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer",
+					attributions: [
+						new ol.Attribution({
+							html: 'Tiles &copy; <a href="http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer">ArcGIS</a>'
+						})
+					]
+				})
+			});
+			var bra = new ol.layer.Tile({
+				title : "Base carto MMA",
+				visible : false,
+				isBaseLayer : true,
+				name : "bra",
+				source : new ol.source.TileWMS({
+					url : "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
+					params : {
+						'layers' : "baseraster",
+						'srs' : "EPSG:4326",
+						'format' : "image/png"
+					}
+				})
+			});
+			var tms = new ol.layer.Tile({
+				title : "OSGEO",
+				visible : false,
+				isBaseLayer : true,
+				name : "tms",
+				source : new ol.source.TileWMS({
+					url : "http://tilecache.osgeo.org/wms-c/Basic.py/",
+					params : {
+						'layers' : "basic",
+						'type' : "png",
+						'srs' : "EPSG:4326",
+						'format' : "image/png",
+						'VERSION' : '1.1.1'
+					},
+					attributions: [
+						new ol.Attribution({
+							html: '&copy; <a href="http://www.tilecache.org/">2006-2010, TileCache Contributors</a>'
+						})
+					]
+				})
 			});
-			
-			var layMSNAsterHillshade =
-				new OpenLayers.Layer.TMS(
-					"ASTER GDEM & SRTM Hillshade (experimental)",
-					"http://korona.geog.uni-heidelberg.de/tiles/asterh/",
-					{
-						type : 'png',
-						getURL : getTileURL,
-						displayOutsideMaxExtent : true,
-						isBaseLayer : true,
-						visibility : false,
-						attribution : mapSurfer
-					});
-			
-			var layMSNAsterContours =
-				new OpenLayers.Layer.TMS("ASTER GDEM Contour Lines (zoom 13-17)", "http://korona.geog.uni-heidelberg.de/tiles/asterc/", {
-					type : 'png',
-					getURL : getTileURL,
-					displayOutsideMaxExtent : true,
-					isBaseLayer : true,
-					visibility : false,
-					attribution : mapSurfer
-				});
-
 			i3GEO.Interface.openlayers.LAYERSADICIONAIS = [
-				osm, aquarela, toner, tonerlite, layMapQuestAerial, layMSNOsmRoad,layMSNOsmRoadsGray,layMSNOsmBoundariesOverlay,layMSNOsmHybrid,layMSNAsterHillshade,layMSNAsterContours
+				eng, oce, ims, wsm, bra, tms
 			];
+			*/
 		})();
-		i3GEO.Interface.openlayers.googleLike = true;
 		i3GEO.inicia();
 	</script>
 </body>
diff --git a/js/util.js b/js/util.js
index 5359e13..33dded6 100755
--- a/js/util.js
+++ b/js/util.js
@@ -2925,7 +2925,7 @@ i3GEO.util =
 		 * Converte string 'xmin ymin xmax ymax' ou 'xmin ymin' de geo para a projecao OSM
 		 */
 		extGeo2OSM : function(ext, retornaArray) {
-			var metrica, point, proj900913, projWGS84, temp, sep;
+			var metrica, point, temp, sep;
 			sep = " ";
 			if (typeof ext == "object") {
 				return i3GEO.util.projGeo2OSM(ext);
@@ -2937,15 +2937,13 @@ i3GEO.util =
 					temp = ext.split(sep);
 				}
 				if (temp[0] * 1 <= 180 && temp[0] * 1 >= -180) {
-					projWGS84 = new OpenLayers.Projection("EPSG:4326");
-					proj900913 = new OpenLayers.Projection("EPSG:900913");
-					point = new OpenLayers.LonLat(temp[0], temp[1]);
-					metrica = point.transform(projWGS84, proj900913);
-					ext = metrica.lon + sep + metrica.lat;
+					point = new ol.geom.Point([temp[0], temp[1]]);
+					metrica = point.transform("EPSG:4326","EPSG:900913");
+					ext = metrica.getCoordinates()[0] + sep + metrica.getCoordinates()[1];
 					if (temp.length > 2) {
-						point = new OpenLayers.LonLat(temp[2], temp[3]);
-						metrica = point.transform(projWGS84, proj900913);
-						ext += sep + metrica.lon + sep + metrica.lat;
+						point = new ol.geom.Point([temp[2], temp[3]]);
+						metrica = point.transform("EPSG:4326","EPSG:900913");
+						ext += sep + metrica.getCoordinates()[0] + sep + metrica.getCoordinates()[1];
 					}
 				}
 			}
@@ -2961,7 +2959,7 @@ i3GEO.util =
 		 * Converte string 'xmin ymin xmax ymax' ou 'xmin ymin' de geo para a projecao OSM
 		 */
 		extOSM2Geo : function(ext, retornaArray) {
-			var metrica, point, proj900913, projWGS84, temp, sep;
+			var metrica, point, temp, sep;
 			sep = " ";
 			if (typeof ext == "object") {
 				return i3GEO.util.projOSM2Geo(ext);
@@ -2973,15 +2971,13 @@ i3GEO.util =
 					temp = ext.split(sep);
 				}
 				if (temp[0] * 1 >= 180 || temp[0] * 1 <= -180) {
-					projWGS84 = new OpenLayers.Projection("EPSG:4326");
-					proj900913 = new OpenLayers.Projection("EPSG:900913");
-					point = new OpenLayers.LonLat(temp[0], temp[1]);
-					metrica = point.transform(proj900913, projWGS84);
-					ext = metrica.lon + sep + metrica.lat;
+					point = new ol.geom.Point([temp[0], temp[1]]);
+					metrica = point.transform("EPSG:900913","EPSG:4326");
+					ext = metrica.getCoordinates()[0] + sep + metrica.getCoordinates()[1];
 					if (temp.length > 2) {
-						point = new OpenLayers.LonLat(temp[2], temp[3]);
-						metrica = point.transform(proj900913, projWGS84);
-						ext += sep + metrica.lon + sep + metrica.lat;
+						point = new ol.geom.Point([temp[2], temp[3]]);
+						metrica = point.transform("EPSG:900913","EPSG:4326");
+						ext += sep + metrica.getCoordinates()[0] + sep + metrica.getCoordinates()[1];
 					}
 				}
 			}
@@ -2998,9 +2994,7 @@ i3GEO.util =
 		 */
 		projOSM2Geo : function(obj) {
 			if (i3GEO.Interface.openlayers.googleLike === true) {
-				projWGS84 = new OpenLayers.Projection("EPSG:4326");
-				proj900913 = new OpenLayers.Projection("EPSG:900913");
-				obj = obj.transform(proj900913, projWGS84);
+				obj = obj.transform("EPSG:900913","EPSG:4326");
 			}
 			return obj;
 		},
@@ -3011,9 +3005,7 @@ i3GEO.util =
 		 */
 		projGeo2OSM : function(obj) {
 			if (i3GEO.Interface.openlayers.googleLike === true) {
-				projWGS84 = new OpenLayers.Projection("EPSG:4326");
-				proj900913 = new OpenLayers.Projection("EPSG:900913");
-				obj = obj.transform(projWGS84, proj900913);
+				obj = obj.transform("EPSG:4326","EPSG:900913");
 			}
 			return obj;
 		},
@@ -3400,7 +3392,7 @@ i3GEO.util =
 		},
 		/**
 		 * Function: uid
-		 * 
+		 *
 		 * Retorna um ID unico baseado no tempo
 		 */
 		uid : function(){
--
libgit2 0.21.2

