--no commit message

Edmar Moretti
1 parent 9d60b4ce
Showing 11 changed files with 39 additions and 33 deletions Show diff stats
admin/admin.db
classesjs/classe_interface.js
classesjs/classe_janela.js
ferramentas/buscafotos/index.js.php
ferramentas/confluence/index.js.php
ferramentas/googlemaps/index.php
ferramentas/metar/index.js.php
imagens/google/confluence.png
imagens/google/foto.png
imagens/google/metar.png
ms_configura.php
@@ -2037,7 +2037,7 @@ i3GEO.Interface = {
 				},
 				janela = i3GEO.janela.cria(
 					"230px",
-					"100px",
+					"110px",
 					"",
 					"",
 					"",
@@ -250,6 +250,8 @@ i3GEO.janela = {
 			classe = "hd";
 			i3GEO.janela.TRANSICAOSUAVE = false;
 		}
+		if(navm && i3GEO.Interface.ATUAL === "googleearth")
+		{funcaoMinimiza = null;}
 		wlargurA = parseInt(wlargura,10)+2+"px";
 		if($i(id))
 		{YAHOO.janelaDoca.xp.panel.destroy();}
@@ -179,7 +179,7 @@ i3GEOF.buscaFotos = {
 	*/
 	ativaFoco: function(){
 		g_operacao = "navega";
-		i3GEO.util.criaPin();
+		i3GEO.util.criaPin("pinfoto",i3GEO.configura.locaplic+'/imagens/google/foto.png');
 		if(!$i("i3GEOF.buscaFotos_c"))
 		{return;}
 		var i = $i("i3GEOF.buscaFotos_c").style;
@@ -264,8 +264,8 @@ i3GEOF.buscaFotos = {
 	Esconde a imagem de localização da foto no mapa
 	*/
 	escondexy: function(){
-		if($i("boxpin")){
-			var box = $i("boxpin");
+		if($i("pinfoto")){
+			var box = $i("pinfoto");
 			box.style.display = "none";
 			box.style.top = "0px";
 			box.style.left = "0px";
@@ -281,12 +281,12 @@ i3GEOF.buscaFotos = {
 		{return;}
 		xy = xy.split(",");
 	 	xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
-		var box = $i("boxpin");
+		var box = $i("pinfoto");
 		box.style.display = "block";
-		box.style.width = "21px";
-		box.style.height = "25px";
-		box.style.top = parseInt(xy[1],10)+"px";
-		box.style.left = parseInt(xy[0],10)+"px";
+		box.style.width = "27px";
+		box.style.height = "27px";
+		box.style.top = parseInt(xy[1],10) - 27 + "px";
+		box.style.left = parseInt(xy[0],10) - 13 +"px";
 	},
 	/*
 	Function: listafotospanoramio
@@ -143,7 +143,7 @@ i3GEOF.confluence = {
 	*/
 	ativaFoco: function(){
 		g_operacao = "navega";
-		i3GEO.util.criaPin();
+		i3GEO.util.criaPin("pinconf",i3GEO.configura.locaplic+'/imagens/google/confluence.png');
 		var i = $i("i3GEOF.confluence_c").style;
 		i3GEO.janela.ULTIMOZINDEX++;
 		i.zIndex = 21000 + i3GEO.janela.ULTIMOZINDEX;
@@ -154,8 +154,8 @@ i3GEOF.confluence = {
 	Esconde a marca mostrada no mapa
 	*/
 	escondexy: function(){
-		if($i("boxpin")){
-			var box = $i("boxpin");
+		if($i("pinconf")){
+			var box = $i("pinconf");
 			box.style.display = "none";
 			box.style.top = "0px";
 			box.style.left = "0px";
@@ -171,12 +171,12 @@ i3GEOF.confluence = {
 		{return;}
 		xy = xy.split(",");
 	 	xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
-		var box = $i("boxpin");
+		var box = $i("pinconf");
 		box.style.display = "block";
-		box.style.width = "21px";
-		box.style.height = "25px";
-		box.style.top = parseInt(xy[1],10)+"px";
-		box.style.left = parseInt(xy[0],10)+"px";
+		box.style.width = "27px";
+		box.style.height = "27px";
+		box.style.top = parseInt(xy[1],10) - 27 +"px";
+		box.style.left = parseInt(xy[0],10) - 13 +"px";
 	},
 	/*
 	Function: lista
@@ -106,7 +106,8 @@ function inicializa(){
 		}
    	});
 	GEvent.addListener(map, "mousemove", function(ponto) {
-		var teladms,tela;
+		var teladms,tela,temp,
+			mapexten = window.parent.i3GEO.parametros.mapexten;
 		teladms = window.parent.i3GEO.calculo.dd2dms(ponto.x,ponto.y);
 		//tela = map.getProjection().fromLatLngToPixel(ponto);
 		window.parent.objposicaocursor = {
@@ -122,12 +123,15 @@ function inicializa(){
 		window.parent.i3GEO.eventos.mousemoveMapa();
 		if(window.parent.i3GEO.Interface.ATUAL === "googleearth")
 		{return;}
-	 	xy = window.parent.i3GEO.calculo.dd2tela(ponto.x,ponto.y,window.parent.document.getElementById(window.parent.i3GEO.Interface.IDMAPA),window.parent.i3GEO.parametros.mapexten,window.parent.i3GEO.parametros.pixelsize);
-		box.style.display = "block";
-		box.style.width = "5px";
-		box.style.height = "5px";
-		box.style.top = parseInt(xy[1],10)+"px";
-		box.style.left = parseInt(xy[0],10)+"px";		
+	 	temp = mapexten.split(" ");
+		if(ponto.x < temp[2] && ponto.y < temp[3]){
+			xy = window.parent.i3GEO.calculo.dd2tela(ponto.x,ponto.y,window.parent.document.getElementById(window.parent.i3GEO.Interface.IDMAPA),mapexten,window.parent.i3GEO.parametros.pixelsize);
+			box.style.display = "block";
+			box.style.width = "5px";
+			box.style.height = "5px";
+			box.style.top = (parseInt(xy[1],10) + 2.5) +"px";
+			box.style.left = (parseInt(xy[0],10) - 2.5) +"px";
+		}
 	});
 	function botaoI3geo() {}
     botaoI3geo.prototype = new GControl();
@@ -208,7 +212,7 @@ function ondegoogle()
 	var h = xyMin[1]-xyMax[1]
 	box.style.display = "block"
 	box.style.width = w
-	box.style.height = h
+	box.style.height = h+3
 	box.style.top = xyMax[1]+"px"
 	box.style.left = xyMin[0]+"px"
 	box.style.display="block"
@@ -220,16 +220,16 @@ i3GEOF.metar = {
 	mostraxy: function(x,y){
 		if(i3GEO.Interface.ATUAL === "googleearth")
 		{return;}
-		i3GEO.util.criaBox("boxpin");
+		i3GEO.util.criaPin("pinmetar",i3GEO.configura.locaplic+'/imagens/google/metar.png');
 		xy = i3GEO.calculo.dd2tela(x*1,y*1,$i(i3GEO.Interface.IDCORPO),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
-		var box = $i("boxpin");
+		var box = $i("pinmetar");
 		box.style.display = "block";
-		box.style.width = "5px";
-		box.style.height = "5px";
-		box.style.top = parseInt(xy[1],10)-5+"px";
-		box.style.left = parseInt(xy[0],10)-5+"px";
+		box.style.width = "27px";
+		box.style.height = "27px";
+		box.style.top = parseInt(xy[1],10)-27+"px";
+		box.style.left = parseInt(xy[0],10)-13+"px";
 		box.style.position = "absolute";
-		box.style.border = "solid 2px red"
+		box.style.border = "solid 0px red"
 		box.style.zIndex = 5000
 	}
 };
@@ -371,7 +371,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == &#39;WIN&#39;))
 	 Tipo:
 	 {string}
 	*/
-	$interfacePadrao = "googlemaps.phtml";
+	$interfacePadrao = "openlayers.htm";
 }
 else //se for linux
 {
	@@ -2037,7 +2037,7 @@ i3GEO.Interface = {		@@ -2037,7 +2037,7 @@ i3GEO.Interface = {
2037	},	2037	},
2038	janela = i3GEO.janela.cria(	2038	janela = i3GEO.janela.cria(
2039	"230px",	2039	"230px",
2040	- "100px",	2040	+ "110px",
2041	"",	2041	"",
2042	"",	2042	"",
2043	"",	2043	"",
	@@ -371,7 +371,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))		@@ -371,7 +371,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
371	Tipo:	371	Tipo:
372	{string}	372	{string}
373	*/	373	*/
374	- $interfacePadrao = "googlemaps.phtml";	374	+ $interfacePadrao = "openlayers.htm";
375	}	375	}
376	else //se for linux	376	else //se for linux
377	{	377	{