diff --git a/www/js/analog.js b/www/js/analog.js index 1b692a28..4967ed46 100644 --- a/www/js/analog.js +++ b/www/js/analog.js @@ -862,53 +862,53 @@ function buildGraph( prefix, chart, csv, titleAdd, timestr ) { switch ( unitid ) { case 1: unit = _( "Soil moisture" ); title = _( "Soil moisture" ) + " " + titleAdd; - unitStr = function( val ) { return val + " %"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " %"; }; minFunc = 0; maxFunc = 100; break; case 2: unit = _( "degree celsius temperature" ); title = _( "Temperature" ) + " " + titleAdd; - unitStr = function( val ) { return val + String.fromCharCode( 176 ) + "C"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + String.fromCharCode( 176 ) + "C"; }; break; case 3: unit = _( "degree fahrenheit temperature" ); title = _( "Temperature" ) + " " + titleAdd; - unitStr = function( val ) { return val + String.fromCharCode( 176 ) + "F"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + String.fromCharCode( 176 ) + "F"; }; break; case 4: unit = _( "Volt" ); title = _( "Voltage" ) + " " + titleAdd; - unitStr = function( val ) { return val + " V"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " V"; }; minFunc = 0; maxFunc = 4; autoY = false; break; case 5: unit = _( "Humidity" ); title = _( "Air Humidity" ) + " " + titleAdd; - unitStr = function( val ) { return val + " %"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " %"; }; minFunc = 0; maxFunc = 100; break; case 6: unit = _( "Rain" ); title = _( "Rainfall" ) + " " + titleAdd; - unitStr = function( val ) { return val + " in"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " in"; }; break; case 7: unit = _( "Rain" ); title = _( "Rainfall" ) + " " + titleAdd; - unitStr = function( val ) { return val + " mm"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " mm"; }; minFunc = 0; break; case 8: unit = _( "Wind" ); title = _( "Wind" ) + " " + titleAdd; - unitStr = function( val ) { return val + " mph"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " mph"; }; minFunc = 0; break; case 9: unit = _( "Wind" ); title = _( "Wind" ) + " " + titleAdd; - unitStr = function( val ) { return val + " kmh"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " kmh"; }; minFunc = 0; break; case 10: unit = _( "Level" ); title = _( "Level" ) + " " + titleAdd; - unitStr = function( val ) { return val + " %"; }; + unitStr = function( val ) { return +( Math.round( val + "e+2" ) + "e-2" ) + " %"; }; minFunc = 0; maxFunc = 100; autoY = false;