Ticket #10222: linemerge.patch

django/contrib/gis/geos/base.py

@@ -551 +551 @@
         "Returns a Geometry representing all the points in this Geometry and other."
         return self._topology(geos_union(self.ptr, other.ptr))
 
+    def line_merge(self):
+        """
+        Returns a Geometry representing the line merge of a geometry collection
+        or multi-linestring geometry.
+        """
+        return self._topology(geos_linemerge(self.ptr))
+
     #### Other Routines ####
     @property
     def area(self):

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

@@ -28 +28 @@
 geos_simplify = topology(lgeos.GEOSSimplify, c_double)
 geos_symdifference = topology(lgeos.GEOSSymDifference, GEOM_PTR)
 geos_union = topology(lgeos.GEOSUnion, GEOM_PTR)
+geos_linemerge = topology(lgeos.GEOSLineMerge)
 
 # GEOSRelate returns a string, not a geometry.
 geos_relate = lgeos.GEOSRelate

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

@@ -30 +30 @@
 from django.contrib.gis.geos.prototypes.topology import \
     geos_boundary, geos_buffer, geos_centroid, geos_convexhull, geos_difference, \
     geos_envelope, geos_intersection, geos_pointonsurface, geos_preservesimplify, \
-    geos_simplify, geos_symdifference, geos_union, geos_relate
+    geos_simplify, geos_symdifference, geos_union, geos_relate, geos_linemerge

django/contrib/gis/tests/test_geos.py

@@ -767 +767 @@
                 self.assertEqual(geom, tmpg)
                 if not no_srid: self.assertEqual(geom.srid, tmpg.srid)
 
+    def test26_line_merge(self):
+        "Testing line merge support"
+        pre_merge = fromstr(line_merge_geoms[0].wkt)
+        post_merge = fromstr(line_merge_geoms[1].wkt)
+        self.assertEqual(pre_merge.line_merge().wkt, post_merge.wkt)
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(GEOSTest))

django/contrib/gis/tests/geometries.py

@@ -151 +151 @@
                   2.0, 8),
                  )
 
+line_merge_geoms = (TestGeom('MULTILINESTRING((1 1, 3 3), (3 3, 4 2))'),
+                    TestGeom('LINESTRING (1.0000000000000000 1.0000000000000000, 3.0000000000000000 3.0000000000000000, 4.0000000000000000 2.0000000000000000)'))
+
 json_geoms = (TestGeom('POINT(100 0)', json='{ "type": "Point", "coordinates": [ 100.000000, 0.000000 ] }'),
               TestGeom('POLYGON((0 0, -10 0, -10 -10, 0 -10, 0 0))', json='{ "type": "Polygon", "coordinates": [ [ [ 0.000000, 0.000000 ], [ -10.000000, 0.000000 ], [ -10.000000, -10.000000 ], [ 0.000000, -10.000000 ], [ 0.000000, 0.000000 ] ] ] }'),
               TestGeom('MULTIPOLYGON(((102 2, 103 2, 103 3, 102 3, 102 2)), ((100.0 0.0, 101.0 0.0, 101.0 1.0, 100.0 1.0, 100.0 0.0), (100.2 0.2, 100.8 0.2, 100.8 0.8, 100.2 0.8, 100.2 0.2)))', json='{ "type": "MultiPolygon", "coordinates": [ [ [ [ 102.000000, 2.000000 ], [ 103.000000, 2.000000 ], [ 103.000000, 3.000000 ], [ 102.000000, 3.000000 ], [ 102.000000, 2.000000 ] ] ], [ [ [ 100.000000, 0.000000 ], [ 101.000000, 0.000000 ], [ 101.000000, 1.000000 ], [ 100.000000, 1.000000 ], [ 100.000000, 0.000000 ] ], [ [ 100.200000, 0.200000 ], [ 100.800000, 0.200000 ], [ 100.800000, 0.800000 ], [ 100.200000, 0.800000 ], [ 100.200000, 0.200000 ] ] ] ] }'),