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

Josué Kouka, 14 février 2018 11:55

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

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

 .../maps/migrations/0005_auto_20180213_1611.py     | 24 ++++++++++++++++++++++
 combo/apps/maps/models.py                          |  4 +++-
 combo/apps/maps/static/js/combo.map.js             | 17 +++++++++++++++
 combo/apps/maps/templates/maps/map_cell.html       |  3 +++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 combo/apps/maps/migrations/0005_auto_20180213_1611.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='display_marker_data',
                 field=models.BooleanField(default=False, verbose_name='Display marker data'),
             ),
             migrations.AlterField(
                 model_name='maplayer',
                 name='icon',
                 field=models.CharField(blank=True, max_length=32, null=True, verbose_name='Marker icon', choices=[(b'ambulance', 'Ambulance'), (b'asterisk', 'Asterisk'), (b'bell', 'Bell'), (b'bicycle', 'Bicycle'), (b'book', 'Book'), (b'broken_chain', 'Broken chain'), (b'building', 'Building'), (b'bus', 'Bus'), (b'car', 'Car'), (b'checkmark', 'Checkmark'), (b'cube', 'Cube'), (b'drop', 'Drop'), (b'eye', 'Eye'), (b'flag', 'Flag'), (b'gavel', 'Gavel'), (b'hospital', 'Hospital'), (b'house', 'House'), (b'lightbulb', 'Lightbulb'), (b'map_signs', 'Map signs'), (b'motorcycle', 'Motorcycle'), (b'paint_brush', 'Paint brush'), (b'paw', 'Paw'), (b'recycle', 'Recycle'), (b'road', 'Road'), (b'shower', 'Shower'), (b'star', 'Star'), (b'subway', 'Subway'), (b'taxi', 'Taxi'), (b'train', 'Train'), (b'trash', 'Trash'), (b'tree', 'Tree'), (b'truck', 'Truck'), (b'university', 'University'), (b'warning', 'Warning'), (b'wheelchair', 'Wheelchair')]),
             ),
+        ]

                                        choices=ZOOM_LEVELS, default='0')
         max_zoom = models.CharField(_('Maximal zoom level'), max_length=2,
                                     choices=ZOOM_LEVELS, default=19)
         display_marker_data = models.BooleanField(default=False, verbose_name=_('Display marker data'))
         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', 'display_marker_data', '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['display_marker_data'] = self.display_marker_data
             return ctx

                   var geo_json = L.geoJson(data, {
                       onEachFeature: function(feature, layer) {
                           $(cell).trigger('combo:map-feature-prepare', {'feature': feature, 'layer': layer});
                           var display_marker_data = $map_widget.data('display-marker-properties');
                           if (display_marker_data){
                                 var popup = '';
                                 if (feature.properties.display_fields) {
                                     $.each(feature.properties.display_fields, function(key, value) {
                                         popup += '<p class="popup-field"><span class="field-label">' + value[1] + '</span>';
                                     });
                                 } else {
                                     $.each(feature.properties, function(key, value){
                                         // exclude object type properties
                                         if (typeof(value) !== 'object'){
                                             popup += '<p class="popup-field"><span class="field-label">' + 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}}"
             {% if cell.display_marker_data %}
             data-display-marker-properties="{{ cell.display_marker_data }}"
             {% endif %}
             {% 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