Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CEA projection #10

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Fix CEA projection #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/locationtech/proj4j/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private synchronized void initialize() {
register("bonne", BonneProjection.class, "Bonne (Werner lat_1=90)");
register("cass", CassiniProjection.class, "Cassini");
register("cc", CentralCylindricalProjection.class, "Central Cylindrical");
register("cea", EqualAreaCylindricalProjection.class, "Equal Area Cylindrical");
register("cea", CylindricalEqualAreaProjection.class, "Equal Area Cylindrical");
// register( "chamb", Projection.class, "Chamberlin Trimetric" );
register("collg", CollignonProjection.class, "Collignon");
register("crast", CrasterProjection.class, "Craster Parabolic (Putnins P4)");
Expand Down Expand Up @@ -194,8 +194,10 @@ private synchronized void initialize() {
register("lagrng", LagrangeProjection.class, "Lagrange");
register("larr", LarriveeProjection.class, "Larrivee");
register("lask", LaskowskiProjection.class, "Laskowski");
register("latlong", LongLatProjection.class, "Lat/Long");
register("longlat", LongLatProjection.class, "Lat/Long");
register("latlong", LongLatProjection.class, "Lat/Long (Geodetic alias)");
register("longlat", LongLatProjection.class, "Lat/Long (Geodetic alias)");
register("latlon", LongLatProjection.class, "Lat/Long (Geodetic alias)");
register("lonlat", LongLatProjection.class, "Lat/Long (Geodetic)");
register("lcc", LambertConformalConicProjection.class, "Lambert Conformal Conic");
register("leac", LambertEqualAreaConicProjection.class, "Lambert Equal Area Conic");
// register( "lee_os", Projection.class, "Lee Oblated Stereographic" );
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/locationtech/proj4j/proj/CylindricalEqualAreaProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class CylindricalEqualAreaProjection extends Projection {

private double qp;
private double[] apa;
private double trueScaleLatitude;

public CylindricalEqualAreaProjection() {
this(0.0, 0.0, 0.0);
Expand Down
93 changes: 0 additions & 93 deletions src/main/java/org/locationtech/proj4j/proj/EqualAreaCylindricalProjection.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/resources/proj4-epsg.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@
"4326 -> 3407","passing","EPSG","4326","EPSG","3407","1.0","-1.0","0.0","-4.1203006439011E7","-1.027783275293E7","0.0","1.000000","1.000000","1.000000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3408","passing","EPSG","4326","EPSG","3408","1.0","-1.0","0.0","158617.286076","-9087178.233242","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3409","passing","EPSG","4326","EPSG","3409","1.0","-1.0","0.0","155872.772909","8929945.179252","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3410","failing","EPSG","4326","EPSG","3410","1.0","-1.0","0.0","96301.077465","-128394.917833","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3410","passing","EPSG","4326","EPSG","3410","1.0","-1.0","0.0","96301.077465","-128394.917833","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3411","passing","EPSG","4326","EPSG","3411","1.0","-1.0","0.0","9025052.976399","-8715392.351348","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3412","passing","EPSG","4326","EPSG","3412","1.0","-1.0","0.0","211500.770422","1.2116871022335E7","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3413","passing","EPSG","4326","EPSG","3413","1.0","-1.0","0.0","9024858.222421","-8715204.279617","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
Expand Down Expand Up @@ -1848,7 +1848,7 @@
"4326 -> 3970","passing","EPSG","4326","EPSG","3970","1.0","-1.0","0.0","9766541.186236","106793.672654","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3973","passing","EPSG","4326","EPSG","3973","1.0","-1.0","0.0","158605.709728","-9086515.024711","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3974","passing","EPSG","4326","EPSG","3974","1.0","-1.0","0.0","155873.556203","8929990.054097","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3975","failing","EPSG","4326","EPSG","3975","1.0","-1.0","0.0","96486.280251","-127566.985295","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3975","passing","EPSG","4326","EPSG","3975","1.0","-1.0","0.0","96486.280251","-127566.985295","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3976","passing","EPSG","4326","EPSG","3976","1.0","-1.0","0.0","211496.210061","1.2116609759456E7","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3978","passing","EPSG","4326","EPSG","3978","1.0","-1.0","0.0","1.1394567715938E7","3952432.439572","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 3979","passing","EPSG","4326","EPSG","3979","1.0","-1.0","0.0","1.1394567715938E7","3952432.439572","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
Expand Down Expand Up @@ -2588,7 +2588,7 @@
"4326 -> 6925","passing","EPSG","4326","EPSG","6925","1.0","-1.0","0.0","3.8151513491838E7","7483236.836791","0.0","0.030480","0.030480","0.030480","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6931","passing","EPSG","4326","EPSG","6931","1.0","-1.0","0.0","158605.709728","-9086515.024711","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6932","passing","EPSG","4326","EPSG","6932","1.0","-1.0","0.0","155873.556203","8929990.054097","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6933","failing","EPSG","4326","EPSG","6933","1.0","-1.0","0.0","96486.280251","-127566.985295","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6933","passing","EPSG","4326","EPSG","6933","1.0","-1.0","0.0","96486.280251","-127566.985295","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6962","passing","EPSG","4326","EPSG","6962","1.0","-1.0","0.0","-2677190.737666","-4766506.168209","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6984","passing","EPSG","4326","EPSG","6984","1.0","-1.0","0.0","-3837638.237021","-3019405.091929","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
"4326 -> 6991","passing","EPSG","4326","EPSG","6991","1.0","-1.0","0.0","-3837638.237021","-3019405.091929","0.0","0.100000","0.100000","0.100000","","","","Auto-generated from proj.4 epsg database"
Expand Down