Download as
Browse Code »

Commit 04336c5069fd4bb852914db611f257f8501b1040

Authored by Edmar Moretti
1 parent bf3525ef
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 5 changed files with 20 additions and 10 deletions   Show diff stats
classesjs/classe_analise.js
  Diff comments   View file @04336c5
... ... @@ -388,7 +388,6 @@ i3GEO.analise = {
388 388 }
389 389 if(i3GEO.Interface.ATUAL === "googleearth")
390 390 {i3GEO.Interface.googleearth.insereMarca(d+" km",objposicaocursor.ddx,objposicaocursor.ddy,"","divGeometriasTemp");}
391   -
392 391 }
393 392 //cria a linha ligando os dois ultimos pontos
394 393 if(i3GEO.Interface.ATUAL === "googleearth"){
... ...
classesjs/classe_interface.js
  Diff comments   View file @04336c5
... ... @@ -1463,6 +1463,16 @@ i3GEO.Interface = {
1463 1463 catch(e){alert(e);return;}
1464 1464 if(dobra)
1465 1465 {$i(i3GEO.Interface.IDMAPA).appendChild(dobra);}
  1466 +
  1467 + i3GeoMap.setMapTypeId(i3GEO.Interface.googlemaps.TIPOMAPA);
  1468 + sw = new google.maps.LatLng(ret[1],ret[0]);
  1469 + ne = new google.maps.LatLng(ret[3],ret[2]);
  1470 +
  1471 + i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
  1472 +
  1473 + //FIXME Isso provoca um loop infinito e trava
  1474 + //i3GeoMap.setZoom(i3GeoMap.getZoom()+1);
  1475 +
1466 1476 //
1467 1477 //carrega o javascript que permite fazer o zoom por box
1468 1478 //
... ... @@ -1470,11 +1480,6 @@ i3GEO.Interface = {
1470 1480 js = i3GEO.configura.locaplic+"/pacotes/google/keydragzoom.js.php";
1471 1481 i3GEO.util.scriptTag(js,"i3GEO.Interface.googlemaps.ativaZoomBox()","keydragzoom_script");
1472 1482 }
1473   - i3GeoMap.setMapTypeId(i3GEO.Interface.googlemaps.TIPOMAPA);
1474   - sw = new google.maps.LatLng(ret[1],ret[0]);
1475   - ne = new google.maps.LatLng(ret[3],ret[2]);
1476   - i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
1477   -
1478 1483 i3GeoMapOverlay = new google.maps.OverlayView();
1479 1484 i3GeoMapOverlay.draw = function() {};
1480 1485  
... ... @@ -1785,6 +1790,7 @@ i3GEO.Interface = {
1785 1790 sw = new google.maps.LatLng(ret[1],ret[0]),
1786 1791 ne = new google.maps.LatLng(ret[3],ret[2]);
1787 1792 i3GeoMap.fitBounds(new google.maps.LatLngBounds(sw,ne));
  1793 + //i3GeoMap.setZoom(i3GeoMap.getZoom()+1);
1788 1794 },
1789 1795 pan2ponto: function(x,y){
1790 1796 i3GeoMap.panTo(new google.maps.LatLng(y,x));
... ...
classesjs/classe_util.js
  Diff comments   View file @04336c5
... ... @@ -671,7 +671,7 @@ i3GEO.util = {
671 671 array[top,left] - valores em pixel da posicao calculada da imagem
672 672 */
673 673 posicionaImagemNoMapa: function(id,x,y){
674   - if(typeof(console) !== 'undefined'){console.info("i3GEO.util.posicionaImagemNoMapa()");}
  674 + if(typeof(console) !== 'undefined'){console.warn("i3GEO.util.posicionaImagemNoMapa()");}
675 675 var i,mx,my;
676 676 if(x && x != "")
677 677 {objposicaocursor.telax = x;}
... ... @@ -680,10 +680,11 @@ i3GEO.util = {
680 680 i = $i(id);
681 681 mx = parseInt(i.style.width,10) / 2;
682 682 my = parseInt(i.style.height,10) / 2;
  683 + //alert(objposicaocursor.telax+" "+objposicaocursor.telay)
683 684 i.style.position = "absolute";
684   - i.style.top = objposicaocursor.telay - my + "px";
  685 + i.style.top = objposicaocursor.telay + "px";
685 686 i.style.left = objposicaocursor.telax - mx + "px";
686   - return [objposicaocursor.telay - my,objposicaocursor.telax - mx];
  687 + return [objposicaocursor.telay + my,objposicaocursor.telax - mx];
687 688 },
688 689 /*
689 690 Function: escondePin
... ...
ferramentas/identifica/index.js
  Diff comments   View file @04336c5
... ... @@ -547,6 +547,10 @@ i3GEOF.identifica = {
547 547 */
548 548 buscaDadosTema: function(tema){
549 549 var res,opcao,resolucao,listaDeTemas="",temp;
  550 + if(tema == ""){
  551 + i3GEOF.identifica.criaJanelaFlutuante();
  552 + return;
  553 + }
550 554 try{
551 555 $i("i3GEOidentificaocorrencia").innerHTML = "<img src='"+i3GEO.configura.locaplic+"/imagens/aguarde.gif' />";
552 556 res = $i("i3GEOidentificaresolucao");
... ...
pacotes/google/keydragzoom.js.php
  Diff comments   View file @04336c5
... ... @@ -461,9 +461,9 @@
461 461 */
462 462 DragZoom.prototype.onMouseUp_ = function (e) {
463 463 this.mouseDown_ = false;
  464 + if (this.dragging_) {
464 465 //desativa o clique permanente
465 466 i3GEO.eventos.cliquePerm.ativa();
466   - if (this.dragging_) {
467 467 var left = Math.min(this.startPt_.x, this.endPt_.x);
468 468 var top = Math.min(this.startPt_.y, this.endPt_.y);
469 469 var width = Math.abs(this.startPt_.x - this.endPt_.x);
... ...