matplotlib-checkins Mailing List for matplotlib

Revision: 8672
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8672&view=rev
Author: jswhit
Date: 2010年08月30日 15:20:42 +0000 (2010年8月30日)
Log Message:
-----------
change version number to 1.0.1
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
 trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2010年08月30日 15:18:39 UTC (rev 8671)
+++ trunk/toolkits/basemap/Changelog	2010年08月30日 15:20:42 UTC (rev 8672)
@@ -1,4 +1,7 @@
-version 1.0 (svn revision 8531)
+version 1.0.1 (not yet released).
+ * add datum grid shift files, so that pyproj.transform can do datum
+ shifts.
+version 1.0 (svn revision 8531)
 	 * don't force adjustable='box' so Basemap is compatible
 with AxesGrid. Added fcstmaps_axesgrid.py example.
 * add support for plotting on unstructured grids using
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年08月30日 15:18:39 UTC (rev 8671)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年08月30日 15:20:42 UTC (rev 8672)
@@ -52,7 +52,7 @@
 else:
 basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '1.0'
+__version__ = '1.0.1'
 
 # supported map projections.
 _projnames = {'cyl' : 'Cylindrical Equidistant',
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2010年08月30日 15:18:39 UTC (rev 8671)
+++ trunk/toolkits/basemap/setup.py	2010年08月30日 15:20:42 UTC (rev 8672)
@@ -241,7 +241,7 @@
 
 setup(
 name = "basemap",
- version = "1.0",
+ version = "1.0.1",
 description = "Plot data on map projections with matplotlib",
 long_description = """
 An add-on toolkit for matplotlib that lets you plot data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8671
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8671&view=rev
Author: jswhit
Date: 2010年08月30日 15:18:39 +0000 (2010年8月30日)
Log Message:
-----------
update tests to check for installation of datum grid files.
Modified Paths:
--------------
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py	2010年08月29日 13:27:14 UTC (rev 8670)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py	2010年08月30日 15:18:39 UTC (rev 8671)
@@ -258,7 +258,7 @@
 >>> print '%9.3f %11.3f' % (x1,y1)
 569704.566 4269024.671
 >>> print '%9.3f %11.3f' % (x2,y2)
- 569706.333 4268817.680
+ 569722.342 4268814.027
 >>> print '%8.3f %5.3f' % p2(x2,y2,inverse=True)
 -92.200 38.567
 >>> # process 3 points at a time in a tuple
@@ -271,11 +271,18 @@
 567703.344 351730.944 728553.093 4298200.739 4353698.725 4292319.005
 >>> xy = x2+y2
 >>> print '%9.3f %9.3f %9.3f %11.3f %11.3f %11.3f' % xy
- 567705.072 351727.113 728558.917 4297993.157 4353490.111 4292111.678
+ 567721.149 351747.558 728569.133 4297989.112 4353489.644 4292106.305
 >>> lons, lats = p2(x2,y2,inverse=True)
 >>> xy = lons+lats
 >>> print '%8.3f %8.3f %8.3f %5.3f %5.3f %5.3f' % xy
 -92.220 -94.720 -90.370 38.830 39.320 38.750
+ >>> # test datum shifting, installation of extra datum grid files.
+ >>> p1 = Proj(proj='latlong',datum='WGS84')
+ >>> x1 = -111.5; y1 = 45.25919444444
+ >>> p2 = Proj(proj="utm",zone=10,datum='NAD27')
+ >>> x2, y2 = transform(p1, p2, x1, y1)
+ >>> print "%12.3f %12.3f" % (x2,y2)
+ 1402285.991 5076292.423
 """
 # process inputs, making copies that support buffer API.
 inx, xisfloat, xislist, xistuple = _copytobuffer(x)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.