Download as
Browse Code »

Commit e05ba873f171a8c575c69b792818337563574f2c

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

$1

Showing 2 changed files with 45 additions and 39 deletions   Show diff stats
classesjs/classe_calculo.js
  Diff comments   View file @e05ba87
... ... @@ -118,7 +118,7 @@ i3GEO.calculo = {
118 118 return [(xy.x)+pos[0],(xy.y)+pos[1]];
119 119 }
120 120 if(arguments.length === 3){
121   - ext = i3GEO.parametros.mapexten;
  121 + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
122 122 cellsize = i3GEO.parametros.pixelsize;
123 123 }
124 124 if(arguments.length === 4){
... ...
ferramentas/confluence/index.js
  Diff comments   View file @e05ba87
... ... @@ -91,11 +91,11 @@ i3GEOF.confluence = {
91 91 i3GEO.eventos.NAVEGAMAPA.push("i3GEOF.confluence.lista()");
92 92 }
93 93 if(i3GEO.Interface.ATUAL === "googlemaps"){
94   - confluenceDragend = google.maps.event.addListener(i3GeoMap, "dragend", function() {i3GEOF.confluence.lista();});
95   - confluenceZoomend = google.maps.event.addListener(i3GeoMap, "zoomend", function() {i3GEOF.confluence.lista();});
  94 + confluenceDragend = google.maps.event.addListener(i3GeoMap, "dragend", function() {i3GEOF.confluence.lista();});
  95 + confluenceZoomend = google.maps.event.addListener(i3GeoMap, "zoomend", function() {i3GEOF.confluence.lista();});
96 96 }
97 97 if(i3GEO.Interface.ATUAL === "googleearth"){
98   - confluenceDragend = google.earth.addEventListener(i3GeoMap.getView(), "viewchangeend", function() {i3GEOF.confluence.lista();});
  98 + confluenceDragend = google.earth.addEventListener(i3GeoMap.getView(), "viewchangeend", function() {i3GEOF.confluence.lista();});
99 99 }
100 100 i3GEOF.confluence.lista();
101 101 }
... ... @@ -192,11 +192,13 @@ i3GEOF.confluence = {
192 192 Indica a confluência no mapa
193 193 */
194 194 mostraxy: function(xy){
195   - if(i3GEO.Interface.ATUAL === "googleearth")
  195 + if(i3GEO.Interface.ATUAL === "googleearth" || i3GEO.Interface.openlayers.googleLike === true)
196 196 {return;}
  197 + var box = $i("pinconf"),
  198 + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
197 199 xy = xy.split(",");
198   - xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
199   - var box = $i("pinconf");
  200 + xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),ext,i3GEO.parametros.pixelsize);
  201 +
200 202 box.style.display = "block";
201 203 box.style.width = "27px";
202 204 box.style.height = "27px";
... ... @@ -209,42 +211,46 @@ i3GEOF.confluence = {
209 211 Lista os pontos de confluência
210 212 */
211 213 lista: function(){
212   - if(i3GEOF.confluence.aguarde.visibility === "visible")
213   - {return;}
214   - i3GEOF.confluence.aguarde.visibility = "visible";
215   - var ins = "",i,j,ext,xini,yini,xfim,yfim,xs,dx,ys = [];
216   - if(i3GEO.parametros.mapexten)
217   - {ext = i3GEO.parametros.mapexten;}
218   - else
219   - {ext = "-49.1774741355 -16.379556709 -47.2737662565 -14.9806872512";} //apenas para exemplo
220   - ext = ext.split(" ");
221   - xini = parseInt(ext[0],10);
222   - yini = parseInt(ext[1],10);
223   - xfim = parseInt(ext[2],10);
224   - yfim = parseInt(ext[3],10);
225   - xs = [];
226   - dx = xfim - xini;
227   - if ((dx > 1) || (dx < -1)){
228   - for (i=xini;i<xfim;i++){
229   - xs.push(i);
  214 + try{
  215 + var ins = "",i,j,ext,xini,yini,xfim,yfim,xs,dx,ys = [];
  216 + if(i3GEO.parametros.mapexten){
  217 + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
  218 + }
  219 + else{
  220 + ext = "-49.1774741355 -16.379556709 -47.2737662565 -14.9806872512";
  221 + } //apenas para exemplo
  222 + ext = ext.split(" ");
  223 + xini = parseInt(ext[0],10);
  224 + yini = parseInt(ext[1],10);
  225 + xfim = parseInt(ext[2],10);
  226 + yfim = parseInt(ext[3],10);
  227 + xs = [];
  228 + dx = xfim - xini;
  229 + if ((dx > 1) || (dx < -1)){
  230 + for (i=xini;i<xfim;i++){
  231 + xs.push(i);
  232 + }
  233 + ys = [];
  234 + for (i=yini;i<yfim;i++){
  235 + ys.push(i);
  236 + }
230 237 }
231   - ys = [];
232   - for (i=yini;i<yfim;i++){
233   - ys.push(i);
  238 + ins = "<p class='paragrafo' >"+$trad(1,i3GEOF.confluence.dicionario)+"</p>";
  239 + if(xs.length === 0){
  240 + ins += "<br><br>"+$trad(2,i3GEOF.confluence.dicionario)+" <br><br>"+$trad(3,i3GEOF.confluence.dicionario);
234 241 }
235   - }
236   - ins = "<p class='paragrafo' >"+$trad(1,i3GEOF.confluence.dicionario)+"</p>";
237   - if(xs.length === 0){
238   - ins += "<br><br>"+$trad(2,i3GEOF.confluence.dicionario)+" <br><br>"+$trad(3,i3GEOF.confluence.dicionario);
239   - }
240   - else{
241   - for (i=0;i<xs.length;i++){
242   - for (j=0;j<ys.length;j++){
243   - ins += "<br><a onmouseout='i3GEOF.confluence.escondexy()' 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>";
  242 + else{
  243 + for (i=0;i<xs.length;i++){
  244 + for (j=0;j<ys.length;j++){
  245 + ins += "<br><a onmouseout='i3GEOF.confluence.escondexy()' 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>";
  246 + }
244 247 }
245 248 }
  249 + $i("i3GEOconfluenceLista").innerHTML = ins+"<br><br>";
  250 + i3GEOF.confluence.aguarde.visibility = "hidden";
  251 + }
  252 + catch(e){
  253 + return true;
246 254 }
247   - $i("i3GEOconfluenceLista").innerHTML = ins+"<br><br>";
248   - i3GEOF.confluence.aguarde.visibility = "hidden";
249 255 }
250 256 };
... ...