Merge pull request #1207 from pelson/healpix_fix

Fixed rHealpix projection, closing #1206.
OSGeo · Dec 26, 2018 · 355d681 · 355d681
2 parents 14481b2 + 5d39ae0
commit 355d681
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c
@@ -499,8 +499,8 @@ static XY combine_caps(double x, double y, int north_square, int south_square,
         double a[2];
         /* Workaround cppcheck git issue */
         double* pa = a;
-        pa[0] = -3*M_FORTPI + ((inverse == 0) ? 0 : capmap.cn) *M_HALFPI;
-        pa[1] = M_HALFPI;
+        pa[0] = -3*M_FORTPI + ((inverse == 0) ? pole : capmap.cn) *M_HALFPI;
+        pa[1] = ((capmap.region == north) ? 1 : -1) *M_HALFPI;
         vector_add(ret_dot, a, vector);
     }
 

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -2006,6 +2006,25 @@ expect  -0.001790493 0.000759909
 accept  -200 -100
 expect  -0.001790493 -0.000759909
 
+-------------------------------------------------------------------------------
+operation +proj=rhealpix   +south_square=2  +north_square=3
+-------------------------------------------------------------------------------
+tolerance 1 m
+accept  45 50
+expect  10806592   10007554
+accept  45 -50
+expect  5003777   -5802815
+accept  135 50
+expect  15011332   5802815
+
+direction inverse
+accept  10806592   10007554
+expect  45 50
+accept  5003777   -5802815
+expect  45 -50
+accept  15011332   5802815
+expect  135 50
+
 
 ===============================================================================
 Interrupted Goode Homolosine