shapely 1.2b2__tar.gz → 1.2b4__tar.gz

{Shapely-1.2b2 → Shapely-1.2b4}/CHANGES.txt

@@ -1,5 +1,9 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.2b3 (2010-02-28)
+------------------
+- Only provide simplification implementations for GEOS C API >= 1.5.
+
 1.2b2 (2010-02-19)
 ------------------
 - Fix cascaded_union bug introduced in 1.2b1 (#212).

{Shapely-1.2b2 → Shapely-1.2b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b2
+Version: 1.2b4
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -124,14 +124,20 @@ Description:
         
         Shapely is written by:
         
-        * Sean Gillies (Pleiades)
+        * Sean Gillies
         * Aron Bierbaum
-        * Howard Butler (Hobu, Inc.)
-        * Kai Lautaportti (Hexagon IT)
-        * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
-        * Eric Lemoine (Camptocamp SA)
+        * Kai Lautaportti
         
-        with additional help from:
+        Patches contributed by:
+        
+        * Howard Butler
+        * Fr |eaigue| d |eaigue| ric Junod
+        * Eric Lemoine
+        * Jonathan Tartley
+        * Kristian Thy
+        * Oliver Tonnhofer
+        
+        Additional help from:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)

{Shapely-1.2b2 → Shapely-1.2b4}/README.txt

@@ -116,14 +116,20 @@ Credits
 
 Shapely is written by:
 
-* Sean Gillies (Pleiades)
+* Sean Gillies
 * Aron Bierbaum
-* Howard Butler (Hobu, Inc.)
-* Kai Lautaportti (Hexagon IT)
-* Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
-* Eric Lemoine (Camptocamp SA)
+* Kai Lautaportti
 
-with additional help from:
+Patches contributed by:
+
+* Howard Butler
+* Fr |eaigue| d |eaigue| ric Junod
+* Eric Lemoine
+* Jonathan Tartley
+* Kristian Thy
+* Oliver Tonnhofer
+
+Additional help from:
 
 * Justin Bronn (GeoDjango) for ctypes inspiration
 * Martin Davis (JTS)

{Shapely-1.2b2 → Shapely-1.2b4}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b2
+Version: 1.2b4
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -124,14 +124,20 @@ Description:
         
         Shapely is written by:
         
-        * Sean Gillies (Pleiades)
+        * Sean Gillies
         * Aron Bierbaum
-        * Howard Butler (Hobu, Inc.)
-        * Kai Lautaportti (Hexagon IT)
-        * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
-        * Eric Lemoine (Camptocamp SA)
+        * Kai Lautaportti
         
-        with additional help from:
+        Patches contributed by:
+        
+        * Howard Butler
+        * Fr |eaigue| d |eaigue| ric Junod
+        * Eric Lemoine
+        * Jonathan Tartley
+        * Kristian Thy
+        * Oliver Tonnhofer
+        
+        Additional help from:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)

{Shapely-1.2b2 → Shapely-1.2b4}/setup.py

@@ -4,7 +4,9 @@ try:
     from distribute_setup import use_setuptools
     use_setuptools()
 except:
-    warnings.warn("Failed to import distribute_setup", ImportWarning)
+    warnings.warn(
+    "Failed to import distribute_setup, continuing without distribute.", 
+    Warning)
 
 from setuptools import setup, find_packages
 import sys
@@ -14,7 +16,7 @@ readme_text = file('README.txt', 'rb').read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2b2',
+    version             = '1.2b4',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Planar geometries, predicates, and operations',

{Shapely-1.2b2 → Shapely-1.2b4}/shapely/geos.py

@@ -22,21 +22,15 @@ class NullHandler(logging.Handler):
 LOG = logging.getLogger(__name__)
 LOG.addHandler(NullHandler())
 
-# Find and load the GEOS library
-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")
-    except (ImportError, WindowsError):
-        raise
-    def free(m):
-        try:
-            cdll.msvcrt.free(m)
-        except WindowsError:
-            # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
-            pass
+# Find and load the GEOS and C libraries
+# If this ever gets any longer, we'll break it into separate modules
+
+if sys.platform == 'linux2':
+    _lgeos = CDLL(find_library('geos_c'))
+    free = CDLL(find_library('c')).free
+    free.argtypes = [c_void_p]
+    free.restype = None
+
 elif sys.platform == 'darwin':
     lib = find_library('geos_c')
     if lib is None:
@@ -54,10 +48,39 @@ elif sys.platform == 'darwin':
     if lib is None:
         raise ImportError("Could not find geos_c library")
     _lgeos = CDLL(lib)
-    free = CDLL(find_library('libc')).free
+    free = CDLL(find_library('c')).free
     free.argtypes = [c_void_p]
     free.restype = None
-else:
+
+elif 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")
+    except (ImportError, WindowsError):
+        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 == 'sunos5':
+    # Try the major versioned name first, falling back on the unversioned
+    # name.
+    try:
+        _lgeos = CDLL('libgeos_c.so.1')
+    except (OSError, ImportError):
+        _lgeos = CDLL('libgeos_c.so')
+    except:
+        raise
+    free = CDLL('libc.so.1').free
+    free.argtypes = [c_void_p]
+    free.restype = None
+
+else: # other *nix systems
     # Try the major versioned name first, falling back on the unversioned
     # name.
     try:
@@ -344,5 +367,6 @@ elif geos_c_version >= (1, 5, 0):
         L = LGEOS15
 else:
         L = LGEOS14
+
 lgeos = L(_lgeos)
 

{Shapely-1.2b2 → Shapely-1.2b4}/shapely/impl.py

@@ -44,13 +44,12 @@ IMPL14 = {
     'touches': (BinaryPredicate, 'touches'),
     'within': (BinaryPredicate, 'within'),
     'equals_exact': (BinaryPredicate, 'equals_exact'),
-    'simplify': (UnaryTopologicalOp, 'simplify'),
-    'topology_preserve_simplify': 
-        (UnaryTopologicalOp, 'topology_preserve_simplify'),
-
     }
 
 IMPL15 = {
+    'simplify': (UnaryTopologicalOp, 'simplify'),
+    'topology_preserve_simplify': 
+        (UnaryTopologicalOp, 'topology_preserve_simplify'),
     'prepared_intersects': (BinaryPredicate, 'prepared_intersects'),
     'prepared_contains': (BinaryPredicate, 'prepared_contains'),
     'prepared_contains_properly':