From 6f613cd245058308c6c7510f0d79692f83a568e0 Mon Sep 17 00:00:00 2001
From: Josue Kouka <jkouka@entrouvert.com>
Date: Thu, 15 Feb 2018 11:21:37 +0100
Subject: [PATCH] maps: add handling of marker behaviour on click (#21034)

---
 combo/apps/maps/migrations/0006_auto_20180215_1020.py | 19 +++++++++++++++++++
 combo/apps/maps/models.py                             | 10 +++++++++-
 combo/apps/maps/static/js/combo.map.js                | 18 ++++++++++++++++++
 combo/apps/maps/templates/maps/map_cell.html          |  1 +
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 combo/apps/maps/migrations/0006_auto_20180215_1020.py

diff --git a/combo/apps/maps/migrations/0006_auto_20180215_1020.py b/combo/apps/maps/migrations/0006_auto_20180215_1020.py
new file mode 100644
index 0000000..1a5ae46
--- /dev/null
+++ b/combo/apps/maps/migrations/0006_auto_20180215_1020.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maps', '0005_auto_20180212_1742'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='map',
+            name='marker_onclick_behaviour',
+            field=models.CharField(default=b'none', max_length=32, verbose_name='Marker behaviour on clik', choices=[(b'none', 'Nothing'), (b'display_data', 'Display data in popup')]),
+        ),
+    ]
diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index 3702341..082e8e0 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -67,6 +67,11 @@ ICONS = [
     ('wheelchair', _('Wheelchair')),
 ]
 
+MARKER_ONCLIK_BEHAVIOUR = [
+    ('none', _('Nothing')),
+    ('display_data', _('Display data in popup')),
+]
+
 ZOOM_LEVELS = [ ('0', _('Whole world')),
                 ('9', _('Wide area')),
                 ('11', _('Area')),
@@ -201,6 +206,8 @@ class Map(CellBase):
     max_zoom = models.CharField(_('Maximal zoom level'), max_length=2,
                                 choices=ZOOM_LEVELS, default=19)
     group_markers = models.BooleanField(_('Group markers in clusters'), default=False)
+    marker_onclick_behaviour = models.CharField(_('Marker behaviour on clik'), max_length=32,
+                                                default='none', choices=MARKER_ONCLIK_BEHAVIOUR)
     layers = models.ManyToManyField(MapLayer, verbose_name=_('Layers'), blank=True)
 
     template_name = 'maps/map_cell.html'
@@ -217,7 +224,7 @@ class Map(CellBase):
 
     def get_default_form_class(self):
         fields = ('title', 'initial_state', 'initial_zoom', 'min_zoom',
-                  'max_zoom', 'group_markers', 'layers')
+                  'max_zoom', 'group_markers', 'marker_onclick_behaviour', 'layers')
         widgets = {'layers': forms.widgets.CheckboxSelectMultiple}
         return forms.models.modelform_factory(self.__class__, fields=fields,
                                              widgets=widgets)
@@ -247,4 +254,5 @@ class Map(CellBase):
         ctx['map_attribution'] = settings.COMBO_MAP_ATTRIBUTION
         ctx['max_bounds'] = settings.COMBO_MAP_MAX_BOUNDS
         ctx['group_markers'] = self.group_markers
+        ctx['marker_onclick_behaviour'] = self.marker_onclick_behaviour
         return ctx
diff --git a/combo/apps/maps/static/js/combo.map.js b/combo/apps/maps/static/js/combo.map.js
index 31744c5..31209f6 100644
--- a/combo/apps/maps/static/js/combo.map.js
+++ b/combo/apps/maps/static/js/combo.map.js
@@ -12,6 +12,24 @@ $(function() {
               var geo_json = L.geoJson(data, {
                   onEachFeature: function(feature, layer) {
                       $(cell).trigger('combo:map-feature-prepare', {'feature': feature, 'layer': layer});
+                      var marker_onclick_behaviour = $map_widget.data('marker-onclick-behaviour');
+                      if (marker_onclick_behaviour === 'display_data') {
+                            var popup = '';
+                            if (feature.properties.display_fields) {
+                                $.each(feature.properties.display_fields, function(key, value) {
+                                    popup += '<p class="popup-field"><span class="field-value">' + escape(value[1]) + '</span>';
+                                });
+                            } else {
+                                var properties = feature.properties;
+                                $.each(Object.keys(properties).sort(), function(idx, key) {
+                                    // exclude object type properties
+                                    if (typeof(properties[key]) !== 'object') {
+                                        popup += '<p class="popup-field"><span class="field-value">' + escape(properties[key]) + '</span>' + '</p>';
+                                    }
+                                });
+                            }
+                            layer.bindPopup(popup);
+                      }
                   },
                   pointToLayer: function (feature, latlng) {
                       var markerStyles = "background-color: " + feature.properties.layer.colour + ";";
diff --git a/combo/apps/maps/templates/maps/map_cell.html b/combo/apps/maps/templates/maps/map_cell.html
index a37a2e9..06fb6a8 100644
--- a/combo/apps/maps/templates/maps/map_cell.html
+++ b/combo/apps/maps/templates/maps/map_cell.html
@@ -7,6 +7,7 @@
         data-init-lng="{{ init_lng }}" data-geojson-url="{{ geojson_url }}"
         data-tile-urltemplate="{{ tile_urltemplate}}" data-map-attribution="{{ map_attribution}}"
         {% if group_markers %}data-group-markers="1"{% endif %}
+        data-marker-onclick-behaviour="{{ cell.marker_onclick_behaviour }}"
         {% if max_bounds.corner1.lat %}
         data-max-bounds-lat1="{{ max_bounds.corner1.lat }}"
         data-max-bounds-lng1="{{ max_bounds.corner1.lng }}"
-- 
2.11.0