Merge remote-tracking branch 'origin/master'

CHANGES

@@ -5,7 +5,7 @@ CHANGELOG
 0.13.6 (unreleased)
 -------------------
 
-- Nothing changed yet.
+* Django Leaflet forms fiels without libgeos installed (thanks Florent Lebreton)
 
 
 0.13.5 (2014-06-18)

leaflet/admin.py

@@ -9,10 +9,10 @@
     GeoJSONField = type(object)
 try:
     from django.contrib.gis.db.models import GeometryField
-    from .forms.widgets import LeafletWidget
 except ImportError:
     GeometryField = type(object)
-    from django.forms.widgets import Textarea as LeafletWidget
+
+from .forms.widgets import LeafletWidget
 
 
 class LeafletGeoAdmin(ModelAdmin):

leaflet/forms/backport.py

@@ -34,7 +34,6 @@
 
 from django.conf import settings
 from django.contrib.gis import gdal
-from django.contrib.gis.geos import GEOSGeometry, GEOSException
 from django.forms.widgets import Widget
 from django.template import loader
 from django.utils import six
@@ -43,6 +42,16 @@
 from django.utils.translation import ugettext_lazy as _
 from django.core import validators
 
+try:
+    from django.contrib.gis.geos import GEOSGeometry
+except ImportError:
+    from .nogeos import GEOSGeometry
+
+try:
+    from django.contrib.gis.geos import GEOSException
+except ImportError:
+    from .nogeos import GEOSException
+
 logger = logging.getLogger('django.contrib.gis')
 
 

leaflet/forms/nogeos.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+
+class GEOSGeometry(object):
+    """
+    A simple mock of django.contrib.gis.geos.GEOSGeometry to make
+    django-leaflet work with only django-geojson (without libgeos)
+    """
+    def __init__(self, geo_input, srid=None):
+        self.srid = srid
+        self.geojson = geo_input
+        return
+
+
+class GEOSException(Exception):
+    pass