shapely 1.2.14__tar.gz → 1.2.16__tar.gz

{Shapely-1.2.14 → Shapely-1.2.16}/CHANGES.txt

@@ -1,7 +1,28 @@
-=======
 Changes
 =======
 
+1.2.16 (2012-09-18)
+-------------------
+- Add ops.unary_union function.
+- Alias ops.cascaded_union to ops.unary_union when GEOS CAPI >= (1,7,0).
+- Add geos_version_string attribute to shapely.geos.
+- Ensure parent is set when child geometry is accessed.
+- Generate _speedups.c using Cython when building from repo when missing,
+  stale, or the build target is "sdist".
+- The is_simple predicate of invalid, self-intersecting linear rings now
+  returns ``False``.
+- Remove VERSION.txt from repo, it's now written by the distutils setup script
+  with value of shapely.__version__.
+
+1.2.15 (2012-06-27)
+-------------------
+- Eliminate numerical sensitivity in a method chaining test (Debian bug
+  #663210).
+- Account for cascaded union of random buffered test points being a polygon
+  or multipolygon (Debian bug #666655).
+- Use Cython to build speedups if it is installed.
+- Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+
 1.2.14 (2012-01-23)
 -------------------
 - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14 → Shapely-1.2.16}/CREDITS.txt

@@ -1,3 +1,6 @@
+Credits
+=======
+
 Shapely is written by:
 
 * Sean Gillies
@@ -24,4 +27,6 @@ Additional help from:
 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).
 
+.. |eaigue| unicode:: U+00E9
+   :trim:
 .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2.14/Shapely.egg-info → Shapely-1.2.16}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.14
+Version: 1.2.16
 Summary: Geometric objects, predicates, and operations
-Home-page: https://github.com/sgillies/shapely
+Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
@@ -13,7 +13,7 @@ Description: ======
         PostGIS-ish operations outside a database context for Pythoneers and
         Pythonistas.
         
-        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+        .. image:: images/4511827859_b5822043b7_o.png
         :width: 800
         :height: 400
         
@@ -121,6 +121,17 @@ Description: ======
         
         Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
         
+        
+        
+        .. _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
+        
+        
         Credits
         =======
         
@@ -134,8 +145,8 @@ Description: ======
         Patches contributed by:
         
         * Howard Butler
-        * Frédéric Junod
-        * Éric Lemoine
+        * Fr |eaigue| d |eaigue| ric Junod
+        * Eric Lemoine
         * Jonathan Tartley
         * Kristian Thy
         * Mike Toews (https://github.com/mwtoews)
@@ -145,23 +156,40 @@ 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)
+        * 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
+        .. |eaigue| unicode:: U+00E9
+        :trim:
         .. _Pleiades: http://pleiades.stoa.org
         
-        
         Changes
         =======
         
+        1.2.16 (2012-09-18)
+        -------------------
+        - Add ops.unary_union function.
+        - Alias ops.cascaded_union to ops.unary_union when GEOS CAPI >= (1,7,0).
+        - Add geos_version_string attribute to shapely.geos.
+        - Ensure parent is set when child geometry is accessed.
+        - Generate _speedups.c using Cython when building from repo when missing,
+        stale, or the build target is "sdist".
+        - The is_simple predicate of invalid, self-intersecting linear rings now
+        returns ``False``.
+        - Remove VERSION.txt from repo, it's now written by the distutils setup script
+        with value of shapely.__version__.
+        
+        1.2.15 (2012-06-27)
+        -------------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
         1.2.14 (2012-01-23)
         -------------------
         - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14 → Shapely-1.2.16}/README.rst

@@ -5,7 +5,7 @@ README
 PostGIS-ish operations outside a database context for Pythoneers and
 Pythonistas.
 
-.. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+.. image:: images/4511827859_b5822043b7_o.png
    :width: 800
    :height: 400
 
@@ -113,34 +113,7 @@ 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).
+.. include:: CREDITS.txt
 
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.org

{Shapely-1.2.14 → Shapely-1.2.16/Shapely.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.14
+Version: 1.2.16
 Summary: Geometric objects, predicates, and operations
-Home-page: https://github.com/sgillies/shapely
+Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
@@ -13,7 +13,7 @@ Description: ======
         PostGIS-ish operations outside a database context for Pythoneers and
         Pythonistas.
         
-        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+        .. image:: images/4511827859_b5822043b7_o.png
         :width: 800
         :height: 400
         
@@ -121,6 +121,17 @@ Description: ======
         
         Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
         
+        
+        
+        .. _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
+        
+        
         Credits
         =======
         
@@ -134,8 +145,8 @@ Description: ======
         Patches contributed by:
         
         * Howard Butler
-        * Frédéric Junod
-        * Éric Lemoine
+        * Fr |eaigue| d |eaigue| ric Junod
+        * Eric Lemoine
         * Jonathan Tartley
         * Kristian Thy
         * Mike Toews (https://github.com/mwtoews)
@@ -145,23 +156,40 @@ 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)
+        * 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
+        .. |eaigue| unicode:: U+00E9
+        :trim:
         .. _Pleiades: http://pleiades.stoa.org
         
-        
         Changes
         =======
         
+        1.2.16 (2012-09-18)
+        -------------------
+        - Add ops.unary_union function.
+        - Alias ops.cascaded_union to ops.unary_union when GEOS CAPI >= (1,7,0).
+        - Add geos_version_string attribute to shapely.geos.
+        - Ensure parent is set when child geometry is accessed.
+        - Generate _speedups.c using Cython when building from repo when missing,
+        stale, or the build target is "sdist".
+        - The is_simple predicate of invalid, self-intersecting linear rings now
+        returns ``False``.
+        - Remove VERSION.txt from repo, it's now written by the distutils setup script
+        with value of shapely.__version__.
+        
+        1.2.15 (2012-06-27)
+        -------------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
         1.2.14 (2012-01-23)
         -------------------
         - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14 → Shapely-1.2.16}/Shapely.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ CHANGES.txt
 CREDITS.txt
 LICENSE.txt
 README.rst
+VERSION.txt
 setup.cfg
 setup.py
 Shapely.egg-info/PKG-INFO
@@ -44,7 +45,6 @@ shapely/geometry/polygon.py
 shapely/geometry/proxy.py
 shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
-shapely/speedups/_speedups.pyx
 shapely/tests/Array.txt
 shapely/tests/GeoInterface.txt
 shapely/tests/IterOps.txt
@@ -77,10 +77,12 @@ shapely/tests/test_geomseq.py
 shapely/tests/test_getitem.py
 shapely/tests/test_linear_referencing.py
 shapely/tests/test_mapping.py
+shapely/tests/test_ndarrays.py
 shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py
 shapely/tests/test_speedups.py
+shapely/tests/test_unary_union.py
 shapely/tests/test_validation.py
 shapely/tests/test_xy.py
 shapely/tests/threading_test.py

Shapely-1.2.16/VERSION.txt

@@ -0,0 +1 @@
+1.2.16

{Shapely-1.2.14 → Shapely-1.2.16}/docs/manual.txt

@@ -5,8 +5,8 @@ The Shapely User Manual
 =======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.14
-:Date: 21 January 2012
+:Revision: 1.2.16
+:Date: 18 September 2012
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -943,7 +943,11 @@ meaningless for others.
 .. attribute:: object.is_simple
 
   Returns ``True`` if the feature does not cross itself.
-  
+
+.. note:: 
+
+   The simplicity test is meaningful only for `LineStrings` and `LinearRings`.
+
 .. sourcecode:: pycon
 
   >>> LineString([(0, 0), (1, 1), (1, -1), (0, 1)]).is_simple
@@ -1482,6 +1486,40 @@ Figure 1. Convex hull (blue) of 2 points (left) and of 6 points (right).
   >>> MultiPoint([(0, 0), (1, 1)]).envelope
   <shapely.geometry.polygon.Polygon object at 0x...>
 
+.. method:: object.parallel_offset(distance, side, resolution=16, join_style=1, mitre_limit=1.0)
+
+  Returns a LineString or MultiLineString geometry at a distance from the
+  object on its right or its left side.
+
+  Distance must be a positive float value. The side parameter may be 'left' or
+  'right'. The resolution of the offset around each vertex of the object is
+  parameterized as in the buffer method.
+
+  The styles of joins between offset segments are: 1 (round, the default),
+  2 (mitre or miter), and 3 (bevel).
+
+  Severely mitered corners can be controlled by the mitre_limit parameter
+  (spelled in British English, en-gb). The ratio of the distance from the
+  corner to the end of the mitred offset corner is the miter ratio. Corners
+  with a ratio which exceed the limit will be beveled.
+  
+.. note::
+
+  This method is only available for `LinearRing`, `LineString`, and
+  `MultiLineString` objects.
+
+.. plot:: code/parallel_offset.py
+
+Figure 1. Three styles of parallel offset lines on the left side of a simple
+line string (its starting point shown as a circle) and one offset on the right
+side, a multipart.
+
+The effect of the `mitre_limit` parameter is shown below.
+
+.. plot:: code/parallel_offset_mitre.py
+
+Figure 1. Large and small mitre_limit values for left and right offsets.
+
 .. method:: object.simplify(tolerance, preserve_topology=True)
 
   Returns a simplified representation of the geometric object.
@@ -1591,6 +1629,17 @@ The function is particularly useful in dissolving `MultiPolygons`.
   >>> cascaded_union(m).area
   6.6103013551167971
 
+.. note::
+
+   In 1.2.16 :func:`shapely.ops.cascaded_union` is superceded by
+   :func:`shapely.ops.unary_union` if GEOS 3.2+ is used. The unary union
+   function can operate on different geometry types, not only polygons as is
+   the case for the older cascaded unions.
+
+.. function:: shapely.ops.unary_union(geoms)
+
+  Returns a representation of the union of the given geometric objects.
+
 Prepared Geometry Operations
 ----------------------------
 
@@ -1632,7 +1681,7 @@ Diagnostics
 The messages may or may not have a representation of a problem point that can
 be parsed out.
 
-.. sourcecode:: python
+.. sourcecode:: pycon
 
   >>> coords = [(0, 0), (0, 2), (1, 1), (2, 2), (2, 0), (1, 1), (0, 0)]
   >>> p = Polygon(coords)
@@ -1640,6 +1689,23 @@ be parsed out.
   >>> explain_validity(p)
   'Ring Self-intersection[1 1]'
 
+The Shapely version, GEOS library version, and GEOS C API version are
+accessible via :attr:`shapely.__version__`,
+:attr:`shapely.geos.geos_version_string`, and
+:attr:`shapely.geos.geos_capi_version`.
+
+.. sourcecode:: pycon
+
+  >>> import shapely
+  >>> shapely.__version__
+  '1.2.16'
+  >>> import shapely.geos
+  >>> shapely.geos.geos_version_string
+  '3.3.0-CAPI-1.7.0'
+  >>> shapely.geos.geos_capi_version
+  (1, 7, 0)
+
+
 Interoperation
 ==============
 

{Shapely-1.2.14 → Shapely-1.2.16}/setup.py

@@ -1,4 +1,3 @@
-import glob
 import warnings
 
 try:
@@ -6,30 +5,45 @@ try:
     use_setuptools()
 except:
     warnings.warn(
-    "Failed to import distribute_setup, continuing without distribute.", 
+    "Failed to import distribute_setup, continuing without distribute.",
     Warning)
 
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
+import glob
+import os
+import platform
 from setuptools.extension import Extension
-from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages
+from setuptools.command.build_ext import build_ext as distutils_build_ext
+import subprocess
 import sys
-import platform
+
+# Parse the version from the shapely module
+for line in open('shapely/__init__.py', 'rb'):
+    if line.find("__version__") >= 0:
+        version = line.split("=")[1].strip()
+        version = version.strip('"')
+        version = version.strip("'")
+        continue
+
+open('VERSION.txt', 'wb').write(version)
 
 readme_text = open('README.rst', 'rb').read()
+readme_text = readme_text.replace(".. include:: CREDITS.txt", "")
+
+f = open('CREDITS.txt', 'rb')
+credits = f.read()
 
-# Skip the first line of the changes file to get the right header level
 f = open('CHANGES.txt', 'rb')
-f.readline()
 changes_text = f.read()
 
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2.14',
+    version             = version,
     requires_python     = '>=2.5,<3',
-    requires_external   = 'libgeos_c (>=3.1)', 
+    requires_external   = 'libgeos_c (>=3.1)',
     description         = 'Geometric objects, predicates, and operations',
     license             = 'BSD',
     keywords            = 'geometry topology gis',
@@ -37,8 +51,8 @@ setup_args = dict(
     author_email        = 'sean.gillies@gmail.com',
     maintainer          = 'Sean Gillies',
     maintainer_email    = 'sean.gillies@gmail.com',
-    url                 = 'https://github.com/sgillies/shapely',
-    long_description    = readme_text + "\n" + changes_text,
+    url                 = 'https://github.com/Toblerity/Shapely',
+    long_description    = readme_text + "\n" + credits + "\n" + changes_text,
     packages            = find_packages(),
     test_suite          = 'shapely.tests.test_suite',
     classifiers         = [
@@ -61,7 +75,7 @@ if sys.platform == 'win32':
     elif platform.python_version().startswith('2.5.'):
         setup_args.update(
             data_files=[('DLLs', glob.glob('DLLs_x86_VC7/*.dll'))]
-            )       
+            )
     else:
         setup_args.update(
             data_files=[('DLLs', glob.glob('DLLs_x86_VC9/*.dll'))]
@@ -81,41 +95,61 @@ else:
 class BuildFailed(Exception):
     pass
 
-class ve_build_ext(build_ext):
+class build_ext(distutils_build_ext):
     # This class allows C extension building to fail.
 
     def run(self):
         try:
-            build_ext.run(self)
+            distutils_build_ext.run(self)
         except DistutilsPlatformError, x:
             raise BuildFailed(x)
 
     def build_extension(self, ext):
         try:
-            build_ext.build_extension(self, ext)
+            distutils_build_ext.build_extension(self, ext)
         except ext_errors, x:
             raise BuildFailed(x)
 
-if sys.platform == 'win32':
-    # geos DLL is geos.dll instead of geos_c.dll on Windows
-    ext_modules = [
-        Extension("shapely.speedups._speedups",
-              ["shapely/speedups/_speedups.c"], libraries=['geos']),
-    ]
-elif (hasattr(platform, 'python_implementation') 
+if (hasattr(platform, 'python_implementation')
     and platform.python_implementation() == 'PyPy'):
-    # python_implementation >= 2.6
+    # python_implementation is only available since 2.6
     ext_modules = []
+
+elif sys.platform == 'win32':
+    libraries = ['geos']
 else:
-    ext_modules = [
-        Extension("shapely.speedups._speedups", 
-              ["shapely/speedups/_speedups.c"], libraries=['geos_c']),
-    ]
+    libraries = ['geos_c']
+
+if os.path.exists("MANIFEST.in"):
+    pyx_file = "shapely/speedups/_speedups.pyx"
+    c_file = "shapely/speedups/_speedups.c"
+
+    force_cython = False
+    if 'sdist' in sys.argv:
+        force_cython = True
+
+    try:
+        if (force_cython or not os.path.exists(c_file)
+            or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
+            print >>sys.stderr, "Updating C extension with Cython."
+            subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
+    except (subprocess.CalledProcessError, OSError):
+        print >>sys.stderr, "Warning: Could not (re)create C extension with Cython."
+        if force_cython:
+            raise
+    if not os.path.exists("shapely/speedups/_speedups.c"):
+        print >>sys.stderr, "Warning: speedup extension not found"
+
+ext_modules = [
+    Extension(
+        "shapely.speedups._speedups",
+        ["shapely/speedups/_speedups.c"],
+        libraries=libraries )]
 
 try:
     # try building with speedups
     setup(
-        cmdclass={'build_ext': ve_build_ext},
+        cmdclass={'build_ext': build_ext},
         ext_modules=ext_modules,
         **setup_args
     )

Shapely-1.2.16/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.16"

{Shapely-1.2.14 → Shapely-1.2.16}/shapely/coords.py

@@ -8,6 +8,21 @@ import sys
 from shapely.geos import lgeos
 from shapely.topology import Validating
 
+try:
+    import numpy
+    has_numpy = True
+except ImportError:
+    has_numpy = False
+
+def required(ob):
+    """Return an object that meets Shapely requirements for self-owned
+    C-continguous data, copying if necessary, or just return the original
+    object."""
+    if has_numpy and hasattr(ob, '__array_interface__'):
+        return numpy.require(ob, numpy.float64, ["C", "OWNDATA"])
+    else:
+        return ob
+
 
 class CoordinateSequence(object):
     """

{Shapely-1.2.14 → Shapely-1.2.16}/shapely/ctypes_declarations.py

@@ -282,3 +282,7 @@ def prototype(lgeos, geosVersion):
             lgeos.GEOSInterpolateNormalized.argtypes = [ctypes.c_void_p, 
                                                         ctypes.c_double]
 
+    # TODO: Find out what version of geos_c came with geos 3.3.0
+    if geosVersion >= (1, 6, 3):
+        lgeos.GEOSUnaryUnion.restype = ctypes.c_void_p
+        lgeos.GEOSUnaryUnion.argtypes = [ctypes.c_void_p]