shapely 1.0__tar.gz → 1.0b1__tar.gz

Shapely-1.0b1/CREDITS.txt

@@ -0,0 +1,6 @@
+Sean Gillies (PCL)
+Howard Butler (PCL)
+Kai Lautaportti (PCL)
+Frédéric Junod (Camptocamp SA)
+Eric Lemoine (Camptocamp SA)
+Justin Bronn (GeoDjango) for ctypes inspiration

{Shapely-1.0 → Shapely-1.0b1}/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

{Shapely-1.0 → Shapely-1.0b1}/README.txt

@@ -1,8 +1,8 @@
 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:
 
@@ -12,22 +12,18 @@ applications. For more information, see:
 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
 
@@ -35,29 +31,26 @@ with the setup script::
 
   $ sudo python setup.py install
 
-or by using the development buildout on Linux, 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
+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
 -----------------
@@ -79,7 +72,6 @@ Numpy arrays can also be adapted to Shapely points and linestrings::
   >>> line.wkt
   'LINESTRING (1.0000000000000000 2.0000000000000000, 3.0000000000000000 4.0000000000000000)'
 
-
 Python Geo Interface
 --------------------
 
@@ -107,7 +99,6 @@ geometry with the asShape factory::
 See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
 details on the interface.
 
-
 Testing
 -------
 
@@ -117,11 +108,7 @@ Several of the modules have docstring doctests::
   $ 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
 -------
@@ -129,27 +116,9 @@ Support
 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).
-

{Shapely-1.0 → Shapely-1.0b1}/Shapely.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

{Shapely-1.0 → Shapely-1.0b1}/Shapely.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-1.0 → Shapely-1.0b1}/setup.py

@@ -1,17 +1,11 @@
 
 from setuptools import setup, Extension
-from sys import version_info
-
-# Require ctypes egg only for Python < 2.5
-install_requires = ['setuptools']
-if version_info[:2] < (2,5):
-    install_requires.append('ctypes')
 
 # Get text from README.txt
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0',
+      version       = '1.0b1',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -21,12 +15,12 @@ setup(name          = 'Shapely',
       maintainer_email  = 'sgillies@frii.com',
       url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
       long_description = readme_text,
-      packages      = ['shapely', 'shapely.geometry'],
-      install_requires = install_requires,
-      #tests_require = ['numpy'], -- not working with "tests" command
+      packages      = ['shapely'],
+      install_requires = ['setuptools', 'ctypes'],
+      #tests_require = ['numpy'],
       test_suite = 'tests.test_suite',
       classifiers   = [
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',

{Shapely-1.0 → Shapely-1.0b1}/shapely/geometry/base.py

@@ -5,7 +5,7 @@ Base geometry class and utilities.
 from ctypes import string_at, byref, c_int, c_size_t, c_char_p, c_double
 import sys
 
-from shapely.geos import lgeos, free, allocated_c_char_p
+from shapely.geos import lgeos
 from shapely.predicates import BinaryPredicate, UnaryPredicate
 from shapely.topology import BinaryTopologicalOp, UnaryTopologicalOp
 
@@ -22,8 +22,6 @@ GEOMETRY_TYPES = [
     ]
 
 def geometry_type_name(g):
-    if g is None:
-        raise ValueError, "Null geometry has no type"
     return GEOMETRY_TYPES[lgeos.GEOSGeomTypeId(g)]
 
 # Abstract geometry factory for use with topological methods below
@@ -158,42 +156,23 @@ class GeometrySequence(object):
                 max = l
 
 
-def exceptNull(func):
-    """Decorator which helps avoid GEOS operations on null pointers."""
-    def wrapper(*args, **kwargs):
-        # self is the first arg
-        if args[0]._geom is None:
-            raise ValueError, "Null geometry supports no operations"
-        return func(*args, **kwargs)
-    return wrapper
-
-def exceptEitherNull(func):
-    """Decorator which avoids GEOS operations on one or more null pointers."""
-    def wrapper(*args, **kwargs):
-        # self is the first arg
-        if args[0]._geom is None or args[1]._geom is None:
-            raise ValueError, "Null geometry supports no operations"
-        return func(*args, **kwargs)
-    return wrapper
-
-
 class BaseGeometry(object):
     
     """Provides GEOS spatial predicates and topological operations.
     """
 
-    __geom = None # See _geom property below
+    _geom = None
     _ctypes_data = None
     _ndim = None
     _crs = None
     _owned = False
 
     def __init__(self):
-        self.__geom = None
+        self._geom = lgeos.GEOSGeomFromWKT(c_char_p('GEOMETRYCOLLECTION EMPTY'))
 
     def __del__(self):
-        if self.__geom is not None and not self._owned:
-            lgeos.GEOSGeom_destroy(self.__geom)
+        if self._geom is not None and not self._owned:
+            lgeos.GEOSGeom_destroy(self._geom)
 
     def __str__(self):
         return self.to_wkt()
@@ -210,20 +189,11 @@ class BaseGeometry(object):
         return (self.__class__, (), self.to_wkb())
 
     def __setstate__(self, state):
-        self.__geom = lgeos.GEOSGeomFromWKB_buf(
+        self._geom = lgeos.GEOSGeomFromWKB_buf(
                         c_char_p(state), 
                         c_size_t(len(state))
                         )
 
-    # _geom has been made a property with the GEOS geometry pointer stored
-    # in __geom so that geometries and geometry adapters can share __del__
-
-    def get_geom(self):
-        return self.__geom
-    def set_geom(self, val):
-        self.__geom = val
-    _geom = property(get_geom, set_geom)
-
     # Array and ctypes interfaces
 
     @property
@@ -252,7 +222,6 @@ class BaseGeometry(object):
         """Provide the Numpy array protocol."""
         raise NotImplementedError
 
-    @exceptNull
     def get_coords(self):
         return CoordinateSequence(self)
 
@@ -274,34 +243,19 @@ class BaseGeometry(object):
 
     # Type of geometry and its representations
 
-    @exceptNull
     def geometryType(self):
         """Returns a string representing the geometry type, e.g. 'Polygon'."""
         return geometry_type_name(self._geom)
 
-    @exceptNull
     def to_wkb(self):
         """Returns a WKB byte string representation of the geometry."""
-        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(self._geom, byref(size))
-
-    @exceptNull
+        bytes = lgeos.GEOSGeomToWKB_buf(self._geom, byref(size))
+        return string_at(bytes, size.value)
+
     def to_wkt(self):
         """Returns a WKT string representation of the geometry."""
-        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(self._geom)
+        return string_at(lgeos.GEOSGeomToWKT(self._geom))
 
     geom_type = property(geometryType)
     wkt = property(to_wkt)
@@ -310,20 +264,17 @@ class BaseGeometry(object):
     # Basic geometry properties
 
     @property
-    @exceptNull
     def area(self):
         a = c_double()
         retval =  lgeos.GEOSArea(self._geom, byref(a))
         return a.value
 
     @property
-    @exceptNull
     def length(self):
         len = c_double()
         retval =  lgeos.GEOSLength(self._geom, byref(len))
         return len.value
 
-    @exceptEitherNull
     def distance(self, other):
         d = c_double()
         retval =  lgeos.GEOSDistance(self._geom, other._geom, byref(d))
@@ -344,22 +295,15 @@ class BaseGeometry(object):
     centroid = UnaryTopologicalOp(lgeos.GEOSGetCentroid, geom_factory)
 
     # Buffer has a unique distance argument, so not a descriptor
-    @exceptNull
     def buffer(self, distance, quadsegs=16):
         return geom_factory(
             lgeos.GEOSBuffer(self._geom, c_double(distance), c_int(quadsegs))
             )
 
     # Relate has a unique string return value
-    @exceptNull
     def relate(self, other):
         func = lgeos.GEOSRelate
-        def errcheck(result, func, argtuple):
-            retval = result.value
-            free(result)
-            return retval
-        func.restype = allocated_c_char_p
-        func.errcheck = errcheck
+        func.restype = c_char_p
         return lgeos.GEOSRelate(self._geom, other._geom)
 
     # Binary predicates
@@ -387,7 +331,6 @@ class BaseGeometry(object):
     has_z = UnaryPredicate(lgeos.GEOSHasZ)
 
     @property
-    @exceptNull
     def bounds(self):
         env = self.envelope
         if env.geom_type != 'Polygon':