0001-maps-add-handling-of-marker-behaviour-on-click-21034.patch

Josué Kouka, 08 juin 2018 15:10

Voir les différences: en ligne côte à côte

Subject: [PATCH] maps: add handling of marker behaviour on click (#21034)

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

     # -*- 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 click', choices=[(b'none', 'Nothing'), (b'display_data', 'Display data in popup')]),
             ),
+        ]

         ('wheelchair', _('Wheelchair')),
+    ]
     MARKER_ONCLIK_BEHAVIOUR = [
         ('none', _('Nothing')),
         ('display_data', _('Display data in popup')),
+    ]
     ZOOM_LEVELS = [ ('0', _('Whole world')),
                     ('9', _('Wide area')),
                     ('11', _('Area')),
-...
         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 click'), max_length=32,
                                                     default='none', choices=MARKER_ONCLIK_BEHAVIOUR)
         layers = models.ManyToManyField(MapLayer, verbose_name=_('Layers'), blank=True)
         template_name = 'maps/map_cell.html'
-...
         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)
-...
             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

                   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 = '';
                                 $popup_field = $('<div><p class="popup-field"><span class="field-value"></span></p></div>');
                                 if (feature.properties.display_fields) {
                                     $.each(feature.properties.display_fields, function(idx, field) {
                                         if (field.html_value){
                                             $popup_field.find('.field-value').html(field.html_value);
                                         } else {
                                             $popup_field.find('.field-value').text(field.value);
+                                        }
                                         popup += $popup_field.html();
                                     });
                                 } else {
                                     var properties = feature.properties;
                                     $.each(Object.keys(properties).sort(), function(idx, field) {
                                         // exclude object type properties
                                         if (typeof(properties[field]) !== 'object') {
                                             $popup_field.find('.field-value').text(properties[field]);
                                             popup += $popup_field.html()
+                                        }
                                     });
+                                }
                                 layer.bindPopup(popup);
+                          }
                       },
                       pointToLayer: function (feature, latlng) {
                           var markerStyles = "background-color: " + feature.properties.layer.colour + ";";

             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 }}"
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-maps-add-handling-of-marker-behaviour-on-click-21034.patch