Download as
Browse Code »

Commit a1e93a4ec2803df201e7d28d3429b9cd482dc864

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

Ajustes na ferramenta googlemaps. Remoção do botão i3Geo e navegação sincronizada.

Showing 2 changed files with 14 additions and 3 deletions   Show diff stats
admin/admin.db
View file @a1e93a4
No preview for this file type
ferramentas/googlemaps1/index.js
  Diff comments   View file @a1e93a4
@@ -48,6 +48,7 @@ if (app=='N') navn=true; else navm=true; @@ -48,6 +48,7 @@ if (app=='N') navn=true; else navm=true;
48 i3GEO = window.parent.i3GEO; 48 i3GEO = window.parent.i3GEO;
49 MARCA = false; 49 MARCA = false;
50 BOX = false; 50 BOX = false;
  51 +ATUALIZABOX = true;
51 $i = function(id){ 52 $i = function(id){
52 return window.parent.document.getElementById(id); 53 return window.parent.document.getElementById(id);
53 }; 54 };
@@ -88,6 +89,13 @@ function inicializa(){ @@ -88,6 +89,13 @@ function inicializa(){
88 }); 89 });
89 google.maps.event.addListener(map, "bounds_changed", function() { 90 google.maps.event.addListener(map, "bounds_changed", function() {
90 if(i3GEO){ 91 if(i3GEO){
  92 + //evita loop entre os eventos do i3geo e do googlemaps
  93 + if(ATUALIZABOX === true){
  94 + var bd = map.getBounds();
  95 + var centro = bd.getCenter();
  96 + i3GEO.Interface[i3GEO.Interface.ATUAL].pan2ponto(centro.lng(),centro.lat());
  97 + }
  98 + ATUALIZABOX = true;
91 ondegoogle(); 99 ondegoogle();
92 } 100 }
93 }); 101 });
@@ -121,9 +129,11 @@ function inicializa(){ @@ -121,9 +129,11 @@ function inicializa(){
121 } 129 }
122 }); 130 });
123 if(i3GEO){ 131 if(i3GEO){
  132 + /*
124 if(i3GEO.parametros.mapfile){ 133 if(i3GEO.parametros.mapfile){
125 botaoI3geo(); 134 botaoI3geo();
126 } 135 }
  136 + */
127 ondegoogle(map); 137 ondegoogle(map);
128 } 138 }
129 botaoRota(); 139 botaoRota();
@@ -208,10 +218,11 @@ function moveMapa(bd){ @@ -208,10 +218,11 @@ function moveMapa(bd){
208 /* 218 /*
209 Function: panTogoogle 219 Function: panTogoogle
210 220
211 -Desloca o mapa principal conforme a extensão geográfica do mapa do GM 221 +Desloca o mapa do google quando o mapa principal e deslocado
212 */ 222 */
213 function panTogoogle(){ 223 function panTogoogle(){
214 if(!i3GEO){return;} 224 if(!i3GEO){return;}
  225 + ATUALIZABOX = false;
215 var pol = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); 226 var pol = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
216 var ret = pol.split(" "); 227 var ret = pol.split(" ");
217 var pt1 = (( (ret[0] * -1) - (ret[2] * -1) ) / 2) + ret[0] *1; 228 var pt1 = (( (ret[0] * -1) - (ret[2] * -1) ) / 2) + ret[0] *1;
@@ -310,7 +321,7 @@ function constroiRota(){ @@ -310,7 +321,7 @@ function constroiRota(){
310 var place = response[0]; 321 var place = response[0];
311 endereco2 = place.formatted_address; 322 endereco2 = place.formatted_address;
312 endereco2 = i3GEO.janela.prompt( 323 endereco2 = i3GEO.janela.prompt(
313 - "Endereco do final", 324 + "Confirme o endereco do final",
314 function(){ 325 function(){
315 montaRota(); 326 montaRota();
316 }, 327 },
@@ -327,7 +338,7 @@ function constroiRota(){ @@ -327,7 +338,7 @@ function constroiRota(){
327 var place = response[0]; 338 var place = response[0];
328 endereco1 = place.formatted_address; 339 endereco1 = place.formatted_address;
329 endereco1 = i3GEO.janela.prompt( 340 endereco1 = i3GEO.janela.prompt(
330 - "Endereco do inicio", 341 + "Confirme o endereco do inicio",
331 function(){ 342 function(){
332 geocoder.geocode( 343 geocoder.geocode(
333 {'location':pontoRota2}, 344 {'location':pontoRota2},