1.1 --- a/django/contrib/gis/geos/prototypes/topology.py	Wed Mar 18 16:07:49 2009 -0500
     1.2 +++ b/django/contrib/gis/geos/prototypes/topology.py	Thu Mar 19 13:08:50 2009 -0500
     1.3 @@ -3,9 +3,9 @@
     1.4   topological operations on geometries.
     1.5  """
     1.6  __all__ = ['geos_boundary', 'geos_buffer', 'geos_centroid', 'geos_convexhull',
     1.7 -           'geos_difference', 'geos_envelope', 'geos_intersection',
     1.8 -           'geos_pointonsurface', 'geos_preservesimplify', 'geos_simplify',
     1.9 -           'geos_symdifference', 'geos_union', 'geos_relate']
    1.10 +           'geos_difference', 'geos_envelope', 'geos_intersection', 
    1.11 +           'geos_linemerge', 'geos_pointonsurface', 'geos_preservesimplify',
    1.12 +           'geos_simplify', 'geos_symdifference', 'geos_union', 'geos_relate']
    1.13  
    1.14  from ctypes import c_char_p, c_double, c_int
    1.15  from django.contrib.gis.geos.libgeos import lgeos, GEOM_PTR, GEOS_PREPARE
    1.16 @@ -28,6 +28,7 @@
    1.17  geos_difference = topology(lgeos.GEOSDifference, GEOM_PTR)
    1.18  geos_envelope = topology(lgeos.GEOSEnvelope)
    1.19  geos_intersection = topology(lgeos.GEOSIntersection, GEOM_PTR)
    1.20 +geos_linemerge = topology(lgeos.GEOSLineMerge)
    1.21  geos_pointonsurface = topology(lgeos.GEOSPointOnSurface)
    1.22  geos_preservesimplify = topology(lgeos.GEOSTopologyPreserveSimplify, c_double)
    1.23  geos_simplify = topology(lgeos.GEOSSimplify, c_double)