Commit 1ad8685a5387f8236ab0467f5de758365270b3e2
1 parent
ab21d64f
Exists in
master
and in
7 other branches
$1
Showing
1 changed file
with
18 additions
and
12 deletions
Show diff stats
ferramentas/buscarapida/index.js
| ... | ... | @@ -159,7 +159,7 @@ i3GEObuscaRapida = { |
| 159 | 159 | catch(e){} |
| 160 | 160 | i3GEO.php.buscaRapida(resultado,locaplic,i3GEObuscaRapida.servico,palavra); |
| 161 | 161 | } |
| 162 | - if(google && google === true){ | |
| 162 | + if(google && google === true && window.parent.google){ | |
| 163 | 163 | try |
| 164 | 164 | {aguarde("block");} |
| 165 | 165 | catch(e){} |
| ... | ... | @@ -274,8 +274,11 @@ i3GEObuscaRapida = { |
| 274 | 274 | ins += "</td><td onclick=\""+i3GEObuscaRapida.funcaozoom+"('"+wkt+"','"+layer+"','"+gid+"','"+retorno.data.geonames[i].lugares[j].nome+"')\" onmouseover=\"i3GEObuscaRapida.mostraxy('"+wkt+"','wkt')\" onmouseout='i3GEObuscaRapida.escondexy()' style='color:blue;cursor:pointer'><img title='localizar' src='../../imagens/branco.gif' class='tic' /></td></tr>"; |
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | + ins += "</table>"; | |
| 278 | + } | |
| 279 | + else{ | |
| 280 | + ins += "-</table>"; | |
| 277 | 281 | } |
| 278 | - ins += "</table>"; | |
| 279 | 282 | } |
| 280 | 283 | } |
| 281 | 284 | catch(e){ins = $trad("x43")+" "+i3GEObuscaRapida.servico+"<br>";} |
| ... | ... | @@ -350,13 +353,15 @@ i3GEObuscaRapida = { |
| 350 | 353 | */ |
| 351 | 354 | zoom: function(wkt,layer,gid,nm){ |
| 352 | 355 | var adicionaCamada = function(layer,gid,nm,ext){ |
| 353 | - var s = i3GEObuscaRapida.servicowms+"?gid="+gid+"&"; | |
| 354 | - i3GEO.php.adicionaTemaWMS(window.parent.i3GEO.atualiza,s,layer,"default","EPSG:4618","image/png","1.1.0",nm+" - "+layer,"","nao","",i3GEObuscaRapida.locaplic,window.parent.i3GEO.configura.sid); | |
| 355 | - i3GEObuscaRapida.zoomExt(ext); | |
| 356 | + if(window.parent.i3GEO.Interface.openlayers.googleLike === false){ | |
| 357 | + var s = i3GEObuscaRapida.servicowms+"?gid="+gid+"&"; | |
| 358 | + i3GEO.php.adicionaTemaWMS(window.parent.i3GEO.atualiza,s,layer,"default","EPSG:4618","image/png","1.1.0",nm+" - "+layer,"","nao","",i3GEObuscaRapida.locaplic,window.parent.i3GEO.configura.sid); | |
| 359 | + } | |
| 360 | + i3GEObuscaRapida.zoomExt(ext); | |
| 356 | 361 | }; |
| 357 | 362 | var ext = i3GEO.util.wkt2ext(wkt,"polygon"); |
| 358 | 363 | if(ext == false){alert("wkt invalido");return;} |
| 359 | - try{window.parent.i3GEO.janela.abreAguarde("i3GEO.atualiza",$trad("o1"));}catch(e){if(typeof(console) !== 'undefined'){console.error(e);}} | |
| 364 | + | |
| 360 | 365 | i3GEO.php.mudaext(adicionaCamada(layer,gid,nm,ext),window.parent.i3GEO.configura.tipoimagem,ext,i3GEObuscaRapida.locaplic,window.parent.i3GEO.configura.sid); |
| 361 | 366 | }, |
| 362 | 367 | zoomExt: function(ext){ |
| ... | ... | @@ -386,12 +391,13 @@ i3GEObuscaRapida = { |
| 386 | 391 | obj {Object dom} - objeto DOM do tipo INPUT tendo como valor o código do tema |
| 387 | 392 | */ |
| 388 | 393 | adicionatema:function(obj){ |
| 389 | - if (obj.checked) | |
| 390 | - { | |
| 391 | - window.parent.i3GEO.janela.abreAguarde("i3GEO.atualiza",$trad("o1")); | |
| 392 | - var temp = function() | |
| 393 | - {window.parent.i3GEO.atualiza("");}; | |
| 394 | - i3GEO.php.adtema(temp,obj.value,i3GEObuscaRapida.locaplic,window.parent.i3GEO.configura.sid); | |
| 394 | + if (obj.checked){ | |
| 395 | + //window.parent.i3GEO.janela.abreAguarde("i3GEO.atualiza",$trad("o1")); | |
| 396 | + if(window.parent.i3GEO.Interface.openlayers.googleLike === false){ | |
| 397 | + var temp = function() | |
| 398 | + {window.parent.i3GEO.atualiza("");}; | |
| 399 | + i3GEO.php.adtema(temp,obj.value,i3GEObuscaRapida.locaplic,window.parent.i3GEO.configura.sid); | |
| 400 | + } | |
| 395 | 401 | } |
| 396 | 402 | else |
| 397 | 403 | {alert("Escolha um tema");} | ... | ... |