0001-maps-display-marker-data-in-popup-21034.patch

Josué Kouka, 15 février 2018 10:49

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

Subject: [PATCH] maps: display marker data in popup (#21034)

 .../maps/migrations/0005_auto_20180214_1544.py     | 19 +++++++++++++++++++
 combo/apps/maps/models.py                          | 10 +++++++++-
 combo/apps/maps/static/js/combo.map.js             | 22 ++++++++++++++++++++++
 combo/apps/maps/templates/maps/map_cell.html       |  1 +
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 combo/apps/maps/migrations/0005_auto_20180214_1544.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('maps', '0004_map_initial_state'),
+        ]
         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')]),
             ),
+        ]

         ('wheelchair', _('Wheelchair')),
+    ]
     MARKER_ONCLIK_BEHAVIOUR = [
         ('none', _('Nothing')),
         ('display_data', _('Display data in popup')),
+    ]
     ZOOM_LEVELS = [ ('0', _('Whole world')),
                     ('9', _('Wide area')),
                     ('11', _('Area')),
-...
                                        choices=ZOOM_LEVELS, default='0')
         max_zoom = models.CharField(_('Maximal zoom level'), max_length=2,
                                     choices=ZOOM_LEVELS, default=19)
         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'
-...
         def get_default_form_class(self):
             fields = ('title', 'initial_state', 'initial_zoom', 'min_zoom',
                       'max_zoom', 'layers')
                       'max_zoom', 'marker_onclick_behaviour', 'layers')
             widgets = {'layers': forms.widgets.CheckboxSelectMultiple}
             return forms.models.modelform_factory(self.__class__, fields=fields,
                                                  widgets=widgets)
-...
             ctx['tile_urltemplate'] = settings.COMBO_MAP_TILE_URLTEMPLATE
             ctx['map_attribution'] = settings.COMBO_MAP_ATTRIBUTION
             ctx['max_bounds'] = settings.COMBO_MAP_MAX_BOUNDS
             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 = '';
                                 if (feature.properties.display_fields) {
                                     $.each(feature.properties.display_fields, function(key, value) {
                                         popup += '<p class="popup-field"><span class="field-value">' + value[1] + '</span>';
                                     });
                                 } else {
                                     // sort object properties
                                     let properties = Object.keys(feature.properties).sort().reduce(function(new_prop, key){
                                         new_prop[key] = feature.properties[key];
                                         return new_prop;
                                     }, {});
                                     $.each(properties, function(key, value){
                                         // exclude object type properties
                                         if (typeof(value) !== 'object'){
                                             popup += '<p class="popup-field"><span class="field-value">' + value + '</span>' + '</p>';
+                                        }
                                     });
+                                }
                                 layer.bindPopup(popup);
+                          }
                       },
                       pointToLayer: function (feature, latlng) {
                           var markerStyles = "background-color: " + feature.properties.layer.colour + ";";

             data-max-zoom="{{ max_zoom }}" data-init-lat="{{ init_lat }}"
             data-init-lng="{{ init_lng }}" data-geojson-url="{{ geojson_url }}"
             data-tile-urltemplate="{{ tile_urltemplate}}" data-map-attribution="{{ map_attribution}}"
             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-display-marker-data-in-popup-21034.patch