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

Valentin Deniaud, 04 novembre 2021 18:06

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

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

 combo/apps/maps/forms.py                      |  1 -
 .../migrations/0017_auto_20211104_1559.py     | 23 +++++++++++++
 .../migrations/0018_auto_20211104_1559.py     | 34 +++++++++++++++++++
 .../migrations/0019_auto_20211104_1603.py     | 17 ++++++++++
 combo/apps/maps/models.py                     | 22 ++++++------
 combo/apps/maps/views.py                      |  2 +-
 tests/test_maps_cells.py                      |  9 +++--
 tests/test_maps_manager.py                    |  2 --
 8 files changed, 92 insertions(+), 18 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

combo/apps/maps/forms.py
66	66	'icon_colour',
67	67	'cache_duration',
68	68	'include_user_identifier',
69		'properties',
70	69	'geojson_query_parameter',
71	70	'geojson_accepts_circle_param',
72	71	]

     # 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='map',
                 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):
         MapLayer = apps.get_model('maps', 'MapLayer')
         Map = apps.get_model('maps', 'Map')
         for cell in Map.objects.all():
             properties = [layer.properties for layer in cell.layers.all() if layer.properties.strip()]
             cell.properties = ','.join(properties)
             cell.save()
     def populate_layer_properties(apps, schema_editor):
         MapLayer = apps.get_model('maps', 'MapLayer')
         Map = apps.get_model('maps', 'Map')
         for cell in Map.objects.all():
             for layer in cell.layers.all():
                 layer.properties = cell.properties
                 layer.save()
     class Migration(migrations.Migration):
         dependencies = [
             ('maps', '0017_auto_20211104_1559'),
+        ]
         operations = [
             migrations.RunPython(populate_cell_properties, populate_layer_properties),
+        ]

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

         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
-...
             _('Marker behaviour on click'), max_length=32, default='none', choices=MARKER_BEHAVIOUR_ONCLICK
+        )
         layers = models.ManyToManyField(MapLayer, through='MapLayerOptions', verbose_name=_('Layers'), blank=True)
         properties = models.CharField(
             _('Properties'),
             max_length=500,
             blank=True,
             help_text=_('List of properties to include, separated by commas'),
+        )
         default_template_name = 'maps/map_cell.html'
         manager_form_template = 'maps/map_cell_form.html'
-...
                 'max_zoom',
                 'group_markers',
                 'marker_behaviour_onclick',
                 'properties',
+            )
             return forms.models.modelform_factory(self.__class__, fields=fields)
-...
                     'icon': l.icon,
                     'icon_colour': l.icon_colour,
                     'marker_colour': l.marker_colour,
                     'properties': [x.strip() for x in l.properties.split(',')],
                     'properties': [x.strip() for x in self.properties.split(',')],
+                }
                 for l in self.layers.filter(kind='geojson')
+            ]

combo/apps/maps/views.py
29	29	layer = get_object_or_404(cell.layers.all(), kind='geojson', slug=kwargs['layer_slug'])
30	30	if not cell.page.is_visible(request.user) or not cell.is_visible(user=request.user):
31	31	return HttpResponseForbidden()
32		geojson = layer.get_geojson(request)
	32	geojson = layer.get_geojson(request, cell.properties)
33	33	content_type = 'application/json'
34	34	return HttpResponse(json.dumps(geojson), content_type=content_type)

         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()
             cell.properties = 'name, hop'
             cell.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()
             cell.properties = ''
             cell.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()
             cell.properties = 'id'
             cell.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/')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

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