shapely 1.4.0__tar.gz → 1.4.1__tar.gz

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

@@ -1,6 +1,10 @@
 Changes
 =======
 
+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.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.0
+Version: 1.4.1
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -248,6 +248,10 @@ Description: =======
         Changes
         =======
         
+        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.1/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.0
+Version: 1.4.1
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -248,6 +248,10 @@ Description: =======
         Changes
         =======
         
+        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.1}/Shapely.egg-info/SOURCES.txt

@@ -50,7 +50,6 @@ shapely/geometry/proxy.py
 shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
 shapely/vectorized/__init__.py
-shapely/vectorized/_vectorized.c
 shapely/vectorized/_vectorized.pyx
 tests/__init__.py
 tests/binascii_hex.txt

Shapely-1.4.1/VERSION.txt

@@ -0,0 +1 @@
+1.4.1

{Shapely-1.4.0 → Shapely-1.4.1}/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.1/shapely/__init__.py

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

{Shapely-1.4.0 → Shapely-1.4.1}/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.1}/shapely/ctypes_declarations.py

@@ -357,9 +357,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.1}/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):

{Shapely-1.4.0 → Shapely-1.4.1}/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)