shapely 1.3.2__tar.gz → 1.3.3__tar.gz

{Shapely-1.3.2 → Shapely-1.3.3}/CHANGES.txt

@@ -1,14 +1,14 @@
 Changes
 =======
 
-1.3.2 (2014-05-13)
+1.3.3 (2014-07-23)
 ------------------
-- Let LineString() take a sequence of Points (#130).
+- Allow single-part geometries as argument to ops.cacaded_union() (#135).
+- Support affine transformations of LinearRings (#112).
 
-1.3.1 (2014-04-22)
+1.3.2 (2014-05-13)
 ------------------
-- More reliable proxy cleanup on exit (#106).
-- More robust DLL loading on all platforms (#114).
+- Let LineString() take a sequence of Points (#130).
 
 1.3.0 (2013-12-31)
 ------------------

{Shapely-1.3.2/Shapely.egg-info → Shapely-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.2
+Version: 1.3.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -133,7 +133,7 @@ Description: =======
           (env)$ pip install -r requirements-dev.txt
           (env)$ python setup.py develop
         
-        Shapely uses a Zope-stye suite of unittests and doctests, exercised via
+        Shapely's suite of unittests and doctests, exercised via
         setup.py.::
         
           (env)$ python setup.py test
@@ -141,6 +141,20 @@ Description: =======
         Nosetests won't run the tests properly; Zope doctest suites are not currently
         supported well by nose.
         
+        Roadmap and Maintenance
+        =======================
+        
+        Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
+        not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
+        for major bugs.
+        
+        Shapely 1.3.x is a maintenance-only branch supporting Pythons 2.7 and 3+.
+        
+        "Shapely 3000" is the name of the next milestone. New features will include
+        vectorized operations, better integration with IPython Notebook, support for
+        fixed precision models, and more. Less ctypes and more Cython is another theme
+        in this branch. A 1.4 release should come out of this by Summer, 2014.
+        
         Support
         =======
         
@@ -213,14 +227,14 @@ Description: =======
         Changes
         =======
         
-        1.3.2 (2014-05-13)
+        1.3.3 (2014-07-23)
         ------------------
-        - Let LineString() take a sequence of Points (#130).
+        - Allow single-part geometries as argument to ops.cacaded_union() (#135).
+        - Support affine transformations of LinearRings (#112).
         
-        1.3.1 (2014-04-22)
+        1.3.2 (2014-05-13)
         ------------------
-        - More reliable proxy cleanup on exit (#106).
-        - More robust DLL loading on all platforms (#114).
+        - Let LineString() take a sequence of Points (#130).
         
         1.3.0 (2013-12-31)
         ------------------

{Shapely-1.3.2 → Shapely-1.3.3}/README.rst

@@ -125,7 +125,7 @@ Use of a virtual environment is strongly recommended.::
   (env)$ pip install -r requirements-dev.txt
   (env)$ python setup.py develop
 
-Shapely uses a Zope-stye suite of unittests and doctests, exercised via
+Shapely's suite of unittests and doctests, exercised via
 setup.py.::
 
   (env)$ python setup.py test
@@ -133,6 +133,20 @@ setup.py.::
 Nosetests won't run the tests properly; Zope doctest suites are not currently
 supported well by nose.
 
+Roadmap and Maintenance
+=======================
+
+Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
+not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
+for major bugs.
+
+Shapely 1.3.x is a maintenance-only branch supporting Pythons 2.7 and 3+.
+
+"Shapely 3000" is the name of the next milestone. New features will include
+vectorized operations, better integration with IPython Notebook, support for
+fixed precision models, and more. Less ctypes and more Cython is another theme
+in this branch. A 1.4 release should come out of this by Summer, 2014.
+
 Support
 =======
 

{Shapely-1.3.2 → Shapely-1.3.3/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.2
+Version: 1.3.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -133,7 +133,7 @@ Description: =======
           (env)$ pip install -r requirements-dev.txt
           (env)$ python setup.py develop
         
-        Shapely uses a Zope-stye suite of unittests and doctests, exercised via
+        Shapely's suite of unittests and doctests, exercised via
         setup.py.::
         
           (env)$ python setup.py test
@@ -141,6 +141,20 @@ Description: =======
         Nosetests won't run the tests properly; Zope doctest suites are not currently
         supported well by nose.
         
+        Roadmap and Maintenance
+        =======================
+        
+        Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
+        not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
+        for major bugs.
+        
+        Shapely 1.3.x is a maintenance-only branch supporting Pythons 2.7 and 3+.
+        
+        "Shapely 3000" is the name of the next milestone. New features will include
+        vectorized operations, better integration with IPython Notebook, support for
+        fixed precision models, and more. Less ctypes and more Cython is another theme
+        in this branch. A 1.4 release should come out of this by Summer, 2014.
+        
         Support
         =======
         
@@ -213,14 +227,14 @@ Description: =======
         Changes
         =======
         
-        1.3.2 (2014-05-13)
+        1.3.3 (2014-07-23)
         ------------------
-        - Let LineString() take a sequence of Points (#130).
+        - Allow single-part geometries as argument to ops.cacaded_union() (#135).
+        - Support affine transformations of LinearRings (#112).
         
-        1.3.1 (2014-04-22)
+        1.3.2 (2014-05-13)
         ------------------
-        - More reliable proxy cleanup on exit (#106).
-        - More robust DLL loading on all platforms (#114).
+        - Let LineString() take a sequence of Points (#130).
         
         1.3.0 (2013-12-31)
         ------------------

{Shapely-1.3.2 → Shapely-1.3.3}/Shapely.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ Shapely.egg-info/dependency_links.txt
 Shapely.egg-info/top_level.txt
 docs/manual.txt
 shapely/__init__.py
+shapely/_geos.pxi
 shapely/affinity.py
 shapely/coords.py
 shapely/ctypes_declarations.py
@@ -86,5 +87,8 @@ shapely/tests/test_styles.py
 shapely/tests/test_transform.py
 shapely/tests/test_union.py
 shapely/tests/test_validation.py
+shapely/tests/test_vectorized.py
 shapely/tests/test_xy.py
-shapely/tests/threading_test.py
+shapely/tests/threading_test.py
+shapely/vectorized/__init__.py
+shapely/vectorized/_vectorized.pyx

Shapely-1.3.3/VERSION.txt

@@ -0,0 +1 @@
+1.3.3

{Shapely-1.3.2 → Shapely-1.3.3}/docs/manual.txt

@@ -346,8 +346,14 @@ copy.
   >>> LineString(line)
   <shapely.geometry.linestring.LineString object at 0x...>
 
-A sequence of `Point` instances is not a valid constructor parameter. A
-`LineString` is described by points, but is not composed of `Point` instances.
+A `LineString` may also be constructed using a a sequence of mixed `Point`
+instances or coordinate tuples. The individual coordinates are copied into
+the new object.
+
+.. sourcecode:: pycon
+
+  >>> LineString([Point(0.0, 1.0), (2.0, 3.0), Point(4.0, 5.0)])
+  <shapely.geometry.linestring.LineString object at 0x...>
 
 .. _linearrings:
 
@@ -1387,7 +1393,7 @@ Constructive Methods
 Shapely geometric object have several methods that yield new objects not
 derived from set-theoretic analysis.
 
-.. method:: object.buffer(distance, resolution=16, cap_style=1, join_style=1, mitre_limit=1.0)
+.. method:: object.buffer(distance, resolution=16, cap_style=1, join_style=1, mitre_limit=5.0)
 
   Returns an approximate representation of all points within a given `distance`
   of the this geometric object.
@@ -1519,7 +1525,7 @@ Figure 10. 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)
+.. method:: object.parallel_offset(distance, side, resolution=16, join_style=1, mitre_limit=5.0)
 
   Returns a LineString or MultiLineString geometry at a distance from the
   object on its right or its left side.
@@ -1811,12 +1817,13 @@ for `func`.
 
 .. sourcecode:: python
 
+    from shapely.ops import transform
     from functools import partial
     import pyproj
 
     project = partial(
         pyproj.transform,
-        pyproj.Proj(init='espg:4326'),
+        pyproj.Proj(init='epsg:4326'),
         pyproj.Proj(init='epsg:26913'))
 
     g2 = transform(project, g1)

{Shapely-1.3.2 → Shapely-1.3.3}/setup.py

@@ -14,6 +14,7 @@ except ImportError:
 from distutils.cmd import Command
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
+from distutils.sysconfig import get_config_var
 import errno
 import glob
 import os
@@ -22,6 +23,7 @@ import shutil
 import subprocess
 import sys
 
+
 class test(Command):
     """Run unit tests after in-place build"""
     description = __doc__
@@ -57,6 +59,7 @@ class test(Command):
         if not result.wasSuccessful():
             sys.exit(1)
 
+
 # Get the version from the shapely module
 version = None
 with open('shapely/__init__.py', 'r') as fp:
@@ -100,6 +103,7 @@ setup_args = dict(
         'shapely.examples',
         'shapely.speedups',
         'shapely.tests',
+        'shapely.vectorized',
     ],
     cmdclass            = {'test': test},
     classifiers         = [
@@ -113,6 +117,7 @@ setup_args = dict(
         'Programming Language :: Python :: 3',
         'Topic :: Scientific/Engineering :: GIS',
     ],
+    data_files         = [('shapely', ['shapely/_geos.pxi'])]
 )
 
 # Add DLLs for Windows
@@ -152,20 +157,23 @@ class BuildFailed(Exception):
     pass
 
 
-class build_ext(distutils_build_ext):
-    # This class allows C extension building to fail.
-
-    def run(self):
-        try:
-            distutils_build_ext.run(self)
-        except DistutilsPlatformError as x:
-            raise BuildFailed(x)
+def construct_build_ext(build_ext):
+    class WrappedBuildExt(build_ext):
+        # This class allows C extension building to fail.
+    
+        def run(self):
+            try:
+                build_ext.run(self)
+            except DistutilsPlatformError as x:
+                raise BuildFailed(x)
+    
+        def build_extension(self, ext):
+            try:
+                build_ext.build_extension(self, ext)
+            except ext_errors as x:
+                raise BuildFailed(x)
+    return WrappedBuildExt
 
-    def build_extension(self, ext):
-        try:
-            distutils_build_ext.build_extension(self, ext)
-        except ext_errors as x:
-            raise BuildFailed(x)
 
 if (hasattr(platform, 'python_implementation')
         and platform.python_implementation() == 'PyPy'):
@@ -177,6 +185,7 @@ elif sys.platform == 'win32':
 else:
     libraries = ['geos_c']
 
+
 if os.path.exists("MANIFEST.in"):
     pyx_file = "shapely/speedups/_speedups.pyx"
     c_file = "shapely/speedups/_speedups.c"
@@ -202,12 +211,35 @@ ext_modules = [
     Extension(
         "shapely.speedups._speedups",
         ["shapely/speedups/_speedups.c"],
-        libraries=libraries)
+        libraries=libraries,
+        include_dirs=[get_config_var('INCLUDEDIR')],),
 ]
 
+try:
+    import numpy as np
+    from Cython.Distutils import build_ext as cython_build_ext
+    from distutils.extension import Extension as DistutilsExtension
+
+    cmd_classes = setup_args.setdefault('cmdclass', {})
+    if 'build_ext' in cmd_classes:
+        raise ValueError('We need to put the Cython build_ext in '
+                         'cmd_classes, but it is already defined.')
+    cmd_classes['build_ext'] = cython_build_ext
+
+    ext_modules.append(DistutilsExtension("shapely.vectorized._vectorized",
+                                 sources=["shapely/vectorized/_vectorized.pyx"],
+                                 libraries=libraries + [np.get_include()],
+                                 include_dirs=[get_config_var('INCLUDEDIR'), np.get_include()],
+                                 ))
+except ImportError:
+    print("Numpy or Cython not available, shapely.vectorized submodule not "
+          "being built.")
+
+
 try:
     # try building with speedups
-    setup_args['cmdclass']['build_ext'] = build_ext
+    existing_build_ext = setup_args['cmdclass'].get('build_ext', distutils_build_ext)
+    setup_args['cmdclass']['build_ext'] = construct_build_ext(existing_build_ext)
     setup(
         ext_modules=ext_modules,
         **setup_args

Shapely-1.3.3/shapely/__init__.py

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

Shapely-1.3.3/shapely/_geos.pxi

@@ -0,0 +1,52 @@
+# The beginnings of a Cython definition of GEOS. In the future much of this
+# could be auto-generated.
+
+ctypedef long ptr
+
+
+cdef extern from "geos_c.h":
+    ctypedef void *GEOSContextHandle_t
+    ctypedef struct GEOSGeometry
+    ctypedef struct GEOSCoordSequence
+    ctypedef struct GEOSPreparedGeometry
+    
+    GEOSCoordSequence *GEOSCoordSeq_create_r(GEOSContextHandle_t, unsigned int, unsigned int) nogil
+    GEOSCoordSequence *GEOSGeom_getCoordSeq_r(GEOSContextHandle_t, GEOSGeometry *) nogil
+
+    int GEOSCoordSeq_getSize_r(GEOSContextHandle_t, GEOSCoordSequence *, int *) nogil
+    int GEOSCoordSeq_setX_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double) nogil
+    int GEOSCoordSeq_setY_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double) nogil
+    int GEOSCoordSeq_setZ_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double) nogil
+    int GEOSCoordSeq_getX_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double *) nogil
+    int GEOSCoordSeq_getY_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double *) nogil
+    int GEOSCoordSeq_getZ_r(GEOSContextHandle_t, GEOSCoordSequence *, int, double *) nogil
+
+    GEOSGeometry *GEOSGeom_createPoint_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
+    GEOSGeometry *GEOSGeom_createLineString_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
+    GEOSGeometry *GEOSGeom_createLinearRing_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
+
+    void GEOSGeom_destroy_r(GEOSContextHandle_t, GEOSGeometry *) nogil
+
+    char GEOSPreparedContains_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedContainsProperly_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedCoveredBy_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedCovers_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedCrosses_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedDisjoint_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedIntersects_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedOverlaps_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedTouches_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+    char GEOSPreparedWithin_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
+
+
+cdef GEOSContextHandle_t get_geos_context_handle():
+    # Note: This requires that lgeos is defined, so needs to be imported as:
+    from shapely.geos import lgeos
+    cdef ptr handle = lgeos.geos_handle
+    return <GEOSContextHandle_t>handle
+
+
+cdef GEOSPreparedGeometry *geos_from_prepared(shapely_geom) except *:
+    """Get the Prepared GEOS geometry pointer from the given shapely geometry."""
+    cdef ptr geos_geom = shapely_geom._geom
+    return <GEOSPreparedGeometry *>geos_geom

{Shapely-1.3.2 → Shapely-1.3.3}/shapely/affinity.py

@@ -77,7 +77,7 @@ def affine_transform(geom, matrix):
                 yield (xp, yp, zp)
 
     # Process coordinates from each supported geometry type
-    if geom.type in ('Point', 'LineString'):
+    if geom.type in ('Point', 'LineString', 'LinearRing'):
         return type(geom)(list(affine_pts(geom.coords)))
     elif geom.type == 'Polygon':
         ring = geom.exterior

{Shapely-1.3.2 → Shapely-1.3.3}/shapely/coords.py

@@ -21,8 +21,13 @@ 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"])
+    if (hasattr(ob, '__array_interface__')
+            and ob.__array_interface__.get('strides')):
+        if has_numpy:
+            return numpy.require(ob, numpy.float64, ["C", "OWNDATA"])
+        else:
+            # raise an error if strided. See issue #52.
+            raise ValueError("C-contiguous data is required")
     else:
         return ob
 

{Shapely-1.3.2 → Shapely-1.3.3}/shapely/geometry/base.py

@@ -160,7 +160,7 @@ class BaseGeometry(object):
     # _crs : object
     #     Coordinate reference system. Available for Shapely extensions, but
     #     not implemented here.
-    # _owned : bool
+    # _other_owned : bool
     #     True if this object's GEOS geometry is owned by another as in the
     #     case of a multipart geometry member.
     __geom__ = EMPTY
@@ -168,7 +168,7 @@ class BaseGeometry(object):
     _ctypes_data = None
     _ndim = None
     _crs = None
-    _owned = False
+    _other_owned = False
 
     # Backend config
     impl = DefaultImplementation
@@ -180,19 +180,18 @@ class BaseGeometry(object):
     # a reference to the so/dll proxy to preserve access during clean up
     _lgeos = lgeos
 
-    def empty(self):
+    def empty(self, val=EMPTY):
         # TODO: defer cleanup to the implementation. We shouldn't be
         # explicitly calling a lgeos method here.
-        if not (self._owned or self._is_empty):
+        if not self._is_empty and not self._other_owned and self.__geom__:
             try:
                 self._lgeos.GEOSGeom_destroy(self.__geom__)
             except AttributeError:
                 pass  # _lgeos might be empty on shutdown
-        self.__geom__ = EMPTY
+        self.__geom__ = val
 
     def __del__(self):
-        self.empty()
-        self.__geom__ = None
+        self.empty(val=None)
         self.__p__ = None
 
     def __str__(self):
@@ -324,6 +323,36 @@ class BaseGeometry(object):
         """WKB hex representation of the geometry"""
         return WKBWriter(lgeos).write_hex(self)
 
+    def svg(self, scale_factor=1.):
+        """
+        SVG representation of the geometry. Scale factor is multiplied by
+        the size of the SVG symbol so it can be scaled consistently for a
+        consistent appearance based on the canvas size.
+        """
+        raise NotImplementedError
+
+    def _repr_svg_(self):
+        """SVG representation for iPython notebook"""
+        #Pick an arbitrary size for the SVG canvas
+
+
+        xmin, ymin, xmax, ymax = self.buffer(1).bounds
+        x_size = min([max([100., xmax - xmin]), 300])
+        y_size = min([max([100., ymax - ymin]), 300])
+        try:
+            scale_factor = max([xmax - xmin, ymax - ymin]) / max([x_size, y_size])
+        except ZeroDivisionError:
+            scale_factor = 1
+        buffered_box = "{0} {1} {2} {3}".format(xmin, ymin, xmax - xmin, ymax - ymin)
+        return """<svg
+            preserveAspectRatio="xMinYMin meet"
+            viewBox="{0}"
+            width="{1}"
+            height="{2}"
+            transform="translate(0, {1}),scale(1, -1)">
+            {3}
+            </svg>""".format(buffered_box, x_size, y_size, self.svg(scale_factor))
+
     @property
     def geom_type(self):
         """Name of the geometry's type, such as 'Point'"""
@@ -394,7 +423,7 @@ class BaseGeometry(object):
 
     def buffer(self, distance, resolution=16, quadsegs=None,
                cap_style=CAP_STYLE.round, join_style=JOIN_STYLE.round,
-               mitre_limit=0):
+               mitre_limit=5.0):
         """Returns a geometry with an envelope at a distance from the object's
         envelope
 
@@ -433,7 +462,6 @@ class BaseGeometry(object):
           >>> g.buffer(1.0, cap_style='square').area
           4.0
         """
-
         if quadsegs is not None:
             warn(
                 "The `quadsegs` argument is deprecated. Use `resolution`.",
@@ -441,7 +469,9 @@ class BaseGeometry(object):
             res = quadsegs
         else:
             res = resolution
-
+        if mitre_limit == 0.0:
+            raise ValueError(
+                'Cannot compute offset from zero-length line segment')
         if cap_style == CAP_STYLE.round and join_style == JOIN_STYLE.round:
             return geom_factory(self.impl['buffer'](self, distance, res))
 
@@ -657,6 +687,14 @@ class BaseMultipartGeometry(BaseGeometry):
         else:
             return ()[index]
 
+    def svg(self, scale_factor=1.):
+        """
+        SVG representation of the geometry. Scale factor is multiplied by
+        the size of the SVG symbol so it can be scaled consistently for a
+        consistent appearance based on the canvas size.
+        """
+        return "\n".join([g.svg(scale_factor) for g in self])
+
 
 class GeometrySequence(object):
     """
@@ -688,7 +726,7 @@ class GeometrySequence(object):
 
     def _get_geom_item(self, i):
         g = self.shape_factory()
-        g._owned = True
+        g._other_owned = True
         g._geom = lgeos.GEOSGetGeometryN(self._geom, i)
         g._ndim = self._ndim
         g.__p__ = self
@@ -746,7 +784,7 @@ class HeterogeneousGeometrySequence(GeometrySequence):
     def _get_geom_item(self, i):
         sub = lgeos.GEOSGetGeometryN(self._geom, i)
         g = geom_factory(sub, parent=self)
-        g._owned = True
+        g._other_owned = True
         return g
 
 

{Shapely-1.3.2 → Shapely-1.3.3}/shapely/geometry/linestring.py

@@ -53,6 +53,24 @@ class LineString(BaseGeometry):
             'coordinates': tuple(self.coords)
             }
 
+    def svg(self, scale_factor=1.):
+        """
+        SVG representation of the geometry. Scale factor is multiplied by
+        the size of the SVG symbol so it can be scaled consistently for a
+        consistent appearance based on the canvas size.
+        """
+        pnt_format = " ".join(["{0},{1}".format(*c) for c in self.coords])
+        return """<polyline
+            fill="none"
+            stroke="{2}"
+            stroke-width={1}
+            points="{0}"
+            opacity=".8"
+            />""".format(
+                pnt_format,
+                2.*scale_factor, 
+                "#66cc99" if self.is_valid else "#ff3333")
+
     @property
     def ctypes(self):
         if not self._ctypes_data:
@@ -88,7 +106,7 @@ class LineString(BaseGeometry):
 
     def parallel_offset(
             self, distance, side,
-            resolution=16, join_style=JOIN_STYLE.round, mitre_limit=1.0):
+            resolution=16, join_style=JOIN_STYLE.round, mitre_limit=5.0):
 
         """Returns a LineString or MultiLineString geometry at a distance from
         the object on its right or its left side.
@@ -108,12 +126,14 @@ class LineString(BaseGeometry):
         far beyond 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."""
-
+        if mitre_limit == 0.0:
+            raise ValueError(
+                'Cannot compute offset from zero-length line segment')
         try:
             return geom_factory(self.impl['parallel_offset'](
                 self, distance, resolution, join_style, mitre_limit,
                 bool(side == 'left')))
-        except WindowsError:
+        except OSError:
             raise TopologicalError()
 
 

{Shapely-1.3.2 → Shapely-1.3.3}/shapely/geometry/multilinestring.py

@@ -61,11 +61,32 @@ class MultiLineString(BaseMultipartGeometry):
             'coordinates': tuple(tuple(c for c in g.coords) for g in self.geoms)
             }
 
+    def svg(self, scale_factor=1.):
+        """
+        SVG representation of the geometry. Scale factor is multiplied by
+        the size of the SVG symbol so it can be scaled consistently for a
+        consistent appearance based on the canvas size.
+        """
+        parts = []
+        for part in self.geoms:
+            pnt_format = " ".join(["{0},{1}".format(*c) for c in part.coords])
+            parts.append("""<polyline
+                fill="none"
+                stroke="{2}"
+                stroke-width={1}
+                points="{0}"
+                opacity=".8"
+                />""".format(
+                    pnt_format,
+                    2.*scale_factor,
+                    "#66cc99" if self.is_valid else "#ff3333"))
+        return "\n".join(parts)
+
 
 class MultiLineStringAdapter(CachingGeometryProxy, MultiLineString):
     
     context = None
-    _owned = False
+    _other_owned = False
 
     def __init__(self, context):
         self.context = context