diff --git a/ferramentas/area/dependencias.php b/ferramentas/area/dependencias.php index 2f002b8..f81cc68 100755 --- a/ferramentas/area/dependencias.php +++ b/ferramentas/area/dependencias.php @@ -16,6 +16,7 @@ if(extension_loaded('zlib')){ header("Content-type: text/javascript"); include("index.js"); include("dicionario.js"); +include("../../pacotes/formatnumber.js"); echo "\n"; if(extension_loaded('zlib')){ diff --git a/ferramentas/area/index.js b/ferramentas/area/index.js index 460e88f..42e7edb 100755 --- a/ferramentas/area/index.js +++ b/ferramentas/area/index.js @@ -351,21 +351,21 @@ i3GEOF.area = texto = "total
" + $trad("d21at") + " km2: " - + (area / 1000000).toFixed(3) + + format("#.###,000", (area / 1000000).toFixed(3)) + "
" + $trad("d21at") + " ha: " - + (area / 10000).toFixed(2) + + format("#.###,00",(area / 10000).toFixed(2)) + "
" + $trad("x98") + " km: " - + (per).toFixed(2) + + format("#.###,00",(per).toFixed(2)) + "
" + $trad("x25") + ": " + i3GEO.calculo.metododistancia; mostra.innerHTML = texto + "
"; - i3GEOF.area.ultimaMedida = (area / 1000000).toFixed(3) + " km2"; + i3GEOF.area.ultimaMedida = format("#.###,000",(area / 1000000).toFixed(3)) + " km2"; } }, /** @@ -377,19 +377,19 @@ i3GEOF.area = texto = "parcial
" + $trad("d21at") + " km2:" - + (area / 1000000).toFixed(3) + + format("#.###,000",(area / 1000000).toFixed(3)) + "
" + $trad("d21at") + " ha: " - + (area / 10000).toFixed(2) + + format("#.###,00",(area / 10000).toFixed(2)) + "
" + $trad("x95") + " km: " - + trecho.toFixed(3) + + format("#.###,000",trecho.toFixed(3)) + "
" + $trad("x98") + " km: " - + (per).toFixed(3) + + format("#.###,000",(per).toFixed(3)) + "
" + $trad("x23") + " (DMS):" diff --git a/ferramentas/distancia/dependencias.php b/ferramentas/distancia/dependencias.php index 2f002b8..f81cc68 100755 --- a/ferramentas/distancia/dependencias.php +++ b/ferramentas/distancia/dependencias.php @@ -16,6 +16,7 @@ if(extension_loaded('zlib')){ header("Content-type: text/javascript"); include("index.js"); include("dicionario.js"); +include("../../pacotes/formatnumber.js"); echo "\n"; if(extension_loaded('zlib')){ diff --git a/ferramentas/distancia/index.js b/ferramentas/distancia/index.js index 224513c..7fc5a1e 100755 --- a/ferramentas/distancia/index.js +++ b/ferramentas/distancia/index.js @@ -404,11 +404,11 @@ i3GEOF.distancia = texto = "total
" + $trad("x96") + " km: " - + total.toFixed(3) + + format("#.###,000",total.toFixed(3)) + "
" + $trad("x96") + " m: " - + (total * 1000).toFixed(2) + + format("#.###,00",(total * 1000).toFixed(2)) + "
" + $trad("x25") + ": " @@ -425,11 +425,11 @@ i3GEOF.distancia = texto = "parcial
" + $trad("x95") + " km: " - + trecho.toFixed(3) + + format("#.###,000",trecho.toFixed(3)) + "
" + $trad("x97") + " km: " - + (parcial + trecho).toFixed(3) + + format("#.###,000",(parcial + trecho).toFixed(3)) + "
" + $trad("x23") + " (DMS): " -- libgit2 0.21.2