sharpetronics/Map-Projections
1
0
Fork 0
mirror of https://github.com/csharpee/Map-Projections.git synced 2025-12-08 00:00:14 -05:00
Code Issues Projects Releases Wiki Activity

do not localize numbers in SVGs

Browse Source 
SVGs only accept «0» as the zero character and «.» as the decimal separator.  when I started aggressively using String.format(), it started localizing numbers to sometimes use ⋅ and ,, tho, which of course resulted in invalid SVGs.  luckily when it *reads* doubles it seems to assume US locale.
This commit is contained in:
Justin Kunimune 2024-01-02 09:25:44 -10:00
parent 33bfa1deb9
commit e1bf7086ab
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/image/Path.java
View File

@ -13,6 +13,7 @@ import static java.lang.Math.max;
import static java.lang.Math.sin;
import static java.lang.Math.toDegrees;
import static java.lang.String.format;
import static java.util.Locale.US;
public class Path {
/**
@ -242,7 +243,7 @@ public class Path {
private static String formatDouble(double d) { //format a number with the minimum number of digits, but at most 3
String str = format("%.3f", d);
String str = format(US, "%.3f", d);
if (str.contains("."))
str = str.replaceFirst("0+$", "");
if (str.endsWith("."))

15
src/image/SVGMap.java
View File

@ -51,6 +51,7 @@ import static java.lang.Double.parseDouble;
import static java.lang.Math.PI;
import static java.lang.Math.hypot;
import static java.lang.String.format;
import static java.util.Locale.US;
import static utils.Math2.linInterp;
import static utils.Math2.max;
import static utils.Quantity.parseQuantity;
@ -166,7 +167,7 @@ public class SVGMap implements Iterable<SVGMap.SVGElement>, SavableImage {
// @Override /* only available in Java 14+ */
// public void declaration(String version, String encoding, String standalone) {
// elements.add(new Content(String.format(
// elements.add(new Content(format(
// "<?xml version=\"%s\" encoding=\"%s\" standalone=\"%s\"?>\n",
// version, encoding, standalone)));
// }
@ -218,8 +219,10 @@ public class SVGMap implements Iterable<SVGMap.SVGElement>, SavableImage {
Quantity displayWidth = parseQuantity(attributes.getValue("width"));
Quantity displayHeight = parseQuantity(attributes.getValue("height"));
if (attributes.getValue("viewBox") == null)
attributes.addAttribute("", "", "viewBox", "",
format("%f %f %f %f", 0., 0., displayWidth.value, displayHeight.value));
attributes.addAttribute(
"", "", "viewBox", "",
format(US, "%f %f %f %f",
0., 0., displayWidth.value, displayHeight.value));
String[] values = attributes.getValue("viewBox").split("\\s", 4);
double vbMinX = parseDouble(values[0]);
double vbMinY = parseDouble(values[1]);
@ -590,7 +593,7 @@ public class SVGMap implements Iterable<SVGMap.SVGElement>, SavableImage {
}
public String toString() {
return format(formatSpecifier, width.value, width.units, height.value, height.units,
return format(US, formatSpecifier, width.value, width.units, height.value, height.units,
vbMinX, vbMinY, vbWidth, vbHeight);
}
}
@ -630,7 +633,7 @@ public class SVGMap implements Iterable<SVGMap.SVGElement>, SavableImage {
}
public String toString() {
return format(formatSpecifier, x, y);
return format(US, formatSpecifier, x, y);
}
}
@ -648,7 +651,7 @@ public class SVGMap implements Iterable<SVGMap.SVGElement>, SavableImage {
}
public String toString() {
return format(formatSpecifier, Path.toString(commands));
return format(US, formatSpecifier, Path.toString(commands));
}
}
}