shapely 1.0.1__tar.gz → 1.0.3__tar.gz

Shapely-1.0.3/CHANGES.txt

@@ -0,0 +1,10 @@
+All tickets are children of http://trac.gispython.org/projects/PCL/ticket/
+
+1.0.3 (2008-04-09)
+------------------
+- Do not release GIL when calling GEOS functions (#158).
+- Prevent faults when chaining multiple GEOS operators (#159).
+
+1.0.2 (2008-02-26)
+------------------
+- Fix loss of dimensionality in polygon rings (#155).

Shapely-1.0.1/CHANGES.txt → Shapely-1.0.3/HISTORY.txt

@@ -6,3 +6,19 @@ All ticket numbers are rooted at http://trac.gispython.org/projects/PCL/ticket/
   (#151).
 - Protect against abnormal use of coordinate accessors (#152).
 - Coordinate sequences now implement the numpy array protocol (#153).
+
+
+1.0: 18 January 2008
+--------------------
+- Final release.
+
+
+1.0 RC2: 16 January 2008
+------------------------
+- Added temporary solution for #149.
+
+
+1.0 RC1: 14 January 2008
+------------------------
+- First release candidate
+

{Shapely-1.0.1 → Shapely-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.1
+Version: 1.0.3
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -9,10 +9,11 @@ License: BSD
 Description: Shapely
         =======
         
-        Shapely is a Python package for programming with 2D geospatial geometries. It
-        is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
-        coordinate and reference systems. Projection responsibility is left to specific
-        applications. For more information, see:
+        Shapely is a Python package for manipulation and analysis of 2D geospatial
+        geometries. It is based on GEOS (http://geos.refractions.net).  Shapely 1.0 is
+        not concerned with data formats or coordinate reference systems.
+        Responsibility for reading and writing data and projecting coordinates is left
+        to other packages like WorldMill_ and pyproj_. For more information, see:
         
         * Shapely wiki_
         * Shapely manual_
@@ -23,7 +24,9 @@ Description: Shapely
         See also CHANGES.txt_ and HISTORY.txt_.
         
         .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-        .. _HISTROY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _WorldMill: http://pypi.python.org/pypi/WorldMill
+        .. _pyproj: http://pypi.python.org/pypi/pyproj
         
         
         Dependencies

{Shapely-1.0.1 → Shapely-1.0.3}/README.txt

@@ -1,10 +1,11 @@
 Shapely
 =======
 
-Shapely is a Python package for programming with 2D geospatial geometries. It
-is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
-coordinate and reference systems. Projection responsibility is left to specific
-applications. For more information, see:
+Shapely is a Python package for manipulation and analysis of 2D geospatial
+geometries. It is based on GEOS (http://geos.refractions.net).  Shapely 1.0 is
+not concerned with data formats or coordinate reference systems.
+Responsibility for reading and writing data and projecting coordinates is left
+to other packages like WorldMill_ and pyproj_. For more information, see:
 
 * Shapely wiki_
 * Shapely manual_
@@ -15,7 +16,9 @@ http://zcologia.com/news/564/shapely-for-python-3-0/.)
 See also CHANGES.txt_ and HISTORY.txt_.
 
 .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-.. _HISTROY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+.. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+.. _WorldMill: http://pypi.python.org/pypi/WorldMill
+.. _pyproj: http://pypi.python.org/pypi/pyproj
 
 
 Dependencies

{Shapely-1.0.1 → Shapely-1.0.3}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.1
+Version: 1.0.3
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -9,10 +9,11 @@ License: BSD
 Description: Shapely
         =======
         
-        Shapely is a Python package for programming with 2D geospatial geometries. It
-        is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
-        coordinate and reference systems. Projection responsibility is left to specific
-        applications. For more information, see:
+        Shapely is a Python package for manipulation and analysis of 2D geospatial
+        geometries. It is based on GEOS (http://geos.refractions.net).  Shapely 1.0 is
+        not concerned with data formats or coordinate reference systems.
+        Responsibility for reading and writing data and projecting coordinates is left
+        to other packages like WorldMill_ and pyproj_. For more information, see:
         
         * Shapely wiki_
         * Shapely manual_
@@ -23,7 +24,9 @@ Description: Shapely
         See also CHANGES.txt_ and HISTORY.txt_.
         
         .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-        .. _HISTROY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _WorldMill: http://pypi.python.org/pypi/WorldMill
+        .. _pyproj: http://pypi.python.org/pypi/pyproj
         
         
         Dependencies

{Shapely-1.0.1 → Shapely-1.0.3}/Shapely.egg-info/SOURCES.txt

@@ -50,4 +50,5 @@ tests/binascii_hex.txt
 tests/invalid_intersection.txt
 tests/rungrind.dist
 tests/test_doctests.py
+tests/test_threads.py
 tests/valgrind-python.supp

{Shapely-1.0.1 → Shapely-1.0.3}/setup.py

@@ -11,7 +11,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.1',
+      version       = '1.0.3',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.1 → Shapely-1.0.3}/setup_windows.py

@@ -11,7 +11,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0',
+      version       = '1.0.3',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.1 → Shapely-1.0.3}/shapely/geometry/base.py

@@ -28,7 +28,7 @@ def geometry_type_name(g):
 
 # Abstract geometry factory for use with topological methods below
 
-def geom_factory(g):
+def geom_factory(g, parent=None):
     if not g:
         raise ValueError, "No Shapely geometry can be created from this null value"
     ob = BaseGeometry()
@@ -42,6 +42,7 @@ def geom_factory(g):
         )
     ob.__class__ = getattr(mod, geom_type)
     ob.__geom__ = g
+    ob.__p__ = parent
     ob._ndim = 2 # callers should be all from 2D worlds
     return ob
 
@@ -231,6 +232,7 @@ class BaseGeometry(object):
     """
 
     __geom__ = None # See _geom property below
+    __p__ = None
     _ctypes_data = None
     _ndim = None
     _crs = None

{Shapely-1.0.1 → Shapely-1.0.3}/shapely/geometry/polygon.py

@@ -172,7 +172,7 @@ class LinearRing(LineString):
             # allow creation of null lines, to support unpickling
             pass
         else:
-            self._geom, self._ndims = geos_linearring_from_py(coordinates)
+            self._geom, self._ndim = geos_linearring_from_py(coordinates)
 
     @property
     def __geo_interface__(self):
@@ -278,7 +278,7 @@ class InteriorRingSequence(object):
 
 def geos_polygon_from_py(shell, holes=None):
     if shell is not None:
-        geos_shell, ndims = geos_linearring_from_py(shell)
+        geos_shell, ndim = geos_linearring_from_py(shell)
         if holes:
             ob = holes
             L = len(ob)
@@ -294,7 +294,7 @@ def geos_polygon_from_py(shell, holes=None):
     
             # add to coordinate sequence
             for l in xrange(L):
-                geom, ndims = geos_linearring_from_py(ob[l])
+                geom, ndim = geos_linearring_from_py(ob[l])
                 geos_holes[l] = cast(geom, c_void_p)
 
         else:
@@ -307,7 +307,7 @@ def geos_polygon_from_py(shell, holes=None):
                         geos_holes,
                         L
                         ),
-            ndims
+            ndim
             )
 
 class Polygon(BaseGeometry):
@@ -339,7 +339,7 @@ class Polygon(BaseGeometry):
         BaseGeometry.__init__(self)
 
         if shell is not None:
-            self._geom, self._ndims = geos_polygon_from_py(shell, holes)
+            self._geom, self._ndim = geos_polygon_from_py(shell, holes)
 
     @property
     @exceptNull

{Shapely-1.0.1 → Shapely-1.0.3}/shapely/geos.py

@@ -3,7 +3,7 @@ Exports the libgeos_c shared lib, GEOS-specific exceptions, and utilities.
 """
 
 import atexit
-from ctypes import cdll, CDLL, CFUNCTYPE, c_char_p
+from ctypes import cdll, CDLL, pydll, PyDLL, CFUNCTYPE, c_char_p
 from ctypes.util import find_library
 import os
 import sys
@@ -15,7 +15,7 @@ if sys.platform == 'win32':
         local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
         original_path = os.environ['PATH']
         os.environ['PATH'] = "%s;%s" % (local_dlls, original_path)
-        lgeos = CDLL("geos.dll")
+        lgeos = PyDLL("geos.dll")
     except (ImportError, WindowsError):
         raise
     def free(m):
@@ -38,14 +38,14 @@ elif sys.platform == 'darwin':
                 break
             else:
                 raise ImportError, "Could not find geos_c library"
-    lgeos = CDLL(lib)
+    lgeos = PyDLL(lib)
     free = CDLL(find_library('libc')).free
 else:
     # Try the major versioned name first, falling back on the unversioned name.
     try:
-        lgeos = CDLL('libgeos_c.so.1')
+        lgeos = PyDLL('libgeos_c.so.1')
     except (OSError, ImportError):
-        lgeos = CDLL('libgeos_c.so')
+        lgeos = PyDLL('libgeos_c.so')
     except:
         raise
     free = CDLL('libc.so.6').free

{Shapely-1.0.1 → Shapely-1.0.3}/shapely/topology.py

@@ -38,7 +38,7 @@ class BinaryTopologicalOp(object):
                 raise TopologicalError, \
                 "The operation '%s' produced a null geometry. Likely cause is invalidity of the 'other' geometry %s" % (self.fn.__name__, repr(other))
 
-        return self.factory(product)
+        return self.factory(product, self.context)
 
 
 class UnaryTopologicalOp(object):
@@ -59,7 +59,7 @@ class UnaryTopologicalOp(object):
     def __get__(self, obj, objtype=None):
         if obj._geom is None:
             raise ValueError, "Null geometry supports no operations"
-        return self.factory(self.fn(obj._geom))
+        return self.factory(self.fn(obj._geom), obj)
     
     def __set__(self, obj, value=None):
         raise AttributeError, "Attribute is read-only"

{Shapely-1.0.1 → Shapely-1.0.3}/tests/attribute-chains.txt

@@ -9,7 +9,7 @@ See also ticket #151.
     [(0.0, 0.0), (0.0, 1.0), (-1.0, 1.0), (-1.0, 0.0), (0.0, 0.0)]
 
     >>> print list(p.buffer(1).exterior.coords)
-    [(-0.99999999999999989, 2.0), (0.0, 2.0)...
+    [(0.0, -1.0), (-1.0, -1.0), ...
 
 Test chained access to interiors
 
@@ -22,6 +22,10 @@ Test chained access to interiors
     >>> print list(p.interiors[0].coords)
     [(-0.25, 0.25), (-0.25, 0.75), (-0.75, 0.75), (-0.75, 0.25), (-0.25, 0.25)]
     >>> print list(p.interiors[0].buffer(1).exterior.coords)
-    [(-0.24999999999999986, -0.75), (-0.25, -0.75)...
-    
+    [(-0.25, -0.75), (-0.75, -0.75), ...
+
+Test multiple operators, boundary of a buffer
+
+    >>> print list(p.buffer(1).boundary.coords)
+    [(0.0, -1.0), (-1.0, -1.0), ...
 

Shapely-1.0.3/tests/test_threads.py

@@ -0,0 +1,33 @@
+import threading
+
+def main():
+   num_threads = 4
+   use_threads = True
+   
+   if not use_threads:
+      # Run core code
+      runShapelyBuilding()
+   else:
+      threads = [threading.Thread(target=runShapelyBuilding) for x in range(num_threads)]
+      for t in threads:
+         t.start()
+      for t in threads:
+         t.join()
+         
+def runShapelyBuilding():
+   import shapely.wkt
+   import shapely.wkb
+   
+   print "Running shapely tests on wkb"
+   
+   wkb = shapely.wkt.loads("POINT (0 0)").wkb
+   
+   for i in xrange(1000):
+      obj = shapely.wkb.loads(wkb)
+   
+   print "Done"
+   
+# Run main
+if __name__ == '__main__':
+   main()   
+

Shapely-1.0.1/HISTORY.txt

@@ -1,16 +0,0 @@
-All ticket numbers are rooted at http://trac.gispython.org/projects/PCL/ticket/
-
-1.0: 18 January 2008
---------------------
-- Final release.
-
-
-1.0 RC2: 16 January 2008
-------------------------
-- Added temporary solution for #149.
-
-
-1.0 RC1: 14 January 2008
-------------------------
-- First release candidate
-