shapely 1.2.16__tar.gz → 1.2.17__tar.gz

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

@@ -1,6 +1,15 @@
 Changes
 =======
 
+1.2.17 (2013-01-27)
+-------------------
+- Avoid circular import between wkt/wkb and geometry.base by moving calls
+  to GEOS serializers to the latter module.
+- Set _ndim when unpickling (issue #6).
+- Don't install DLLs to Python's DLL directory (#37).
+- Add affinity module of affine transformation (#31).
+- Fix NameError that blocked installation with PyPy (#40, #41).
+
 1.2.16 (2012-09-18)
 -------------------
 - Add ops.unary_union function.

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

@@ -16,6 +16,8 @@ Patches contributed by:
 * Jonathan Tartley
 * Kristian Thy
 * Mike Toews (https://github.com/mwtoews)
+* Phil Elson (https://github.com/pelson)
+* Jeethu Rao (https://github.com/jeethu)
 
 Additional help from:
 

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

@@ -1,19 +1,19 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.16
+Version: 1.2.17
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: ======
-        README
-        ======
+Description: =======
+        Shapely
+        =======
         
         PostGIS-ish operations outside a database context for Pythoneers and
         Pythonistas.
         
-        .. image:: images/4511827859_b5822043b7_o.png
+        .. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
         :width: 800
         :height: 400
         
@@ -150,6 +150,8 @@ Description: ======
         * Jonathan Tartley
         * Kristian Thy
         * Mike Toews (https://github.com/mwtoews)
+        * Phil Elson (https://github.com/pelson)
+        * Jeethu Rao (https://github.com/jeethu)
         
         Additional help from:
         
@@ -168,6 +170,15 @@ Description: ======
         Changes
         =======
         
+        1.2.17 (2013-01-27)
+        -------------------
+        - Avoid circular import between wkt/wkb and geometry.base by moving calls
+        to GEOS serializers to the latter module.
+        - Set _ndim when unpickling (issue #6).
+        - Don't install DLLs to Python's DLL directory (#37).
+        - Add affinity module of affine transformation (#31).
+        - Fix NameError that blocked installation with PyPy (#40, #41).
+        
         1.2.16 (2012-09-18)
         -------------------
         - Add ops.unary_union function.

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

@@ -1,11 +1,11 @@
-======
-README
-======
+=======
+Shapely
+=======
 
 PostGIS-ish operations outside a database context for Pythoneers and
 Pythonistas.
 
-.. image:: images/4511827859_b5822043b7_o.png
+.. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
    :width: 800
    :height: 400
 

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

@@ -1,19 +1,19 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.16
+Version: 1.2.17
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: ======
-        README
-        ======
+Description: =======
+        Shapely
+        =======
         
         PostGIS-ish operations outside a database context for Pythoneers and
         Pythonistas.
         
-        .. image:: images/4511827859_b5822043b7_o.png
+        .. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
         :width: 800
         :height: 400
         
@@ -150,6 +150,8 @@ Description: ======
         * Jonathan Tartley
         * Kristian Thy
         * Mike Toews (https://github.com/mwtoews)
+        * Phil Elson (https://github.com/pelson)
+        * Jeethu Rao (https://github.com/jeethu)
         
         Additional help from:
         
@@ -168,6 +170,15 @@ Description: ======
         Changes
         =======
         
+        1.2.17 (2013-01-27)
+        -------------------
+        - Avoid circular import between wkt/wkb and geometry.base by moving calls
+        to GEOS serializers to the latter module.
+        - Set _ndim when unpickling (issue #6).
+        - Don't install DLLs to Python's DLL directory (#37).
+        - Add affinity module of affine transformation (#31).
+        - Fix NameError that blocked installation with PyPy (#40, #41).
+        
         1.2.16 (2012-09-18)
         -------------------
         - Add ops.unary_union function.

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

@@ -11,6 +11,7 @@ Shapely.egg-info/dependency_links.txt
 Shapely.egg-info/top_level.txt
 docs/manual.txt
 shapely/__init__.py
+shapely/affinity.py
 shapely/coords.py
 shapely/ctypes_declarations.py
 shapely/ftools.py
@@ -65,6 +66,7 @@ shapely/tests/dimensions.txt
 shapely/tests/invalid_intersection.txt
 shapely/tests/linemerge.txt
 shapely/tests/polygonize.txt
+shapely/tests/test_affinity.py
 shapely/tests/test_box.py
 shapely/tests/test_cga.py
 shapely/tests/test_collection.py
@@ -78,6 +80,7 @@ shapely/tests/test_getitem.py
 shapely/tests/test_linear_referencing.py
 shapely/tests/test_mapping.py
 shapely/tests/test_ndarrays.py
+shapely/tests/test_pickle.py
 shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py

Shapely-1.2.17/VERSION.txt

@@ -0,0 +1 @@
+1.2.17

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

@@ -5,8 +5,8 @@ The Shapely User Manual
 =======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.16
-:Date: 18 September 2012
+:Revision: 1.2.15
+:Date: 8 July 2012
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -646,7 +646,7 @@ Collections of Lines
 
 Figure 1: On the left, a `simple`, disconnected `MultiLineString`, and on the
 right, a non-simple `MultiLineString`. The points defining the objects are
-shownb in gray, the boundaries of the objects in black.
+shown in gray, the boundaries of the objects in black.
 
 A `MultiLineString` has zero area and non-zero length.
 
@@ -771,7 +771,7 @@ longer empty.
 Linear Referencing Methods
 --------------------------
 
-It can useful to specify position along linear features such as `LineStrings`
+It can be useful to specify position along linear features such as `LineStrings`
 and `MultiLineStrings` with a 1-dimensional referencing system. Shapely
 supports linear referencing based on length or distance, evaluating the
 distance along a geometric object to the projection of a given point, or the

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

@@ -10,12 +10,14 @@ except:
 
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
+import errno
 import glob
 import os
 import platform
 from setuptools.extension import Extension
 from setuptools import setup, find_packages
 from setuptools.command.build_ext import build_ext as distutils_build_ext
+import shutil
 import subprocess
 import sys
 
@@ -68,18 +70,23 @@ setup_args = dict(
 
 # Add DLLs for Windows
 if sys.platform == 'win32':
+    try:
+        os.mkdir('shapely/DLLs')
+    except OSError, ex:
+        if ex.errno != errno.EEXIST: raise
     if '(AMD64)' in sys.version:
-        setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_AMD64_VC9/*.dll'))]
-            )
+        for dll in glob.glob('DLLs_AMD64_VC9/*.dll'):
+            shutil.copy(dll, 'shapely/DLLs')
     elif platform.python_version().startswith('2.5.'):
-        setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_x86_VC7/*.dll'))]
-            )
+        for dll in glob.glob('DLLs_x86_VC7/*.dll'):
+            shutil.copy(dll, 'shapely/DLLs')
     else:
-        setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_x86_VC9/*.dll'))]
-            )
+        for dll in glob.glob('DLLs_x86_VC9/*.dll'):
+            shutil.copy(dll, 'shapely/DLLs')
+    setup_args.update(
+        package_data={'shapely': ['shapely/DLLs/*.dll']},
+        include_package_data=True,
+    )
 
 
 # Optional compilation of speedups
@@ -114,7 +121,7 @@ if (hasattr(platform, 'python_implementation')
     and platform.python_implementation() == 'PyPy'):
     # python_implementation is only available since 2.6
     ext_modules = []
-
+    libraries = []
 elif sys.platform == 'win32':
     libraries = ['geos']
 else:

Shapely-1.2.17/shapely/__init__.py

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

Shapely-1.2.17/shapely/affinity.py

@@ -0,0 +1,248 @@
+"""Affine transforms, both in general and specific, named transforms."""
+
+from math import sin, cos, tan, pi
+
+__all__ = ['affine_transform', 'rotate', 'scale', 'skew', 'translate']
+
+def affine_transform(geom, matrix):
+    """Return a transformed geometry using an affine transformation matrix.
+
+    The coefficient matrix is provided as a list or tuple with 6 or 12 items
+    for 2D or 3D transformations, respectively.
+
+    For 2D affine transformations, the 6 parameter matrix is:
+
+        [a, b, d, e, xoff, yoff]
+
+    which represents the augmented matrix:
+
+                            / a  b xoff \ 
+        [x' y' 1] = [x y 1] | d  e yoff |
+                            \ 0  0   1  /
+
+    or the equations for the transformed coordinates:
+
+        x' = a * x + b * y + xoff
+        y' = d * x + e * y + yoff
+
+    For 3D affine transformations, the 12 parameter matrix is:
+
+        [a, b, c, d, e, f, g, h, i, xoff, yoff, zoff]
+
+    which represents the augmented matrix:
+
+                                 / a  b  c xoff \ 
+        [x' y' z' 1] = [x y z 1] | d  e  f yoff |
+                                 | g  h  i zoff |
+                                 \ 0  0  0   1  /
+
+    or the equations for the transformed coordinates:
+
+        x' = a * x + b * y + c * z + xoff
+        y' = d * x + e * y + f * z + yoff
+        z' = g * x + h * y + i * z + zoff
+    """
+    if len(matrix) == 6:
+        ndim = 2
+        a, b, d, e, xoff, yoff = matrix
+        if geom.has_z:
+            ndim = 3
+            i = 1.0
+            c = f = g = h = zoff = 0.0
+            matrix = a, b, c, d, e, f, g, h, i, xoff, yoff, zoff
+    elif len(matrix) == 12:
+        ndim = 3
+        a, b, c, d, e, f, g, h, i, xoff, yoff, zoff = matrix
+        if not geom.has_z:
+            ndim = 2
+            matrix = a, b, d, e, xoff, yoff
+    else:
+        raise ValueError("`matrix` expects either 6 or 12 coefficients")
+
+    def affine_pts(pts):
+        """Internal function to yield affine transform of coordinate tuples"""
+        if ndim == 2:
+            for x, y in pts:
+                xp = a * x + b * y + xoff
+                yp = d * x + e * y + yoff
+                yield (xp, yp)
+        elif ndim == 3:
+            for x, y, z in pts:
+                xp = a * x + b * y + c * z + xoff
+                yp = d * x + e * y + f * z + yoff
+                zp = g * x + h * y + i * z + zoff
+                yield (xp, yp, zp)
+
+    # Process coordinates from each supported geometry type
+    if geom.type in ('Point', 'LineString'):
+        return type(geom)(list(affine_pts(geom.coords)))
+    elif geom.type == 'Polygon':
+        ring = geom.exterior
+        shell = type(ring)(list(affine_pts(ring.coords)))
+        holes = list(geom.interiors)
+        for pos, ring in enumerate(holes):
+            holes[pos] = type(ring)(list(affine_pts(ring.coords)))
+        return type(geom)(shell, holes)
+    elif geom.type.startswith('Multi') or geom.type == 'GeometryCollection':
+        # Recursive call
+        # TODO: fix GeometryCollection constructor
+        return type(geom)([affine_transform(part, matrix) for part in geom.geoms])
+    else:
+        raise ValueError('Type %r not recognized'%geom.type)
+
+def interpret_origin(geom, origin, ndim):
+    """Return interpreted coordinate tuple for origin parameter.
+
+    This is a helper function for other transform functions.
+
+    The point of origin can be a keyword 'center' for the 2D bounding box
+    center, 'centroid' for the geometry's 2D centroid, a Point object or a
+    coordinate tuple (x0, y0, z0).
+    """
+    # get coordinate tuple from `origin` from keyword or Point type
+    if origin == 'center':
+        # bounding box center
+        minx, miny, maxx, maxy = geom.bounds
+        origin = ((maxx + minx)/2.0, (maxy + miny)/2.0)
+    elif origin == 'centroid':
+        origin = geom.centroid.coords[0]
+    elif isinstance(origin, str):
+        raise ValueError('`origin` keyword %r is not recognized'%origin)
+    elif hasattr(origin, 'type') and origin.type == 'Point':
+        origin = origin.coords[0]
+
+    # origin should now be tuple-like
+    if len(origin) not in (2, 3):
+        raise ValueError('Expected number of items in `origin` to be '\
+                         'either 2 or 3')
+    if ndim == 2:
+        return origin[0:2]
+    else: # 3D coordinate
+        if len(origin) == 2:
+            return origin + (0.0,)
+        else:
+            return origin
+
+def rotate(geom, angle, origin='center', use_radians=False):
+    """Return a rotated geometry on a 2D plane.
+
+    The angle of rotation can be specified in either degrees (default) or
+    radians by setting `use_radians=True`. Positive angles are
+    counter-clockwise and negative are clockwise rotations.
+
+    The point of origin can be a keyword 'center' for the bounding box
+    center (default), 'centroid' for the geometry's centroid, a Point object
+    or a coordinate tuple (x0, y0).
+
+    The transformation matrix for 2D rotation is:
+
+      / cos(r) -sin(r) xoff \ 
+      | sin(r)  cos(r) yoff |
+      \   0       0      1  /
+    
+    where the offsets are calculated from the origin Point(x0, y0):
+
+        xoff = x0 - x0 * cos(r) + y0 * sin(r)
+        yoff = y0 - x0 * sin(r) - y0 * cos(r)
+    """
+    if not use_radians: # convert from degrees
+        angle *= pi/180.0
+    cosp = cos(angle)
+    sinp = sin(angle)
+    if abs(cosp) < 2.5e-16:
+        cosp = 0.0
+    if abs(sinp) < 2.5e-16:
+        sinp = 0.0
+    x0, y0 = interpret_origin(geom, origin, 2)
+
+    matrix = (cosp, -sinp, 0.0,
+              sinp,  cosp, 0.0,
+              0.0,    0.0, 1.0,
+              x0 - x0 * cosp + y0 * sinp, y0 - x0 * sinp - y0 * cosp, 0.0)
+    return affine_transform(geom, matrix)
+
+def scale(geom, xfact=1.0, yfact=1.0, zfact=1.0, origin='center'):
+    """Return a scaled geometry, scaled by factors along each dimension.
+
+    The point of origin can be a keyword 'center' for the 2D bounding box
+    center (default), 'centroid' for the geometry's 2D centroid, a Point
+    object or a coordinate tuple (x0, y0, z0).
+
+    Negative scale factors will mirror or reflect coordinates.
+
+    The general 3D affine transformation matrix for scaling is:
+
+        / xfact  0    0   xoff \ 
+        |   0  yfact  0   yoff |
+        |   0    0  zfact zoff |
+        \   0    0    0     1  /
+
+    where the offsets are calculated from the origin Point(x0, y0, z0):
+
+        xoff = x0 - x0 * xfact
+        yoff = y0 - y0 * yfact
+        zoff = z0 - z0 * zfact
+    """
+    x0, y0, z0 = interpret_origin(geom, origin, 3)
+
+    matrix = (xfact, 0.0, 0.0,
+              0.0, yfact, 0.0,
+              0.0, 0.0, zfact,
+              x0 - x0 * xfact, y0 - y0 * yfact, z0 - z0 * zfact)
+    return affine_transform(geom, matrix)
+
+def skew(geom, xs=0.0, ys=0.0, origin='center', use_radians=False):
+    """Return a skewed geometry, sheared by angles along x and y dimensions.
+
+    The shear angle can be specified in either degrees (default) or radians
+    by setting `use_radians=True`.
+
+    The point of origin can be a keyword 'center' for the bounding box
+    center (default), 'centroid' for the geometry's centroid, a Point object
+    or a coordinate tuple (x0, y0).
+
+    The general 2D affine transformation matrix for skewing is:
+
+        /   1    tan(xs) xoff \ 
+        | tan(ys)  1     yoff |
+        \   0      0       1  /
+
+    where the offsets are calculated from the origin Point(x0, y0):
+
+        xoff = -y0 * tan(xs)
+        yoff = -x0 * tan(ys)
+    """
+    if not use_radians: # convert from degrees
+        xs *= pi/180.0
+        ys *= pi/180.0
+    tanx = tan(xs)
+    tany = tan(ys)
+    if abs(tanx) < 2.5e-16:
+        tanx = 0.0
+    if abs(tany) < 2.5e-16:
+        tany = 0.0
+    x0, y0 = interpret_origin(geom, origin, 2)
+
+    matrix = (1.0, tanx, 0.0,
+              tany, 1.0, 0.0,
+              0.0,  0.0, 1.0,
+              -y0 * tanx, -x0 * tany, 0.0)
+    return affine_transform(geom, matrix)
+
+def translate(geom, xoff=0.0, yoff=0.0, zoff=0.0):
+    """Return a translated geometry shifted by offsets along each dimension.
+
+    The general 3D affine transformation matrix for translation is:
+
+        / 1  0  0 xoff \ 
+        | 0  1  0 yoff |
+        | 0  0  1 zoff |
+        \ 0  0  0   1  /
+    """
+    matrix = (1.0, 0.0, 0.0,
+              0.0, 1.0, 0.0,
+              0.0, 0.0, 1.0,
+              xoff, yoff, zoff)
+    return affine_transform(geom, matrix)
+
+

{Shapely-1.2.16 → Shapely-1.2.17}/shapely/geometry/base.py

@@ -1,14 +1,14 @@
 """Base geometry class and utilities
 """
 
+from ctypes import pointer, c_size_t, c_char_p, c_void_p
 import sys
 import warnings
 
 from shapely.coords import CoordinateSequence
 from shapely.ftools import wraps
-from shapely.geos import lgeos
+from shapely.geos import lgeos, ReadingError
 from shapely.impl import DefaultImplementation, delegated
-from shapely import wkb, wkt
 
 GEOMETRY_TYPES = [
     'Point',
@@ -48,6 +48,34 @@ def geom_factory(g, parent=None):
         ob._ndim = 2
     return ob
 
+def geom_from_wkt(data):
+    geom = lgeos.GEOSGeomFromWKT(c_char_p(data))
+    if not geom:
+        raise ReadingError, \
+        "Could not create geometry because of errors while reading input."
+    return geom_factory(geom)
+
+def geom_to_wkt(ob):
+    if ob is None or ob._geom is None:
+        raise ValueError("Null geometry supports no operations")
+    return lgeos.GEOSGeomToWKT(ob._geom)
+
+def deserialize_wkb(data):
+    geom = lgeos.GEOSGeomFromWKB_buf(c_char_p(data), c_size_t(len(data)));
+    if not geom:
+        raise ReadingError(
+            "Could not create geometry because of errors while reading input.")
+    return geom
+
+def geom_from_wkb(data):
+    return geom_factory(deserialize_wkb(data))
+
+def geom_to_wkb(ob):
+    if ob is None or ob._geom is None:
+        raise ValueError("Null geometry supports no operations")
+    size = c_size_t()
+    return lgeos.GEOSGeomToWKB_buf(c_void_p(ob._geom), pointer(size))
+
 def exceptNull(func):
     """Decorator which helps avoid GEOS operations on null pointers."""
     @wraps(func)
@@ -57,7 +85,7 @@ def exceptNull(func):
         return func(*args, **kwargs)
     return wrapper
 
-EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
+EMPTY = deserialize_wkb('010700000000000000'.decode('hex'))
 
 class BaseGeometry(object):
     """
@@ -124,7 +152,11 @@ class BaseGeometry(object):
 
     def __setstate__(self, state):
         self.empty()
-        self.__geom__ = wkb.deserialize(state)
+        self.__geom__ = deserialize_wkb(state)
+        if lgeos.methods['has_z'](self.__geom__):
+            self._ndim = 3
+        else:
+            self._ndim = 2
 
     # The _geom property
     def _get_geom(self):
@@ -200,10 +232,10 @@ class BaseGeometry(object):
         return self.geometryType()
 
     def to_wkb(self):
-        return wkb.dumps(self)
+        return geom_to_wkb(self)
 
     def to_wkt(self):
-        return wkt.dumps(self)
+        return geom_to_wkt(self)
 
     geom_type = property(geometryType,
         doc="""Name of the geometry's type, such as 'Point'"""
@@ -354,7 +386,7 @@ class BaseGeometry(object):
     @property
     def is_empty(self):
         """True if the set of points in this geometry is empty, else False"""
-        return bool(self.impl['is_empty'](self)) or (self._geom is None)
+        return (self._geom is None) or bool(self.impl['is_empty'](self))
 
     @property
     def is_ring(self):

{Shapely-1.2.16 → Shapely-1.2.17}/shapely/geometry/proxy.py

@@ -1,10 +1,8 @@
 """Proxy for coordinates stored outside Shapely geometries
 """
 
+from shapely.geometry.base import deserialize_wkb, EMPTY
 from shapely.geos import lgeos
-from shapely import wkb
-
-EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
 
 
 class CachingGeometryProxy(object):

{Shapely-1.2.16 → Shapely-1.2.17}/shapely/geos.py

@@ -64,7 +64,7 @@ elif sys.platform == 'darwin':
 elif sys.platform == 'win32':
     try:
         egg_dlls = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                     r"..\DLLs"))
+                                     r"DLLs"))
         wininst_dlls =  os.path.abspath(os.__file__ + "../../../DLLs")
         original_path = os.environ['PATH']
         os.environ['PATH'] = "%s;%s;%s" % (egg_dlls, wininst_dlls, original_path)

{Shapely-1.2.16 → Shapely-1.2.17}/shapely/speedups/_speedups.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 0.15.1 on Tue Sep 18 11:19:15 2012 */
+/* Generated by Cython 0.15.1 on Sun Jan 27 11:41:17 2013 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"

{Shapely-1.2.16 → Shapely-1.2.17}/shapely/tests/__init__.py

@@ -4,7 +4,7 @@ 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, test_getitem
-import test_ndarrays, test_unary_union
+import test_ndarrays, test_unary_union, test_pickle, test_affinity
 
 def test_suite():
     suite = TestSuite()
@@ -28,5 +28,7 @@ def test_suite():
     suite.addTest(test_getitem.test_suite())
     suite.addTest(test_ndarrays.test_suite())
     suite.addTest(test_unary_union.test_suite())
+    suite.addTest(test_pickle.test_suite())
+    suite.addTest(test_affinity.test_suite())
     return suite