0001-opengis-add-text-search-for-queries-40743.patch

Valentin Deniaud, 15 avril 2020 11:16

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

Subject: [PATCH] opengis: add text search for queries (#40743)

 .../migrations/0009_auto_20200407_1544.py     | 26 ++++++++++++++++
 passerelle/apps/opengis/models.py             | 28 +++++++++++++----
 passerelle/settings.py                        |  1 +
 tests/test_opengis.py                         | 30 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 passerelle/apps/opengis/migrations/0009_auto_20200407_1544.py

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.18 on 2020-04-07 13:44
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('opengis', '0008_featurecache'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='featurecache',
                 name='text',
                 field=models.CharField(default='', max_length=2048),
                 preserve_default=False,
             ),
             migrations.AddField(
                 model_name='query',
                 name='index_properties',
                 field=models.CharField(blank=True, help_text='Comma separated list such as property1,property2', max_length=1024, verbose_name='Properties for searching'),
             ),
+        ]

     from passerelle.base.models import BaseResource, BaseQuery
     from passerelle.utils.api import endpoint
     from passerelle.utils.conversion import num2deg
     from passerelle.utils.conversion import num2deg, simplify
     from passerelle.utils.jsonresponse import APIError
-...
                       'bbox': {
                           'description': _('Only include results inside bounding box'),
                           'example_value': '-0.489,51.28,0.236,51.686'
                       },
                       'q': {
                           'description': _('Text search for specified properties'),
                           'example_value': 'library'
+                      }
                   },
                   show=False)
         def query(self, request, query_slug, bbox=None):
         def query(self, request, query_slug, bbox=None, q=None):
             query = get_object_or_404(Query, resource=self, slug=query_slug)
             return query.q(request, bbox)
             return query.q(request, bbox, q)
         def export_json(self):
             d = super(OpenGIS, self).export_json()
-...
         typename = models.CharField(_('Feature type'), max_length=256)
         filter_expression = models.TextField(_('XML filter'), blank=True)
         index_properties = models.CharField(
             verbose_name=_('Properties for searching'),
             help_text=_('Comma separated list such as property1,property2'),
             max_length=1024,
             blank=True)
         delete_view = 'opengis-query-delete'
         edit_view = 'opengis-query-edit'
-...
             endpoint.parameters = resource_endpoint.parameters
             return endpoint
         def q(self, request, bbox):
         def q(self, request, bbox, q):
             features = self.features.all()
             if not features.exists():
                 raise APIError('Data is not synchronized yet. Retry in a few minutes.')
-...
                                    'floating point numbers of the form lonmin,latmin,lonmax,latmax')
                 features = features.filter(lon__gte=lonmin, lon__lte=lonmax, lat__gte=latmin,
                                            lat__lte=latmax)
             if q:
                 features = features.filter(text__search=simplify(q))
             data = {
                 'type': 'FeatureCollection',
                 'name': self.typename
-...
                 except (KeyError, TypeError):
                     self.resource.logger.warning('invalid coordinates in geometry: %s', geometry)
                     continue
                 features.append(FeatureCache(query=self, lat=lat, lon=lon, data=feature))
                 text = ''
                 if self.index_properties:
                     properties = [x.strip() for x in self.index_properties.split(',') if x.strip()]
                     values = [val for prop, val in feature.get('properties', {}).items()
                               if prop in properties]
                     text = simplify(' '.join(values))
                 features.append(FeatureCache(query=self, lat=lat, lon=lon, text=text, data=feature))
             with transaction.atomic():
                 self.features.all().delete()
                 FeatureCache.objects.bulk_create(features)
-...
             verbose_name=_('Query'))
         lat = models.FloatField()
         lon = models.FloatField()
         text = models.CharField(max_length=2048)
         data = JSONField()

passerelle/settings.py
115	115	'django.contrib.messages',
116	116	'django.contrib.staticfiles',
117	117	'django.contrib.admin',
	118	'django.contrib.postgres',
118	119	# base app
119	120	'passerelle.base',
120	121	# connectors

         resp = app.get(connector.get_absolute_url())
         assert query.name in resp.text
         assert query.description in resp.text
         assert '/opengis/test/query/test_query/?bbox=' in resp.text
         assert '/opengis/test/query/test_query/' in resp.text
         assert 'bbox=-0.489,51.28,0.236,51.686' in resp.text
         assert 'q=library' in resp.text
     @mock.patch('passerelle.utils.Request.get')
     def test_opengis_query_text_search(mocked_get, app, connector, query):
         endpoint = utils.generic_endpoint_url('opengis', 'query/test_query/', slug=connector.slug)
         mocked_get.side_effect = geoserver_geolocated_responses
         query.update_cache()
         resp = app.get(endpoint + '?q=grenoble')
         assert len(resp.json['features']) == 0
         query.index_properties = 'nom_commune,nom_voie'
         query.save()
         query.update_cache()
         resp = app.get(endpoint + '?q=grenoble')
         assert len(resp.json['features']) == 4
         resp = app.get(endpoint + '?q=victor')
         assert len(resp.json['features']) == 2
         resp = app.get(endpoint + '?q=hugo victor')
         assert len(resp.json['features']) == 2
         resp = app.get(endpoint + '?q=nomatch')
         assert len(resp.json['features']) == 0
     def test_opengis_export_import(query):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-opengis-add-text-search-for-queries-40743.patch