Merged revisions 8808 via svnmerge from

WeatherGod · WeatherGod · commit ff2b1f3c1939 · 2010-11-22T16:08:32.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8808 | weathergod | 2010-11-22 10:05:17 -0600 (Mon, 22 Nov 2010) | 3 lines Fixed a mistake with the Hammer projection in the geo module. Thanks to Matthias Plum for reporting and Tobias Winchen for confirming. ........ svn path=/trunk/matplotlib/; revision=8809
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2010-11-22 Fixed error with Hammer projection. - BVR
+
 2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR
 
 2010-11-07 New rc parameters examples.download and examples.directory
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
@@ -346,7 +346,7 @@ def transform(self, ll):
             cos_latitude = np.cos(latitude)
             sqrt2 = np.sqrt(2.0)
 
-            alpha = 1.0 + cos_latitude * np.cos(half_long)
+            alpha = np.sqrt(1.0 + cos_latitude * np.cos(half_long))
             x = (2.0 * sqrt2) * (cos_latitude * np.sin(half_long)) / alpha
             y = (sqrt2 * np.sin(latitude)) / alpha
             return np.concatenate((x, y), 1)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2010-11-22 Fixed error with Hammer projection. - BVR`
	`2`	`+`
`1`	`3`	`2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR`
`2`	`4`
`3`	`5`	`2010-11-07 New rc parameters examples.download and examples.directory`