Merge pull request #368 from micahcochran/patterson

Add Patterson Cylindrical Projection

7 files changed, 152 insertions, 2 deletions

diff --git a/nad/testvarious b/nad/testvarious
index 0f3384c2..a3604ec1 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -787,6 +787,40 @@ $EXE -f '%.7f' \
  -E >> ${OUT} <<EOF
 7461300.0 528000.0 0.0
 EOF
+echo  "##############################################################" >> ${OUT}
+echo  "Test patterson forward projection" >> ${OUT}
+#
+$EXE -f '%0.8f' \
+    +proj=latlong +datum=WGS84 \
+    +to +proj=patterson +a=6371008.7714 +b=6371008.7714 +units=m \
+ -E >> ${OUT} <<EOF
+-180 90
+-135 67.5
+-90 45
+-45 22.5
+0 0
+45 -22.5
+90 -45
+135 -67.5
+180 -90
+EOF
+echo  "##############################################################" >> ${OUT}
+echo  "Test patterson inverse projection" >> ${OUT}
+#
+$EXE -f '%0.3f' \
+    +proj=patterson +a=6371008.7714 +b=6371008.7714 +units=m \
+    +to +proj=latlong +datum=WGS84 \
+ -E >> ${OUT} <<EOF
+-20015114.352186374 11409566.822831295
+-15011335.76413978 8729502.054111844
+-10007557.176093187 5366413.421153781
+-5003778.588046594 2551415.729669344
+0.0 0.0
+5003778.588046594 -2551415.729669344
+10007557.176093187 -5366413.421153781
+15011335.76413978 -8729502.054111844
+20015114.352186374 -11409566.822831295
+EOF
 
 
 # Done!
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 3dca88c9..f61df2f6 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -357,3 +357,25 @@ Test misrsom forward projection
 ##############################################################
 Test misrsom inverse projection
 7461300.0 528000.0 0.0	48.6496622	66.2263207 0.0000000
+##############################################################
+Test patterson forward projection
+-180 90	-20015114.35218637	11409566.82283130 0.00000000
+-135 67.5	-15011335.76413978	8729502.05411184 0.00000000
+-90 45	-10007557.17609319	5366413.42115378 0.00000000
+-45 22.5	-5003778.58804659	2551415.72966934 0.00000000
+0 0	0.00000000	0.00000000 0.00000000
+45 -22.5	5003778.58804659	-2551415.72966934 0.00000000
+90 -45	10007557.17609319	-5366413.42115378 0.00000000
+135 -67.5	15011335.76413978	-8729502.05411184 0.00000000
+180 -90	20015114.35218637	-11409566.82283130 0.00000000
+##############################################################
+Test patterson inverse projection
+-20015114.352186374 11409566.822831295	-180.000	90.000 0.000
+-15011335.76413978 8729502.054111844	-135.000	67.500 0.000
+-10007557.176093187 5366413.421153781	-90.000	45.000 0.000
+-5003778.588046594 2551415.729669344	-45.000	22.500 0.000
+0.0 0.0	0.000	0.000 0.000
+5003778.588046594 -2551415.729669344	45.000	-22.500 0.000
+10007557.176093187 -5366413.421153781	90.000	-45.000 0.000
+15011335.76413978 -8729502.054111844	135.000	-67.500 0.000
+20015114.352186374 -11409566.822831295	180.000	-90.000 0.000
diff --git a/src/Makefile.am b/src/Makefile.am
index 871f8478..6fd97475 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,7 @@ libproj_la_SOURCES = \
 	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \
 	PJ_gn_sinu.c PJ_goode.c PJ_igh.c PJ_hatano.c PJ_loxim.c \
 	PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
-	PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
+	PJ_nell.c PJ_nell_h.c PJ_patterson.c PJ_putp2.c PJ_putp3.c \
 	PJ_putp4p.c PJ_putp5.c PJ_putp6.c PJ_qsc.c PJ_robin.c \
 	PJ_sch.c PJ_sts.c PJ_urm5.c PJ_urmfps.c PJ_wag2.c \
 	PJ_wag3.c PJ_wink1.c PJ_wink2.c pj_latlong.c pj_geocent.c \
diff --git a/src/PJ_patterson.c b/src/PJ_patterson.c
new file mode 100644
index 00000000..6fa10c28
--- /dev/null
+++ b/src/PJ_patterson.c
@@ -0,0 +1,92 @@
+/*

+ * Copyright (c) 2014 Bojan Savric

+ * 

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+ 

+/*

+ * The Patterson Cylindrical projection was designed by Tom Patterson, US National

+ * Park Service, in 2014, using Flex Projector. The polynomial equations for the

+ * projection were developed by Bojan Savric, Oregon State University, in

+ * collaboration with Tom Patterson and Bernhard Jenny, Oregon State University.

+ *

+ * Java reference algorithm implemented by Bojan Savric in Java Map Projection

+ * Library (a Java port of PROJ.4) in the file PattersonProjection.java.

+ *

+ * References:

+ *    Java Map Projection Library 

+ *       https://github.com/OSUCartography/JMapProjLib

+ * 

+ *    Patterson Cylindrical Projection

+ *       http://shadedrelief.com/patterson/

+ * 

+ *    Patterson, T., Savric, B., and Jenny, B. (2015). Cartographic Perspectives

+ *       (No.78). Describes the projection design and characteristics, and

+ *       developing the equations.    doi:10.14714/CP78.1270

+ *       http://dx.doi.org/10.14714/CP78.1270

+ * 

+ * Port to PROJ.4 by Micah Cochran, 26 March 2016

+ */

+

+#define PJ_LIB__

+# include   <projects.h>

+PROJ_HEAD(patterson, "Patterson Cylindrical") "\n\tCyl.";

+#define K1 1.0148

+#define K2 0.23185

+#define K3 -0.14499

+#define K4 0.02406

+#define C1 K1

+#define C2 (5.0 * K2)

+#define C3 (7.0 * K3)

+#define C4 (9.0 * K4)

+#define EPS11 1.0e-11

+#define MAX_Y 1.790857183

+

+FORWARD(s_forward); /* spheroid */

+    double phi2;

+    (void) P;

+    phi2 = lp.phi * lp.phi;

+    xy.x = lp.lam;

+    xy.y = lp.phi * (K1 + phi2 * phi2 * (K2 + phi2 * (K3 + K4 * phi2)));

+    return (xy);

+}

+INVERSE(s_inverse); /* spheroid */

+    double yc, tol, y2, f, fder;

+    (void) P;

+    yc = xy.y;

+    

+    /* make sure y is inside valid range */

+    if (xy.y > MAX_Y) {

+        xy.y = MAX_Y;

+    } else if (xy.y < -MAX_Y) {

+        xy.y = -MAX_Y;

+    }

+    

+    for (;;) { /* Newton-Raphson */

+        y2 = yc * yc;

+        f = (yc * (K1 + y2 * y2 * (K2 + y2 * (K3 + K4 * y2)))) - xy.y;

+        fder = C1 + y2 * y2 * (C2 + y2 * (C3 + C4 * y2));

+        yc -= tol = f / fder;

+        if (fabs(tol) < EPS11) {

+            break;

+        }

+    }

+    lp.phi = yc;

+    

+    /* longitude */

+    lp.lam = xy.x;

+    

+    return (lp);

+}

+FREEUP; if (P) pj_dalloc(P); }

+ENTRY0(patterson) P->es = 0.; P->inv = s_inverse; P->fwd = s_forward; ENDENTRY(P)

diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index 85207e87..a8797a74 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -107,6 +107,7 @@ SET(SRC_LIBPROJ_PJ
         PJ_oea.c
         PJ_omerc.c
         PJ_ortho.c
+        PJ_patterson.c
         PJ_poly.c
         PJ_putp2.c
         PJ_putp3.c
diff --git a/src/makefile.vc b/src/makefile.vc
index 327d2c21..435f9943 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -16,7 +16,7 @@ conic = \
 cylinder = \
 	PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \
 	PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_misrsom.obj PJ_merc.obj \
-	PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_somerc.obj \
+	PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_patterson.obj PJ_somerc.obj \
 	PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj \
 	PJ_gstmerc.obj proj_etmerc.obj 
 
diff --git a/src/pj_list.h b/src/pj_list.h
index 338eb2dd..47362d87 100644
--- a/src/pj_list.h
+++ b/src/pj_list.h
@@ -97,6 +97,7 @@ PROJ_HEAD(omerc, "Oblique Mercator")
 PROJ_HEAD(ortel, "Ortelius Oval")
 PROJ_HEAD(ortho, "Orthographic")
 PROJ_HEAD(pconic, "Perspective Conic")
+PROJ_HEAD(patterson, "Patterson Cylindrical")
 PROJ_HEAD(poly, "Polyconic (American)")
 PROJ_HEAD(putp1, "Putnins P1")
 PROJ_HEAD(putp2, "Putnins P2")