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

This looks terrible

Browse Source 
I've realized that my edge breaking system is way overzealous, and I curbed it somewhat. I think it's probably easier for users to break excess edges than to have to replace incorrectly broken ones.
This commit is contained in:
Justin Kunimune 2019-10-25 10:14:44 -04:00
parent 40e33bfeed
commit 8406b13eae
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/image/SVGMap.java
View File

@ -63,6 +63,9 @@ public class SVGMap implements Iterable<SVGMap.Path> {
public static final double[] NULL_TRANSFORM = {1, 1, 0, 0}; public static final double[] NULL_TRANSFORM = {1, 1, 0, 0};
private static final double MAX_EDGE_FACTOR = 20; // cut lines that are more than this much longer than their neighbors
private static final double MAX_EDGE_LENGTH = 1/20.; // cut lines that are more than this far across the map
private List<Path> paths; //the set of closed curves in this image private List<Path> paths; //the set of closed curves in this image
private List<String> format; //the stuff that goes between the curve descriptions, probably important for something. private List<String> format; //the stuff that goes between the curve descriptions, probably important for something.
private double vbMinX, vbMinY, vbWidth, vbHeight; //the SVG viewBox private double vbMinX, vbMinY, vbWidth, vbHeight; //the SVG viewBox
@ -314,7 +317,9 @@ public class SVGMap implements Iterable<SVGMap.Path> {
out.write(SAXUtils.encode(replacePlaceholders(formatIterator.next(), inWidth/inHeight))); out.write(SAXUtils.encode(replacePlaceholders(formatIterator.next(), inWidth/inHeight)));
while (curveIterator.hasNext()) { while (curveIterator.hasNext()) {
out.write(closePaths(breakWraps(curveIterator.next())).toString( out.write(closePaths(
breakWraps(curveIterator.next(), Math.max(inWidth, inHeight))
).toString(
inMinX, inMaxY, vbMinX, vbMinY, inMinX, inMaxY, vbMinX, vbMinY,
Math.max(vbWidth, vbHeight)/Math.max(inWidth, inHeight))); Math.max(vbWidth, vbHeight)/Math.max(inWidth, inHeight)));
out.write(SAXUtils.encode(formatIterator.next())); out.write(SAXUtils.encode(formatIterator.next()));
@ -346,9 +351,10 @@ public class SVGMap implements Iterable<SVGMap.Path> {
} }
private Path breakWraps(Path continuous) { //break excessively long commands, as they are likely wrapping over a discontinuity private Path breakWraps(Path continuous, double inSize) { //break excessively long commands, as they are likely wrapping over a discontinuity
if (continuous.size() <= 2) return continuous; if (continuous.size() <= 2) return continuous;
Path broken = new Path(); Path broken = new Path();
final double lengthThreshold = inSize*MAX_EDGE_LENGTH;
double[] lens = {Double.NaN, Double.NaN, Double.NaN}; //the revolving array of command lengths double[] lens = {Double.NaN, Double.NaN, Double.NaN}; //the revolving array of command lengths
for (int i = 0; i < continuous.size(); i ++) { for (int i = 0; i < continuous.size(); i ++) {
if (i < continuous.size()-1 && continuous.get(i+1).type != 'M') if (i < continuous.size()-1 && continuous.get(i+1).type != 'M')
@ -359,8 +365,9 @@ public class SVGMap implements Iterable<SVGMap.Path> {
lens[2] = Double.NaN; lens[2] = Double.NaN;
char type = continuous.get(i).type; char type = continuous.get(i).type;
if ((Double.isNaN(lens[0]) || lens[1] > 20*lens[0]) //and compare it to the last two lengths if (lens[1] >= lengthThreshold && // check it against an absolute threshold
&& (Double.isNaN(lens[2]) || lens[1] > 20*lens[2])) //if both sides are far longer or nonexistent (Double.isNaN(lens[0]) || lens[1] > 20*lens[0]) && //and compare it to the last two lengths
(Double.isNaN(lens[2]) || lens[1] > 20*lens[2])) //if both sides are far longer or nonexistent
type = 'M'; //break this line type = 'M'; //break this line
broken.add(new Command(type, continuous.get(i).args.clone())); broken.add(new Command(type, continuous.get(i).args.clone()));