Merge remote-tracking branch 'upstream/master'

Author: barronh

.gitignore

@@ -0,0 +1,69 @@
+#########################################
+# Editor temporary/working/backup files #
+.#*
+[#]*#
+*~
+*$
+*.bak
+.project
+.pydevproject
+
+# Compiled source #
+###################
+*.a
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.py[ocd]
+*.so
+
+# Python files #
+################
+# setup.py working directory
+build
+# sphinx build directory
+doc/_build
+# setup.py dist directory
+dist
+# Egg metadata
+*.egg-info
+# tox testing tool
+.tox
+
+# OS generated files #
+######################
+.gdb_history
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Things specific to this project #
+###################################
+nad2bin
+examples/*.png
+*.pickle
+
+# output of nad2bin
+lib/mpl_toolkits/basemap/data/FL
+lib/mpl_toolkits/basemap/data/MD
+lib/mpl_toolkits/basemap/data/TN
+lib/mpl_toolkits/basemap/data/WI
+lib/mpl_toolkits/basemap/data/WO
+lib/mpl_toolkits/basemap/data/alaska
+lib/mpl_toolkits/basemap/data/conus
+lib/mpl_toolkits/basemap/data/hawaii
+lib/mpl_toolkits/basemap/data/null
+lib/mpl_toolkits/basemap/data/prvi
+lib/mpl_toolkits/basemap/data/stgeorge
+lib/mpl_toolkits/basemap/data/stlrnc
+lib/mpl_toolkits/basemap/data/stpaul
+
+# Documentation generated files #
+#################################
+doc/examples
+doc/_templates/gallery.html
+doc/users/installing.rst
+doc/_static/matplotlibrc

API_CHANGES

@@ -1,3 +1,7 @@
+version 1.0.6:  Added drawcounties,arcgisimage methods. 
+version 1.0.5:  Added 'latlon' keyword to plotting methods (converts lat/lon to x/y
+                and shifts data in longitude (using shiftdata method) to map projection region.
+version 1.0.3:  Added streamplot method.
 version 1.0.2:  default value for lakes kwarg in drawlsmask changed from False to True.
                 default value for inlands kwarg in maskoceans changed from False to True.
                 NetCDFFile function removed.

Changelog

@@ -1,3 +1,131 @@
+version 1.0.7 (git tag v1.0.7rel)
+---------------------------------
+* include mpl_toolkits/__init__.py, since the one installed by matplotlib
+  is now inaccessible inside an egg (in 1.4.x).  Make basemap a 'namespace
+  package'.  Issue 114.
+* fix drawmeridians so meridians reach edge of plot when map projection region
+  is *very* small (issue 113).
+* update pyproj (with fixes to geodesic calculations).
+* support for rotated pole transformation (projection = 'rotpole').
+* fix warpimage with projection = 'hammer' (issue 100).
+* fix tolerances for detecting jumps in meridians and parallels for
+  cyl and rotpole projections (issue 108).
+* fix clipping to map projection region done in contourf and contour methods
+  so it doesn't assume x and y are increasing (issue 110).
+
+version 1.0.6 (git tag v1.0.6rel)
+--------------------------------
+* fix drawcounties for Python 3.3.
+* update pyproj to version 1.9.3 (remove geographiclib python code, replace
+  with C code from proj4).
+* in contourf and contour, all points outside the map projection
+  region were masked. This meant that if a grid cell was partly inside and partly 
+  outside the map projection region, nothing was drawn, leaving a gap along the
+  edge of the map. This was particularly noticeable for very coarse resolution grids.
+  This commit only masks those points more than one grid length beyond the edge
+  of the map projection region.  Fixes issue 88.
+* allow for latitude values slightly greater than 90 to exist in shapefiles,
+  (by truncating to 90).  Still raise exception if latitude exceeds 90.01.
+* added 'wmsimage' method for displaying background image retrieved from
+  a OGC-compliant WMS server using OWSLib (http://pypi.python.org/OWSLib)
+  (requires using 'epsg' keyword to define projection).
+* fix drawing of meridians and parallels for very small map regions
+  (issue 79).
+* add module variable 'latlon_default' that can be used to switch 
+  default value of latlon kwarg to True so plotting methods can be 
+  passed lats and lons (geographic coordinatsin degrees) instead
+  of x,y (projection coordinates).
+* have drawcoastlines use line segments instead of coastline polygons, to
+  avoid 'thickening' of lines around edges of map.
+* added support for cylindrical equal area ('cea') projection.
+* add 'arcgisimage' method for displaying background image retrieved from
+  an ArcGIS server using the REST API
+  (requires using 'epsg' keyword to define projection).
+* add 'epsg' keyword for defining projections.
+* add 'ellps' keyword (rsphere ignored if ellps given).
+* fixed shiftdata method so it shifts mask along with data
+  (https://github.com/matplotlib/basemap/pull/68).
+* added linestyle keyword to all draw* methods.
+* added 'drawcounties' method (https://github.com/matplotlib/basemap/pull/65)
+  thanks to Patrick Marsh.
+* fix bug that caused plotting to fail when latlon keyword is 
+  explicitly set to False (https://github.com/matplotlib/basemap/pull/66).
+* add latlon keyword to plot and scatter methods
+  (https://github.com/matplotlib/basemap/pull/64).
+
+version 1.0.5 (git tag v1.0.5rel)
+---------------------------------
+* fix bug triggered when drawlsmask method called more than once.
+* fix error in contour method that caused a bogus mask to be applied
+  to the data (issue 58).
+* fix further corner cases with splitting of parallels that cross
+  the dateline (issue 40).
+* add latlon keyword to plotting methods.  If latlon=True, x and y
+  values are assumed to longitudes and latitudes in degrees.  The
+  data and longitudes are shifted to the map projection region (for
+  cylindrical and pseudo-cylindrical projections) using the shiftdata
+  method, and lons/lats are converted to map projection coords. Default
+  value is False. Addresses issue 54.  New example shiftdata.py added
+  to illustrate usage.
+* fix bluemarble and warpimage methods to account for change in orientation
+  of arrays returned to matplotlib's pil_to_array (issue 51)
+* fix glitch with drawing meridians and filling coastline polygons with 
+  omerc projection that includes pole.
+
+version 1.0.4 (git tag v1.0.4rel)
+--------------------------------
+* fix bug that caused Europe coastlines to disappear from some maps
+  (evident from nytolondon.py example).
+* fix splitting of parallels in conic projections that cross the dateline
+  (issue 40).
+
+version 1.0.3 (git tag v1.0.3rel)
+------------------------------
+* fix some more python 3 compatibility issues (all examples now
+  work with python 3.2).
+* added alpha keyword to fillcontinents (to set transparency).
+* update geos from 3.3.1 to 3.3.3.
+* upgrade proj4 source to version 4.8.0, pyproj to version 1.9.2.
+* add k_0 keyword for projection = 'tmerc' so UTM zones can be
+  created. Also can be used with 'lcc','omerc' and 'stere'.
+  Added "utmtest.py" example.
+* add streamplot method, along with streamplot_demo.py example.
+* add boundarylats, boundarylons Basemap attributes (arrays
+  describing map boundaries - useful for illustrating map projection
+  region on another map). Example illustrating usage
+  (make_inset.py) added.
+* update coastlines, rivers, political boundaries to GSHHS
+  2.2.0/GMT 4.5.7. The fillcontinents bug (filling the outside
+  instead of the inside of a coastline polygon) is now much
+  harder to trigger.    
+* add 'round' keyword keyword to Basemap.__init__ for pole-centered
+  projections to make them round (clipped at boundinglat) instead
+  of square.        
+* added hexbin method, along with hexbin_demo.py example.
+* drawmapboundary now uses axes bgcolor as default fill_color. If
+  no color fill wanted, set fill_color='none' (a string).
+* clip coastlines for nplaea,npaeqd,splaea,spaeqd in stereographic
+  coordinates to avoid S. America disappearing in some south polar
+  plots.
+* fix broken daynight terminator function.
+* added kav7 (Kavrayskiy VII) and eck4 (Eckert IV) projections
+  (https://github.com/matplotlib/basemap/issues/9).
+* update pyproj source from pyproj.googlecode.com. Includes
+  new more robust and accurate pure python code for geodesic computations
+  from geographiclib.
+* bug fixes for celestial projections, and non-standard sphere
+  radii (https://github.com/matplotlib/basemap/pull/6).
+* fix bug in drawparallels that results in 'KeyError' when drawing
+  parallels very close together (0.1 degrees).
+* fix constant in Robinson projection (update PJ_robin.c
+  from proj4 svn).
+* fix typo in setup.py (replace "!= ['sdist','clean']" with
+  "not in ['sdist','clean']").
+* make sure drawmeridians can handle wrap-around (so that
+  if projection is defined in -180 to 0 and user asks for
+  meridians from 180 to 360 to be drawn, it should work).
+  Only affects projections 'mill','gall','merc' and 'cyl'.
+
 version 1.0.2 (git tag v1.0.2)
            * update include geos from 3.2.0 to 3.3.1 so it compiles with gcc
              4.6.

KNOWN_BUGS

@@ -1,7 +1,7 @@
 * The fillcontinents method doesn't always do the right thing.  Matplotlib
 always tries to fill the inside of a polygon.  Under certain situations,
 what is the inside of a coastline polygon can be ambiguous, and the 
-outside may be filled instead of the inside.  To trigger this,
-run the ortho_demo.py example with lon=-120,lat=60.
-Workaround - mask the land areas with the drawlsmask method instead of
+outside may be filled instead of the inside. 
+Workarounds - change the map projection region slightly or
+mask the land areas with the drawlsmask method instead of
 filling the coastline polygons (this is illustrated in the ortho_demo.py example). 

LICENSE_geographiclib

@@ -0,0 +1,3 @@
+ Copyright (c) Charles Karney (2011) <[email protected]> and licensed
+ under the MIT/X11 License.  For more information, see
+ http://geographiclib.sourceforge.net/

MANIFEST.in

@@ -11,6 +11,10 @@ include Changelog
 include setup.py
 include nad2bin.c
 include src/*
+include examples/testarcgis.py
+include examples/testwmsimage.py
+include examples/counties.py
+include examples/shiftdata.py
 include examples/allskymap.py
 include examples/allskymap_cr_example.py
 include examples/plothighsandlows.py
@@ -64,7 +68,9 @@ include examples/run_all.py
 include examples/polarmaps.py
 include examples/warpimage.py
 include examples/earth_lights_lrg.jpg
-include examples/pnganim.py
+include examples/animate.py
+include examples/hexbin_demo.py
+include examples/make_inset.py
 include examples/garp.py
 include examples/setwh.py
 include examples/ccsm_popgrid.py
@@ -75,11 +81,15 @@ include examples/cities.shx
 include examples/show_colormaps.py
 include examples/plotprecip.py
 include examples/lic_demo.py
+include examples/streamplot_demo.py
 include examples/nws_precip_conus_20061222.nc
 include examples/C02562.orog.nc
 include examples/ccsm_popgrid.nc
 include examples/rita.nc
 include examples/maskoceans.py
+include examples/utmtest.py
+include examples/test_rotpole.py
+include examples/wm201_Arctic_JJA_1990-2008_moyenneDesMoyennes.nc
 include examples/README
 include lib/mpl_toolkits/__init__.py
 include lib/mpl_toolkits/basemap/__init__.py
@@ -96,5 +106,5 @@ include doc/README.txt
 include doc/make.py
 include doc/conf.py
 include doc/index.rst
-recursive-include geos-3.3.1 *
+recursive-include geos-3.3.3 *
 recursive-include lib/mpl_toolkits/basemap/data *

README

@@ -5,14 +5,14 @@ using matplotlib.
 
 **Requirements**
 
-python 2.4 (or higher)
+python 2.5 (or higher)
 
-matplotlib 1.0.1 (or higher)
+matplotlib
 
-numpy 1.4 (or higher)
+numpy 
 
 The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
-Source code is included in the geos-3.3.1 directory.
+Source code is included in the geos-3.3.3 directory.
 
 PIL (http://pythonware.com/products/pil) is optional (only
 needed for Basemap warpimage and bluemarble methods).
@@ -27,8 +27,12 @@ C extensions.
 source code from proj.4 (http://proj.maptools.org) is included in the
 'src' directory under the terms given in LICENSE_proj4.
 
+source code from geographiclib (http://pypi.python.org/pypi/geographiclib)
+is included in the 'lib/mpl_toolkits/basemap' directory under the terms 
+given in LICENSE_geographiclib.
+
 source code for the GEOS library is
-included in the 'geos-3.3.1' directory under the terms given in
+included in the 'geos-3.3.3' directory under the terms given in
 LICENSE_geos.
 
 shapefile.py from pyshp.googlecode.com is included under the terms given
@@ -39,8 +43,8 @@ from datasets provided with the Generic Mapping Tools
 (http://gmt.soest.hawaii.edu)
 and are included under the terms given in LICENSE_data.
 
-Everything else (including src/_proj.pyx, src/_geod.pyx, src/_pyproj.pxi,
-src/_proj.c, src/_geod.c, src/_geos.c, and src/_geos.pyx):
+Everything else (including src/_proj.pyx,,
+src/_proj.c, src/_geos.c, and src/_geos.pyx):
 
 copyright (c) 2011 by Jeffrey Whitaker.
 
@@ -59,7 +63,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 **Documentation** 
 
-see http://matplotlib.gitub.net/basemap.
+see http://matplotlib.github.com/basemap/
 
 see scripts in 'examples' directory for example usage.
 
@@ -80,7 +84,7 @@ geos_c.h is in /usr/local/include, set GEOS_DIR to /usr/local).
 Then go to step (3).  If you don't have it, you can build it from
 the source code included with basemap by following these steps:
 
- > cd geos-3.3.1
+ > cd geos-3.3.3
  > export GEOS_DIR=<where you want the libs and headers to go>
    A reasonable choice on a Unix-like system is /usr/local, or
    if you don't have permission to write there, your home directory.
@@ -123,5 +127,7 @@ Christoph Gohlke
 Eric Bruning
 Stephane Raynaud
 Tom Loredo
+Patrick Marsh
+Phil Elson
 
 for valuable contributions.

doc/conf.py

@@ -23,12 +23,13 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = ['sphinx.ext.autodoc',
 #extensions = ['matplotlib.sphinxext.mathmpl',
 #              'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
-#              'matplotlib.sphinxext.plot_directive',
+              'matplotlib.sphinxext.plot_directive',
 #              'sphinx.ext.inheritance_diagram',
-#              'matplotlib.sphinxext.ipython_console_highlighting']
+#              'matplotlib.sphinxext.ipython_console_highlighting',
+             ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,9 +48,10 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0.2'
+from mpl_toolkits.basemap import __version__ as bmversion
+version = bmversion
 # The full version, including alpha/beta/rc tags.
-release = '1.0.2'
+release = bmversion
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -94,7 +96,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If nonempty, this is the file name suffix for generated HTML files.  The
 # default is ``".html"``.
@@ -164,3 +166,14 @@
 # Show both class-level docstring and __init__ docstring in class
 # documentation
 autoclass_content = 'both'
+
+
+
+
+################ plot directive configurations #####################
+plot_html_show_formats = False
+plot_include_source = True
+plot_rcparams = {'figure.figsize':[8, 6]}
+plot_formats = [('png', 100), # pngs for html building
+                ('pdf', 72), # pdfs for latex building
+               ]