shapely 1.4.0__tar.gz → 1.4.2__tar.gz

{Shapely-1.4.0 → Shapely-1.4.2}/CHANGES.txt

@@ -1,6 +1,14 @@
 Changes
 =======
 
+1.4.2 (2014-09-29)
+------------------
+- Fix bungled 1.4.1 release (#176).
+
+1.4.1 (2014-09-23)
+------------------
+- Return of support for GEOS 3.2 (#176, #178).
+
 1.4.0 (2014-09-08)
 ------------------
 - SVG representations for IPython's inline image protocol.

{Shapely-1.4.0/Shapely.egg-info → Shapely-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.0
+Version: 1.4.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -248,6 +248,14 @@ Description: =======
         Changes
         =======
         
+        1.4.2 (2014-09-29)
+        ------------------
+        - Fix bungled 1.4.1 release (#176).
+        
+        1.4.1 (2014-09-23)
+        ------------------
+        - Return of support for GEOS 3.2 (#176, #178).
+        
         1.4.0 (2014-09-08)
         ------------------
         - SVG representations for IPython's inline image protocol.

{Shapely-1.4.0 → Shapely-1.4.2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.0
+Version: 1.4.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -248,6 +248,14 @@ Description: =======
         Changes
         =======
         
+        1.4.2 (2014-09-29)
+        ------------------
+        - Fix bungled 1.4.1 release (#176).
+        
+        1.4.1 (2014-09-23)
+        ------------------
+        - Return of support for GEOS 3.2 (#176, #178).
+        
         1.4.0 (2014-09-08)
         ------------------
         - SVG representations for IPython's inline image protocol.

Shapely-1.4.2/VERSION.txt

@@ -0,0 +1 @@
+1.4.2

{Shapely-1.4.0 → Shapely-1.4.2}/docs/manual.rst

@@ -717,7 +717,7 @@ instances, thereby making copies.
 
 .. plot:: code/multipolygon.py
 
-Figure 7. On the right, a `valid` `MultiPolygon` with 2 members, and on the
+Figure 7. On the left, a `valid` `MultiPolygon` with 2 members, and on the
 right, a `MultiPolygon` that is invalid because its members touch at an
 infinite number of points (along a line).
 

Shapely-1.4.2/shapely/__init__.py

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

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/_geos.pxi

@@ -26,7 +26,6 @@ cdef extern from "geos_c.h":
     GEOSGeometry *GEOSGeom_createLinearRing_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
     GEOSGeometry *GEOSGeom_clone_r(GEOSContextHandle_t, GEOSGeometry *) nogil
     GEOSCoordSequence *GEOSCoordSeq_clone_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
-    int GEOSGeom_getCoordinateDimension_r(GEOSContextHandle_t, GEOSGeometry *) nogil
 
     void GEOSGeom_destroy_r(GEOSContextHandle_t, GEOSGeometry *) nogil
 
@@ -41,6 +40,7 @@ cdef extern from "geos_c.h":
     char GEOSPreparedTouches_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
     char GEOSPreparedWithin_r(GEOSContextHandle_t, const GEOSPreparedGeometry*, const GEOSGeometry*) nogil
 
+    char GEOSHasZ_r(GEOSContextHandle_t, GEOSGeometry *) nogil
     char GEOSisRing_r(GEOSContextHandle_t, GEOSGeometry *) nogil
     char GEOSisClosed_r(GEOSContextHandle_t, GEOSGeometry *) nogil
 

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/ctypes_declarations.py

@@ -276,8 +276,9 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSisRing.restype = c_byte
     lgeos.GEOSisRing.argtypes = [c_void_p]
 
-    lgeos.GEOSisClosed.restype = c_byte
-    lgeos.GEOSisClosed.argtypes = [c_void_p]
+    if geos_version >= (3, 3, 0):
+        lgeos.GEOSisClosed.restype = c_byte
+        lgeos.GEOSisClosed.argtypes = [c_void_p]
 
     lgeos.GEOSHasZ.restype = c_byte
     lgeos.GEOSHasZ.argtypes = [c_void_p]
@@ -357,9 +358,6 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSGeom_getDimensions.restype = c_int
     lgeos.GEOSGeom_getDimensions.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_getCoordinateDimension.restype = c_int
-    lgeos.GEOSGeom_getCoordinateDimension.argtypes = [c_void_p]
-
     '''
     Misc functions
     '''

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/geometry/base.py

@@ -129,7 +129,9 @@ def geos_geom_from_py(ob, create_func=None):
         cs = lgeos.GEOSGeom_getCoordSeq(ob._geom)
         cs = lgeos.GEOSCoordSeq_clone(cs)
         geom = create_func(cs)
-    N = lgeos.GEOSGeom_getCoordinateDimension(geom)
+
+    N = ob._ndim
+
     return geom, N
 
 def exceptNull(func):
@@ -558,8 +560,18 @@ class BaseGeometry(object):
 
     @property
     def is_closed(self):
-        """True if the geometry is closed, else False"""
-        return bool(self.impl['is_closed'](self))
+        """True if the geometry is closed, else False
+        
+        Applicable only to 1-D geometries."""
+        if self.geom_type == 'LinearRing':
+            return True
+        elif self.geom_type == 'LineString':
+            if 'is_closed' in self.impl:
+                return bool(self.impl['is_closed'](self))
+            else:
+                return self.coords[0] == self.coords[-1]
+        else:
+            return False
 
     @property
     def is_simple(self):

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/geometry/multilinestring.py

@@ -130,7 +130,12 @@ def geos_multilinestring_from_py(ob):
         for l in range(L):
             geom, ndims = linestring.geos_linestring_from_py(array['data'][l])
             subs[i] = cast(geom, c_void_p)
-        N = lgeos.GEOSGeom_getCoordinateDimension(subs[0])
+
+        if lgeos.GEOSHasZ(subs[0]):
+            N = 3
+        else:
+            N = 2
+
     except (NotImplementedError, AttributeError):
         obs = getattr(ob, 'geoms', ob)
         L = len(obs)

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/geos.py

@@ -545,7 +545,6 @@ class LGEOS300(LGEOSBase):
                 self.GEOSisValid,
                 self.GEOSisSimple,
                 self.GEOSisRing,
-                self.GEOSisClosed,
                 self.GEOSHasZ):
             pred.errcheck = errcheck_predicate
 
@@ -561,7 +560,6 @@ class LGEOS300(LGEOSBase):
         self.methods['has_z'] = self.GEOSHasZ
         self.methods['is_empty'] = self.GEOSisEmpty
         self.methods['is_ring'] = self.GEOSisRing
-        self.methods['is_closed'] = self.GEOSisClosed
         self.methods['is_simple'] = self.GEOSisSimple
         self.methods['is_valid'] = self.GEOSisValid
         self.methods['disjoint'] = self.GEOSDisjoint
@@ -622,7 +620,6 @@ class LGEOS310(LGEOSBase):
                 self.GEOSisValid,
                 self.GEOSisSimple,
                 self.GEOSisRing,
-                self.GEOSisClosed,
                 self.GEOSHasZ):
             pred.func.errcheck = errcheck_predicate
 
@@ -640,7 +637,6 @@ class LGEOS310(LGEOSBase):
         self.methods['has_z'] = self.GEOSHasZ
         self.methods['is_empty'] = self.GEOSisEmpty
         self.methods['is_ring'] = self.GEOSisRing
-        self.methods['is_closed'] = self.GEOSisClosed
         self.methods['is_simple'] = self.GEOSisSimple
         self.methods['is_valid'] = self.GEOSisValid
         self.methods['disjoint'] = self.GEOSDisjoint
@@ -713,7 +709,11 @@ class LGEOS330(LGEOS320):
         attr.__name__ = func.__name__
         setattr(self, key, attr)
 
+        for pred in (self.GEOSisClosed,):
+            pred.func.errcheck = errcheck_predicate
+
         self.methods['unary_union'] = self.GEOSUnaryUnion
+        self.methods['is_closed'] = self.GEOSisClosed
         self.methods['cascaded_union'] = self.methods['unary_union']
 
 

{Shapely-1.4.0 → Shapely-1.4.2}/shapely/impl.py

@@ -71,7 +71,6 @@ IMPL300 = {
     'has_z': (UnaryPredicate, 'has_z'),
     'is_empty': (UnaryPredicate, 'is_empty'),
     'is_ring': (UnaryPredicate, 'is_ring'),
-    'is_closed': (UnaryPredicate, 'is_closed'),
     'is_simple': (UnaryPredicate, 'is_simple'),
     'is_valid': (UnaryPredicate, 'is_valid'),
     #
@@ -113,6 +112,9 @@ IMPL320 = {
     'buffer_with_style': (UnaryTopologicalOp, 'buffer_with_style'),
     }
 
+IMPL330 = {
+    'is_closed': (UnaryPredicate, 'is_closed')}
+
 def impl_items(defs):
     return [(k, v[0](v[1])) for k, v in list(defs.items())]
 
@@ -123,5 +125,7 @@ if lgeos.geos_version >= (3, 1, 1):
     imp.update(impl_items(IMPL311))
 if lgeos.geos_version >= (3, 2, 0):
     imp.update(impl_items(IMPL320))
+if lgeos.geos_version >= (3, 3, 0):
+    imp.update(impl_items(IMPL330))
 
 DefaultImplementation = imp