shapely 1.2b7__tar.gz → 1.2rc2__tar.gz

{Shapely-1.2b7 → Shapely-1.2rc2}/CHANGES.txt

@@ -1,5 +1,14 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+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.

Shapely-1.2rc2/CREDITS.txt

@@ -0,0 +1,24 @@
+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).

{Shapely-1.2b7 → Shapely-1.2rc2}/MANIFEST.in

@@ -1,3 +1,5 @@
 exclude *.txt
 recursive-exclude manual *
 include CHANGES.txt CREDITS.txt LICENSE.txt README.txt
+recursive-include shapely/tests *.py *.txt
+recursive-include shapely/examples *.py

{Shapely-1.2b7 → Shapely-1.2rc2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b7
-Summary: Planar geometries, predicates, and operations
+Version: 1.2rc2
+Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: 
+Description: =======
         Shapely
         =======
         
@@ -15,10 +15,10 @@ Description:
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometries. It is not concerned with data formats or coordinate
-        systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
+        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 analyze geometries with blazing speed.
+        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:
@@ -27,7 +27,6 @@ Description:
         * Shapely manual_
         * Shapely `example apps`_
         
-        
         Dependencies
         ------------
         
@@ -36,7 +35,6 @@ Description:
         * Python >=2.5,<3
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
-        
         Installation
         ------------
         
@@ -50,7 +48,6 @@ Description:
         
         $ python setup.py install
         
-        
         Usage
         -----
         
@@ -67,12 +64,19 @@ Description:
         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.::
         
-        Numpy integration
-        -----------------
+        >>> from shapely.wkt import dumps, loads
+        >>> dumps(loads('POINT (0 0)'))
+        'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear geometries, such as the rings of a polygon, provide the Numpy array
-        interface::
+        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)
@@ -83,9 +87,9 @@ Description:
         ...
         [  1.00000000e+01,   0.00000000e+00]])
         
-        That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-        for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-        property for getting separate arrays of coordinate x and y values::
+        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)
@@ -100,14 +104,16 @@ Description:
         >>> asLineString(ag).wkt
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
-        
         Testing
         -------
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+        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
         -------
@@ -118,7 +124,6 @@ Description:
         
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
-        
         Credits
         -------
         
@@ -141,18 +146,18 @@ Description:
         
         * 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/manual.html
+        .. _manual: http://gispython.org/shapely/docs/1.2
         .. |eaigue| unicode:: U+00E9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b7 → Shapely-1.2rc2}/README.txt

@@ -1,4 +1,4 @@
-
+=======
 Shapely
 =======
 
@@ -7,10 +7,10 @@ Shapely
    :height: 400
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
-planar geometries. It is not concerned with data formats or coordinate
-systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
+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 analyze geometries with blazing speed.
+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:
@@ -19,7 +19,6 @@ database using idiomatic Python. For more details, see:
 * Shapely manual_
 * Shapely `example apps`_
 
-
 Dependencies
 ------------
 
@@ -28,7 +27,6 @@ Shapely 1.2 depends on:
 * Python >=2.5,<3
 * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
 
-
 Installation
 ------------
 
@@ -42,7 +40,6 @@ or from a source distribution with the setup script::
 
   $ python setup.py install
 
-
 Usage
 -----
 
@@ -59,12 +56,19 @@ buffering a point::
 See the manual_ for comprehensive usage snippets and the dissolve.py and
 intersect.py `example apps`_.
 
+Integration 
+-----------
 
-Numpy 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.::
 
-All linear geometries, such as the rings of a polygon, provide the Numpy array
-interface::
+  >>> 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)
@@ -75,9 +79,9 @@ interface::
          ...
          [  1.00000000e+01,   0.00000000e+00]])
 
-That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-property for getting separate arrays of coordinate x and y values::
+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)
@@ -92,14 +96,16 @@ Numpy arrays can also be adapted to Shapely linestrings::
   >>> asLineString(ag).wkt
   'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
 
-
 Testing
 -------
 
-Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+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
 -------
@@ -110,7 +116,6 @@ If you have questions, please consider joining our community list:
 
 http://trac.gispython.org/projects/PCL/wiki/CommunityList
 
-
 Credits
 -------
 
@@ -133,18 +138,18 @@ 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/manual.html
+.. _manual: http://gispython.org/shapely/docs/1.2
 .. |eaigue| unicode:: U+00E9
    :trim:
 .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b7 → Shapely-1.2rc2}/Shapely.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b7
-Summary: Planar geometries, predicates, and operations
+Version: 1.2rc2
+Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: 
+Description: =======
         Shapely
         =======
         
@@ -15,10 +15,10 @@ Description:
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometries. It is not concerned with data formats or coordinate
-        systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
+        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 analyze geometries with blazing speed.
+        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:
@@ -27,7 +27,6 @@ Description:
         * Shapely manual_
         * Shapely `example apps`_
         
-        
         Dependencies
         ------------
         
@@ -36,7 +35,6 @@ Description:
         * Python >=2.5,<3
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
-        
         Installation
         ------------
         
@@ -50,7 +48,6 @@ Description:
         
         $ python setup.py install
         
-        
         Usage
         -----
         
@@ -67,12 +64,19 @@ Description:
         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.::
         
-        Numpy integration
-        -----------------
+        >>> from shapely.wkt import dumps, loads
+        >>> dumps(loads('POINT (0 0)'))
+        'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear geometries, such as the rings of a polygon, provide the Numpy array
-        interface::
+        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)
@@ -83,9 +87,9 @@ Description:
         ...
         [  1.00000000e+01,   0.00000000e+00]])
         
-        That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-        for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-        property for getting separate arrays of coordinate x and y values::
+        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)
@@ -100,14 +104,16 @@ Description:
         >>> asLineString(ag).wkt
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
-        
         Testing
         -------
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+        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
         -------
@@ -118,7 +124,6 @@ Description:
         
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
-        
         Credits
         -------
         
@@ -141,18 +146,18 @@ Description:
         
         * 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/manual.html
+        .. _manual: http://gispython.org/shapely/docs/1.2
         .. |eaigue| unicode:: U+00E9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b7 → Shapely-1.2rc2}/Shapely.egg-info/SOURCES.txt

@@ -51,12 +51,15 @@ shapely/tests/Predicates.txt
 shapely/tests/__init__.py
 shapely/tests/attribute-chains.txt
 shapely/tests/binascii_hex.txt
+shapely/tests/cascaded_union.txt
 shapely/tests/dimensions.txt
 shapely/tests/invalid_intersection.txt
 shapely/tests/linear-referencing.txt
 shapely/tests/linemerge.txt
 shapely/tests/polygonize.txt
+shapely/tests/test_collection.py
 shapely/tests/test_doctests.py
+shapely/tests/test_emptiness.py
 shapely/tests/test_equality.py
 shapely/tests/test_geomseq.py
 shapely/tests/test_prepared.py

Shapely-1.2rc2/setup.cfg

@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+

{Shapely-1.2b7 → Shapely-1.2rc2}/setup.py

@@ -16,10 +16,10 @@ readme_text = file('README.txt', 'rb').read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2b7',
+    version             = '1.2rc2',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
-    description         = 'Planar geometries, predicates, and operations',
+    description         = 'Geometric objects, predicates, and operations',
     license             = 'BSD',
     keywords            = 'geometry topology gis',
     author              = 'Sean Gillies',

{Shapely-1.2b7 → Shapely-1.2rc2}/shapely/geometry/base.py

@@ -3,6 +3,7 @@
 
 from functools import wraps
 import sys
+import warnings
 
 from shapely.coords import CoordinateSequence
 from shapely.geos import lgeos
@@ -260,13 +261,15 @@ class BaseGeometry(object):
         """A figure that envelopes the geometry"""
         return geom_factory(self.impl['envelope'](self))
 
-    def buffer(self, distance, quadsegs=16):
+    def buffer(self, distance, resolution=16, quadsegs=None):
         """Returns a geometry with an envelope at a distance from the object's 
         envelope
         
         A negative distance has a "shrink" effect. A zero distance may be used
         to "tidy" a polygon. The resolution of the buffer around each vertex of
-        the object increases by increasing the quadsegs parameter.
+        the object increases by increasing the resolution keyword parameter
+        or second positional parameter. Note: the use of a `quadsegs` parameter
+        is deprecated and will be gone from the next major release.
 
         Example:
 
@@ -279,7 +282,14 @@ class BaseGeometry(object):
           >>> g.buffer(1.0, 3).area     # triangle approximation
           3.0
         """
-        return geom_factory(self.impl['buffer'](self, distance, quadsegs))
+        if quadsegs is not None:
+            warnings.warn(
+                "The `quadsegs` argument is deprecated. Use `resolution`.", 
+                DeprecationWarning)
+            res = quadsegs
+        else:
+            res = resolution
+        return geom_factory(self.impl['buffer'](self, distance, res))
 
     def simplify(self, tolerance, preserve_topology=True):
         """Returns a simplified geometry produced by the Douglas-Puecker 

{Shapely-1.2b7 → Shapely-1.2rc2}/shapely/geos.py

@@ -99,7 +99,7 @@ def _geos_c_version():
     v = func().split('-')[2]
     return tuple(int(n) for n in v.split('.'))
 
-geos_c_version = _geos_c_version()
+geos_capi_version = geos_c_version = _geos_c_version()
 
 class allocated_c_char_p(c_char_p):
     pass
@@ -348,7 +348,7 @@ class LGEOS16LR(LGEOS16):
     """Proxy for the reentrant GEOS_C DLL/SO API version 1.6 with linear
     referencing
     """
-    geos_capi_version = (1, 6, 0.5)
+    geos_capi_version = geos_c_version
     def __init__(self, dll):
         super(LGEOS16LR, self).__init__(dll)
         

{Shapely-1.2b7 → Shapely-1.2rc2}/shapely/prepared.py

@@ -48,7 +48,7 @@ class PreparedGeometry(object):
         return bool(self.impl['prepared_covers'](self, other))
 
 
-def prep(geom):
-    """Creates and returns a prepared geometry."""
-    return PreparedGeometry(geom)
+def prep(ob):
+    """Creates and returns a prepared geometric object."""
+    return PreparedGeometry(ob)
 

Shapely-1.2rc2/shapely/tests/cascaded_union.txt

@@ -0,0 +1,24 @@
+Cascaded Union
+==============
+
+  >>> from functools import partial
+  >>> import random
+  >>> from shapely.geometry import Point
+  >>> from shapely.ops import cascaded_union
+
+Use a partial function to make 100 points uniformly distributed in a 40x40 
+box centered on 0,0.
+
+  >>> r = partial(random.uniform, -20.0, 20.0)
+  >>> points = [Point(r(), r()) for i in range(100)]
+
+Buffer the points, producing 100 polygon spots
+
+  >>> spots = [p.buffer(2.5) for p in points]
+
+Perform a cascaded union of the polygon spots, dissolving them into a 
+collection of polygon patches
+
+  >>> cascaded_union(spots) # doctest: +ELLIPSIS
+  <shapely.geometry.multipolygon.MultiPolygon object at 0x...>
+

Shapely-1.2rc2/shapely/tests/test_collection.py

@@ -0,0 +1,10 @@
+import unittest
+from shapely.geometry.collection import GeometryCollection
+
+class CollectionTestCase(unittest.TestCase):
+    def test_array_interface(self):
+        m = GeometryCollection()
+        self.failUnlessEqual(len(m), 0)
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(CollectionTestCase)

Shapely-1.2rc2/shapely/tests/test_emptiness.py

@@ -0,0 +1,19 @@
+import unittest
+from shapely.geometry.base import BaseGeometry
+from shapely.geometry import Point
+
+class EmptinessTestCase(unittest.TestCase):
+    def test_empty_base(self):
+        g = BaseGeometry()
+        self.failUnless(g._is_empty, True)
+    def test_empty_point(self):
+        p = Point()
+        self.failUnless(p._is_empty, True)
+    def test_emptying_point(self):
+        p = Point(0, 0)
+        self.failIf(p._is_empty, False)
+        p.empty()
+        self.failUnless(p._is_empty, True)
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(EmptinessTestCase)

Shapely-1.2b7/CREDITS.txt

@@ -1,9 +0,0 @@
-Sean Gillies (Pleiades)
-Howard Butler (Hobu, Inc.)
-Kai Lautaportti (Hexagon IT)
-Frédéric Junod (Camptocamp SA)
-Eric Lemoine (Camptocamp SA)
-Justin Bronn (GeoDjango) for ctypes inspiration
-
-Some of this work was supported by a grant from the U.S. National Endowment for
-the Humanities (http://www.neh.gov).

Shapely-1.2b7/setup.cfg

@@ -1,15 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-
-[nosetests]
-cover-package = shapely
-verbosity = 2
-doctest-extension = txt
-with-coverage = 1
-detailed-errors = 1
-pdb-failures = 1
-with-doctest = 1
-pdb = 1
-