Skip to content

Commit

Permalink
Merge branch 'release-v1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mraspaud committed Dec 10, 2014
2 parents bb95750 + d2d1beb commit fde4205
Show file tree
Hide file tree
Showing 35 changed files with 3,075 additions and 2,625 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ install:
- pip install .
- pip install coveralls
- pip install pykdtree
script: python setup.py nosetests --with-coverage --cover-package pyresample
script: coverage run --source=pyresample setup.py test
after_success: coveralls
14 changes: 13 additions & 1 deletion docs/source/geo_def.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ Geometry definitions
The module **pyresample.geometry** contains classes for describing different kinds of types
of remote sensing data geometries. The use of the different classes is described below.

Remarks
-------

All longitudes and latitudes provided to **pyresample.geometry** must be in degrees.
Longitudes must additionally be in the [-180;+180[ validity range.

As of version 1.1.1, the **pyresample.geometry** contructors will check the range of
longitude values, send a warning if some of them fall outside validity range,
and automatically correct the invalid values into [-180;+180[.

Use function **utils.wrap_longitudes** for wrapping longitudes yourself.

AreaDefinition
--------------

Expand Down Expand Up @@ -309,4 +321,4 @@ It can be tested if a (lon, lat) point is inside a GeometryDefinition
... x_size, y_size, area_extent)
>>> print (0, -90) in area_def
True


12 changes: 4 additions & 8 deletions pyresample/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@

from __future__ import absolute_import

from pyresample import grid
from pyresample import image
from pyresample import kd_tree
from pyresample import utils
from pyresample import version
from pyresample import plot

__version__ = version.__version__
from pyresample.version import __version__

__all__ = ['grid', 'image', 'kd_tree',
'utils', 'plot', 'geo_filter', 'geometry']


def get_capabilities():
Expand Down
Loading

0 comments on commit fde4205

Please sign in to comment.