shapely 1.2.12__py2.6-win-amd64.egg → 1.2.14__py2.6-win-amd64.egg

EGG-INFO/PKG-INFO

@@ -1,381 +1,389 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.12
+Version: 1.2.14
 Summary: Geometric objects, predicates, and operations
-Home-page: http://trac.gispython.org/lab/wiki/Shapely
+Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: ======
-        README
-        ======
-        
-        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
-        :width: 800
-        :height: 400
-        
-        Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometric objects. It is not concerned with data formats or coordinate
-        systems.  It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-        JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
-        ability to execute with blazing speed.
-        
-        In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
-        database using idiomatic Python. For more details, see:
-        
-        * Shapely wiki_
-        * Shapely manual_
-        * Shapely `example apps`_
-        
-        Dependencies
-        ------------
-        
-        Shapely 1.2 depends on:
-        
-        * Python >=2.5,<3
-        * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
-        
-        Installation
-        ------------
-        
-        Windows users should use the executable installer, which contains the required
-        GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-        is on the system library path, and install from the Python package index::
-        
-        $ pip install Shapely
-        
-        or from a source distribution with the setup script::
-        
-        $ python setup.py install
-        
-        Usage
-        -----
-        
-        Here is the canonical example of building an approximately circular patch by
-        buffering a point::
-        
-        >>> from shapely.geometry import Point
-        >>> patch = Point(0.0, 0.0).buffer(10.0)
-        >>> patch
-        <shapely.geometry.polygon.Polygon object at 0x...>
-        >>> patch.area
-        313.65484905459385
-        
-        See the manual_ for comprehensive usage snippets and the dissolve.py and
-        intersect.py `example apps`_.
-        
-        Integration
-        -----------
-        
-        Shapely does not read or write data files, but it can serialize and deserialize
-        using several well known formats and protocols. The shapely.wkb and shapely.wkt
-        modules provide dumpers and loaders inspired by Python's pickle module.::
-        
-        >>> from shapely.wkt import dumps, loads
-        >>> dumps(loads('POINT (0 0)'))
-        'POINT (0.0000000000000000 0.0000000000000000)'
-        
-        All linear objects, such as the rings of a polygon (like ``patch`` above),
-        provide the Numpy array interface.::
-        
-        >>> from numpy import asarray
-        >>> ag = asarray(patch.exterior)
-        >>> ag
-        array([[  1.00000000e+01,   0.00000000e+00],
-        [  9.95184727e+00,  -9.80171403e-01],
-        [  9.80785280e+00,  -1.95090322e+00],
-        ...
-        [  1.00000000e+01,   0.00000000e+00]])
-        
-        That yields a numpy array of [x, y] arrays. This is not always exactly what one
-        wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` property
-        for getting separate arrays of coordinate x and y values.::
-        
-        >>> x, y = patch.exterior.xy
-        >>> ax = asarray(x)
-        >>> ax
-        array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
-        
-        Numpy arrays can also be adapted to Shapely linestrings::
-        
-        >>> from shapely.geometry import asLineString
-        >>> asLineString(ag).length
-        62.806623139095073
-        >>> asLineString(ag).wkt
-        'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
-        
-        Testing
-        -------
-        
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised via
-        setup.py.::
-        
-        $ python setup.py test
-        
-        Nosetests won't run the tests properly; Zope doctest suites are not currently
-        supported well by nose.
-        
-        Support
-        -------
-        
-        For current information about this project, see the wiki_.
-        
-        If you have questions, please consider joining our community list:
-        
-        http://trac.gispython.org/projects/PCL/wiki/CommunityList
-        
-        Credits
-        -------
-        
-        Shapely is written by:
-        
-        * Sean Gillies
-        * Aron Bierbaum
-        * Kai Lautaportti
-        
-        Patches contributed by:
-        
-        * Howard Butler
-        * Fr |eaigue| d |eaigue| ric Junod
-        * Eric Lemoine
-        * Jonathan Tartley
-        * Kristian Thy
-        * Oliver Tonnhofer
-        
-        Additional help from:
-        
-        * Justin Bronn (GeoDjango) for ctypes inspiration
-        * Martin Davis (JTS)
-        * Jaakko Salli for the Windows distributions
-        * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
-        
-        Major portions of this work were supported by a grant (for Pleiades_) from the
-        U.S. National Endowment for the Humanities (http://www.neh.gov).
-        
-        .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
-        .. _PostGIS: http://postgis.org
-        .. _GEOS: http://trac.osgeo.org/geos/
-        .. _example apps: http://trac.gispython.org/lab/wiki/Examples
-        .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/docs/1.2
-        .. |eaigue| unicode:: U+00E9
-        :trim:
-        .. _Pleiades: http://pleiades.stoa.org
-        
-        =======
-        CHANGES
-        =======
-        
-        1.2.12 (2011-08-15)
-        -------------------
-        - Build Windows distributions with VC7 or VC9 as appropriate.
-        - More verbose report on failure to speed up.
-        - Fix for prepared geometries broken in 1.2.11.
-        - DO NOT INSTALL 1.2.11
-        
-        1.2.11 (2011-08-04)
-        -------------------
-        - Ignore AttributeError during exit.
-        - PyPy 1.5 support.
-        - Prevent operation on prepared geometry crasher (#12).
-        - Optional Cython speedups for Windows.
-        - Linux 3 platform support.
-        
-        1.2.10 (2011-05-09)
-        -------------------
-        - Add optional Cython speedups.
-        - Add is_cww predicate to LinearRing.
-        - Add function that forces orientation of Polygons.
-        - Disable build of speedups on Windows pending packaging work.
-        
-        1.2.9 (2011-03-31)
-        ------------------
-        - Remove extra glob import.
-        - Move examples to shapely.examples.
-        - Add box() constructor for rectangular polygons.
-        - Fix extraneous imports.
-        
-        1.2.8 (2011-12-03)
-        ------------------
-        - New parallel_offset method (#6).
-        - Support for Python 2.4.
-        
-        1.2.7 (2010-11-05)
-        ------------------
-        - Support for Windows eggs.
-        
-        1.2.6 (2010-10-21)
-        ------------------
-        - The geoms property of an empty collection yields [] instead of a ValueError
-        (#3).
-        - The coords and geometry type sproperties have the same behavior as above.
-        - Ensure that z values carry through into products of operations (#4).
-        
-        1.2.5 (2010-09-19)
-        ------------------
-        - Stop distributing docs/_build.
-        - Include library fallbacks in test_dlls.py for linux platform.
-        
-        1.2.4 (2010-09-09)
-        ------------------
-        - Raise AttributeError when there's no backend support for a method.
-        - Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
-        - Add geos_c DLL loading support for linux platforms where find_library doesn't
-        work.
-        
-        1.2.3 (2010-08-17)
-        ------------------
-        - Add mapping function.
-        - Fix problem with GEOSisValidReason symbol for GEOS < 3.1.
-        
-        1.2.2 (2010-07-23)
-        ------------------
-        - Add representative_point method.
-        
-        1.2.1 (2010-06-23)
-        ------------------
-        - Fixed bounds of singular polygons.
-        - Added shapely.validation.explain_validity function (#226).
-        
-        1.2 (2010-05-27)
-        ----------------
-        - Final release.
-        
-        1.2rc2 (2010-05-26)
-        -------------------
-        - Add examples and tests to MANIFEST.in.
-        - Release candidate 2.
-        
-        1.2rc1 (2010-05-25)
-        -------------------
-        - Release candidate.
-        
-        1.2b7 (2010-04-22)
-        ------------------
-        - Memory leak associated with new empty geometry state fixed.
-        
-        1.2b6 (2010-04-13)
-        ------------------
-        - Broken GeometryCollection fixed.
-        
-        1.2b5 (2010-04-09)
-        ------------------
-        - Objects can be constructed from others of the same type, thereby making
-        copies. Collections can be constructed from sequences of objects, also making
-        copies.
-        - Collections are now iterators over their component objects.
-        - New code for manual figures, using the descartes package.
-        
-        1.2b4 (2010-03-19)
-        ------------------
-        - Adds support for the "sunos5" platform.
-        
-        1.2b3 (2010-02-28)
-        ------------------
-        - Only provide simplification implementations for GEOS C API >= 1.5.
-        
-        1.2b2 (2010-02-19)
-        ------------------
-        - Fix cascaded_union bug introduced in 1.2b1 (#212).
-        
-        1.2b1 (2010-02-18)
-        ------------------
-        - Update the README. Remove cruft from setup.py. Add some version 1.2 metadata
-        regarding required Python version (>=2.5,<3) and external dependency
-        (libgeos_c >= 3.1).
-        
-        1.2a6 (2010-02-09)
-        ------------------
-        - Add accessor for separate arrays of X and Y values (#210).
-        
-        TODO: fill gap here
-        
-        1.2a1 (2010-01-20)
-        ------------------
-        - Proper prototyping of WKB writer, and avoidance of errors on 64-bit systems
-        (#191).
-        - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
-        (#189).
-        
-        =========================
-        1.2 Branched (2009-09-19)
-        =========================
-        
-        1.0.12 (2009-04-09)
-        -------------------
-        - Fix for references held by topology and predicate descriptors.
-        
-        1.0.11 (2008-11-20)
-        -------------------
-        - Work around bug in GEOS 2.2.3, GEOSCoordSeq_getOrdinate not exported properly
-        (#178).
-        
-        1.0.10 (2008-11-17)
-        -------------------
-        - Fixed compatibility with GEOS 2.2.3 that was broken in 1.0.8 release (#176).
-        
-        1.0.9 (2008-11-16)
-        ------------------
-        - Find and load MacPorts libgeos.
-        
-        1.0.8 (2008-11-01)
-        ------------------
-        - Fill out GEOS function result and argument types to prevent faults on a
-        64-bit arch.
-        
-        1.0.7 (2008-08-22)
-        ------------------
-        - Polygon rings now have the same dimensions as parent (#168).
-        - Eliminated reference cycles in polygons (#169).
-        
-        1.0.6 (2008-07-10)
-        ------------------
-        - Fixed adaptation of multi polygon data.
-        - Raise exceptions earlier from binary predicates.
-        - Beginning distributing new windows DLLs (#166).
-        
-        1.0.5 (2008-05-20)
-        ------------------
-        - Added access to GEOS polygonizer function.
-        - Raise exception when insufficient coordinate tuples are passed to LinearRing
-        constructor (#164).
-        
-        1.0.4 (2008-05-01)
-        ------------------
-        - Disentangle Python and topological equality (#163).
-        - Add shape(), a factory that copies coordinates from a geo interface provider.
-        To be used instead of asShape() unless you really need to store coordinates
-        outside shapely for efficient use in other code.
-        - Cache GEOS geometries in adapters (#163).
-        
-        1.0.3 (2008-04-09)
-        ------------------
-        - Do not release GIL when calling GEOS functions (#158).
-        - Prevent faults when chaining multiple GEOS operators (#159).
-        
-        1.0.2 (2008-02-26)
-        ------------------
-        - Fix loss of dimensionality in polygon rings (#155).
-        
-        1.0.1 (2008-02-08)
-        ------------------
-        - Allow chaining expressions involving coordinate sequences and geometry parts
-        (#151).
-        - Protect against abnormal use of coordinate accessors (#152).
-        - Coordinate sequences now implement the numpy array protocol (#153).
-        
-        1.0 (2008-01-18)
-        ----------------
-        - Final release.
-        
-        1.0 RC2 (2008-01-16)
-        --------------------
-        - Added temporary solution for #149.
-        
-        1.0 RC1 (2008-01-14)
-        --------------------
-        - First release candidate
-        
+Description: ======
+        README
+        ======
+        
+        PostGIS-ish operations outside a database context for Pythoneers and
+        Pythonistas.
+        
+        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+           :width: 800
+           :height: 400
+        
+        Shapely is a BSD-licensed Python package for manipulation and analysis of
+        planar geometric objects. It is based on the widely deployed GEOS_ (the engine
+        of PostGIS_) and JTS_ (from which GEOS is ported) libraries. This C dependency
+        is traded for the ability to execute with blazing speed. Shapely is not
+        concerned with data formats or coordinate systems, but can be readily
+        integrated with packages that are. For more details, see:
+        
+        * Shapely wiki_
+        * Shapely manual_
+        * Shapely `example apps`_
+        
+        Dependencies
+        ============
+        
+        Shapely 1.2 depends on:
+        
+        * Python >=2.5,<3
+        * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
+        
+        Installation
+        ============
+        
+        Windows users should use the executable installer, which contains the required
+        GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
+        is on the system library path, and install from the Python package index::
+        
+          $ pip install Shapely
+        
+        or from a source distribution with the setup script::
+        
+          $ python setup.py install
+        
+        Usage
+        =====
+        
+        Here is the canonical example of building an approximately circular patch by
+        buffering a point::
+        
+          >>> from shapely.geometry import Point
+          >>> patch = Point(0.0, 0.0).buffer(10.0)
+          >>> patch
+          <shapely.geometry.polygon.Polygon object at 0x...>
+          >>> patch.area
+          313.65484905459385
+        
+        See the manual_ for comprehensive usage snippets and the dissolve.py and
+        intersect.py `example apps`_.
+        
+        Integration 
+        ===========
+        
+        Shapely does not read or write data files, but it can serialize and deserialize
+        using several well known formats and protocols. The shapely.wkb and shapely.wkt
+        modules provide dumpers and loaders inspired by Python's pickle module.::
+        
+          >>> from shapely.wkt import dumps, loads
+          >>> dumps(loads('POINT (0 0)'))
+          'POINT (0.0000000000000000 0.0000000000000000)'
+        
+        All linear objects, such as the rings of a polygon (like ``patch`` above),
+        provide the Numpy array interface.::
+        
+          >>> from numpy import asarray
+          >>> ag = asarray(patch.exterior)
+          >>> ag
+          array([[  1.00000000e+01,   0.00000000e+00],
+                 [  9.95184727e+00,  -9.80171403e-01],
+                 [  9.80785280e+00,  -1.95090322e+00],
+                 ...
+                 [  1.00000000e+01,   0.00000000e+00]])
+        
+        That yields a numpy array of [x, y] arrays. This is not always exactly what one
+        wants for plotting shapes with Matplotlib (for example), so Shapely 1.2 adds
+        a `xy` property for obtaining separate arrays of coordinate x and y values.::
+        
+          >>> x, y = patch.exterior.xy
+          >>> ax = asarray(x)
+          >>> ax
+          array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
+        
+        Numpy arrays can also be adapted to Shapely linestrings::
+        
+          >>> from shapely.geometry import asLineString
+          >>> asLineString(ag).length
+          62.806623139095073
+          >>> asLineString(ag).wkt
+          'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
+        
+        Testing
+        =======
+        
+        Shapely uses a Zope-stye suite of unittests and doctests, exercised via
+        setup.py.::
+        
+          $ python setup.py test
+        
+        Nosetests won't run the tests properly; Zope doctest suites are not currently
+        supported well by nose.
+        
+        Support
+        =======
+        
+        Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
+        
+        Credits
+        =======
+        
+        Shapely is written by:
+        
+        * Sean Gillies
+        * Aron Bierbaum
+        * Kai Lautaportti
+        * Oliver Tonnhofer
+        
+        Patches contributed by:
+        
+        * Howard Butler
+        * Frédéric Junod
+        * Éric Lemoine
+        * Jonathan Tartley
+        * Kristian Thy
+        * Mike Toews (https://github.com/mwtoews)
+        
+        Additional help from:
+        
+        * Justin Bronn (GeoDjango) for ctypes inspiration
+        * Martin Davis (JTS)
+        * Jaakko Salli for the Windows distributions
+        * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS_ Project)
+        
+        Major portions of this work were supported by a grant (for Pleiades_) from the
+        U.S. National Endowment for the Humanities (http://www.neh.gov).
+        
+        .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
+        .. _PostGIS: http://postgis.org
+        .. _GEOS: http://trac.osgeo.org/geos/
+        .. _example apps: http://trac.gispython.org/lab/wiki/Examples
+        .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
+        .. _manual: http://toblerity.github.com/shapely/manual.html
+        .. _Pleiades: http://pleiades.stoa.org
+        
+        
+        Changes
+        =======
+        
+        1.2.14 (2012-01-23)
+        -------------------
+        - A geometry's coords property is now sliceable, yielding a list of coordinate
+          values.
+        - Homogeneous collections are now sliceable, yielding a new collection of the
+          same type.
+        
+        1.2.13 (2011-09-16)
+        -------------------
+        - Fixed errors in speedups on 32bit systems when GEOS references memory above
+          2GB.
+        - Add shapely.__version__ attribute.
+        - Update the manual.
+        
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
+        1.2.10 (2011-05-09)
+        -------------------
+        - Add optional Cython speedups.
+        - Add is_cww predicate to LinearRing.
+        - Add function that forces orientation of Polygons.
+        - Disable build of speedups on Windows pending packaging work.
+        
+        1.2.9 (2011-03-31)
+        ------------------
+        - Remove extra glob import.
+        - Move examples to shapely.examples.
+        - Add box() constructor for rectangular polygons.
+        - Fix extraneous imports.
+        
+        1.2.8 (2011-12-03)
+        ------------------
+        - New parallel_offset method (#6).
+        - Support for Python 2.4.
+        
+        1.2.7 (2010-11-05)
+        ------------------
+        - Support for Windows eggs.
+        
+        1.2.6 (2010-10-21)
+        ------------------
+        - The geoms property of an empty collection yields [] instead of a ValueError
+          (#3).
+        - The coords and geometry type sproperties have the same behavior as above.
+        - Ensure that z values carry through into products of operations (#4).
+        
+        1.2.5 (2010-09-19)
+        ------------------
+        - Stop distributing docs/_build.
+        - Include library fallbacks in test_dlls.py for linux platform.
+        
+        1.2.4 (2010-09-09)
+        ------------------
+        - Raise AttributeError when there's no backend support for a method.
+        - Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
+        - Add geos_c DLL loading support for linux platforms where find_library doesn't
+          work.
+        
+        1.2.3 (2010-08-17)
+        ------------------
+        - Add mapping function.
+        - Fix problem with GEOSisValidReason symbol for GEOS < 3.1.
+        
+        1.2.2 (2010-07-23)
+        ------------------
+        - Add representative_point method.
+        
+        1.2.1 (2010-06-23)
+        ------------------
+        - Fixed bounds of singular polygons.
+        - Added shapely.validation.explain_validity function (#226).
+        
+        1.2 (2010-05-27)
+        ----------------
+        - Final release.
+        
+        1.2rc2 (2010-05-26)
+        -------------------
+        - Add examples and tests to MANIFEST.in.
+        - Release candidate 2.
+        
+        1.2rc1 (2010-05-25)
+        -------------------
+        - Release candidate.
+        
+        1.2b7 (2010-04-22)
+        ------------------
+        - Memory leak associated with new empty geometry state fixed.
+        
+        1.2b6 (2010-04-13)
+        ------------------
+        - Broken GeometryCollection fixed.
+        
+        1.2b5 (2010-04-09)
+        ------------------
+        - Objects can be constructed from others of the same type, thereby making
+          copies. Collections can be constructed from sequences of objects, also making
+          copies.
+        - Collections are now iterators over their component objects.
+        - New code for manual figures, using the descartes package.
+        
+        1.2b4 (2010-03-19)
+        ------------------
+        - Adds support for the "sunos5" platform.
+        
+        1.2b3 (2010-02-28)
+        ------------------
+        - Only provide simplification implementations for GEOS C API >= 1.5.
+        
+        1.2b2 (2010-02-19)
+        ------------------
+        - Fix cascaded_union bug introduced in 1.2b1 (#212).
+        
+        1.2b1 (2010-02-18)
+        ------------------
+        - Update the README. Remove cruft from setup.py. Add some version 1.2 metadata
+          regarding required Python version (>=2.5,<3) and external dependency
+          (libgeos_c >= 3.1).
+        
+        1.2a6 (2010-02-09)
+        ------------------
+        - Add accessor for separate arrays of X and Y values (#210).
+        
+        TODO: fill gap here
+        
+        1.2a1 (2010-01-20)
+        ------------------
+        - Proper prototyping of WKB writer, and avoidance of errors on 64-bit systems
+          (#191).
+        - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
+          (#189).
+        
+        1.2 Branched (2009-09-19)
+        
+        1.0.12 (2009-04-09)
+        -------------------
+        - Fix for references held by topology and predicate descriptors.
+        
+        1.0.11 (2008-11-20)
+        -------------------
+        - Work around bug in GEOS 2.2.3, GEOSCoordSeq_getOrdinate not exported properly
+          (#178).
+        
+        1.0.10 (2008-11-17)
+        -------------------
+        - Fixed compatibility with GEOS 2.2.3 that was broken in 1.0.8 release (#176).
+        
+        1.0.9 (2008-11-16)
+        ------------------
+        - Find and load MacPorts libgeos.
+        
+        1.0.8 (2008-11-01)
+        ------------------
+        - Fill out GEOS function result and argument types to prevent faults on a
+          64-bit arch.
+        
+        1.0.7 (2008-08-22)
+        ------------------
+        - Polygon rings now have the same dimensions as parent (#168).
+        - Eliminated reference cycles in polygons (#169).
+        
+        1.0.6 (2008-07-10)
+        ------------------
+        - Fixed adaptation of multi polygon data.
+        - Raise exceptions earlier from binary predicates.
+        - Beginning distributing new windows DLLs (#166).
+        
+        1.0.5 (2008-05-20)
+        ------------------
+        - Added access to GEOS polygonizer function.
+        - Raise exception when insufficient coordinate tuples are passed to LinearRing
+          constructor (#164).
+        
+        1.0.4 (2008-05-01)
+        ------------------
+        - Disentangle Python and topological equality (#163).
+        - Add shape(), a factory that copies coordinates from a geo interface provider.
+          To be used instead of asShape() unless you really need to store coordinates
+          outside shapely for efficient use in other code.
+        - Cache GEOS geometries in adapters (#163).
+        
+        1.0.3 (2008-04-09)
+        ------------------
+        - Do not release GIL when calling GEOS functions (#158).
+        - Prevent faults when chaining multiple GEOS operators (#159).
+        
+        1.0.2 (2008-02-26)
+        ------------------
+        - Fix loss of dimensionality in polygon rings (#155).
+        
+        1.0.1 (2008-02-08)
+        ------------------
+        - Allow chaining expressions involving coordinate sequences and geometry parts
+          (#151).
+        - Protect against abnormal use of coordinate accessors (#152).
+        - Coordinate sequences now implement the numpy array protocol (#153).
+        
+        1.0 (2008-01-18)
+        ----------------
+        - Final release.
+        
+        1.0 RC2 (2008-01-16)
+        --------------------
+        - Added temporary solution for #149.
+        
+        1.0 RC1 (2008-01-14)
+        --------------------
+        - First release candidate
+        
         
 Keywords: geometry topology gis
 Platform: UNKNOWN

shapely/__init__.py

@@ -1 +1,2 @@
-# package
+__version__ = "1.2.14"
+

shapely/coords.py

@@ -30,7 +30,7 @@ class CoordinateSequence(object):
     # _ndim : int
     #     Number of dimensions (2 or 3, generally)
     # __p__ : object
-    #     Parent (Shapely) geometry    
+    #     Parent (Shapely) geometry
     _cseq = None
     _ndim = None
     __p__ = None
@@ -41,7 +41,7 @@ class CoordinateSequence(object):
     def _update(self):
         self._ndim = self.__p__._ndim
         self._cseq = lgeos.GEOSGeom_getCoordSeq(self.__p__._geom)
-    
+
     def __len__(self):
         self._update()
         cs_len = c_uint(0)
@@ -53,38 +53,56 @@ class CoordinateSequence(object):
         dx = c_double()
         dy = c_double()
         dz = c_double()
-        for i in range(self.__len__()):
+        has_z = self._ndim == 3
+        for i in xrange(self.__len__()):
             lgeos.GEOSCoordSeq_getX(self._cseq, i, byref(dx))
             lgeos.GEOSCoordSeq_getY(self._cseq, i, byref(dy))
-            if self._ndim == 3: # TODO: use hasz
+            if has_z:
                 lgeos.GEOSCoordSeq_getZ(self._cseq, i, byref(dz))
                 yield (dx.value, dy.value, dz.value)
             else:
                 yield (dx.value, dy.value)
 
-    def __getitem__(self, i):
+    def __getitem__(self, key):
         self._update()
-        M = self.__len__()
-        if i + M < 0 or i >= M:
-            raise IndexError("index out of range")
-        if i < 0:
-            ii = M + i
-        else:
-            ii = i
         dx = c_double()
         dy = c_double()
         dz = c_double()
-        lgeos.GEOSCoordSeq_getX(self._cseq, ii, byref(dx))
-        lgeos.GEOSCoordSeq_getY(self._cseq, ii, byref(dy))
-        if self._ndim == 3: # TODO: use hasz
-            lgeos.GEOSCoordSeq_getZ(self._cseq, ii, byref(dz))
-            return (dx.value, dy.value, dz.value)
+        m = self.__len__()
+        has_z = self._ndim == 3
+        if isinstance(key, int):
+            if key + m < 0 or key >= m:
+                raise IndexError("index out of range")
+            if key < 0:
+                i = m + key
+            else:
+                i = key
+            lgeos.GEOSCoordSeq_getX(self._cseq, i, byref(dx))
+            lgeos.GEOSCoordSeq_getY(self._cseq, i, byref(dy))
+            if has_z:
+                lgeos.GEOSCoordSeq_getZ(self._cseq, i, byref(dz))
+                return (dx.value, dy.value, dz.value)
+            else:
+                return (dx.value, dy.value)
+        elif isinstance(key, slice):
+            res = []
+            start, stop, stride = key.indices(m)
+            for i in xrange(start, stop, stride):
+                lgeos.GEOSCoordSeq_getX(self._cseq, i, byref(dx))
+                lgeos.GEOSCoordSeq_getY(self._cseq, i, byref(dy))
+                if has_z:
+                    lgeos.GEOSCoordSeq_getZ(self._cseq, i, byref(dz))
+                    res.append((dx.value, dy.value, dz.value))
+                else:
+                    res.append((dx.value, dy.value))
+            return res
         else:
-            return (dx.value, dy.value)
+            raise TypeError("key must be an index or slice")
 
     @property
     def ctypes(self):
         self._update()
+        has_z = self._ndim == 3
         n = self._ndim
         m = self.__len__()
         array_type = c_double * (m * n)
@@ -95,7 +113,7 @@ class CoordinateSequence(object):
             data[n*i] = temp.value
             lgeos.GEOSCoordSeq_getY(self._cseq, i, byref(temp))
             data[n*i+1] = temp.value
-            if n == 3: # TODO: use hasz
+            if has_z:
                 lgeos.GEOSCoordSeq_getZ(self._cseq, i, byref(temp))
                 data[n*i+2] = temp.value
         return data
@@ -133,7 +151,7 @@ class CoordinateSequence(object):
             lgeos.GEOSCoordSeq_getY(self._cseq, i, byref(temp))
             y.append(temp.value)
         return x, y
-            
+
 
 class BoundsOp(Validating):
 
@@ -163,4 +181,3 @@ class BoundsOp(Validating):
             if y < miny: miny = y
             if y > maxy: maxy = y
         return (minx, miny, maxx, maxy)
-

shapely/geometry/base.py

@@ -12,13 +12,13 @@ from shapely import wkb, wkt
 
 GEOMETRY_TYPES = [
     'Point',
-	'LineString',
-	'LinearRing',
-	'Polygon',
-	'MultiPoint',
-	'MultiLineString',
-	'MultiPolygon',
-	'GeometryCollection'
+    'LineString',
+    'LinearRing',
+    'Polygon',
+    'MultiPoint',
+    'MultiLineString',
+    'MultiPolygon',
+    'GeometryCollection'
     ]
 
 def geometry_type_name(g):
@@ -548,23 +548,35 @@ class GeometrySequence(object):
 
     def __iter__(self):
         self._update()
-        for i in range(self.__len__()):
+        for i in xrange(self.__len__()):
             yield self._get_geom_item(i)
 
     def __len__(self):
         self._update()
         return lgeos.GEOSGetNumGeometries(self._geom)
 
-    def __getitem__(self, i):
+    def __getitem__(self, key):
         self._update()
-        M = self.__len__()
-        if i + M < 0 or i >= M:
-            raise IndexError("index out of range")
-        if i < 0:
-            ii = M + i
+        m = self.__len__()
+        if isinstance(key, int):
+            if key + m < 0 or key >= m:
+                raise IndexError("index out of range")
+            if key < 0:
+                i = m + key
+            else:
+                i = key
+            return self._get_geom_item(i)
+        elif isinstance(key, slice):
+            if type(self) == HeterogeneousGeometrySequence:
+                raise TypeError(
+                    "Heterogenous geometry collections are not sliceable")
+            res = []
+            start, stop, stride = key.indices(m)
+            for i in xrange(start, stop, stride):
+                res.append(self._get_geom_item(i))
+            return type(self.__p__)(res or None)
         else:
-            ii = i
-        return self._get_geom_item(i)
+            raise TypeError("key must be an index or slice")
 
     @property
     def _longest(self):

shapely/geometry/multilinestring.py

@@ -41,7 +41,7 @@ class MultiLineString(BaseMultipartGeometry):
         super(MultiLineString, self).__init__()
 
         if lines is None:
-            # allow creation of null lines, to support unpickling
+            # allow creation of empty multilinestrings, to support unpickling
             pass
         else:
             self._geom, self._ndim = geos_multilinestring_from_py(lines)

shapely/geometry/multipolygon.py

@@ -51,7 +51,7 @@ class MultiPolygon(BaseMultipartGeometry):
         super(MultiPolygon, self).__init__()
 
         if polygons is None:
-            # allow creation of null collections, to support unpickling
+            # allow creation of empty multipolygons, to support unpickling
             pass
         elif context_type == 'polygons':
             self._geom, self._ndim = geos_multipolygon_from_polygons(polygons)

shapely/geometry/polygon.py

@@ -124,15 +124,24 @@ class InteriorRingSequence(object):
     def __len__(self):
         return lgeos.GEOSGetNumInteriorRings(self._geom)
 
-    def __getitem__(self, i):
-        M = self.__len__()
-        if i + M < 0 or i >= M:
-            raise IndexError("index out of range")
-        if i < 0:
-            ii = M + i
+    def __getitem__(self, key):
+        m = self.__len__()
+        if isinstance(key, int):
+            if key + m < 0 or key >= m:
+                raise IndexError("index out of range")
+            if key < 0:
+                i = m + key
+            else:
+                i = key
+            return self._get_ring(i)
+        elif isinstance(key, slice):
+            res = []
+            start, stop, stride = key.indices(m)
+            for i in xrange(start, stop, stride):
+                res.append(self._get_ring(i))
+            return res
         else:
-            ii = i
-        return self._get_ring(i)
+            raise TypeError("key must be an index or slice")
 
     @property
     def _longest(self):

shapely/tests/__init__.py

@@ -3,7 +3,7 @@ from unittest import TestSuite
 import test_doctests, test_prepared, test_equality, test_geomseq, test_xy
 import test_collection, test_emptiness, test_singularity, test_validation
 import test_mapping, test_delegated, test_dlls, test_linear_referencing
-import test_products_z, test_box, test_speedups, test_cga
+import test_products_z, test_box, test_speedups, test_cga, test_getitem
 
 def test_suite():
     suite = TestSuite()
@@ -24,5 +24,6 @@ def test_suite():
     suite.addTest(test_box.test_suite())
     suite.addTest(test_speedups.test_suite())
     suite.addTest(test_cga.test_suite())
+    suite.addTest(test_getitem.test_suite())
     return suite
 

shapely/tests/test_getitem.py

@@ -0,0 +1,113 @@
+import unittest
+from shapely import geometry
+
+class CoordsGetItemTestCase(unittest.TestCase):
+    def test_index_2d_coords(self):
+        c = [(float(x), float(-x)) for x in range(4)]
+        g = geometry.LineString(c)
+        for i in range(-4,4):
+            self.assertTrue(g.coords[i] == c[i])
+        self.assertRaises(IndexError, lambda: g.coords[4])
+        self.assertRaises(IndexError, lambda: g.coords[-5])
+
+    def test_index_3d_coords(self):
+        c = [(float(x), float(-x), float(x*2)) for x in range(4)]
+        g = geometry.LineString(c)
+        for i in range(-4,4):
+            self.assertTrue(g.coords[i] == c[i])
+        self.assertRaises(IndexError, lambda: g.coords[4])
+        self.assertRaises(IndexError, lambda: g.coords[-5])
+
+    def test_index_coords_misc(self):
+        g = geometry.LineString() # empty
+        self.assertRaises(IndexError, lambda: g.coords[0])
+        self.assertRaises(TypeError, lambda: g.coords[0.0])
+
+    def test_slice_2d_coords(self):
+        c = [(float(x), float(-x)) for x in range(4)]
+        g = geometry.LineString(c)
+        self.assertTrue(g.coords[1:] == c[1:])
+        self.assertTrue(g.coords[:-1] == c[:-1])
+        self.assertTrue(g.coords[::-1] == c[::-1])
+        self.assertTrue(g.coords[::2] == c[::2])
+        self.assertTrue(g.coords[:4] == c[:4])
+        self.assertTrue(g.coords[4:] == c[4:] == [])
+
+    def test_slice_3d_coords(self):
+        c = [(float(x), float(-x), float(x*2)) for x in range(4)]
+        g = geometry.LineString(c)
+        self.assertTrue(g.coords[1:] == c[1:])
+        self.assertTrue(g.coords[:-1] == c[:-1])
+        self.assertTrue(g.coords[::-1] == c[::-1])
+        self.assertTrue(g.coords[::2] == c[::2])
+        self.assertTrue(g.coords[:4] == c[:4])
+        self.assertTrue(g.coords[4:] == c[4:] == [])
+
+class MultiGeomGetItemTestCase(unittest.TestCase):
+    def test_index_multigeom(self):
+        c = [(float(x), float(-x)) for x in range(4)]
+        g = geometry.MultiPoint(c)
+        for i in range(-4,4):
+            self.assertTrue(g[i].equals(geometry.Point(c[i])))
+        self.assertRaises(IndexError, lambda: g[4])
+        self.assertRaises(IndexError, lambda: g[-5])
+
+    def test_index_multigeom_misc(self):
+        g = geometry.MultiLineString() # empty
+        self.assertRaises(IndexError, lambda: g[0])
+        self.assertRaises(TypeError, lambda: g[0.0])
+
+    def test_slice_multigeom(self):
+        c = [(float(x), float(-x)) for x in range(4)]
+        g = geometry.MultiPoint(c)
+        self.failUnlessEqual(type(g[:]), type(g))
+        self.failUnlessEqual(len(g[:]), len(g))
+        self.failUnless(g[1:].equals(geometry.MultiPoint(c[1:])))
+        self.failUnless(g[:-1].equals(geometry.MultiPoint(c[:-1])))
+        self.failUnless(g[::-1].equals(geometry.MultiPoint(c[::-1])))
+        self.failUnless(g[4:].is_empty)
+
+class LinearRingGetItemTestCase(unittest.TestCase):
+    def test_index_linearring(self):
+        shell = geometry.polygon.LinearRing([(0.0, 0.0), (70.0, 120.0),
+                                             (140.0, 0.0), (0.0, 0.0)])
+        holes = [geometry.polygon.LinearRing([(60.0, 80.0), (80.0, 80.0),
+                                              (70.0, 60.0), (60.0, 80.0)]),
+                 geometry.polygon.LinearRing([(30.0, 10.0), (50.0, 10.0),
+                                              (40.0, 30.0), (30.0, 10.0)]),
+                 geometry.polygon.LinearRing([(90.0, 10), (110.0, 10.0),
+                                              (100.0, 30.0), (90.0, 10.0)])]
+        g = geometry.Polygon(shell, holes)
+        for i in range(-3,3):
+            self.assertTrue(g.interiors[i].equals(holes[i]))
+        self.assertRaises(IndexError, lambda: g.interiors[3])
+        self.assertRaises(IndexError, lambda: g.interiors[-4])
+
+    def test_index_linearring_misc(self):
+        g = geometry.Polygon() # empty
+        self.assertRaises(IndexError, lambda: g.interiors[0])
+        self.assertRaises(TypeError, lambda: g.interiors[0.0])
+
+    def test_slice_linearring(self):
+        shell = geometry.polygon.LinearRing([(0.0, 0.0), (70.0, 120.0),
+                                             (140.0, 0.0), (0.0, 0.0)])
+        holes = [geometry.polygon.LinearRing([(60.0, 80.0), (80.0, 80.0),
+                                              (70.0, 60.0), (60.0, 80.0)]),
+                 geometry.polygon.LinearRing([(30.0, 10.0), (50.0, 10.0),
+                                              (40.0, 30.0), (30.0, 10.0)]),
+                 geometry.polygon.LinearRing([(90.0, 10), (110.0, 10.0),
+                                              (100.0, 30.0), (90.0, 10.0)])]
+        g = geometry.Polygon(shell, holes)
+        self.assertTrue(all([a.equals(b) for (a, b) in zip(g.interiors[1:], holes[1:])]))
+        self.assertTrue(all([a.equals(b) for (a, b) in zip(g.interiors[:-1], holes[:-1])]))
+        self.assertTrue(all([a.equals(b) for (a, b) in zip(g.interiors[::-1], holes[::-1])]))
+        self.assertTrue(all([a.equals(b) for (a, b) in zip(g.interiors[::2], holes[::2])]))
+        self.assertTrue(all([a.equals(b) for (a, b) in zip(g.interiors[:3], holes[:3])]))
+        self.assertTrue(g.interiors[3:] == holes[3:] == [])
+
+def test_suite():
+    loader = unittest.TestLoader()
+    return unittest.TestSuite([
+        unittest.TestLoader().loadTestsFromTestCase(CoordsGetItemTestCase),
+        unittest.TestLoader().loadTestsFromTestCase(MultiGeomGetItemTestCase),
+        unittest.TestLoader().loadTestsFromTestCase(LinearRingGetItemTestCase)])