diff --git a/classesjs/classe_configura.js b/classesjs/classe_configura.js index de3c276..a836941 100644 --- a/classesjs/classe_configura.js +++ b/classesjs/classe_configura.js @@ -816,6 +816,7 @@ i3GEO.configura = { //$i("i3GEOmarcaIdentifica").style.display = "none"; }, i; + //alert(objposicaocursor.telay) i3GEO.util.criaPin("i3GEOmarcaIdentifica",i3GEO.configura.locaplic+"/imagens/marcaidentify.png",48,48,temp); i3GEO.util.posicionaImagemNoMapa("i3GEOmarcaIdentifica"); i = $i("i3GEOmarcaIdentifica"); diff --git a/classesjs/classe_eventos.js b/classesjs/classe_eventos.js index 1dd3c1a..4b94381 100644 --- a/classesjs/classe_eventos.js +++ b/classesjs/classe_eventos.js @@ -393,10 +393,8 @@ i3GEO.eventos = { if(typeof(console) !== 'undefined'){console.error(erro);} } if (container !== "divGeometriasTemp" && container !== "mapaReferencia"){ - if(i3GEO.util.in_array(i3GEO.Interface.ATUAL,["googlemaps","googleearth","openlayers"])) - {return;} + return; } - // //verifica sob qual objeto o mouse está se movendo // diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js index 215b0a5..45ed0ad 100644 --- a/classesjs/classe_interface.js +++ b/classesjs/classe_interface.js @@ -1560,8 +1560,7 @@ i3GEO.Interface = { i3GeoMap.overlayMapTypes.insertAt(indice, i); }, registraEventos: function(){ - var pos, - modoAtual = ""; + var modoAtual = ""; google.maps.event.addListener(i3GeoMap, "dragstart", function() { g_operacao = ""; g_tipoacao = ""; @@ -1598,9 +1597,9 @@ i3GEO.Interface = { xy = i3GEO.navega.centroDoMapa(); i3GEO.coordenadas.mostraCoordenadas(false,"",xy[0],xy[1]); }); - pos = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDMAPA)); google.maps.event.addListener(i3GeoMap, "mousemove", function(ponto) { - var teladms,tela; + var teladms,tela, + pos = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDMAPA)); if(modoAtual === "move") {return;} ponto = ponto.latLng; diff --git a/classesjs/classe_util.js b/classesjs/classe_util.js index a332615..7397d52 100644 --- a/classesjs/classe_util.js +++ b/classesjs/classe_util.js @@ -441,10 +441,10 @@ i3GEO.util = { {Array} - array com a posicao [x,y] */ pegaPosicaoObjeto: function(obj){ - if(obj) - { - if(!obj.style) - {return [0,0];} + if(obj){ + if(!obj.style){ + return [0,0]; + } var curleft = 0,curtop = 0; if(obj){ if (obj.offsetParent) { @@ -458,8 +458,9 @@ i3GEO.util = { } return [curleft+document.body.scrollLeft,curtop+document.body.scrollTop]; } - else - {return [0,0];} + else{ + return [0,0]; + } }, /* Function: pegaElementoPai @@ -632,10 +633,8 @@ i3GEO.util = { if(arguments.length < 4 || h === ""){ h = 25; } - if (!$i(id)) - { + if (!$i(id)){ var novoel = document.createElement("img"); - novoel.id = id; novoel.style.zIndex=10000; novoel.style.position="absolute"; novoel.style.width=parseInt(w,10)+"px"; @@ -643,8 +642,12 @@ i3GEO.util = { novoel.style.top="0px"; novoel.style.left="0px"; novoel.src = imagem; - if(id === "boxpin") - {novoel.onmouseover = function(){$i("boxpin").style.display="none";};} + novoel.id = id; + if(id === "boxpin"){ + novoel.onmouseover = function(){ + $i("boxpin").style.display="none"; + }; + } else if(mouseover){ novoel.onmouseover = mouseover; } @@ -680,11 +683,9 @@ 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 + "px"; + i.style.top = objposicaocursor.telay - my + "px"; i.style.left = objposicaocursor.telax - mx + "px"; - return [objposicaocursor.telay + my,objposicaocursor.telax - mx]; + return [objposicaocursor.telay - my,objposicaocursor.telax - mx]; }, /* Function: escondePin @@ -2374,7 +2375,7 @@ i3GEO.util = { Remove um filho de um elemento DOM - Pode-se especificar o pai e o filha a ser removido ou simplesmente o ID do no que se quer remover + Pode-se especificar o pai e o filho a ser removido ou simplesmente o ID do no que se quer remover Parametros: diff --git a/interface/googlemapsdebug.phtml b/interface/googlemapsdebug.phtml index 8c71190..ea93187 100644 --- a/interface/googlemapsdebug.phtml +++ b/interface/googlemapsdebug.phtml @@ -1,7 +1,7 @@ - + diff --git a/pacotes/google/keydragzoom.js.php b/pacotes/google/keydragzoom.js.php index c3b4729..7301408 100644 --- a/pacotes/google/keydragzoom.js.php +++ b/pacotes/google/keydragzoom.js.php @@ -2,7 +2,7 @@ /** * @name Key Drag Zoom for V3 * @version 1.0 - * @author: Nianwei Liu [nianwei at gmail dot com] & Gary Little [gary at luxcentral dot com] + * @author: Nianwei Liu [nianwei at gmail dot com] e Gary Little [gary at luxcentral dot com] * @fileoverview This library adds a drag zoom capability to a Google map. * When drag zoom is enabled, holding down a user-defined hot key (shift | ctrl | alt) * while dragging a box around an area of interest will zoom the map -- libgit2 0.21.2