summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-17 12:39:00 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-17 12:39:00 +0100
commitecf150601c6f63c3faa3d9736fd8a64096eaf71b (patch)
treeea8f974d8354dbe93363e7c1dc9cdd6c3ffd3823
parent3b8df33035c6a28aa05d665a49190e511a8b0ee2 (diff)
downloadChimère-ecf150601c6f63c3faa3d9736fd8a64096eaf71b.tar.bz2
Chimère-ecf150601c6f63c3faa3d9736fd8a64096eaf71b.zip
Fix area edition
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js2
-rw-r--r--chimere/widgets.py9
2 files changed, 7 insertions, 4 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 8f89e48..6dbe811 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -381,11 +381,9 @@ function transformCoordToLonLat(coord) {
settings.map_layers[settings.selected_map_layer]);
*/
-
settings.layerSwitcher = new ol.control.LayerSwitcher();
settings.map.addControl(settings.layerSwitcher);
-
/* marker layer */
settings.iconStyles = new Object();
settings.dbFeatures = new ol.Collection();
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 3fb23e2..f55552f 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -49,7 +49,7 @@ BASE_JS = tuple(
AREA_JS = tuple(
["{}ol3/ol.js".format(settings.STATIC_URL)] +
- ["{}chimere/js/edit_area.js".format(settings.STATIC_URL) +
+ ["{}chimere/js/edit_area.js".format(settings.STATIC_URL),
"{}chimere/js/base.js".format(settings.STATIC_URL)])
@@ -451,7 +451,7 @@ class HiddenPointChooserWidget(PointChooserWidget):
return super(HiddenPointChooserWidget, self).render(*args, **kwargs)
-class PointField(models.PointField):
+class PointField(models.PointField, forms.Field):
'''
Set the widget for the form field
'''
@@ -611,6 +611,11 @@ class AreaWidget(forms.TextInput):
values.append(value)
return values
+ def decompress(self, value):
+ if value:
+ return value
+ return [None, None]
+
class PolygonChooserWidget(forms.TextInput):
"""