shapely 1.0__py2.4.egg → 1.0b1__py2.4.egg

EGG-INFO/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0
+Version: 1.0b1
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -9,8 +9,8 @@ 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
+        Shapely is a Python package for programming with 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:
         
@@ -20,22 +20,18 @@ Description: Shapely
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
         http://zcologia.com/news/564/shapely-for-python-3-0/.)
         
-        
         Dependencies
         ------------
         
-        * libgeos_c (2.2.3 or 3.0.0+)
+        * libgeos_c (2.2.3, also reported to work with 3.0 after small modifications.)
         * Python ctypes_ (standard in Python 2.5+)
         
         .. _ctypes: http://pypi.python.org/pypi/ctypes/
         
-        
         Installation
         ------------
         
-        Windows users should use the executable installer, which contains the required
-        GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-        is on the system library path, and install from the Python package index::
+        Shapely can be installed from the Python package index::
         
         $ sudo easy_install Shapely
         
@@ -43,29 +39,26 @@ Description: Shapely
         
         $ sudo python setup.py install
         
-        or by using the development buildout on Linux, which also provides libgeos_c::
+        or by using the development buildout, which also provides libgeos_c::
         
         $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
         $ cd shapely.buildout
         $ python bootstrap.py
         $ ./bin/buildout
         
-        
         Usage
         -----
         
-        To buffer a point::
+        Buffer a point::
         
         >>> from shapely.geometry import Point
         >>> point = Point(-106.0, 40.0) # longitude, latitude
         >>> point.buffer(10.0)
         <shapely.geometry.polygon.Polygon object at ...>
         
-        See the manual_ for comprehensive examples of usage. See also Operations.txt
-        and Predicates.txt under tests/ for more examples of the spatial operations and
-        predicates provided by Shapely. See also Point.txt, LineString.txt, etc for
-        examples of the geometry APIs.
-        
+        See Operations.txt and Predicates.txt under tests/ for more examples of the
+        spatial operations and predicates provided by Shapely. Also see Point.txt,
+        LineString.txt, etc for examples of the geometry APIs.
         
         Numpy integration
         -----------------
@@ -87,7 +80,6 @@ Description: Shapely
         >>> line.wkt
         'LINESTRING (1.0000000000000000 2.0000000000000000, 3.0000000000000000 4.0000000000000000)'
         
-        
         Python Geo Interface
         --------------------
         
@@ -115,7 +107,6 @@ Description: Shapely
         See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
         details on the interface.
         
-        
         Testing
         -------
         
@@ -125,11 +116,7 @@ Description: Shapely
         $ python point.py
         
         There are also two test runners under tests/. test_doctests.py requires
-        zope.testing. runalldoctests.py does not. Perhaps the easiest way to run the
-        tests is::
-        
-        $ python setup.py test
-        
+        zope.testing. runalldoctests.py does not.
         
         Support
         -------
@@ -137,34 +124,16 @@ Description: Shapely
         For current information about this project, see the wiki_.
         
         .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/manual.html
+        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
         
         If you have questions, please consider joining our community list:
         
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
         
-        Credits
-        -------
-        
-        * Sean Gillies (Pleiades)
-        * Howard Butler (Hobu, Inc.)
-        * Kai Lautaportti (Hexagon IT)
-        * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
-        * Eric Lemoine (Camptocamp SA)
-        * Justin Bronn (GeoDjango) for ctypes inspiration
-        * Artem Pavlenko (Mapnik) for help with GEOS DLLs
-        
-        .. |eaigue| unicode:: U+00E9
-        :trim:
-        
-        Major portions of this work were supported by a grant (to Pleiades) from the
-        U.S.  National Endowment for the Humanities (http://www.neh.gov).
-        
-        
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License

EGG-INFO/SOURCES.txt

@@ -4,7 +4,6 @@ HISTORY.txt
 LICENSE.txt
 README.txt
 setup.py
-setup_windows.py
 Shapely.egg-info/PKG-INFO
 Shapely.egg-info/SOURCES.txt
 Shapely.egg-info/dependency_links.txt
@@ -12,8 +11,6 @@ Shapely.egg-info/requires.txt
 Shapely.egg-info/top_level.txt
 examples/geoms.py
 examples/world.py
-manual/manual.txt
-manual/style.css
 shapely/__init__.py
 shapely/geos.py
 shapely/iterops.py

shapely/geos.py

@@ -3,31 +3,21 @@ 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, CFUNCTYPE, c_char_p
 from ctypes.util import find_library
-import os
 import sys
 
-import shapely
-
 if sys.platform == 'win32':
     try:
-        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 = CDLL('libgeos_c.dll')
     except (ImportError, WindowsError):
+        # Try GEOS DLL from the Windows PostGIS installer for
+        # PostgreSQL 8.2 before failing
+        lgeos = CDLL('libgeos_c-1.dll')
+    except:
         raise
-    def free(m):
-        try:
-            cdll.msvcrt.free(m)
-        except WindowsError:
-            # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
-            pass
-
 elif sys.platform == 'darwin':
     lgeos = CDLL(find_library('geos_c'))
-    free = CDLL(find_library('libc')).free
 else:
     # Try the major versioned name first, falling back on the unversioned name.
     try:
@@ -36,12 +26,6 @@ else:
         lgeos = CDLL('libgeos_c.so')
     except:
         raise
-    free = CDLL('libc.so.6').free
-
-
-class allocated_c_char_p(c_char_p):
-    pass
-
 
 # Exceptions
 

shapely/iterops.py

@@ -2,7 +2,7 @@
 """
 
 from ctypes import c_char_p, c_size_t
-from shapely.geos import lgeos, free
+from shapely.geos import lgeos
 
 
 def geos_from_geometry(geom):
@@ -28,22 +28,20 @@ class BinaryPredicateIterator(object):
         return self
 
     def __call__(self, geom, iterator, value=True):
-        if geom._geom is None:
-            raise ValueError, "Null geometry supports no operations"
+        geos_geom = geos_from_geometry(geom)
         for item in iterator:
             try:
-                this_geom, ob = item
+                geom, ob = item
             except TypeError:
-                this_geom = item
-                ob = this_geom
-            if this_geom._geom is None:
-                raise ValueError, "Null geometry supports no operations"
-            retval = self.fn(geom._geom, this_geom._geom)
+                geom = item
+                ob = geom
+            retval = self.fn(geos_geom, geos_from_geometry(geom))
             if retval == 2:
                 raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
             elif bool(retval) == value:
                 yield ob
 
+
 # utilities
 disjoint = BinaryPredicateIterator(lgeos.GEOSDisjoint)
 touches = BinaryPredicateIterator(lgeos.GEOSTouches)

shapely/predicates.py

@@ -16,20 +16,16 @@ class BinaryPredicate(object):
 
     def __init__(self, fn):
         self.fn = fn
-        def errcheck(result, func, argtuple):
-            if result == 2:
-                raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
-            return result
-        self.fn.errcheck = errcheck
 
     def __get__(self, obj, objtype=None):
         self.context = obj
         return self
 
     def __call__(self, other):
-        if self.context._geom is None or other._geom is None:
-            raise ValueError, "Null geometry supports no operations"
-        return bool(self.fn(self.context._geom, other._geom))
+        retval = self.fn(self.context._geom, other._geom)
+        if retval == 2:
+            raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
+        return bool(retval)
 
 
 # A data descriptor
@@ -42,16 +38,12 @@ class UnaryPredicate(object):
 
     def __init__(self, fn):
         self.fn = fn
-        def errcheck(result, func, argtuple):
-            if result == 2:
-                raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
-            return result
-        self.fn.errcheck = errcheck
 
     def __get__(self, obj, objtype=None):
-        if obj._geom is None:
-            raise ValueError, "Null geometry supports no operations"
-        return bool(self.fn(obj._geom))
+        retval = self.fn(obj._geom)
+        if retval == 2:
+            raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
+        return bool(retval)
     
     def __set__(self, obj, value=None):
         raise AttributeError, "Attribute is read-only"

shapely/topology.py

@@ -26,8 +26,6 @@ class BinaryTopologicalOp(object):
         return self
 
     def __call__(self, other):
-        if self.context._geom is None or other._geom is None:
-            raise ValueError, "Null geometry supports no operations"
         product = self.fn(self.context._geom, other._geom)
         if not product:
             # Check validity of geometries
@@ -57,8 +55,6 @@ class UnaryTopologicalOp(object):
         self.factory = factory
 
     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))
     
     def __set__(self, obj, value=None):

shapely/wkb.py

@@ -4,7 +4,7 @@ Load/dump geometries using the well-known binary (WKB) format.
 
 from ctypes import byref, c_int, c_size_t, c_char_p, string_at
 
-from shapely.geos import lgeos, free, ReadingError
+from shapely.geos import lgeos, ReadingError
 from shapely.geometry.base import geom_factory
 
 
@@ -25,14 +25,9 @@ def load(fp):
 
 def dumps(ob):
     """Dump a WKB representation of a geometry to a byte string."""
-    func = lgeos.GEOSGeomToWKB_buf
     size = c_int()
-    def errcheck(result, func, argtuple):
-        retval = string_at(result, size.value)[:]
-        free(result)
-        return retval
-    func.errcheck = errcheck
-    return func(ob._geom, byref(size))
+    bytes = lgeos.GEOSGeomToWKB_buf(ob._geom, byref(size))
+    return string_at(bytes, size.value)
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

shapely/wkt.py

@@ -4,7 +4,7 @@ Load/dump geometries using the well-known text (WKT) format.
 
 from ctypes import byref, c_int, c_size_t, c_char_p, string_at
 
-from shapely.geos import lgeos, free, allocated_c_char_p, ReadingError
+from shapely.geos import lgeos, ReadingError
 from shapely.geometry.base import geom_factory
 
 
@@ -25,14 +25,7 @@ def load(fp):
 
 def dumps(ob):
     """Dump a WKB representation of a geometry to a byte string."""
-    func = lgeos.GEOSGeomToWKT
-    def errcheck(result, func, argtuple):
-        retval = result.value
-        free(result)
-        return retval
-    func.restype = allocated_c_char_p
-    func.errcheck = errcheck
-    return lgeos.GEOSGeomToWKT(ob._geom)
+    return string_at(lgeos.GEOSGeomToWKT(ob._geom))
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

shapely/geometry/__init__.py

@@ -1,9 +0,0 @@
-from geo import asShape
-from point import Point, asPoint
-from linestring import LineString, asLineString
-from polygon import Polygon, asPolygon
-from multipoint import MultiPoint, asMultiPoint
-from multilinestring import MultiLineString, asMultiLineString
-from multipolygon import MultiPolygon, asMultiPolygon
-from collection import GeometryCollection
-