udata 10.1.5.dev34573__py2.py3-none-any.whl → 10.1.5.dev34612__py2.py3-none-any.whl

udata/core/spatial/models.py

@@ -170,9 +170,7 @@ class SpatialCoverage(db.EmbeddedDocument):
         return [zone for zone in self.zones if zone.handled_level]
 
     def clean(self):
-        if "geom" in self._get_changed_fields():
-            if self.zones:
-                raise db.ValidationError("The spatial coverage already has a Geozone")
-        if "zones" in self._get_changed_fields():
-            if self.geom:
-                raise db.ValidationError("The spatial coverage already has a Geometry")
+        if self.zones and self.geom:
+            raise db.ValidationError(
+                "The spatial coverage cannot contains a Geozone and a Geometry"
+            )

udata/tests/api/test_topics_api.py

@@ -165,7 +165,7 @@ class TopicsAPITest(APITestCase):
         assert topic.owner is None
         assert topic.organization == org
 
-    def test_topic_api_create_spatial(self):
+    def test_topic_api_create_spatial_zone(self):
         paca, _, _ = create_geozones_fixtures()
         granularity = spatial_granularities[0][0]
         data = TopicFactory.as_dict()
@@ -173,7 +173,6 @@ class TopicsAPITest(APITestCase):
         data["reuses"] = [str(r.id) for r in data["reuses"]]
         data["spatial"] = {
             "zones": [paca.id],
-            "geom": SAMPLE_GEOM,
             "granularity": granularity,
         }
         self.login()
@@ -182,6 +181,22 @@ class TopicsAPITest(APITestCase):
         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.granularity, granularity)
+
+    def test_topic_api_create_spatial_geom(self):
+        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"] = {
+            "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(topic.spatial.geom, SAMPLE_GEOM)
         self.assertEqual(topic.spatial.granularity, granularity)
 

{udata-10.1.5.dev34573.dist-info → udata-10.1.5.dev34612.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.1.5.dev34573
+Version: 10.1.5.dev34612
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -141,6 +141,7 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
+- Fix wrong error message when updating the GeoZone of a dataset with already a Geometry [#3271](https://github.com/opendatateam/udata/pull/3271)
 - Update dependencies [#3278](https://github.com/opendatateam/udata/pull/3278)
   - Some of these upgrades implied code changes in udata, udata-front or udata-ckan:
     - upgrade bleach to 6.2.0

{udata-10.1.5.dev34573.dist-info → udata-10.1.5.dev34612.dist-info}/RECORD

@@ -207,7 +207,7 @@ udata/core/spatial/constants.py,sha256=T024yKsXuBkaZ1MAFZPfLh2X_EFFVQ7Sfg4VHCmZQ
 udata/core/spatial/factories.py,sha256=-eQupRrIOQLouw9Bvv4UBqizFKQ4l4CHZBht2cv7irE,3096
 udata/core/spatial/forms.py,sha256=a6bYpRpuPZ9pZvZiLBZrhYQwwL4c7g686-Mknk9R0ek,3041
 udata/core/spatial/geoids.py,sha256=-7MGX9Swe1Hfdla6QPL35xwm1dE3WVNmJaN3HPZQ99k,1159
-udata/core/spatial/models.py,sha256=ermAfh0qo6fOyNzsndc5qT3l1_Vjmeq4yx5p6wp3Jv4,5470
+udata/core/spatial/models.py,sha256=2S2ErmoyrCvCzs2tZmIZvbJmjBAcWzywp5kAZdwjtLU,5312
 udata/core/spatial/tasks.py,sha256=1WVZkmgTbgrJ2-IF479hBzeO_5xtqflTNxHh7nzwnIw,229
 udata/core/spatial/translations.py,sha256=hmtF45cOanPNGX4vBq4iItKwmMKWKcenThTO-DncC54,541
 udata/core/spatial/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -630,7 +630,7 @@ udata/tests/api/test_reports_api.py,sha256=fCSz9NwMXBs6cxdXBVVI6y564AtovmZYw3xkg
 udata/tests/api/test_reuses_api.py,sha256=d8mtUrDURIfnUK-sLogvAP-rOID2FDJ0UVTM0ravQ-Q,24642
 udata/tests/api/test_swagger.py,sha256=eE6La9qdTYTIUFevRVPJgtj17Jq_8uOlsDwzCNR0LL8,760
 udata/tests/api/test_tags_api.py,sha256=36zEBgthVEn6pctJ0kDgPmEaUr-iqRAHeZRcRG2LEXQ,2425
-udata/tests/api/test_topics_api.py,sha256=L2zisaASayFca3Vu0Y3GKMSwmZH1aosklK2TXuMcyXE,11037
+udata/tests/api/test_topics_api.py,sha256=mpIjztDEQ2fx25E9dl4eIARGqtYuh1w8x68PhRr47Ss,11651
 udata/tests/api/test_transfer_api.py,sha256=-OLv-KjyLZL14J8UHl-ak_sYUj6wFiZWyoXC2SMXmEQ,7503
 udata/tests/api/test_user_api.py,sha256=hfDHOv5F81tehbc5u3dYH5rAyYgzgHGCWVcGR3kLIZw,16591
 udata/tests/apiv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -720,9 +720,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=Kd8IoZMPrZeWoMWeC_-hbcoy715a_o
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=77zeFKPGBQ6Rm9EPlOvdEM4xvNfW73nnkMvL6IJhx3M,46287
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=imYa9TggDPt7LFyagrGBucZ6agZlINuoXZIbbiq0Ncw,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=xH_QQlYBJMfB2Y0KPuGpca3jtxhB6xJ3WkDIQ8utbUc,53262
-udata-10.1.5.dev34573.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.1.5.dev34573.dist-info/METADATA,sha256=alaIvmo8W0bAra3ZcoMpPCLugbiAt4B8xNCRkD5kHms,143448
-udata-10.1.5.dev34573.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.1.5.dev34573.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.1.5.dev34573.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.1.5.dev34573.dist-info/RECORD,,
+udata-10.1.5.dev34612.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.1.5.dev34612.dist-info/METADATA,sha256=Jq7WaA9aj9zVFFTm3OuFaPw1gioHQf94RNYWGuNksgg,143594
+udata-10.1.5.dev34612.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.1.5.dev34612.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.1.5.dev34612.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.1.5.dev34612.dist-info/RECORD,,