udata 7.0.5.dev28083__py2.py3-none-any.whl → 7.0.5.dev28120__py2.py3-none-any.whl

udata/core/spatial/commands.py

@@ -141,6 +141,10 @@ def load(geozones_file, levels_file, drop=False):
             total = load_zones(GeoZone, json_geozones)
     log.info('Loaded {total} zones'.format(total=total))
 
+    log.info('Clean removed geozones in datasets')
+    count = fixup_removed_geozone()
+    log.info(f'{count} geozones removed from datasets')
+
 
 @grp.command()
 def migrate():
@@ -188,3 +192,19 @@ def migrate():
     '''.format(level_summary, **counter)), level_summary])
     log.info(summary)
     log.info('Done')
+
+def fixup_removed_geozone():
+    count = 0
+    all_datasets = Dataset.objects(spatial__zones__0__exists=True).timeout(False)
+    for dataset in all_datasets:
+        zones = dataset.spatial.zones
+        new_zones = [z for z in zones if getattr(z, 'name', None) is not None]
+
+        if len(new_zones) < len(zones):
+            log.debug(f"Removing deleted zones from dataset '{dataset.title}'")
+            count += len(zones) - len(new_zones)
+            dataset.spatial.zones = new_zones
+            dataset.save()
+
+    return count
+        

udata/core/topic/api.py

@@ -3,6 +3,7 @@ from udata.core.dataset.api_fields import dataset_fields
 from udata.core.discussions.models import Discussion
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.reuse.api_fields import reuse_fields
+from udata.core.spatial.api_fields import spatial_coverage_fields
 from udata.core.topic.permissions import TopicEditPermission
 from udata.core.topic.parsers import TopicApiParser
 from udata.core.user.api_fields import user_ref_fields
@@ -37,6 +38,9 @@ topic_fields = api.model('Topic', {
     'private': fields.Boolean(description='Is the topic private'),
     'created_at': fields.ISODateTime(
         description='The topic creation date', readonly=True),
+    'spatial': fields.Nested(
+        spatial_coverage_fields, allow_null=True,
+        description='The spatial coverage'),
     'last_modified': fields.ISODateTime(
         description='The topic last modification date', readonly=True),
     'organization': fields.Nested(

udata/core/topic/apiv2.py

@@ -13,6 +13,7 @@ from udata.core.organization.api_fields import org_ref_fields
 from udata.core.reuse.api import ReuseApiParser
 from udata.core.reuse.apiv2 import reuse_page_fields
 from udata.core.reuse.models import Reuse
+from udata.core.spatial.api_fields import spatial_coverage_fields
 from udata.core.topic.models import Topic
 from udata.core.topic.parsers import TopicApiParser
 from udata.core.topic.permissions import TopicEditPermission
@@ -63,6 +64,9 @@ topic_fields = apiv2.model('Topic', {
     'private': fields.Boolean(description='Is the topic private'),
     'created_at': fields.ISODateTime(
         description='The topic creation date', readonly=True),
+    'spatial': fields.Nested(
+        spatial_coverage_fields, allow_null=True,
+        description='The spatial coverage'),
     'last_modified': fields.ISODateTime(
         description='The topic last modification date', readonly=True),
     'organization': fields.Nested(

udata/core/topic/forms.py

@@ -1,4 +1,5 @@
 from udata.forms import ModelForm, fields, validators
+from udata.core.spatial.forms import SpatialCoverageField
 from udata.i18n import lazy_gettext as _
 
 from .models import Topic
@@ -20,6 +21,10 @@ class TopicForm(ModelForm):
     datasets = fields.DatasetListField(_('Associated datasets'))
     reuses = fields.ReuseListField(_('Associated reuses'))
 
+    spatial = SpatialCoverageField(
+        _('Spatial coverage'),
+        description=_('The geographical area covered by the data.'))
+
     tags = fields.TagField(_('Tags'), [validators.DataRequired()])
     private = fields.BooleanField(_('Private'))
     featured = fields.BooleanField(_('Featured'))

udata/core/topic/models.py

@@ -1,6 +1,6 @@
 from flask import url_for
 from mongoengine.signals import pre_save
-from udata.models import db
+from udata.models import db, SpatialCoverage
 from udata.search import reindex
 from udata.tasks import as_task_param
 
@@ -26,6 +26,8 @@ class Topic(db.Document, db.Owned, db.Datetimed):
     private = db.BooleanField()
     extras = db.ExtrasField()
 
+    spatial = db.EmbeddedDocumentField(SpatialCoverage)
+
     meta = {
         'indexes': [
             '$name',

udata/tests/api/test_topics_api.py

@@ -1,10 +1,13 @@
 from flask import url_for
 
 from udata.core.organization.factories import OrganizationFactory
+from udata.core.spatial.models import spatial_granularities
 from udata.core.topic.models import Topic
 from udata.core.topic.factories import TopicFactory
 from udata.core.user.factories import UserFactory
 from udata.models import Member, Discussion
+from udata.tests.api.test_datasets_api import SAMPLE_GEOM
+from udata.tests.features.territories import create_geozones_fixtures
 
 from . import APITestCase
 
@@ -53,6 +56,8 @@ class TopicsAPITest(APITestCase):
         self.assert200(response)
 
         data = response.json
+        self.assertIn('spatial', data)
+
         for dataset, expected in zip(data['datasets'], [d.fetch() for d in topic.datasets]):
             self.assertEqual(dataset['id'], str(expected.id))
             self.assertEqual(dataset['title'], str(expected.title))
@@ -100,6 +105,26 @@ class TopicsAPITest(APITestCase):
         assert topic.owner is None
         assert topic.organization == org
 
+    def test_topic_api_create_spatial(self):
+        paca, _, _ = create_geozones_fixtures()
+        granularity = spatial_granularities[0][0]
+        data = TopicFactory.as_dict()
+        data['datasets'] = [str(d.id) for d in data['datasets']]
+        data['reuses'] = [str(r.id) for r in data['reuses']]
+        data['spatial'] = {
+            'zones': [paca.id],
+            'geom': SAMPLE_GEOM,
+            'granularity': granularity,
+        }
+        self.login()
+        response = self.post(url_for('api.topics'), data)
+        self.assert201(response)
+        self.assertEqual(Topic.objects.count(), 1)
+        topic = Topic.objects.first()
+        self.assertEqual([str(z) for z in topic.spatial.zones], [paca.id])
+        self.assertEqual(topic.spatial.geom, SAMPLE_GEOM)
+        self.assertEqual(topic.spatial.granularity, granularity)
+
     def test_topic_api_update(self):
         '''It should update a topic from the API'''
         owner = self.login()

udata/tests/apiv2/test_topics.py

@@ -40,6 +40,7 @@ class TopicsAPITest(APITestCase):
         topic = TopicFactory()
         topic_response = self.get(url_for('apiv2.topic', topic=topic))
         assert topic_response.status_code == 200
+        assert 'spatial' in topic_response.json
 
         assert topic_response.json['created_at'] is not None
         assert topic_response.json['last_modified'] is not None

{udata-7.0.5.dev28083.dist-info → udata-7.0.5.dev28120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.5.dev28083
+Version: 7.0.5.dev28120
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -145,7 +145,8 @@ It is collectively taken care of by members of the
 - Allow harvesting of big catalog (bigger than 16MB) [#2980](https://github.com/opendatateam/udata/pull/2980) [2985](https://github.com/opendatateam/udata/pull/2985)
 - Add downloads' count to organizations CSV [#2973](https://github.com/opendatateam/udata/pull/2973)
 - Add 3 new badges to the organization model : `company`, `association` and `local authority` [#2984](https://github.com/opendatateam/udata/pull/2984)
-- Prevent geozones listed ad `deleted` to be loaded [#2983](https://github.com/opendatateam/udata/pull/2983)
+- Prevent geozones listed ad `deleted` to be loaded [#2983](https://github.com/opendatateam/udata/pull/2983) [#2993](https://github.com/opendatateam/udata/pull/2993)
+- Topic: add spatial field [#2988](https://github.com/opendatateam/udata/pull/2988)
 - Topic: add last_modified field [#2987](https://github.com/opendatateam/udata/pull/2987)
 - Add stacktraces to CSV errors [#2990](https://github.com/opendatateam/udata/pull/2990)
 

{udata-7.0.5.dev28083.dist-info → udata-7.0.5.dev28120.dist-info}/RECORD

@@ -178,7 +178,7 @@ udata/core/spam/tests/test_spam.py,sha256=IuSRVoVCLBjJuoCXnPZx8XjtRyt5q2LrSBtIp8
 udata/core/spatial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spatial/api.py,sha256=tlApg3JpqbO6CwEwp1LzZ1hyPQreVEgF3H5yrcAPE74,5848
 udata/core/spatial/api_fields.py,sha256=ymGK3FyE2KNlASOU5GiPgZGeBjjOqnOyCOcRCbuw3D8,2629
-udata/core/spatial/commands.py,sha256=_PJ6ov8Yxz2942lwXraUyu5yaQ4Hn-QlrzrDik5BpcE,6225
+udata/core/spatial/commands.py,sha256=qdJ4mUg3NUTrGx6L5MKPh1usvxmeCn8xMCZNGKyjWYE,6914
 udata/core/spatial/factories.py,sha256=GxUU8nRtSoGPw2m3Q-al0PYps2oSnlqC-bM7Eeu14rk,3288
 udata/core/spatial/forms.py,sha256=tXlYKge5Rc8L8pOjfUo1-9howgVJZDAh7q8xTIlbBww,3218
 udata/core/spatial/geoids.py,sha256=UqCto4dtQYPXOxyG7sx_0npzM6yvId40ngw3eAlmioQ,1159
@@ -201,11 +201,11 @@ udata/core/tags/models.py,sha256=qOvZPBT7d_sSy2iaEDBQs5LK3ksTo6Oim04THO8ftMM,530
 udata/core/tags/tasks.py,sha256=BXBJF45t2DmbWsNgLYkuUC9vBGqJ_Dftye5SmHEOttk,1055
 udata/core/tags/views.py,sha256=BoBktrbx0tqkIu3yYLj_XJjB7ZHu_tq5vfEBrh0MUwI,384
 udata/core/topic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/topic/api.py,sha256=TsGPOxauABYvRqG4ieSS4D-T5K6c6iWhEf9Mk_O4Y2Q,4914
-udata/core/topic/apiv2.py,sha256=SqmrXbu7D7OuBOOSTw4459wQLCCD_wTwSihPpnlspZM,9655
+udata/core/topic/api.py,sha256=G3hN4e9rK5mIYvDLvPpAOo_DN2SySAGykVVvXGx4uMY,5105
+udata/core/topic/apiv2.py,sha256=cf-WUSZ7P6Tss3S8utS-uhreLgGI5XR3nn_1UWiZ_Xs,9846
 udata/core/topic/factories.py,sha256=BEk6YZdaHK-XzCNyD5v_HIKahMe7Lp8aKOlCZLuivtk,711
-udata/core/topic/forms.py,sha256=cr7n1jWsQOlJCprRdjp3Pt4Pq1zu7elqIqgTfniJ7Sk,792
-udata/core/topic/models.py,sha256=A0_-To8fjGpEFwAGK_eBMvpfdGTe7XnyDDMVDpPC7dI,1997
+udata/core/topic/forms.py,sha256=XqGI4nANdsm2UkIiGAuVqEdZkN5N9sqJ4VaM_PhTaVQ,987
+udata/core/topic/models.py,sha256=PZsYfiuEU86iL1x-qvDevn4Io8lKGahAbqky03j1N2k,2071
 udata/core/topic/parsers.py,sha256=oe_4ehnlgPKre2GG1LA6hcQa6H5V5q1adUsQIzVqb_Q,876
 udata/core/topic/permissions.py,sha256=RtFPPlxuU_Bv7ip6LDO4AoPrKFnIOEs9cCMXaSSmEdk,118
 udata/core/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -573,14 +573,14 @@ udata/tests/api/test_organizations_api.py,sha256=HxeTqP14wlWGaQt4fpQljuRy98HWnmL
 udata/tests/api/test_reuses_api.py,sha256=gQ-o4JXK2S6z2yW13-i8e81pCdr9j2yyM1KinPbkc5g,16971
 udata/tests/api/test_swagger.py,sha256=tLg452rCD5Q0AgFXOVZKMM6jGiWwC5diX5PxbdYni0o,760
 udata/tests/api/test_tags_api.py,sha256=xSIx_x5gqKz6BJCXKEsTqA_CR4BF1nG5NxEyfp9dy0o,2579
-udata/tests/api/test_topics_api.py,sha256=EJQGcriw8JD-tKcXHYLhlKedjA56SdlYIeMwVy6X4tU,6508
+udata/tests/api/test_topics_api.py,sha256=BYkfBJpz58DbCZ_fgPvpH0unKPJ1PY8B5dm9Km4YWkQ,7586
 udata/tests/api/test_transfer_api.py,sha256=aGGJp79YYHQQyMAKhp7urk4eD587v3kbIy-8rJ_kk1s,2901
 udata/tests/api/test_user_api.py,sha256=NVXsn-sRrMQYbbUyJ2_I2_C3UPfzgCZv-us6RvM5VE8,13597
 udata/tests/apiv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/apiv2/test_datasets.py,sha256=j2cuaGtTnpF5TAvuzMEmx0uEXvuANlIKS5quupJocx4,17953
 udata/tests/apiv2/test_organizations.py,sha256=CpNG8xl13rZXxTN2-JRx9ZkyI7IuQUaOsNuumUxuB3I,6704
 udata/tests/apiv2/test_swagger.py,sha256=D8jpRqDUmqVkNVYkYaXfvMPUc7OBVs_dMsC13KZciWE,785
-udata/tests/apiv2/test_topics.py,sha256=c17lj_U2Y4VPu81vQfhZyLLpdEZ3BH46D7rm4oxKdZo,8212
+udata/tests/apiv2/test_topics.py,sha256=d30tJU167B5r8WWBHvI9rKdjnGrVpf7-HyvKlWyaxtc,8260
 udata/tests/cli/test_cli_base.py,sha256=piqoq4Ib5bdZQpuUAJh583qfjCSglWZQclKzhO3Yr_0,321
 udata/tests/cli/test_db_cli.py,sha256=-hw9SU3RvNT7fvqVtQHxEpKstnjMU4L_DY9tiBH-ybs,1726
 udata/tests/data/image.jpg,sha256=hdmpaCjOhmAAfNGuTqWKEjv7IC4GXJx-nP_rT274hc8,337049
@@ -658,9 +658,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=dXTr2zzGPgclSMzAJo4qhOEVHYWYP7
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=G-MNwE4Gih-4w-xNAjp7PAvQOeW1uyM-27Z6O08_SCc,42104
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=5bvKeJp9nqk76tZsgbGC2qnbpJws5lODdMcezr6LKbQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=d_uBu93oIsmeewv8QzrB2Z8tmkUXn8juwT5OiySALog,48684
-udata-7.0.5.dev28083.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.5.dev28083.dist-info/METADATA,sha256=4w1CFQ0LFGdUxsjtEpaRyKORzWTSa7qgwKkDW0kmiCk,119126
-udata-7.0.5.dev28083.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.5.dev28083.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
-udata-7.0.5.dev28083.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.5.dev28083.dist-info/RECORD,,
+udata-7.0.5.dev28120.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.5.dev28120.dist-info/METADATA,sha256=Qum0kYJJX9EDfQ9n2ACO4H-5bwmi-TEIV5FJGQD3wuk,119267
+udata-7.0.5.dev28120.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.5.dev28120.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
+udata-7.0.5.dev28120.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.5.dev28120.dist-info/RECORD,,