Download as
Browse Code »

Commit f9781e6323450c9e21095d9613f9d9694d741842

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

Formatação dos textos mostrados nas ferramentas de cálculo de área e distância

Showing 4 changed files with 14 additions and 12 deletions   Show diff stats
ferramentas/area/dependencias.php
  Diff comments   View file @f9781e6
... ... @@ -16,6 +16,7 @@ if(extension_loaded('zlib')){
16 16 header("Content-type: text/javascript");
17 17 include("index.js");
18 18 include("dicionario.js");
  19 +include("../../pacotes/formatnumber.js");
19 20 echo "\n";
20 21  
21 22 if(extension_loaded('zlib')){
... ...
ferramentas/area/index.js
  Diff comments   View file @f9781e6
... ... @@ -351,21 +351,21 @@ i3GEOF.area =
351 351 texto =
352 352 "total <br>" + $trad("d21at")
353 353 + " km2: "
354   - + (area / 1000000).toFixed(3)
  354 + + format("#.###,000", (area / 1000000).toFixed(3))
355 355 + "<br>"
356 356 + $trad("d21at")
357 357 + " ha: "
358   - + (area / 10000).toFixed(2)
  358 + + format("#.###,00",(area / 10000).toFixed(2))
359 359 + "<br>"
360 360 + $trad("x98")
361 361 + " km: "
362   - + (per).toFixed(2)
  362 + + format("#.###,00",(per).toFixed(2))
363 363 + "<br>"
364 364 + $trad("x25")
365 365 + ": "
366 366 + i3GEO.calculo.metododistancia;
367 367 mostra.innerHTML = texto + "<hr>";
368   - i3GEOF.area.ultimaMedida = (area / 1000000).toFixed(3) + " km2";
  368 + i3GEOF.area.ultimaMedida = format("#.###,000",(area / 1000000).toFixed(3)) + " km2";
369 369 }
370 370 },
371 371 /**
... ... @@ -377,19 +377,19 @@ i3GEOF.area =
377 377 texto =
378 378 "parcial <br>" + $trad("d21at")
379 379 + " km2:"
380   - + (area / 1000000).toFixed(3)
  380 + + format("#.###,000",(area / 1000000).toFixed(3))
381 381 + "<br>"
382 382 + $trad("d21at")
383 383 + " ha: "
384   - + (area / 10000).toFixed(2)
  384 + + format("#.###,00",(area / 10000).toFixed(2))
385 385 + "<br>"
386 386 + $trad("x95")
387 387 + " km: "
388   - + trecho.toFixed(3)
  388 + + format("#.###,000",trecho.toFixed(3))
389 389 + "<br>"
390 390 + $trad("x98")
391 391 + " km: "
392   - + (per).toFixed(3)
  392 + + format("#.###,000",(per).toFixed(3))
393 393 + "<br>"
394 394 + $trad("x23")
395 395 + " (DMS):"
... ...
ferramentas/distancia/dependencias.php
  Diff comments   View file @f9781e6
... ... @@ -16,6 +16,7 @@ if(extension_loaded(&#39;zlib&#39;)){
16 16 header("Content-type: text/javascript");
17 17 include("index.js");
18 18 include("dicionario.js");
  19 +include("../../pacotes/formatnumber.js");
19 20 echo "\n";
20 21  
21 22 if(extension_loaded('zlib')){
... ...
ferramentas/distancia/index.js
  Diff comments   View file @f9781e6
... ... @@ -404,11 +404,11 @@ i3GEOF.distancia =
404 404 texto =
405 405 "total <br>" + $trad("x96")
406 406 + " km: "
407   - + total.toFixed(3)
  407 + + format("#.###,000",total.toFixed(3))
408 408 + "<br>"
409 409 + $trad("x96")
410 410 + " m: "
411   - + (total * 1000).toFixed(2)
  411 + + format("#.###,00",(total * 1000).toFixed(2))
412 412 + "<br>"
413 413 + $trad("x25")
414 414 + ": "
... ... @@ -425,11 +425,11 @@ i3GEOF.distancia =
425 425 texto =
426 426 "parcial <br>" + $trad("x95")
427 427 + " km: "
428   - + trecho.toFixed(3)
  428 + + format("#.###,000",trecho.toFixed(3))
429 429 + "<br>"
430 430 + $trad("x97")
431 431 + " km: "
432   - + (parcial + trecho).toFixed(3)
  432 + + format("#.###,000",(parcial + trecho).toFixed(3))
433 433 + "<br>"
434 434 + $trad("x23")
435 435 + " (DMS): "
... ...