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

Josué Kouka, 16 mai 2018 12:06

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

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

 .../maps/migrations/0006_auto_20180215_1020.py     | 19 ++++++++++++
 combo/apps/maps/models.py                          | 36 +++++++++++++++++++++-
 combo/apps/maps/static/js/combo.map.js             | 19 ++++++++++++
 combo/apps/maps/templates/maps/map_cell.html       |  1 +
 combo/apps/maps/views.py                           |  2 +-
 tests/test_maps_cells.py                           | 23 +++++++++++++-
 6 files changed, 97 insertions(+), 3 deletions(-)
 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 clik', choices=[(b'none', 'Nothing'), (b'display_data', 'Display data in popup')]),
             ),
+        ]

     from django.core import serializers
     from django.db import models
     from django.utils.html import escape
     from django.utils.text import slugify
     from django.utils.translation import ugettext_lazy as _
     from django.core.urlresolvers import reverse_lazy
-...
         ('wheelchair', _('Wheelchair')),
+    ]
     MARKER_ONCLIK_BEHAVIOUR = [
         ('none', _('Nothing')),
         ('display_data', _('Display data in popup')),
+    ]
     ZOOM_LEVELS = [ ('0', _('Whole world')),
                     ('9', _('Wide area')),
                     ('11', _('Area')),
-...
                     ('19', _('Ant')),]
     def escape_properties(properties):
         if isinstance(properties, (list,)):
             escaped = []
             for prop in properties:
                 if isinstance(prop, (list,)):
                     prop = escape_properties(prop)
                     escaped.append(prop)
                 else:
                     escaped.append(escape(prop))
         else:
             escaped = {}
             for key, value in properties.iteritems():
                 if isinstance(value, (dict,)):
                     value = escape_properties(value)
                 escaped[escape(key)] = escape(value)
         return escaped
     class MapLayerManager(models.Manager):
         def get_by_natural_key(self, slug):
             return self.get(slug=slug)
-...
                 features = [x for x in features if match(x)]
             for feature in features:
                 properties = feature.get('properties', {})
                 display_fields = properties.get('display_fields')
                 if display_fields:
                     feature['properties']['display_fields'] = escape_properties(display_fields)
                 else:
                     feature['properties'] = escape_properties(properties)
                 feature['properties']['layer'] = {
                     'colour': self.marker_colour,
                     'icon_colour': self.icon_colour,
-...
         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'
-...
         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

     $(function() {
         L.Map.include(
+          {
             add_geojson_layer: function(callback) {
-...
                   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 {
                                     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">' + properties[key] + '</span>' + '</p>';
+                                        }
                                     });
+                                }
                                 layer.bindPopup(popup);
+                          }
                       },
                       pointToLayer: function (feature, latlng) {
                           var markerStyles = "background-color: " + feature.properties.layer.colour + ";";

combo/apps/maps/templates/maps/map_cell.html
7	7	data-init-lng="{{ init_lng }}" data-geojson-url="{{ geojson_url }}"
8	8	data-tile-urltemplate="{{ tile_urltemplate}}" data-map-attribution="{{ map_attribution}}"
9	9	{% if group_markers %}data-group-markers="1"{% endif %}
	10	data-marker-onclick-behaviour="{{ cell.marker_onclick_behaviour }}"
10	11	{% if max_bounds.corner1.lat %}
11	12	data-max-bounds-lat1="{{ max_bounds.corner1.lat }}"
12	13	data-max-bounds-lng1="{{ max_bounds.corner1.lng }}"

     import json
     from django.views.generic.base import View
     from django.http import HttpResponse, Http404, HttpResponseForbidden
     from django.views.generic.base import View
     from .models import Map

     from django.test import Client
     from django.core.urlresolvers import reverse
     from django.contrib.auth.models import Group
     from django.utils.html import escape
     from combo.data.models import Page
     from combo.apps.maps.models import MapLayer, Map
     from combo.apps.maps.models import MapLayer, Map, escape_properties
     pytestmark = pytest.mark.django_db
-...
             assert len(json.loads(resp.content)['features']) == 1
             assert 'orig=combo' in requests_get.call_args[0][1]
             assert not 'email=admin%40localhost&' in requests_get.call_args[0][1]
     def test_feature_properties_escaping():
         list_properties = [
             ['code', '<script>alert("hello")</script>'],
             ['category', 'potholes'],
+        ]
         escaped_list_properties = escape_properties(list_properties)
         assert escaped_list_properties[0][0] == 'code'
         assert escaped_list_properties[0][1] == escape(list_properties[0][1])
         assert escaped_list_properties[1][0] == 'category'
         assert escaped_list_properties[1][1] == 'potholes'
         dict_properties = {
             'code': '<script>alert("hello")</script>',
             'category': 'potholes'
+        }
         escaped_dict_properties = escape_properties(dict_properties)
         for key, value in escaped_dict_properties.items():
             assert key in ('code', 'category')
             assert value in (escape(dict_properties['code']), 'potholes')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

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