Commit 1919c9ec81d4f04a6dd9058cd234e2a9589cad1d
1 parent
d43f76e3
Exists in
master
and in
7 other branches
Adaptação da ferramenta Confluence para bootstrap e inclusão de restrição de navegação por escala
Showing
58 changed files
with
39 additions
and
42 deletions
Show diff stats
ferramentas/confluence/dicionario.js
ferramentas/confluence/index.js
| ... | ... | @@ -78,7 +78,7 @@ i3GEOF.confluence = { |
| 78 | 78 | } |
| 79 | 79 | $i(iddiv).innerHTML += i3GEOF.confluence.html(); |
| 80 | 80 | i3GEOF.confluence.ativaFoco(); |
| 81 | - if(i3GEO.Interface.ATUAL !== "googlemaps" && i3GEO.Interface.ATUAL !== "googleearth"){ | |
| 81 | + if(i3GEO.Interface.ATUAL !== "googlemaps"){ | |
| 82 | 82 | i3GEO.eventos.NAVEGAMAPA.push("i3GEOF.confluence.lista()"); |
| 83 | 83 | } |
| 84 | 84 | if(i3GEO.Interface.ATUAL === "googlemaps"){ |
| ... | ... | @@ -152,9 +152,6 @@ i3GEOF.confluence = { |
| 152 | 152 | google.maps.event.removeListener(confluenceDragend); |
| 153 | 153 | google.maps.event.removeListener(confluenceZoomend); |
| 154 | 154 | } |
| 155 | - if(i3GEO.Interface.ATUAL === "googleearth"){ | |
| 156 | - google.earth.removeEventListener(confluenceDragend); | |
| 157 | - } | |
| 158 | 155 | }; |
| 159 | 156 | YAHOO.util.Event.addListener(janela[0].close, "click", temp); |
| 160 | 157 | }, |
| ... | ... | @@ -196,46 +193,45 @@ i3GEOF.confluence = { |
| 196 | 193 | Lista os pontos de confluência |
| 197 | 194 | */ |
| 198 | 195 | lista: function(){ |
| 199 | - try{ | |
| 200 | - var ins = "",i,j,ext,xini,yini,xfim,yfim,xs,dx,ys = []; | |
| 201 | - if(i3GEO.parametros.mapexten){ | |
| 202 | - ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
| 203 | - } | |
| 204 | - else{ | |
| 205 | - ext = "-49.1774741355 -16.379556709 -47.2737662565 -14.9806872512"; | |
| 206 | - } //apenas para exemplo | |
| 207 | - ext = ext.split(" "); | |
| 208 | - xini = parseInt(ext[0],10); | |
| 209 | - yini = parseInt(ext[1],10); | |
| 210 | - xfim = parseInt(ext[2],10); | |
| 211 | - yfim = parseInt(ext[3],10); | |
| 212 | - xs = []; | |
| 213 | - dx = xfim - xini; | |
| 214 | - if ((dx > 1) || (dx < -1)){ | |
| 215 | - for (i=xini;i<xfim;i++){ | |
| 216 | - xs.push(i); | |
| 217 | - } | |
| 218 | - ys = []; | |
| 219 | - for (i=yini;i<yfim;i++){ | |
| 220 | - ys.push(i); | |
| 221 | - } | |
| 196 | + if(i3GEO.parametros.mapscale > 9000000){ | |
| 197 | + $i("i3GEOconfluenceLista").innerHTML = "<h5 class='alert alert-warning'>" + $trad('msgZoom',i3GEOF.confluence.dicionario) + "</h5>"; | |
| 198 | + return; | |
| 199 | + } | |
| 200 | + var ins = "",i,j,ext,xini,yini,xfim,yfim,xs,dx,ys = []; | |
| 201 | + if(i3GEO.parametros.mapexten){ | |
| 202 | + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
| 203 | + } | |
| 204 | + else{ | |
| 205 | + ext = "-49.1774741355 -16.379556709 -47.2737662565 -14.9806872512"; | |
| 206 | + } //apenas para exemplo | |
| 207 | + ext = ext.split(" "); | |
| 208 | + xini = parseInt(ext[0],10); | |
| 209 | + yini = parseInt(ext[1],10); | |
| 210 | + xfim = parseInt(ext[2],10); | |
| 211 | + yfim = parseInt(ext[3],10); | |
| 212 | + xs = []; | |
| 213 | + dx = xfim - xini; | |
| 214 | + if ((dx > 1) || (dx < -1)){ | |
| 215 | + for (i=xini;i<xfim;i++){ | |
| 216 | + xs.push(i); | |
| 222 | 217 | } |
| 223 | - ins = "<p class='paragrafo' >"+$trad('ajuda',i3GEOF.confluence.dicionario)+"</p>"; | |
| 224 | - if(xs.length === 0){ | |
| 225 | - ins += "<br><br>"+$trad('msgCoordenada',i3GEOF.confluence.dicionario)+" <br><br>"+$trad('msgZoom',i3GEOF.confluence.dicionario); | |
| 218 | + ys = []; | |
| 219 | + for (i=yini;i<yfim;i++){ | |
| 220 | + ys.push(i); | |
| 226 | 221 | } |
| 227 | - else{ | |
| 228 | - for (i=0;i<xs.length;i++){ | |
| 229 | - for (j=0;j<ys.length;j++){ | |
| 230 | - ins += "<br><a onmouseover='i3GEOF.confluence.mostraxy(\""+ys[j]+","+xs[i]+"\")' href='http://www.confluence.org/confluence.php?lat="+ys[j]+"&lon="+xs[i]+" ' target=blank >Long. "+xs[i]+" Lat."+ys[j]+"</a><br>"; | |
| 231 | - } | |
| 222 | + } | |
| 223 | + ins = "<h5>"+$trad('ajuda',i3GEOF.confluence.dicionario)+"</h5>"; | |
| 224 | + if(xs.length === 0){ | |
| 225 | + ins += "<h5 class='alert alert-info'>"+$trad('msgCoordenada',i3GEOF.confluence.dicionario)+"<br>"+$trad('msgZoom',i3GEOF.confluence.dicionario) + "</h5>"; | |
| 226 | + } | |
| 227 | + else{ | |
| 228 | + for (i=0;i<xs.length;i++){ | |
| 229 | + for (j=0;j<ys.length;j++){ | |
| 230 | + ins += "<p><a onmouseover='i3GEOF.confluence.mostraxy(\""+ys[j]+","+xs[i]+"\")' href='http://www.confluence.org/confluence.php?lat="+ys[j]+"&lon="+xs[i]+" ' target=blank >Long. "+xs[i]+" Lat."+ys[j]+"</a></p>"; | |
| 232 | 231 | } |
| 233 | 232 | } |
| 234 | - $i("i3GEOconfluenceLista").innerHTML = ins+"<br><br>"; | |
| 235 | - i3GEOF.confluence.aguarde.visibility = "hidden"; | |
| 236 | - } | |
| 237 | - catch(e){ | |
| 238 | - return true; | |
| 239 | 233 | } |
| 234 | + $i("i3GEOconfluenceLista").innerHTML = ins+"<hr>"; | |
| 235 | + i3GEOF.confluence.aguarde.visibility = "hidden"; | |
| 240 | 236 | } |
| 241 | 237 | }; | ... | ... |
ferramentas/confluence/template_mst.html
pacotes/yui290/build/container/container_compacto.js
100644 → 100755
pacotes/yui290/build/container/container_core_compacto.js
100644 → 100755
pacotes/yui290/build/utilities/utilities_compacto.js
100644 → 100755