From 469259df22b746e84b7e47a44a41f0653acb71c3 Mon Sep 17 00:00:00 2001 From: pissang Date: Wed, 18 Mar 2020 22:40:11 +0800 Subject: [PATCH] Merge from release. add missing merged file --- src/coord/radar/Radar.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/coord/radar/Radar.ts b/src/coord/radar/Radar.ts index 2d6da96ab..14d40f7a9 100644 --- a/src/coord/radar/Radar.ts +++ b/src/coord/radar/Radar.ts @@ -204,7 +204,7 @@ class Radar implements CoordinateSystem, CoordinateSystemMaster { ); } else if (fixedMin != null) { - var max; + let max; // User set min, expand extent on the other side do { max = fixedMin + interval * splitNumber; @@ -217,7 +217,7 @@ class Radar implements CoordinateSystem, CoordinateSystemMaster { } while (max < rawExtent[1] && isFinite(max) && isFinite(rawExtent[1])); } else if (fixedMax != null) { - var min; + let min; // User set min, expand extent on the other side do { min = fixedMax - interval * splitNumber; @@ -227,17 +227,14 @@ class Radar implements CoordinateSystem, CoordinateSystemMaster { } while (min > rawExtent[0] && isFinite(min) && isFinite(rawExtent[0])); } else { - var nicedSplitNumber = scale.getTicks().length - 1; + const nicedSplitNumber = scale.getTicks().length - 1; if (nicedSplitNumber > splitNumber) { interval = increaseInterval(interval); } - // PENDING - var center = Math.ceil((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval; - var halfSplitNumber = Math.round(splitNumber / 2); - scale.setExtent( - numberUtil.round(center - halfSplitNumber * interval), - numberUtil.round(center + (splitNumber - halfSplitNumber) * interval) - ); + // TODO + const max = Math.ceil(rawExtent[1] / interval) * interval; + const min = numberUtil.round(max - interval * splitNumber); + scale.setExtent(min, max); scale.setInterval(interval); } }); -- GitLab