Clean-up use of delegated/impl in geometry/base.py

jorisvandenbossche · jorisvandenbossche · commit 69d2fe2c1183 · 2020-11-05T10:40:22.000+01:00
diff --git a/shapely/geometry/base.py b/shapely/geometry/base.py
@@ -23,7 +23,7 @@
 from shapely.errors import ShapelyDeprecationWarning
 from shapely.geos import WKBWriter, WKTWriter
 from shapely.geos import lgeos
-from shapely.impl import DefaultImplementation, delegated
+from shapely.impl import DefaultImplementation
 
 log = logging.getLogger(__name__)
 
@@ -356,7 +356,6 @@ def centroid(self):
         """Returns the geometric center of the object"""
         return pygeos.centroid(self)
 
-    @delegated
     def representative_point(self):
         """Returns a point guaranteed to be within the object, cheaply."""
         return pygeos.point_on_surface(self)
@@ -506,7 +505,6 @@ def buffer(self, distance, resolution=16, quadsegs=None,
             single_sided=single_sided
         )
 
-    @delegated
     def simplify(self, tolerance, preserve_topology=True):
         """Returns a simplified geometry produced by the Douglas-Peucker
         algorithm
@@ -657,22 +655,15 @@ def relate_pattern(self, other, pattern):
     # Linear referencing
     # ------------------
 
-    @delegated
     def project(self, other, normalized=False):
         """Returns the distance along this geometry to a point nearest the
         specified point
 
         If the normalized arg is True, return the distance normalized to the
         length of the linear geometry.
         """
-        if normalized:
-            op = self.impl['project_normalized']
-        else:
-            op = self.impl['project']
-        return op(self, other)
+        return pygeos.line_locate_point(self, other, normalized=normalized)
 
-    @delegated
-    @exceptNull
     def interpolate(self, distance, normalized=False):
         """Return a point at the specified distance along a linear geometry
 
diff --git a/tests/test_delegated.py b/tests/test_delegated.py
diff --git a/tests/test_geos_err_handler.py b/tests/test_geos_err_handler.py
@@ -28,6 +28,7 @@ def test_error_handler_exception(tmpdir):
     assert "Expected number but encountered word: 'LOLWUT'" in log
 
 
+@shapely20_todo  # logging is not yet implemented
 def test_error_handler(tmpdir):
     logger = logging.getLogger('shapely.geos')
     logfile = str(tmpdir.join('test_error.log'))
diff --git a/tests/test_linear_referencing.py b/tests/test_linear_referencing.py
@@ -2,6 +2,9 @@
 from shapely.geos import geos_version
 from shapely.geometry import Point, LineString, MultiLineString
 
+import pygeos
+import pytest
+
 
 class LinearReferencingTestCase(unittest.TestCase):
 
@@ -32,7 +35,7 @@ def test_multiline_project(self):
 
     @unittest.skipIf(geos_version < (3, 2, 0), 'GEOS 3.2.0 required')
     def test_not_supported_project(self):
-        with self.assertRaises(TypeError):
+        with pytest.raises(pygeos.GEOSException, match="IllegalArgumentException"):
             self.point.buffer(1.0).project(self.point)
 
     @unittest.skipIf(geos_version < (3, 2, 0), 'GEOS 3.2.0 required')
diff --git a/tests/test_operations.py b/tests/test_operations.py
@@ -88,12 +88,18 @@ def test_interpolate(self):
         known_point = Point(1,1.5)
         interpolated_point = test_line.interpolate(.5, normalized=True)
         self.assertEqual(interpolated_point, known_point)
-        
-        # Issue #653; should raise ValueError on exception
+
+        # Issue #653; should nog segfault for empty geometries
         empty_line = loads('LINESTRING EMPTY')
-        assert(empty_line.is_empty)
-        with pytest.raises(ValueError):
-            empty_line.interpolate(.5, normalized=True)
-        
+        assert empty_line.is_empty
+        interpolated_point = empty_line.interpolate(.5, normalized=True)
+        assert interpolated_point.is_empty
+
+        # invalid geometry should raise TypeError on exception
+        polygon = loads('POLYGON EMPTY')
+        with pytest.raises(TypeError, match="incorrect geometry type"):
+            polygon.interpolate(.5, normalized=True)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromTestCase(OperationsTestCase)
