Use DecomalFormat.setMaximumFractionDigits & keep negative zero

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
powsybl · May 17, 2022 · 251fbe8 · 251fbe8
1 parent 0eeed13
commit 251fbe8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java
@@ -1,7 +1,5 @@
 package com.powsybl.sld.svg;
 
-import org.apache.commons.math3.util.Precision;
-
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
@@ -43,10 +41,11 @@ public DirectionalFeederInfo(String componentType, double value, int precision,
     }
 
     private static String format(double value, int precision) {
-        // build pattern
-        String pattern = precision == 0 ? "#;#" : "#.0" + "#".repeat(precision - 1);
-        String formattedValue = new DecimalFormat(pattern, DecimalFormatSymbols.getInstance(Locale.ENGLISH)).format(value);
-        return formattedValue.replaceAll("^-(?=0(\\.0*)?$)", ""); // Avoid negative zero
+        DecimalFormat format = new DecimalFormat();
+        format.setMaximumFractionDigits(precision);
+        // Floating representation with point
+        format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH));
+        return format.format(value);
     }
 
     public DiagramLabelProvider.LabelDirection getDirection() {

diff --git a/single-line-diagram-core/src/test/resources/consecutive_shunts.svg b/single-line-diagram-core/src/test/resources/consecutive_shunts.svg