diff --git a/output/graph - plotter.png b/output/graph - plotter.png index 72ee467..98463ab 100644 Binary files a/output/graph - plotter.png and b/output/graph - plotter.png differ diff --git a/src/apps/MapPlotter.java b/src/apps/MapPlotter.java index 670c862..bc1ad65 100644 --- a/src/apps/MapPlotter.java +++ b/src/apps/MapPlotter.java @@ -84,7 +84,7 @@ public class MapPlotter extends Application { Arbitrary.DANSEIJI_II }; private static final Projection[] TETRAHEDRAL = { Polyhedral.LEE_TETRAHEDRAL_RECTANGULAR, Polyhedral.AUTHAGRAPH, Polyhedral.VAN_LEEUWEN }; - private static final Projection[] CHEATY = { Pseudocylindrical.LEMONS, Octohedral.KEYES_BASIC_M, + private static final Projection[] CHEATY = { Pseudocylindrical.LEMONS, Octohedral.CAHILL_KEYES, Polyhedral.DYMAXION, Octohedral.CAHILL_CONCIALDI }; private static final Projection[] OTHER = { Misc.PEIRCE_QUINCUNCIAL }; diff --git a/src/maps/Lenticular.java b/src/maps/Lenticular.java index c4b9516..c464efa 100644 --- a/src/maps/Lenticular.java +++ b/src/maps/Lenticular.java @@ -189,7 +189,8 @@ public class Lenticular { public double[] inverse(double x, double y) { - return obliquifyPlnr(HAMMER.inverse(x/1.63*2, y), POLE); // TODO +// return obliquifyPlnr(HAMMER.inverse(x/1.63*2, y), POLE); // TODO + return null; } }; diff --git a/src/maps/Polyhedral.java b/src/maps/Polyhedral.java index dc5ff30..b6bb900 100644 --- a/src/maps/Polyhedral.java +++ b/src/maps/Polyhedral.java @@ -234,7 +234,7 @@ public class Polyhedral { public static final Projection VAN_LEEUWEN = new PolyhedralProjection( - "van Leeuwen", "An uninterrupted equal-area tetrahedral projection. It's more accurately known as \"the Vertex-oriented great circle projection applied to a tetrahedron\", but the guy who copublished it with Leeuwen calls it \"the van Leeuwen projection\" on his website, so I think this is fine.", + "Van Leeuwen", "An uninterrupted equal-area tetrahedral projection. It's more accurately known as \"the Vertex-oriented great circle projection applied to a tetrahedron\", but the guy who copublished it with Leeuwen calls it \"the van Leeuwen projection\" on his website, so I think this is fine.", 0b1011, Configuration.TETRAHEDRON_WIDE_VERTEX, Property.EQUAL_AREA, 3) { public double[] faceProject(double lat, double lon) { diff --git a/src/maps/Pseudocylindrical.java b/src/maps/Pseudocylindrical.java index f5c420f..c8854e0 100644 --- a/src/maps/Pseudocylindrical.java +++ b/src/maps/Pseudocylindrical.java @@ -95,7 +95,7 @@ public class Pseudocylindrical { public static final Projection KAVRAYSKIY_VII = new Projection( "Kavrayskiy VII", Math.PI*Math.sqrt(3), Math.PI, 0b1111, Type.PSEUDOCYLINDRICAL, - Property.COMPROMISE, 3, null, "mostly popular in the former Soviet Union") { + Property.COMPROMISE, 2, null, "mostly popular in the former Soviet Union") { public double[] project(double lat, double lon) { return new double[] { 1.5*lon*Math.sqrt(1/3.-Math.pow(lat/Math.PI, 2)), lat };