0001-maps-move-properties-from-layer-to-cell-57760.patch

Valentin Deniaud, 09 novembre 2021 17:32

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

Subject: [PATCH 1/2] maps: move properties from layer to cell (#57760)

 combo/apps/maps/forms.py                      |  4 +--
 .../migrations/0017_auto_20211104_1559.py     | 23 ++++++++++++++++
 .../migrations/0018_auto_20211104_1559.py     | 25 ++++++++++++++++++
 .../migrations/0019_auto_20211104_1603.py     | 17 ++++++++++++
 combo/apps/maps/models.py                     | 26 +++++++++++--------
 .../maps/templates/maps/map_cell_form.html    |  2 --
 combo/apps/maps/views.py                      |  3 ++-
 tests/test_maps_cells.py                      | 11 +++++---
 tests/test_maps_manager.py                    | 18 ++++++++++---
 9 files changed, 106 insertions(+), 23 deletions(-)
 create mode 100644 combo/apps/maps/migrations/0017_auto_20211104_1559.py
 create mode 100644 combo/apps/maps/migrations/0018_auto_20211104_1559.py
 create mode 100644 combo/apps/maps/migrations/0019_auto_20211104_1603.py

                     'icon_colour',
                     'cache_duration',
                     'include_user_identifier',
                     'properties',
                     'geojson_query_parameter',
                     'geojson_accepts_circle_param',
+                ]
-...
     class MapLayerOptionsForm(forms.ModelForm):
         class Meta:
             model = MapLayerOptions
             fields = ['map_layer', 'opacity']
             fields = ['map_layer', 'opacity', 'properties']
             widgets = {'opacity': forms.NumberInput(attrs={'step': 0.1, 'min': 0, 'max': 1})}
         def __init__(self, *args, **kwargs):
-...
             else:
                 self.fields['opacity'].required = True
                 self.fields['opacity'].initial = 1
                 del self.fields['properties']

     # Generated by Django 2.2.19 on 2021-11-04 14:59
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('maps', '0016_auto_20210927_1945'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='maplayeroptions',
                 name='properties',
                 field=models.CharField(
                     blank=True,
                     help_text='List of properties to include, separated by commas',
                     max_length=500,
                     verbose_name='Properties',
                 ),
             ),
+        ]

     # Generated by Django 2.2.19 on 2021-11-04 14:59
     from django.db import migrations
     def populate_cell_properties(apps, schema_editor):
         Map = apps.get_model('maps', 'Map')
         MapLayerOptions = apps.get_model('maps', 'MapLayerOptions')
         for cell in Map.objects.all():
             for layer in cell.layers.all():
                 MapLayerOptions.objects.update_or_create(
                     map_cell=cell, map_layer=layer, defaults={'properties': layer.properties}
+                )
     class Migration(migrations.Migration):
         dependencies = [
             ('maps', '0017_auto_20211104_1559'),
+        ]
         operations = [
             migrations.RunPython(populate_cell_properties, migrations.RunPython.noop),
+        ]

     # Generated by Django 2.2.19 on 2021-11-04 15:03
     from django.db import migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('maps', '0018_auto_20211104_1559'),
+        ]
         operations = [
             migrations.RemoveField(
                 model_name='maplayer',
                 name='properties',
             ),
+        ]

     from django.conf import settings
     from django.core import serializers, validators
     from django.db import models
     from django.db.models import OuterRef, Subquery
     from django.urls import reverse
     from django.utils.encoding import python_2_unicode_compatible
     from django.utils.html import escape
-...
         icon_colour = models.CharField(_('Icon colour'), max_length=7, default='#000000')
         cache_duration = models.PositiveIntegerField(_('Cache duration'), default=60, help_text=_('In seconds.'))
         include_user_identifier = models.BooleanField(_('Include user identifier in request'), default=True)
         properties = models.CharField(
             _('Properties'),
             max_length=500,
             blank=True,
             help_text=_('List of properties to include, separated by commas'),
+        )
         geojson_query_parameter = models.CharField(
             _("Query parameter for fulltext requests"),
             max_length=100,
-...
             layer = next(serializers.deserialize('json', json.dumps([json_layer]), ignorenonexistent=True))
             layer.save()
         def get_geojson(self, request):
         def get_geojson(self, request, properties=''):
             geojson_url = get_templated_url(self.geojson_url)
             query_parameter = self.geojson_query_parameter
-...
             else:
                 features = data
             properties = []
             if self.properties:
                 properties = [x.strip() for x in self.properties.split(',')]
             properties = [x.strip() for x in properties.split(',') if x.strip()]
             if properties:
                 for feature in features:
                     if 'display_fields' in feature['properties']:
                         # w.c.s. content, filter fields on varnames
-...
         def get_geojson_layers(self):
             if not self.pk:
                 return []
             options = MapLayerOptions.objects.filter(map_cell=self, map_layer=OuterRef('pk'))
             layers = self.layers.filter(kind='geojson').annotate(
                 properties=Subquery(options.values('properties'))
+            )
             return [
+                {
                     'url': reverse('mapcell-geojson', kwargs={'cell_id': self.pk, 'layer_slug': l.slug}),
-...
                     'marker_colour': l.marker_colour,
                     'properties': [x.strip() for x in l.properties.split(',')],
+                }
                 for l in self.layers.filter(kind='geojson')
                 for l in layers
+            ]
         def get_cell_extra_context(self, context):
-...
             null=True,
             help_text=_('Float value between 0 (transparent) and 1 (opaque)'),
+        )
         properties = models.CharField(
             _('Properties'),
             max_length=500,
             blank=True,
             help_text=_('List of properties to include, separated by commas'),
+        )
         class Meta:
             db_table = 'maps_map_layers'

         {% for option in options %}
         <li>
           <span>{{ option.map_layer.label }} {% if option.map_layer.kind == 'tiles' %}({{ option.map_layer.get_kind_display }}){% endif %}</span>
           {% if option.map_layer.kind == 'tiles' %}
           <a rel="popup" title="{% trans "Edit" %}" class="link-action-icon edit" href="{% url 'maps-manager-cell-edit-layer' page_pk=page.pk cell_reference=cell.get_reference layeroptions_pk=option.pk %}">{% trans "Edit" %}</a>
           {% endif %}
           <a rel="popup" title="{% trans "Delete" %}" class="link-action-icon delete" href="{% url 'maps-manager-cell-delete-layer' page_pk=page.pk cell_reference=cell.get_reference layeroptions_pk=option.pk %}">{% trans "Delete" %}</a>
         </li>
         {% endfor %}

             layer = get_object_or_404(cell.layers.all(), kind='geojson', slug=kwargs['layer_slug'])
             if not cell.page.is_visible(request.user) or not cell.is_visible(user=request.user):
                 return HttpResponseForbidden()
             geojson = layer.get_geojson(request)
             options = cell.maplayeroptions_set.get(map_layer=layer)
             geojson = layer.get_geojson(request, options.properties)
             content_type = 'application/json'
             return HttpResponse(json.dumps(geojson), content_type=content_type)

         cell.title = 'Map'
         cell.save()
         layer.save()
         MapLayerOptions.objects.create(map_cell=cell, map_layer=layer)
         options = MapLayerOptions.objects.create(map_cell=cell, map_layer=layer)
         with mock.patch('combo.utils.requests_wrapper.RequestsSession.request') as requests_get:
             layer.geojson_url = 'http://example.org/geojson?t1'
-...
         with mock.patch('combo.utils.requests_wrapper.RequestsSession.request') as requests_get:
             layer.geojson_url = 'http://example.org/geojson?t2'
             layer.properties = 'name, hop'
             layer.save()
             options.properties = 'name, hop'
             options.save()
             requests_get.return_value = mock.Mock(
                 content=SAMPLE_GEOJSON_CONTENT, json=lambda: json.loads(SAMPLE_GEOJSON_CONTENT), status_code=200
+            )
-...
         with mock.patch('combo.utils.requests_wrapper.RequestsSession.request') as requests_get:
             layer.geojson_url = 'http://example.org/geojson?t3'
             layer.properties = ''
             layer.save()
             options.properties = ''
             options.save()
             requests_get.return_value = mock.Mock(
                 content=SAMPLE_WCS_GEOJSON_CONTENT,
                 json=lambda: json.loads(SAMPLE_WCS_GEOJSON_CONTENT),
-...
         with mock.patch('combo.utils.requests_wrapper.RequestsSession.request') as requests_get:
             layer.geojson_url = 'http://example.org/geojson?t4'
             layer.properties = 'id'
             layer.save()
             options.properties = 'id'
             options.save()
             requests_get.return_value = mock.Mock(
                 content=SAMPLE_WCS_GEOJSON_CONTENT,
                 json=lambda: json.loads(SAMPLE_WCS_GEOJSON_CONTENT),

         assert 'marker_colour' not in resp.context['form'].fields
         assert 'icon' not in resp.context['form'].fields
         assert 'icon_colour' not in resp.context['form'].fields
         assert 'properties' not in resp.context['form'].fields
         assert 'geojson_query_parameter' not in resp.context['form'].fields
         assert 'geojson_accepts_circle_param' not in resp.context['form'].fields
         resp.forms[0]['label'] = 'Test'
-...
         assert 'marker_colour' not in resp.context['form']
         assert 'icon' not in resp.context['form']
         assert 'icon_colour' not in resp.context['form']
         assert 'properties' not in resp.context['form']
         resp.forms[0]['tiles_default'] = False
         resp = resp.forms[0].submit()
         assert resp.location.endswith('/manage/maps/')
-...
         assert options.map_layer == layer
         resp = resp.follow()
         assert '/layer/%s/edit/' % options.pk not in resp.text
         assert list(cell.get_free_geojson_layers()) == []
         assert list(cell.get_free_tiles_layers()) == [tiles_layer]
         assert '/add-layer/geojson/' not in resp.text
         resp = resp.click(href='.*/layer/%s/edit/$' % options.pk)
         assert 'map_layer' not in resp.context['form'].fields
         assert 'opacity' not in resp.context['form'].fields
         resp.form['properties'] = 'a, b'
         resp = resp.form.submit()
         assert resp.status_int == 302
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.pk, cell.get_reference()))
         options = MapLayerOptions.objects.get()
         options.refresh_from_db()
         assert options.properties == 'a, b'
         resp = resp.follow()
         resp = resp.click(href='.*/layer/%s/delete/$' % options.pk)
         resp = resp.forms[0].submit()
         assert resp.status_int == 302
-...
         assert list(cell.get_free_tiles_layers()) == [tiles_layer]
         resp = resp.click(href='.*/add-layer/tiles/$')
         assert list(resp.context['form'].fields['map_layer'].queryset) == [tiles_layer]
         assert 'properties' not in resp.context['form'].fields
         resp.forms[0]['map_layer'] = tiles_layer.pk
         resp.forms[0]['opacity'] = 1
         resp = resp.forms[0].submit()
-...
         resp = resp.follow()
         resp = resp.click(href='.*/layer/%s/edit/$' % options.pk)
         assert 'map_layer' not in resp.context['form'].fields
         assert 'properties' not in resp.context['form'].fields
         resp.forms[0]['opacity'] = 0.5
         resp = resp.forms[0].submit()
         assert resp.status_int == 302
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-maps-move-properties-from-layer-to-cell-57760.patch