Ticket #11948: 08_contrib-gis-linearref.patch

django/contrib/gis/geos/geometry.py

@@ -667 +667 @@
         "Clones this Geometry."
         return GEOSGeometry(capi.geom_clone(self.ptr), srid=self.srid)
 
+    def project(self, point):
+        if not isinstance(point, Point):
+            raise TypeError('locate_point argument must be a Point')
+        if not isinstance(self, (LineString, MultiLineString)):
+            raise TypeError('locate_point only works on LineString and MultiLineString geometries')
+        return capi.geos_project(self.ptr, point.ptr)
+
+
+    def interpolate(self, distance):
+        if not isinstance(self, (LineString, MultiLineString)):
+            raise TypeError('interpolate only works on LineString and MultiLineString geometries')
+        return self._topology(capi.geos_interpolate(self.ptr, distance))
+
+    def project_normalized(self, point):
+        if not isinstance(point, Point):
+            raise TypeError('locate_point argument must be a Point')
+        if not isinstance(self, (LineString, MultiLineString)):
+            raise TypeError('locate_point only works on LineString and MultiLineString geometries')
+        return capi.geos_project_normalized(self.ptr, point.ptr)
+
+
+    def interpolate_normalized(self, distance):
+        if not isinstance(self, (LineString, MultiLineString)):
+            raise TypeError('interpolate only works on LineString and MultiLineString geometries')
+        return self._topology(capi.geos_interpolate_normalized(self.ptr, distance))
+
+
 # Class mapping dictionary.  Has to be at the end to avoid import
 # conflicts with GEOSGeometry.
 from django.contrib.gis.geos.linestring import LineString, LinearRing

django/contrib/gis/geos/prototypes/geom.py

@@ -1 @@
-from ctypes import c_char_p, c_int, c_size_t, c_ubyte, c_uint, POINTER
-from django.contrib.gis.geos.libgeos import CS_PTR, GEOM_PTR, PREPGEOM_PTR, GEOS_PREPARE
+from ctypes import c_char_p, c_int, c_double, c_size_t, c_ubyte, c_uint, POINTER
+from django.contrib.gis.geos.libgeos import geos_version_info, CS_PTR, GEOM_PTR, PREPGEOM_PTR, GEOS_PREPARE
 from django.contrib.gis.geos.prototypes.errcheck import \
     check_geom, check_minus_one, check_sized_string, check_string, check_zero
 from django.contrib.gis.geos.prototypes.threadsafe import GEOSFunc
@@ -117 +117 @@
 geos_set_srid = GEOSFunc('GEOSSetSRID')
 geos_set_srid.argtypes = [GEOM_PTR, c_int]
 geos_set_srid.restype = None
+
+# Linear referencing routines
+
+info = geos_version_info()
+if info['version'] >= '3.2.0':
+    geos_project = GEOSFunc('GEOSProject')
+    geos_project.argtypes = [GEOM_PTR, GEOM_PTR]
+    geos_project.restype = c_double
+    geos_interpolate = geom_output(GEOSFunc('GEOSInterpolate'), [GEOM_PTR, c_double])
+
+    geos_project_normalized = GEOSFunc('GEOSProjectNormalized')
+    geos_project_normalized.argtypes = [GEOM_PTR, GEOM_PTR]
+    geos_project_normalized.restype = c_double
+    geos_interpolate_normalized = geom_output(GEOSFunc('GEOSInterpolateNormalized'), [GEOM_PTR, c_double])

django/contrib/gis/geos/prototypes/__init__.py

@@ -13 +13 @@
 from django.contrib.gis.geos.prototypes.geom import from_hex, from_wkb, from_wkt, \
     create_point, create_linestring, create_linearring, create_polygon, create_collection, \
     destroy_geom, get_extring, get_intring, get_nrings, get_geomn, geom_clone, \
-    geos_normalize, geos_type, geos_typeid, geos_get_srid, geos_set_srid, \
-    get_dims, get_num_coords, get_num_geoms, \
-    to_hex, to_wkb, to_wkt
+    geos_normalize, geos_interpolate, geos_interpolate_normalized, geos_project, \
+    geos_project_normalized, geos_type, geos_typeid, geos_get_srid, geos_set_srid, \
+    get_dims, get_num_coords, get_num_geoms, to_hex, to_wkb, to_wkt
 
 # Miscellaneous routines.
 from django.contrib.gis.geos.prototypes.misc import *

django/contrib/gis/geos/tests/test_geos.py

@@ -1046 +1046 @@
 
         print "\nEND - expecting GEOS_NOTICE; safe to ignore.\n"
 
+    def test28_linearref(self):
+        "Testing linear referencing"
+
+        info = geos_version_info()
+        if info['version'] < '3.2.0':
+            return #no linear referencing yet
+            
+        ls = fromstr('LINESTRING(0 0, 0 10, 10 10, 10 0)')
+        mls = fromstr('MULTILINESTRING((0 0, 0 10), (10 0, 10 10))')
+
+        self.assertEqual(ls.project(Point(0, 20)), 10.0)
+        self.assertEqual(ls.project(Point(7, 6)), 24)
+
+        self.assertEqual(ls.interpolate(10), Point(0, 10))
+        self.assertEqual(ls.interpolate(24), Point(10, 6))
+
+        self.assertEqual(mls.project(Point(0, 20)), 10)
+        self.assertEqual(mls.project(Point(7, 6)), 16)
+
+        self.assertEqual(mls.interpolate(9), Point(0, 9)) 
+        self.assertEqual(mls.interpolate(17), Point(10, 7))
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(GEOSTest))