Changeset 5684

Timestamp:

01/08/08 11:40:54 (1 year ago)

Author:

tschaub

Message:

using OpenLayers.Number.format

Files:

• sandbox/tschaub/scalebar/lib/OpenLayers/BaseTypes.js (modified) (2 diffs)
• sandbox/tschaub/scalebar/lib/OpenLayers/Control/ScaleBar.js (modified) (5 diffs)

sandbox/tschaub/scalebar/lib/OpenLayers/BaseTypes.js

@@ -214 +214 @@
-
-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
@@ -232 +245 @@
-        }
-        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
+     *
+     * Returns:
+     * {String} A string representing the formatted number.
+     */
+    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 = parseFloat(num.toFixed(dec));
+        }
+
+        var parts = num.toString().split(".");
+        var integer = parts[0];
+        if (tsep) {
+            var thousands = /(-?[0-9]+)([0-9]{3})/; 
+            while(thousands.test(integer)) { 
+                integer = integer.replace(thousands, "$1" + tsep + "$2"); 
+            }
+        }
+        
+        if (dec == 0) {
+            str = integer;
+        } else {
+            var rem = parts.length > 1 ? parts[1] : "0";
+            if (dec) {
+                rem = rem + new Array(dec - rem.length + 1).join("0");
+            }
+            str = integer + dsep + rem;
+        }
+        return str;
-    }
-};

sandbox/tschaub/scalebar/lib/OpenLayers/Control/ScaleBar.js

@@ -98 +98 @@
-     */
-    scaleText: "scale 1:",
-
+
-    /**
-     * Property: thousandsSeparator
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /**
@@ -314 +308 @@
-        this.scale = (scale != undefined) ? scale : this.map.getScale();
-        // update the element title and width
-this.formatNumber
+OpenLayers.Number.format
-        this.element.style.width = this.maxWidth + 'px';
-        // check each measurement unit in the display system
@@ -346 +340 @@
-            // add major measure
-            if(!this.singleLine) {
-
-
+
+
+
+
+
-                this.numbersContainer.appendChild(this.createElement(
-                    "NumbersBox", measure, xPos - this.dxNumbersBox
@@ -391 +388 @@
-        ));
-        // add final measure
-
+
+
+
+
-        if(!this.singleLine) {
-            this.numbersContainer.appendChild(this.createElement(
@@ -585 +585 @@
-        return value ? value : 0;
-    },
-    
-    /**
-     * Method: formatNumber
-     * Returns a string formatted number with thousands separators truncated
-     *     to the given number of decimal places.
-     *
-     * Parameters:
-     * num - {Float} Input number
-     * dec - {Integer} Optional number of decimals.  Default is 0.
-     * tsep - {String} Thousands separator.  Default is <thousandsSeparator>.
-     * dsep - {String} Decimal separator.  Default is <decimalSeparator>.
-     *
-     * Returns:
-     * {String} A formatted number string.
-     */
-    formatNumber: function(num, dec, tsep, dsep) {
-        dec = (dec != undefined) ? dec : 0;
-        tsep = (tsep != undefined) ? tsep : this.decimalSeparator;
-        dsep = (dsep != undefined) ? dsep : this.thousandsSeparator;
-        var str;
-        var integer = Math.round(num).toString();
-        var thousands = /(-?[0-9]+)([0-9]{3})/;
-        while(thousands.test(integer)) {
-            integer = integer.replace(thousands, "$1" + tsep + "$2");
-        }
-        if(dec > 0) {
-            var rem = Math.floor(Math.pow(10, dec) * (num - Math.round(num)));
-            if(rem == 0) {
-                str = integer;
-            } else {
-                str = integer + dcep + rem;
-            }
-        } else {
-            str = integer;
-        }
-        return str;
-    },
-
-    /**