Merge pull request #1774 from UV-CDAT/revert-1772-fix-proj4-minus3-annie

Revert "BUG: proj4 over option causes problems with polar projections"

Author: doutriaux1

Packages/vcs/Lib/vcs2vtk.py

@@ -570,22 +570,24 @@ def projectArray(w, projection, wc, geo=None):
         pname = projDict.get(projection._type, projection.type)
         projName = pname
         pd.SetName(projName)
-        if (projection.type == 'aeqd' or
-                projection.type == 'polar stereographic'):
+        if projection.type == 'aeqd':
+            # this is a temporary branch to keep the same
+            # baselines
             setProjectionParameters(pd, projection)
-        elif projection.type == "polar (non gctp)":
-            if ym < yM:
-                pd.SetOptionalParameter("lat_0", "-90.")
-                pd.SetCentralMeridian(xm)
-            else:
-                pd.SetOptionalParameter("lat_0", "90.")
-                pd.SetCentralMeridian(xm + 180.)
         else:
             pd.SetOptionalParameter("over", "true")
-            setProjectionParameters(pd, projection)
-            if ((not hasattr(projection, 'centralmeridian') or
-                 numpy.allclose(projection.centralmeridian, 1e+20))):
-                pd.SetCentralMeridian(float(xm + xM) / 2.0)
+            if projection.type == "polar (non gctp)":
+                if ym < yM:
+                    pd.SetOptionalParameter("lat_0", "-90.")
+                    pd.SetCentralMeridian(xm)
+                else:
+                    pd.SetOptionalParameter("lat_0", "90.")
+                    pd.SetCentralMeridian(xm + 180.)
+            else:
+                setProjectionParameters(pd, projection)
+                if ((not hasattr(projection, 'centralmeridian') or
+                     numpy.allclose(projection.centralmeridian, 1e+20))):
+                    pd.SetCentralMeridian(float(xm + xM) / 2.0)
         geo.SetSourceProjection(ps)
         geo.SetDestinationProjection(pd)
 
@@ -611,22 +613,24 @@ def project(pts, projection, wc, geo=None):
         pname = projDict.get(projection._type, projection.type)
         projName = pname
         pd.SetName(projName)
-        if (projection.type == 'aeqd' or
-                projection.type == 'polar stereographic'):
+        if projection.type == 'aeqd':
+            # this is a temporary branch to keep the same
+            # baselines
             setProjectionParameters(pd, projection)
-        elif projection.type == "polar (non gctp)":
-            if ym < yM:
-                pd.SetOptionalParameter("lat_0", "-90.")
-                pd.SetCentralMeridian(xm)
-            else:
-                pd.SetOptionalParameter("lat_0", "90.")
-                pd.SetCentralMeridian(xm + 180.)
         else:
             pd.SetOptionalParameter("over", "true")
-            setProjectionParameters(pd, projection)
-            if (not hasattr(projection, 'centralmeridian') or
-                    numpy.allclose(projection.centralmeridian, 1e+20)):
-                pd.SetCentralMeridian(float(xm + xM) / 2.0)
+            if projection.type == "polar (non gctp)":
+                if ym < yM:
+                    pd.SetOptionalParameter("lat_0", "-90.")
+                    pd.SetCentralMeridian(xm)
+                else:
+                    pd.SetOptionalParameter("lat_0", "90.")
+                    pd.SetCentralMeridian(xm + 180.)
+            else:
+                setProjectionParameters(pd, projection)
+                if (not hasattr(projection, 'centralmeridian') or
+                        numpy.allclose(projection.centralmeridian, 1e+20)):
+                    pd.SetCentralMeridian(float(xm + xM) / 2.0)
         geo.SetSourceProjection(ps)
         geo.SetDestinationProjection(pd)
     geopts = vtk.vtkPoints()