Ticket #1253: number_format.diff

lib/OpenLayers/BaseTypes.js

@@ -213 +213 @@
- *********************/
-
-OpenLayers.Number = {
+
+    /**
+     * APIProperty: OpenLayers.Number.decimalSeparator
+     * Decimal separator to use when formatting numbers.
+     */
+    decimalSeparator: ".",
+    
+    /**
+     * APIProperty: OpenLayers.Number.thousandsSeparator
+     * Thousands separator to use when formatting numbers.
+     */
+    thousandsSeparator: ",",
+    
-    /**
-     * APIFunction: OpenLayers.Number.limitSigDigs
-     * Limit the number of significant digits on a float.
@@ -231 +244 @@
-            fig = parseFloat(num.toPrecision(sig));
-        }
-        return fig;
+    },
+    
+    /**
+     * APIFunction: OpenLayers.Number.format
+     * Formats a number for output.
+     * 
+     * Parameters:
+     * num  - {Float}
+     * dec  - {Integer} Number of decimal places to round to.
+     *        Defaults to 0. Set to null to leave decimal places unchanged.
+     * tsep - {String} Thousands separator.
+     *        Defaults to OpenLayers.Number.thousandsSeparator
+     * dsep - {String} Decimal separator.
+     *        Defaults to OpenLayers.Number.decimalSeparator
+     */
+    format: function(num, dec, tsep, dsep) {
+        dec = (typeof dec != "undefined") ? dec : 0; 
+        tsep = (typeof tsep != "undefined") ? tsep :
+            OpenLayers.Number.thousandsSeparator; 
+        dsep = (typeof dsep != "undefined") ? dsep :
+            OpenLayers.Number.decimalSeparator;
+
+        if (dec != null) {
+            num = Math.round(num*Math.pow(10, dec)) / Math.pow(10, dec);
+        }
+
+        var splittedNum = num.toString().split(".");
+        var integer = splittedNum[0];
+        if (tsep) {
+            var thousands = /(-?[0-9]+)([0-9]{3})/; 
+            while(thousands.test(integer)) { 
+                integer = integer.replace(thousands, "$1" + tsep + "$2"); 
+            }
+        }
+        
+        if (dec == 0) {
+            return integer;
+        } else {
+            var rem = splittedNum.length > 0 ? splittedNum[1] : "0";
+            if (dec) {
+                rem = rem + new Array(dec - rem.length + 1).join("0");
+            }
+            return integer + dsep + rem;
+        }
-    }
-};
-

tests/test_BaseTypes.html

@@ -137 +137 @@
-        t.eq(OpenLayers.Number.limitSigDigs(num, 5), 1234.6, "running limSigDig() on a floating point number works fine");
-        
-    }
+    
+    function test_Number_format(t) {
+        t.plan(6);
+        
+        t.eq(OpenLayers.Number.format(12345), "12,345", "formatting an integer number works");
+        
+        var num = 12345.6789
+        t.eq(OpenLayers.Number.format(num, null, "", ","), "12345,6789", "only changing decimal separator and leaving everything else untouched works");
+        t.eq(OpenLayers.Number.format(num, 5), "12,345.67890", "filling up decimals with trailing zeroes works");
+        t.eq(OpenLayers.Number.format(num, 3, ".", ","), "12.345,679", "rounding and changing decimal/thousands separator in function call works");
+        t.eq(OpenLayers.Number.format(num, 0, ""), "12346", "empty thousands separator in function call works");
+        OpenLayers.Number.thousandsSeparator = ".";
+        OpenLayers.Number.decimalSeparator = ",";
+        t.eq(OpenLayers.Number.format(num, 3), "12.345,679", "changing thousands/decimal separator globally works");
+    }
-
-    function test_07_Function_bind(t) {
-        t.plan(12);