From e5b22ec0e35f7b261c56e393cf7144bd84c8b470 Mon Sep 17 00:00:00 2001 From: Justin Kunimune Date: Sun, 3 Nov 2024 14:03:05 -0500 Subject: [PATCH] fix projection booleans I'm not sure how these got so messed up, but they should be fine now. --- src/maps/Danseiji.java | 18 +++++++++--------- src/maps/Elastic.java | 2 +- src/maps/Liquid.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/maps/Danseiji.java b/src/maps/Danseiji.java index d652cf1..9e0f68e 100644 --- a/src/maps/Danseiji.java +++ b/src/maps/Danseiji.java @@ -55,37 +55,37 @@ public class Danseiji { public static final DanseijiProjection DANSEIJI_N = new DanseijiProjection( "Danseiji N", "The optimal conventional lenticular map", - true, Type.OTHER, Property.COMPROMISE, false, "danseijiN.csv"); + false, Type.OTHER, Property.COMPROMISE, false, "danseijiN.csv"); public static final DanseijiProjection DANSEIJI_I = new DanseijiProjection( "Danseiji I", "The optimal conventional equal-area map", - true, Type.OTHER, Property.COMPROMISE, false, "danseijiI.csv"); + false, Type.OTHER, Property.COMPROMISE, false, "danseijiI.csv"); public static final DanseijiProjection DANSEIJI_II = new DanseijiProjection( "Danseiji II", "An optimised map that gives more weight to shapes rather than sizes", - true, Type.OTHER, Property.COMPROMISE, false, "danseijiII.csv"); + false, Type.OTHER, Property.COMPROMISE, false, "danseijiII.csv"); public static final DanseijiProjection DANSEIJI_III = new DanseijiProjection( - "Danseiji III", "A map optimised to move distortion from the continents into the oceans. I recommend using the newer Elastic III instead", + "Danseiji III", "A map optimised to move distortion from the continents into the oceans. I recommend using the newer Elastic III instead.", true, Type.OTHER, Property.COMPROMISE, true, "danseijiIII.csv"); public static final DanseijiProjection DANSEIJI_IV = new DanseijiProjection( - "Danseiji IV", "A map optimised to display landmasses accurately and without interruption. I recommend using the newer Elastic I instead", + "Danseiji IV", "A map optimised to display landmasses accurately and without interruption. I recommend using the newer Elastic I instead.", true, Type.OTHER, Property.COMPROMISE, true, "danseijiIV.csv"); public static final DanseijiProjection DANSEIJI_V = new DanseijiProjection( - "Danseiji V", "A map optimised to show off the continents by compressing the oceans. I recommend using the newer Elastic III instead", - true, Type.OTHER, Property.COMPROMISE, true, "danseijiV.csv"); + "Danseiji V", "A map optimised to show off the continents by compressing the oceans. I recommend using the newer Elastic III instead.", + false, Type.OTHER, Property.COMPROMISE, true, "danseijiV.csv"); public static final DanseijiProjection DANSEIJI_VI = new DanseijiProjection( "Danseiji VI", "A compromise conventional map, where both physical area and population affect size", - true, Type.OTHER, Property.COMPROMISE, true, "danseijiVI.csv"); + false, Type.OTHER, Property.COMPROMISE, true, "danseijiVI.csv"); @@ -100,7 +100,7 @@ public class Danseiji { public DanseijiProjection( String title, String description, boolean interrupted, Type type, Property property, boolean basedOnLand, String filename) { - super(title, "Justin H. Kunimune", description, null, !interrupted, true, true, false, type, property, 3, + super(title, "Justin H. Kunimune", description, null, !interrupted, true, true, true, type, property, 3, new String[0], new double[0][], !basedOnLand); this.filename = filename; this.shape = null; diff --git a/src/maps/Elastic.java b/src/maps/Elastic.java index 9e73a31..7c00763 100644 --- a/src/maps/Elastic.java +++ b/src/maps/Elastic.java @@ -91,7 +91,7 @@ public class Elastic { String title, String description, boolean interrupted, Type type, Property property, boolean based_on_land, String filename) { super(title, "Justin H. Kunimune", description, null, - true, false, true, !interrupted, + !interrupted, true, true, false, type, property, 4, new String[0], new double[0][], !based_on_land); this.filename = filename; diff --git a/src/maps/Liquid.java b/src/maps/Liquid.java index fb643ec..cfcd981 100644 --- a/src/maps/Liquid.java +++ b/src/maps/Liquid.java @@ -81,7 +81,7 @@ public class Liquid { String title, String description, Projection baseProjection, double centralMeridian, boolean based_on_land, String filename) { super(title, "Robert C. Sargent", description, null, - true, false, true, baseProjection.isContinuous(), + baseProjection.isContinuous(), baseProjection.isComprehensive(), true, true, Type.OTHER, baseProjection.getProperty(), 4, new String[0], new double[0][], !based_on_land); this.filename = filename;