shapely 1.5.8__tar.gz → 1.5.10__tar.gz

{Shapely-1.5.8 → Shapely-1.5.10}/CHANGES.txt

@@ -1,6 +1,15 @@
 Changes
 =======
 
+1.5.10 (2015-08-22)
+-------------------
+- Monkey patch affinity module by absolute reference (#299).
+- Raise TopologicalError in relate() instead of crashing (#294, #295, #303).
+
+1.5.9 (2015-05-27)
+------------------
+- Fix for 64 bit speedups compatibility (#274).
+
 1.5.8 (2015-04-29)
 ------------------
 - Setup file encoding bug fix (#254).

{Shapely-1.5.8/Shapely.egg-info → Shapely-1.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.8
+Version: 1.5.10
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -52,12 +52,13 @@ Description: =======
         
             $ pip install shapely
         
-        If you've installed GEOS to a non-standard location, you can use the
-        geos-config program to find compiler and linker options.
+        If you've installed GEOS to a non-standard location, the geos-config program
+        will be used to get compiler and linker options. If it is not on the PATH,
+        it can be specified with a GEOS_CONFIG environment variable, e.g.:
         
         .. code-block:: console
         
-            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+            $ GEOS_CONFIG=/path/to/geos-config pip install shapely
         
         If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
         stick to 1.2.x as shown below.
@@ -215,6 +216,15 @@ Description: =======
         Changes
         =======
         
+        1.5.10 (2015-08-22)
+        -------------------
+        - Monkey patch affinity module by absolute reference (#299).
+        - Raise TopologicalError in relate() instead of crashing (#294, #295, #303).
+        
+        1.5.9 (2015-05-27)
+        ------------------
+        - Fix for 64 bit speedups compatibility (#274).
+        
         1.5.8 (2015-04-29)
         ------------------
         - Setup file encoding bug fix (#254).
@@ -588,4 +598,4 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
-Requires: libgeos_c (>=3.1)
+Requires: libgeos_c (>=3.3)

{Shapely-1.5.8 → Shapely-1.5.10}/README.rst

@@ -44,12 +44,13 @@ system library path, and install Shapely from the Python package index.
 
     $ pip install shapely
 
-If you've installed GEOS to a non-standard location, you can use the
-geos-config program to find compiler and linker options.
+If you've installed GEOS to a non-standard location, the geos-config program
+will be used to get compiler and linker options. If it is not on the PATH,
+it can be specified with a GEOS_CONFIG environment variable, e.g.:
 
 .. code-block:: console
 
-    $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+    $ GEOS_CONFIG=/path/to/geos-config pip install shapely
 
 If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
 stick to 1.2.x as shown below.

{Shapely-1.5.8 → Shapely-1.5.10/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.8
+Version: 1.5.10
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -52,12 +52,13 @@ Description: =======
         
             $ pip install shapely
         
-        If you've installed GEOS to a non-standard location, you can use the
-        geos-config program to find compiler and linker options.
+        If you've installed GEOS to a non-standard location, the geos-config program
+        will be used to get compiler and linker options. If it is not on the PATH,
+        it can be specified with a GEOS_CONFIG environment variable, e.g.:
         
         .. code-block:: console
         
-            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+            $ GEOS_CONFIG=/path/to/geos-config pip install shapely
         
         If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
         stick to 1.2.x as shown below.
@@ -215,6 +216,15 @@ Description: =======
         Changes
         =======
         
+        1.5.10 (2015-08-22)
+        -------------------
+        - Monkey patch affinity module by absolute reference (#299).
+        - Raise TopologicalError in relate() instead of crashing (#294, #295, #303).
+        
+        1.5.9 (2015-05-27)
+        ------------------
+        - Fix for 64 bit speedups compatibility (#274).
+        
         1.5.8 (2015-04-29)
         ------------------
         - Setup file encoding bug fix (#254).
@@ -588,4 +598,4 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
-Requires: libgeos_c (>=3.1)
+Requires: libgeos_c (>=3.3)

{Shapely-1.5.8 → Shapely-1.5.10}/Shapely.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ shapely/ftools.py
 shapely/geos.py
 shapely/impl.py
 shapely/iterops.py
+shapely/libgeos.py
 shapely/linref.py
 shapely/ops.py
 shapely/predicates.py
@@ -60,6 +61,7 @@ tests/test_box.py
 tests/test_cga.py
 tests/test_collection.py
 tests/test_coords.py
+tests/test_default_impl.py
 tests/test_delaunay.py
 tests/test_delegated.py
 tests/test_dlls.py
@@ -78,6 +80,7 @@ tests/test_linemerge.py
 tests/test_linestring.py
 tests/test_locale.py
 tests/test_mapping.py
+tests/test_multi.py
 tests/test_multilinestring.py
 tests/test_multipoint.py
 tests/test_multipolygon.py
@@ -85,6 +88,7 @@ tests/test_ndarrays.py
 tests/test_nearest.py
 tests/test_operations.py
 tests/test_operators.py
+tests/test_parallel_offset.py
 tests/test_persist.py
 tests/test_pickle.py
 tests/test_point.py

Shapely-1.5.10/VERSION.txt

@@ -0,0 +1 @@
+1.5.10

{Shapely-1.5.8 → Shapely-1.5.10}/docs/manual.rst

@@ -1054,8 +1054,9 @@ differently.
 
 .. method:: object.contains(other)
 
-  Returns ``True`` if the object's `interior` contains the `boundary` and
-  `interior` of the other object and their boundaries do not touch at all.
+  Returns ``True`` if no points of `other` lie in the exterior of the `object`
+  and at least one point of the interior of `other` lies in the interior of
+  `object`.
 
 This predicate applies to all types, and is inverse to :meth:`within`. The
 expression ``a.contains(b) == b.within(a)`` always evaluates to ``True``.
@@ -1124,8 +1125,8 @@ This predicate applies to all types and is the inverse of :meth:`intersects`.
   Returns ``True`` if the `boundary` and `interior` of the object intersect in
   any way with those of the other.
 
-This predicate is equivalent to the OR-ing of :meth:`contains`, :meth:`crosses`,
-:meth:`equals`, :meth:`touches`, and :meth:`within`.
+In other words, geometric objects intersect if they have any boundary or 
+interior point in common.
 
 .. method:: object.touches(other)
 
@@ -1234,6 +1235,37 @@ elements.
   >>> Point(0, 0).relate(LineString([(0, 0), (1, 1)]))
   'F0FFFF102'
 
+.. method:: object.relate_pattern(other, pattern)
+
+    Returns True if the DE-9IM string code for the relationship between the
+    geometries satisfies the pattern, otherwise False.
+
+The :meth:`relate_pattern` compares the DE-9IM code string for two geometries
+against a specified pattern. If the string matches the pattern then ``True`` is
+returned, otherwise ``False``. The pattern specified can be an exact match
+(``0``, ``1`` or ``2``), a boolean match (``T`` or ``F``), or a wildcard
+(``*``). For example, the pattern for the `within` predicate is ``T*****FF*``.
+
+.. code-block:: pycon
+
+  >> point = Point(0.5, 0.5)
+  >> square = Polygon([(0, 0), (0, 1), (1, 1), (1, 0)])
+  >> square.relate_pattern(point, 'T*****FF*')
+  True
+  >> point.within(square)
+  True
+
+Note that the order or the geometries is significant, as demonstrated below.
+In this example the square contains the point, but the point does not contain
+the square.
+
+.. code-block:: pycon
+
+  >>> point.relate(square)
+  '0FFFFF212'
+  >>> square.relate(point)
+  '0F2FF1FF2'
+
 Further discussion of the DE-9IM matrix is beyond the scope of this manual. See
 [4]_ and http://pypi.python.org/pypi/de9im.
 
@@ -2037,7 +2069,7 @@ one geometry to the vertices in a second geometry with a given tolerance.
    The `tolerance` argument specifies the minimum distance between vertices for
    them to be snapped.
 
-   `New in version 1.4.5`
+   `New in version 1.5.0`
 
 .. code-block:: pycon
 

{Shapely-1.5.8 → Shapely-1.5.10}/setup.py

@@ -1,7 +1,24 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
+# Two environment variables influence this script.
+#
+# GEOS_LIBRARY_PATH: a path to a GEOS C shared library.
+#
+# GEOS_CONFIG: the path to a geos-config program that points to GEOS version,
+# headers, and libraries.
+#
+# NB: within this setup scripts, software versions are evaluated according
+# to https://www.python.org/dev/peps/pep-0440/.
 
+import errno
+import glob
+import logging
+import os
+import platform
+import re
+import shutil
+import subprocess
+import sys
 try:
     # If possible, use setuptools
     from setuptools import setup
@@ -11,36 +28,54 @@ except ImportError:
     from distutils.core import setup
     from distutils.extension import Extension
     from distutils.command.build_ext import build_ext as distutils_build_ext
-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
-import platform
-import shutil
-import subprocess
-import sys
 
+from packaging.version import Version
+
+# Get geos_version from GEOS dynamic library, which depends on
+# GEOS_LIBRARY_PATH and/or GEOS_CONFIG environment variables
+from shapely.libgeos import geos_version_string, geos_version, \
+        geos_config, get_geos_config
+
+logging.basicConfig()
+log = logging.getLogger(__file__)
+
+# python -W all setup.py ...
+if 'all' in sys.warnoptions:
+    log.level = logging.DEBUG
 
 # Get the version from the shapely module
-version = None
+shapely_version = None
 with open('shapely/__init__.py', 'r') as fp:
     for line in fp:
-        if "__version__" in line:
-            exec(line.replace('_', ''))
+        if line.startswith("__version__"):
+            shapely_version = Version(
+                line.split("=")[1].strip().strip("\"'"))
             break
-if version is None:
+
+if not shapely_version:
     raise ValueError("Could not determine Shapely's version")
 
+# Fail installation if the GEOS shared library does not meet the minimum
+# version. We ship it with Shapely for Windows, so no need to check on
+# that platform.
+log.debug('GEOS shared library: %s %s', geos_version_string, geos_version)
+if (set(sys.argv).intersection(['install', 'build', 'build_ext']) and
+        shapely_version >= Version('1.3') and
+        geos_version < (3, 3)):
+    log.critical(
+        "Shapely >= 1.3 requires GEOS >= 3.3. "
+        "Install GEOS 3.3+ and reinstall Shapely.")
+    sys.exit(1)
+
 # Handle UTF-8 encoding of certain text files.
 open_kwds = {}
 if sys.version_info >= (3,):
     open_kwds['encoding'] = 'utf-8'
 
 with open('VERSION.txt', 'w', **open_kwds) as fp:
-    fp.write(version)
+    fp.write(str(shapely_version))
 
 with open('README.rst', 'r', **open_kwds) as fp:
     readme = fp.read()
@@ -55,8 +90,8 @@ long_description = readme + '\n\n' + credits + '\n\n' + changes
 
 setup_args = dict(
     name                = 'Shapely',
-    version             = version,
-    requires            = ['Python (>=2.6)', 'libgeos_c (>=3.1)'],
+    version             = str(shapely_version),
+    requires            = ['Python (>=2.6)', 'libgeos_c (>=3.3)'],
     description         = 'Geometric objects, predicates, and operations',
     license             = 'BSD',
     keywords            = 'geometry topology gis',
@@ -74,7 +109,6 @@ setup_args = dict(
         'shapely.speedups',
         'shapely.vectorized',
     ],
-    cmdclass = {},
     classifiers         = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -86,7 +120,8 @@ setup_args = dict(
         'Programming Language :: Python :: 3',
         'Topic :: Scientific/Engineering :: GIS',
     ],
-    data_files         = [('shapely', ['shapely/_geos.pxi'])]
+    data_files         = [('shapely', ['shapely/_geos.pxi'])],
+    cmdclass           = {},
 )
 
 # Add DLLs for Windows
@@ -111,6 +146,47 @@ if sys.platform == 'win32':
     )
 
 
+# Prepare build opts and args for the speedups extension module.
+include_dirs = []
+library_dirs = []
+libraries = []
+extra_link_args = []
+
+try:
+    # Get the version from geos-config. Show error if this version tuple is
+    # different to the GEOS version loaded from the dynamic library.
+    geos_config_version_string = get_geos_config('--version')
+    res = re.findall(r'(\d+)\.(\d+)\.(\d+)', geos_config_version_string)
+    geos_config_version = tuple(int(x) for x in res[0])
+
+    if geos_config_version != geos_version:
+        log.error("The GEOS dynamic library version is %s %s,",
+                  geos_version_string, geos_version)
+        log.error("but the version reported by %s is %s %s.", geos_config,
+                  geos_config_version_string, geos_config_version)
+        sys.exit(1)
+except OSError as ex:
+    log.error(ex)
+    log.error('Cannot find geos-config to get headers and check version.')
+    log.error('If available, specify a path to geos-config with a '
+              'GEOS_CONFIG environment variable')
+    geos_config = None
+
+if geos_config:
+    # Collect other options from GEOS
+    for item in get_geos_config('--cflags').split():
+        if item.startswith("-I"):
+            include_dirs.extend(item[2:].split(":"))
+    for item in get_geos_config('--clibs').split():
+        if item.startswith("-L"):
+            library_dirs.extend(item[2:].split(":"))
+        elif item.startswith("-l"):
+            libraries.append(item[2:])
+        else:
+            # e.g. -framework GEOS
+            extra_link_args.append(item)
+
+
 # Optional compilation of speedups
 # setuptools stuff from Bob Ippolito's simplejson project
 if sys.platform == 'win32' and sys.version_info > (2, 6):
@@ -149,10 +225,6 @@ if (hasattr(platform, 'python_implementation')
     # python_implementation is only available since 2.6
     ext_modules = []
     libraries = []
-elif sys.platform == 'win32':
-    libraries = ['geos']
-else:
-    libraries = ['geos_c']
 
 
 if os.path.exists("MANIFEST.in"):
@@ -166,67 +238,77 @@ if os.path.exists("MANIFEST.in"):
     try:
         if (force_cython or not os.path.exists(c_file)
                 or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
-            print("Updating C extension with Cython.", file=sys.stderr)
+            log.info("Updating C extension with Cython.")
             subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
     except (subprocess.CalledProcessError, OSError):
-        print("Warning: Could not (re)create C extension with Cython.",
-              file=sys.stderr)
+        log.warn("Could not (re)create C extension with Cython.")
         if force_cython:
             raise
-    if not os.path.exists("shapely/speedups/_speedups.c"):
-        print("Warning: speedup extension not found", file=sys.stderr)
+    if not os.path.exists(c_file):
+        log.warn("speedup extension not found")
 
 ext_modules = [
     Extension(
         "shapely.speedups._speedups",
         ["shapely/speedups/_speedups.c"],
+        include_dirs=include_dirs,
+        library_dirs=library_dirs,
         libraries=libraries,
-        include_dirs=[get_config_var('INCLUDEDIR')],),
+        extra_link_args=extra_link_args,
+    ),
 ]
 
 cmd_classes = setup_args.setdefault('cmdclass', {})
 
 try:
-    import numpy as np
+    import numpy
     from Cython.Distutils import build_ext as cython_build_ext
     from distutils.extension import Extension as DistutilsExtension
 
-    if 'build_ext' in cmd_classes:
+    if 'build_ext' in setup_args['cmdclass']:
         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()],
-                                 ))
+    setup_args['cmdclass']['build_ext'] = cython_build_ext
+
+    include_dirs.append(numpy.get_include())
+    libraries.append(numpy.get_include())
+
+    ext_modules.append(DistutilsExtension(
+        "shapely.vectorized._vectorized",
+        sources=["shapely/vectorized/_vectorized.pyx"],
+        include_dirs=include_dirs,
+        library_dirs=library_dirs,
+        libraries=libraries,
+        extra_link_args=extra_link_args,
+    ))
 except ImportError:
-    print("Numpy or Cython not available, shapely.vectorized submodule not "
-          "being built.")
+    log.info("Numpy or Cython not available, shapely.vectorized submodule "
+             "not being built.")
 
 
 try:
     # try building with speedups
-    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
-    )
+    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)
 except BuildFailed as ex:
-    BUILD_EXT_WARNING = "Warning: The C extension could not be compiled, " \
+    BUILD_EXT_WARNING = "The C extension could not be compiled, " \
                         "speedups are not enabled."
-    print(ex)
-    print(BUILD_EXT_WARNING)
-    print("Failure information, if any, is above.")
-    print("I'm retrying the build without the C extension now.")
+    log.warn(ex)
+    log.warn(BUILD_EXT_WARNING)
+    log.warn("Failure information, if any, is above.")
+    log.warn("I'm retrying the build without the C extension now.")
+
+    # Remove any previously defined build_ext command class.
+    if 'build_ext' in setup_args['cmdclass']:
+        del setup_args['cmdclass']['build_ext']
 
     if 'build_ext' in cmd_classes:
         del cmd_classes['build_ext']
 
     setup(**setup_args)
 
-    print(BUILD_EXT_WARNING)
-    print("Plain-Python installation succeeded.")
+    log.warn(BUILD_EXT_WARNING)
+    log.info("Plain-Python installation succeeded.")

Shapely-1.5.10/shapely/__init__.py

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

{Shapely-1.5.8 → Shapely-1.5.10}/shapely/_geos.pxi

@@ -13,7 +13,7 @@ cdef extern from "geos_c.h":
     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_getSize_r(GEOSContextHandle_t, GEOSCoordSequence *, unsigned 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

{Shapely-1.5.8 → Shapely-1.5.10}/shapely/ctypes_declarations.py

@@ -129,8 +129,16 @@ def prototype(lgeos, geos_version):
         lgeos.GEOSBufferWithStyle.restype = c_void_p
         lgeos.GEOSBufferWithStyle.argtypes = [c_void_p, c_double, c_int, c_int, c_int, c_double]
 
-        lgeos.GEOSSingleSidedBuffer.restype = c_void_p
-        lgeos.GEOSSingleSidedBuffer.argtypes = [c_void_p, c_double, c_int, c_int, c_double, c_int]
+        if geos_version >= (3, 3, 0):
+
+            lgeos.GEOSOffsetCurve.restype = c_void_p
+            lgeos.GEOSOffsetCurve.argtypes = [c_void_p, c_double, c_int, c_int, c_double]
+        
+        else:
+
+            # deprecated in GEOS 3.3.0 in favour of GEOSOffsetCurve
+            lgeos.GEOSSingleSidedBuffer.restype = c_void_p
+            lgeos.GEOSSingleSidedBuffer.argtypes = [c_void_p, c_double, c_int, c_int, c_double, c_int]
 
     '''
     Geometry constructors
@@ -290,12 +298,16 @@ def prototype(lgeos, geos_version):
     Dimensionally Extended 9 Intersection Model related
     '''
 
-    lgeos.GEOSRelatePattern.restype = c_char
-    lgeos.GEOSRelatePattern.argtypes = [c_void_p, c_void_p, c_char_p]
-
     lgeos.GEOSRelate.restype = allocated_c_char_p
     lgeos.GEOSRelate.argtypes = [c_void_p, c_void_p]
 
+    lgeos.GEOSRelatePattern.restype = c_byte
+    lgeos.GEOSRelatePattern.argtypes = [c_void_p, c_void_p, c_char_p]
+
+    if geos_version >= (3, 3, 0):
+        lgeos.GEOSRelatePatternMatch.restype = c_byte
+        lgeos.GEOSRelatePatternMatch.argtypes = [c_char_p, c_char_p]
+
     '''
     Prepared Geometry Binary predicates
     Return 2 on exception, 1 on true, 0 on false

{Shapely-1.5.8 → Shapely-1.5.10}/shapely/geometry/base.py

@@ -14,6 +14,16 @@ from shapely.impl import DefaultImplementation, delegated
 
 if sys.version_info[0] < 3:
     range = xrange
+    integer_types = (int, long)
+else:
+    integer_types = (int,)
+
+try:
+    import numpy as np
+    integer_types = integer_types + (np.integer,)
+except ImportError:
+    pass
+
 
 GEOMETRY_TYPES = [
     'Point',
@@ -63,7 +73,7 @@ def geom_factory(g, parent=None):
         [geom_type],
         )
     ob.__class__ = getattr(mod, geom_type)
-    ob.__geom__ = g
+    ob._geom = g
     ob.__p__ = parent
     if lgeos.methods['has_z'](g):
         ob._ndim = 3
@@ -188,14 +198,11 @@ class BaseGeometry(object):
     _ndim = None
     _crs = None
     _other_owned = False
+    _is_empty = True
 
     # Backend config
     impl = DefaultImplementation
 
-    @property
-    def _is_empty(self):
-        return self.__geom__ in [EMPTY, None]
-
     # a reference to the so/dll proxy to preserve access during clean up
     _lgeos = lgeos
 
@@ -207,6 +214,7 @@ class BaseGeometry(object):
                 self._lgeos.GEOSGeom_destroy(self.__geom__)
             except AttributeError:
                 pass  # _lgeos might be empty on shutdown
+        self._is_empty = True
         self.__geom__ = val
 
     def __del__(self):
@@ -235,6 +243,7 @@ class BaseGeometry(object):
     @_geom.setter
     def _geom(self, val):
         self.empty()
+        self._is_empty = val in [EMPTY, None]
         self.__geom__ = val
 
     # Operators
@@ -528,7 +537,7 @@ class BaseGeometry(object):
 
     @delegated
     def simplify(self, tolerance, preserve_topology=True):
-        """Returns a simplified geometry produced by the Douglas-Puecker
+        """Returns a simplified geometry produced by the Douglas-Peucker
         algorithm
 
         Coordinates of the simplified geometry will be no more than the
@@ -663,6 +672,12 @@ class BaseGeometry(object):
         specified decimal place"""
         return self.equals_exact(other, 0.5 * 10**(-decimal))
 
+    def relate_pattern(self, other, pattern):
+        """Returns True if the DE-9IM string code for the relationship between
+        the geometries satisfies the pattern, else False"""
+        pattern = c_char_p(pattern.encode('ascii'))
+        return bool(self.impl['relate_pattern'](self, other, pattern))
+
     # Linear referencing
     # ------------------
 
@@ -828,7 +843,7 @@ class GeometrySequence(object):
     def __getitem__(self, key):
         self._update()
         m = self.__len__()
-        if isinstance(key, int):
+        if isinstance(key, integer_types):
             if key + m < 0 or key >= m:
                 raise IndexError("index out of range")
             if key < 0: