Support negative values for log Scale.

Support implemented by inverting the extents at input and handling the
input as absolute value and finally mapping everything back to negative
axes in inverted order.

Added test cases for passing through 0 power and new a new file ogScale-negative.html.

Author: Antti-Palola

src/scale/Log.ts

@@ -36,9 +36,14 @@ const roundingErrorFix = numberUtil.round;
 const mathFloor = Math.floor;
 const mathCeil = Math.ceil;
 const mathPow = Math.pow;
-
-const mathLog = Math.log;
-
+const mathMax = Math.max;
+const mathRound = Math.round;
+
+/**
+ * LogScale is a scale that maps a linear values to a logarithmic range.
+ *
+ * Support for negative values is implemented by inverting the extents and mapping the values as they were positive.
+ */
 class LogScale extends Scale {
     static type = 'log';
     readonly type = 'log';
@@ -47,6 +52,14 @@ class LogScale extends Scale {
 
     private _originalScale: IntervalScale = new IntervalScale();
 
+    /**
+     * Whether the original input values are negative.
+     *
+     * @type {boolean}
+     * @private
+     */
+    private _isNegative: boolean = false;
+
     private _fixMin: boolean;
     private _fixMax: boolean;
 
@@ -63,12 +76,13 @@ class LogScale extends Scale {
         const originalScale = this._originalScale;
         const extent = this._extent;
         const originalExtent = originalScale.getExtent();
+        const negativeMultiplier = this._isNegative ? -1 : 1;
 
         const ticks = intervalScaleProto.getTicks.call(this, expandToNicedExtent);
 
         return zrUtil.map(ticks, function (tick) {
             const val = tick.value;
-            let powVal = numberUtil.round(mathPow(this.base, val));
+            let powVal = mathPow(this.base, val);
 
             // Fix #4158
             powVal = (val === extent[0] && this._fixMin)
@@ -79,27 +93,31 @@ class LogScale extends Scale {
                 : powVal;
 
             return {
-                value: powVal
+                value: powVal * negativeMultiplier
             };
         }, this);
     }
 
     setExtent(start: number, end: number): void {
-        const base = mathLog(this.base);
+        // Assume the start and end can be infinity
         // log(-Infinity) is NaN, so safe guard here
-        start = mathLog(Math.max(0, start)) / base;
-        end = mathLog(Math.max(0, end)) / base;
+        if (start < Infinity) {
+            start = scaleHelper.absMathLog(start, this.base);
+        }
+        if (end > -Infinity) {
+            end = scaleHelper.absMathLog(end, this.base);
+        }
+
         intervalScaleProto.setExtent.call(this, start, end);
     }
 
     /**
      * @return {number} end
      */
     getExtent() {
-        const base = this.base;
         const extent = scaleProto.getExtent.call(this);
-        extent[0] = mathPow(base, extent[0]);
-        extent[1] = mathPow(base, extent[1]);
+        extent[0] = mathPow(this.base, extent[0]);
+        extent[1] = mathPow(this.base, extent[1]);
 
         // Fix #4158
         const originalScale = this._originalScale;
@@ -113,9 +131,17 @@ class LogScale extends Scale {
     unionExtent(extent: [number, number]): void {
         this._originalScale.unionExtent(extent);
 
-        const base = this.base;
-        extent[0] = mathLog(extent[0]) / mathLog(base);
-        extent[1] = mathLog(extent[1]) / mathLog(base);
+        if (extent[0] < 0 && extent[1] < 0) {
+            // If both extent are negative, switch to plotting negative values.
+            // If there are only some negative values, they will be plotted incorrectly as positive values.
+            this._isNegative = true;
+        }
+
+        const [logStart, logEnd] = this.getLogExtent(extent[0], extent[1]);
+
+        extent[0] = logStart;
+        extent[1] = logEnd;
+
         scaleProto.unionExtent.call(this, extent);
     }
 
@@ -131,13 +157,18 @@ class LogScale extends Scale {
      */
     calcNiceTicks(approxTickNum: number): void {
         approxTickNum = approxTickNum || 10;
-        const extent = this._extent;
-        const span = extent[1] - extent[0];
+
+        const span = this._extent[1] - this._extent[0];
+
         if (span === Infinity || span <= 0) {
             return;
         }
 
-        let interval = numberUtil.quantity(span);
+        let interval = mathMax(
+            1,
+            mathRound(span / approxTickNum)
+        );
+
         const err = approxTickNum / span * interval;
 
         // Filter ticks to get closer to the desired count.
@@ -150,10 +181,10 @@ class LogScale extends Scale {
             interval *= 10;
         }
 
-        const niceExtent = [
-            numberUtil.round(mathCeil(extent[0] / interval) * interval),
-            numberUtil.round(mathFloor(extent[1] / interval) * interval)
-        ] as [number, number];
+        const niceExtent: [number, number] = [
+            mathFloor(this._extent[0] / interval) * interval,
+            mathCeil(this._extent[1] / interval) * interval
+        ];
 
         this._interval = interval;
         this._niceExtent = niceExtent;
@@ -177,13 +208,19 @@ class LogScale extends Scale {
     }
 
     contain(val: number): boolean {
-        val = mathLog(val) / mathLog(this.base);
+        val = scaleHelper.absMathLog(val, this.base);
         return scaleHelper.contain(val, this._extent);
     }
 
-    normalize(val: number): number {
-        val = mathLog(val) / mathLog(this.base);
-        return scaleHelper.normalize(val, this._extent);
+    normalize(inputVal: number): number {
+        const val = scaleHelper.absMathLog(inputVal, this.base);
+        let ex: [number, number] = [this._extent[0], this._extent[1]];
+
+        if (this._isNegative) {
+            // Invert the extent for normalize calculations as the extent is inverted for negative values.
+            ex = [this._extent[1], this._extent[0]];
+        }
+        return scaleHelper.normalize(val, ex);
     }
 
     scale(val: number): number {
@@ -193,6 +230,26 @@ class LogScale extends Scale {
 
     getMinorTicks: IntervalScale['getMinorTicks'];
     getLabel: IntervalScale['getLabel'];
+
+    /**
+     * Get the extent of the log scale.
+     * @param start - The start value of the extent.
+     * @param end - The end value of the extent.
+     * @returns The extent of the log scale. The extent is reversed for negative values.
+     */
+    getLogExtent(start: number, end: number): [number, number] {
+        // Invert the extent but use absolute values
+        if (this._isNegative) {
+            const logStart = scaleHelper.absMathLog(Math.abs(end), this.base);
+            const logEnd = scaleHelper.absMathLog(Math.abs(start), this.base);
+            return [logStart, logEnd];
+        }
+        else {
+            const logStart = scaleHelper.absMathLog(start, this.base);
+            const logEnd = scaleHelper.absMathLog(end, this.base);
+            return [logStart, logEnd];
+        }
+    }
 }
 
 const proto = LogScale.prototype;

src/scale/helper.ts

@@ -28,6 +28,8 @@ type intervalScaleNiceTicksResult = {
     niceTickExtent: [number, number]
 };
 
+const mathLog = Math.log;
+
 export function isValueNice(val: number) {
     const exp10 = Math.pow(10, quantityExponent(Math.abs(val)));
     const f = Math.abs(val / exp10);
@@ -136,3 +138,20 @@ export function normalize(val: number, extent: [number, number]): number {
 export function scale(val: number, extent: [number, number]): number {
     return val * (extent[1] - extent[0]) + extent[0];
 }
+
+/**
+ * Calculates the absolute logarithm of a number with a specified base.
+ * Handles edge cases by:
+ * - Returning 0 for values very close to 0 (within Number.EPSILON)
+ * - Taking the absolute value of the input to handle negative numbers
+ *
+ * @param x - The number to calculate the logarithm of
+ * @param base - The base of the logarithm (defaults to 10)
+ * @returns The absolute logarithm value, or 0 if x is very close to 0
+ */
+export function absMathLog(x: number, base = 10): number {
+    if (Math.abs(x) < Number.EPSILON) {
+        return 0;
+    }
+    return mathLog(Math.abs(x)) / mathLog(base);
+}