shapely 1.2.18__tar.gz → 1.2.19__tar.gz

{Shapely-1.2.18 → Shapely-1.2.19}/CHANGES.txt

@@ -1,6 +1,10 @@
 Changes
 =======
 
+1.2.19 (2013-12-30)
+-------------------
+- Add buffering style options (#55).
+
 1.2.18 (2013-07-23)
 --------------------
 - Add shapely.ops.transform.

{Shapely-1.2.18/Shapely.egg-info → Shapely-1.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.2.18
+Version: 1.2.19
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -190,6 +190,10 @@ Description: =======
         Changes
         =======
         
+        1.2.19 (2013-12-30)
+        -------------------
+        - Add buffering style options (#55).
+        
         1.2.18 (2013-07-23)
         --------------------
         - Add shapely.ops.transform.

{Shapely-1.2.18 → Shapely-1.2.19/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.2.18
+Version: 1.2.19
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -190,6 +190,10 @@ Description: =======
         Changes
         =======
         
+        1.2.19 (2013-12-30)
+        -------------------
+        - Add buffering style options (#55).
+        
         1.2.18 (2013-07-23)
         --------------------
         - Add shapely.ops.transform.

{Shapely-1.2.18 → Shapely-1.2.19}/Shapely.egg-info/SOURCES.txt

@@ -86,6 +86,7 @@ shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py
 shapely/tests/test_speedups.py
+shapely/tests/test_styles.py
 shapely/tests/test_transform.py
 shapely/tests/test_unary_union.py
 shapely/tests/test_validation.py

Shapely-1.2.19/VERSION.txt

@@ -0,0 +1 @@
+1.2.19

{Shapely-1.2.18 → Shapely-1.2.19}/docs/manual.txt

@@ -1389,11 +1389,47 @@ Constructive Methods
 Shapely geometric object have several methods that yield new objects not
 derived from set-theoretic analysis.
 
-.. method:: object.buffer(distance, resolution=16)
+.. method:: object.buffer(distance, resolution=16, cap_style=1, join_style=1, mitre_limit=1.0)
 
   Returns an approximate representation of all points within a given `distance`
   of the this geometric object.
 
+  The styles of caps are specified by integer values: 1 (round), 2 (flat),
+  3 (square). These values are also enumerated by the object
+  :class:`shapely.geometry.CAP_STYLE` (see below).
+  
+  The styles of joins between offset segments are specified by integer values:
+  1 (round), 2 (mitre), and 3 (bevel). These values are also enumerated by the
+  object :class:`shapely.geometry.JOIN_STYLE` (see below).
+
+.. data:: shapely.geometry.CAP_STYLE
+
+   ========= =====
+   Attribute Value
+   ========= =====
+   round        1
+   flat         2
+   square       3
+   ========= =====
+
+.. data:: shapely.geometry.JOIN_STYLE
+
+   ========= =====
+   Attribute Value
+   ========= =====
+   round         1
+   mitre         2
+   bevel         3
+   ========= =====
+
+.. sourcecode:: pycon
+
+  >>> from shapely.geometry import CAP_STYLE, JOIN_STYLE
+  >>> CAP_STYLE.flat
+  2
+  >>> JOIN_STYLE.bevel
+  3
+
 A positive distance has an effect of dilation; a negative distance, erosion.
 The optional `resolution` argument determines the number of segments used to
 approximate a quarter circle around a point.
@@ -1494,8 +1530,9 @@ Figure 10. Convex hull (blue) of 2 points (left) and of 6 points (right).
   '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).
+  The join style is for outside corners between line segments. Accepted integer
+  values are 1 (round), 2 (mitre), and 3 (bevel). See also
+  :data:`shapely.geometry.JOIN_STYLE`.
 
   Severely mitered corners can be controlled by the mitre_limit parameter
   (spelled in British English, en-gb). The ratio of the distance from the
@@ -1504,8 +1541,7 @@ Figure 10. Convex hull (blue) of 2 points (left) and of 6 points (right).
 
 .. note::
 
-  This method is only available for `LinearRing`, `LineString`, and
-  `MultiLineString` objects.
+  This method is only available for `LinearRing` and `LineString`  objects.
 
 .. plot:: code/parallel_offset.py
 

Shapely-1.2.19/shapely/__init__.py

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

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/ctypes_declarations.py

@@ -100,6 +100,11 @@ def prototype(lgeos, geosVersion):
     lgeos.GEOSBuffer.restype = ctypes.c_void_p
     lgeos.GEOSBuffer.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_int]
 
+    lgeos.GEOSBufferWithStyle.restype = ctypes.c_void_p
+    lgeos.GEOSBufferWithStyle.argtypes = [ctypes.c_void_p, ctypes.c_double,
+                                          ctypes.c_int, ctypes.c_int,
+                                          ctypes.c_int, ctypes.c_double]
+
     lgeos.GEOSSimplify.restype = ctypes.c_void_p
     lgeos.GEOSSimplify.argtypes = [ctypes.c_void_p, ctypes.c_double]
 
@@ -271,15 +276,15 @@ def prototype(lgeos, geosVersion):
             lgeos.GEOSProject.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
 
             lgeos.GEOSProjectNormalized.restype = ctypes.c_double
-            lgeos.GEOSProjectNormalized.argtypes = [ctypes.c_void_p, 
+            lgeos.GEOSProjectNormalized.argtypes = [ctypes.c_void_p,
                                                     ctypes.c_void_p]
 
             lgeos.GEOSInterpolate.restype = ctypes.c_void_p
-            lgeos.GEOSInterpolate.argtypes = [ctypes.c_void_p, 
+            lgeos.GEOSInterpolate.argtypes = [ctypes.c_void_p,
                                               ctypes.c_double]
 
             lgeos.GEOSInterpolateNormalized.restype = ctypes.c_void_p
-            lgeos.GEOSInterpolateNormalized.argtypes = [ctypes.c_void_p, 
+            lgeos.GEOSInterpolateNormalized.argtypes = [ctypes.c_void_p,
                                                         ctypes.c_double]
 
     # TODO: Find out what version of geos_c came with geos 3.3.0

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/geometry/__init__.py

@@ -1,6 +1,7 @@
 """Geometry classes and factories
 """
 
+from base import CAP_STYLE, JOIN_STYLE
 from geo import box, shape, asShape, mapping
 from point import Point, asPoint
 from linestring import LineString, asLineString
@@ -14,7 +15,6 @@ __all__ = [
     'box', 'shape', 'asShape', 'Point', 'asPoint', 'LineString', 'asLineString',
     'Polygon', 'asPolygon', 'MultiPoint', 'asMultiPoint',
     'MultiLineString', 'asMultiLineString', 'MultiPolygon', 'asMultiPolygon',
-    'GeometryCollection', 'mapping', 'LinearRing', 'asLinearRing'
+    'GeometryCollection', 'mapping', 'LinearRing', 'asLinearRing',
+    'CAP_STYLE', 'JOIN_STYLE'
     ]
-
-

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/geometry/base.py

@@ -85,6 +85,16 @@ def exceptNull(func):
         return func(*args, **kwargs)
     return wrapper
 
+class CAP_STYLE(object):
+    round = 1
+    flat = 2
+    square = 3
+
+class JOIN_STYLE(object):
+    round = 1
+    mitre = 2
+    bevel = 3
+
 EMPTY = deserialize_wkb('010700000000000000'.decode('hex'))
 
 class BaseGeometry(object):
@@ -323,7 +333,9 @@ class BaseGeometry(object):
         """A figure that envelopes the geometry"""
         return geom_factory(self.impl['envelope'](self))
 
-    def buffer(self, distance, resolution=16, quadsegs=None):
+    def buffer(self, distance, resolution=16, quadsegs=None,
+               cap_style=CAP_STYLE.round, join_style=JOIN_STYLE.round,
+               mitre_limit=0):
         """Returns a geometry with an envelope at a distance from the object's
         envelope
 
@@ -333,6 +345,20 @@ class BaseGeometry(object):
         or second positional parameter. Note: the use of a `quadsegs` parameter
         is deprecated and will be gone from the next major release.
 
+        The styles of caps are: CAP_STYLE.round (1), CAP_STYLE.flat (2), and
+        CAP_STYLE.square (3).
+
+        The styles of joins between offset segments are: JOIN_STYLE.round (1),
+        JOIN_STYLE.mitre (2), and JOIN_STYLE.bevel (3).
+
+        The mitre limit ratio is used for very sharp corners. The mitre ratio
+        is the ratio of the distance from the corner to the end of the mitred
+        offset corner. When two line segments meet at a sharp angle, a miter
+        join will extend the original geometry. To prevent unreasonable
+        geometry, the mitre limit allows controlling the maximum length of the
+        join corner. Corners with a ratio which exceed the limit will be
+        beveled.
+
         Example:
 
           >>> from shapely.wkt import loads
@@ -343,7 +369,12 @@ class BaseGeometry(object):
           3.1415138011443009
           >>> g.buffer(1.0, 3).area     # triangle approximation
           3.0
+          >>> list(g.buffer(1.0, cap_style='square').exterior.coords)
+          [(1.0, 1.0), (1.0, -1.0), (-1.0, -1.0), (-1.0, 1.0), (1.0, 1.0)]
+          >>> g.buffer(1.0, cap_style='square').area
+          4.0
         """
+
         if quadsegs is not None:
             warnings.warn(
                 "The `quadsegs` argument is deprecated. Use `resolution`.",
@@ -351,7 +382,18 @@ class BaseGeometry(object):
             res = quadsegs
         else:
             res = resolution
-        return geom_factory(self.impl['buffer'](self, distance, res))
+
+        if cap_style == CAP_STYLE.round and join_style == JOIN_STYLE.round:
+            return geom_factory(self.impl['buffer'](self, distance, res))
+
+        if 'buffer_with_style' not in self.impl:
+            raise NotImplementedError("Styled buffering not available for "
+                                      "GEOS versions < 3.2.")
+
+        return geom_factory(self.impl['buffer_with_style'](self, distance, res,
+                                                           cap_style,
+                                                           join_style,
+                                                           mitre_limit))
 
     @delegated
     def simplify(self, tolerance, preserve_topology=True):

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/geometry/linestring.py

@@ -6,7 +6,7 @@ from ctypes import ArgumentError
 
 from shapely.coords import required
 from shapely.geos import lgeos, TopologicalError
-from shapely.geometry.base import BaseGeometry, geom_factory
+from shapely.geometry.base import BaseGeometry, geom_factory, JOIN_STYLE
 from shapely.geometry.proxy import CachingGeometryProxy
 
 __all__ = ['LineString', 'asLineString']
@@ -15,7 +15,7 @@ __all__ = ['LineString', 'asLineString']
 class LineString(BaseGeometry):
     """
     A one-dimensional figure comprising one or more line segments
-    
+
     A LineString has non-zero length and zero area. It may approximate a curve
     and need not be straight. Unlike a LinearRing, a LineString is not closed.
     """
@@ -57,7 +57,7 @@ class LineString(BaseGeometry):
     def array_interface(self):
         """Provide the Numpy array protocol."""
         return self.coords.array_interface()
-    
+
     __array_interface__ = property(array_interface)
 
     # Coordinate access
@@ -70,9 +70,9 @@ class LineString(BaseGeometry):
     @property
     def xy(self):
         """Separate arrays of X and Y coordinate values
-        
+
         Example:
-        
+
           >>> x, y = LineString(((0, 0), (1, 1))).xy
           >>> list(x)
           [0.0, 1.0]
@@ -80,22 +80,23 @@ class LineString(BaseGeometry):
           [0.0, 1.0]
         """
         return self.coords.xy
-    
+
     def parallel_offset(
-        self, distance, side, 
-        resolution=16, join_style=1, mitre_limit=1.0):
-        
+        self, distance, side,
+        resolution=16, join_style=JOIN_STYLE.round, 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 buffer around each vertex of
         the object increases by increasing the resolution keyword parameter or
         third positional parameter.
-        
+
         The join style is for outside corners between line segments. Accepted
-        values are 1 => ROUND, 2 => MITRE, 3 => BEVEL.
-        
+        values are JOIN_STYLE.round (1), JOIN_STYLE.mitre (2), and
+        JOIN_STYLE.bevel (3).
+
         The mitre ratio limit is used for very sharp corners. It is the ratio
         of the distance from the corner to the end of the mitred offset corner.
         When two line segments meet at a sharp angle, a miter join will extend
@@ -105,11 +106,11 @@ class LineString(BaseGeometry):
 
         try:
             return geom_factory(self.impl['parallel_offset'](
-                self, distance, resolution, join_style, mitre_limit, 
+                self, distance, resolution, join_style, mitre_limit,
                 bool(side=='left')))
         except WindowsError:
             raise TopologicalError()
-        
+
 
 class LineStringAdapter(CachingGeometryProxy, LineString):
 
@@ -198,7 +199,7 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
                 except IndexError:
                     raise ValueError("Inconsistent coordinate dimensionality")
 
-            # Because of a bug in the GEOS C API, 
+            # Because of a bug in the GEOS C API,
             # always set X before Y
             lgeos.GEOSCoordSeq_setX(cs, i, dx)
             lgeos.GEOSCoordSeq_setY(cs, i, dy)
@@ -227,11 +228,11 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
                 % update_ndim)
         else:
             cs = lgeos.GEOSCoordSeq_create(m, n)
-        
+
         # add to coordinate sequence
         for i in xrange(m):
             coords = ob[i]
-            # Because of a bug in the GEOS C API, 
+            # Because of a bug in the GEOS C API,
             # always set X before Y
             lgeos.GEOSCoordSeq_setX(cs, i, coords[0])
             lgeos.GEOSCoordSeq_setY(cs, i, coords[1])
@@ -240,7 +241,7 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
                     lgeos.GEOSCoordSeq_setZ(cs, i, coords[2])
                 except IndexError:
                     raise ValueError("Inconsistent coordinate dimensionality")
-    
+
     if update_geom is not None:
         return None
     else:

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/geometry/polygon.py

@@ -430,7 +430,7 @@ def update_linearring_from_py(geom, ob):
 def geos_polygon_from_py(shell, holes=None):
     if shell is not None:
         geos_shell, ndim = geos_linearring_from_py(shell)
-        if holes:
+        if holes is not None and len(holes) > 0:
             ob = holes
             L = len(ob)
             exemplar = ob[0]
@@ -438,8 +438,10 @@ def geos_polygon_from_py(shell, holes=None):
                 N = len(exemplar[0])
             except TypeError:
                 N = exemplar._ndim
-            assert L >= 1
-            assert N == 2 or N == 3
+            if not L >= 1:
+                raise ValueError("number of holes must be non zero")
+            if not N in (2, 3):
+                raise ValueError("insufficiant coordinate dimension")
 
             # Array of pointers to ring geometries
             geos_holes = (c_void_p * L)()

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/geos.py

@@ -50,12 +50,16 @@ if sys.platform.startswith('linux'):
     free.restype = None
 
 elif sys.platform == 'darwin':
-    alt_paths = [
+    if hasattr(sys, 'frozen'):
+        # .app file from py2app
+        alt_paths = [os.path.join(os.environ['RESOURCEPATH'], '..', 'Frameworks', 'libgeos_c.dylib')]
+    else:
+        alt_paths = [
             # The Framework build from Kyng Chaos:
             "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
             # macports
             '/opt/local/lib/libgeos_c.dylib',
-    ]
+        ]
     _lgeos = load_dll('geos_c', fallbacks=alt_paths)
     free = load_dll('c').free
     free.argtypes = [c_void_p]
@@ -350,6 +354,8 @@ class LGEOS16(LGEOS15):
     def __init__(self, dll):
         super(LGEOS16, self).__init__(dll)
 
+        self.methods['buffer_with_style'] = self.GEOSBufferWithStyle
+
 
 class LGEOS16LR(LGEOS16):
     """Proxy for the reentrant GEOS_C DLL/SO API version 1.6 with linear

{Shapely-1.2.18 → Shapely-1.2.19}/shapely/impl.py

@@ -4,7 +4,7 @@ This is layer number 2 from the list below.
 
 1) geometric objects: the Python OO API.
 2) implementation map: an abstraction that permits different backends.
-3) backend: callable objects that take Shapely geometric objects as arguments 
+3) backend: callable objects that take Shapely geometric objects as arguments
    and, with GEOS as a backend, translate them to C data structures.
 4) GEOS library: algorithms implemented in C++.
 
@@ -22,7 +22,7 @@ from shapely.topology import BinaryRealProperty, BinaryTopologicalOp
 from shapely.topology import UnaryRealProperty, UnaryTopologicalOp
 
 def delegated(func):
-    """A delegated method raises AttributeError in the absence of backend 
+    """A delegated method raises AttributeError in the absence of backend
     support."""
     @wraps(func)
     def wrapper(*args, **kwargs):
@@ -42,6 +42,8 @@ class BaseImpl(object):
         self.map.update(values)
     def __getitem__(self, key):
         return self.map[key]
+    def __contains__(self, key):
+        return key in self.map
 
 class GEOSImpl(BaseImpl):
     def __repr__(self):
@@ -82,23 +84,24 @@ IMPL14 = {
     'touches': (BinaryPredicate, 'touches'),
     'within': (BinaryPredicate, 'within'),
     'equals_exact': (BinaryPredicate, 'equals_exact'),
-    
+
     # First pure Python implementation
     'is_ccw': (cga.is_ccw_impl, 'is_ccw'),
     }
 
 IMPL15 = {
     'simplify': (UnaryTopologicalOp, 'simplify'),
-    'topology_preserve_simplify': 
+    'topology_preserve_simplify':
         (UnaryTopologicalOp, 'topology_preserve_simplify'),
     'prepared_intersects': (BinaryPredicate, 'prepared_intersects'),
     'prepared_contains': (BinaryPredicate, 'prepared_contains'),
-    'prepared_contains_properly': 
+    'prepared_contains_properly':
         (BinaryPredicate, 'prepared_contains_properly'),
     'prepared_covers': (BinaryPredicate, 'prepared_covers'),
     }
 
 IMPL16 = {
+    'buffer_with_style': (UnaryTopologicalOp, 'buffer_with_style'),
     }
 
 IMPL16LR = {