Merge pull request #381 from ckan/fix-geom-serialization

Fix bug in geometry serialization, locn:Geometry -> locn:geometry

Author: amercader

ckanext/dcat/profiles/euro_dcat_ap_scheming.py

@@ -272,7 +272,7 @@ def _graph_from_dataset_v2_scheming(self, dataset_dict, dataset_ref):
                     self.g.add((spatial_ref, SKOS.prefLabel, Literal(item["text"])))
 
                 for field in [
-                    ("geom", LOCN.Geometry),
+                    ("geom", LOCN.geometry),
                     ("bbox", DCAT.bbox),
                     ("centroid", DCAT.centroid),
                 ]:

ckanext/dcat/tests/profiles/dcat_ap_2/test_scheming_support.py

@@ -264,10 +264,10 @@ def test_e2e_ckan_to_dcat(self):
             g, spatial[0][2], SKOS.prefLabel, dataset["spatial_coverage"][0]["text"]
         )
 
-        assert len([t for t in g.triples((spatial[0][2], LOCN.Geometry, None))]) == 1
+        assert len([t for t in g.triples((spatial[0][2], LOCN.geometry, None))]) == 1
         # Geometry in WKT
         wkt_geom = wkt.dumps(dataset["spatial_coverage"][0]["geom"], decimals=4)
-        assert self._triple(g, spatial[0][2], LOCN.Geometry, wkt_geom, GSP.wktLiteral)
+        assert self._triple(g, spatial[0][2], LOCN.geometry, wkt_geom, GSP.wktLiteral)
 
         # Test qualified relation
         relation = [t for t in g.triples((dataset_ref, DCAT.qualifiedRelation, None))]

ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py

@@ -239,10 +239,10 @@ def test_e2e_ckan_to_dcat(self):
             g, spatial[0][2], SKOS.prefLabel, dataset["spatial_coverage"][0]["text"]
         )
 
-        assert len([t for t in g.triples((spatial[0][2], LOCN.Geometry, None))]) == 1
+        assert len([t for t in g.triples((spatial[0][2], LOCN.geometry, None))]) == 1
         # Geometry in WKT
         wkt_geom = wkt.dumps(dataset["spatial_coverage"][0]["geom"], decimals=4)
-        assert self._triple(g, spatial[0][2], LOCN.Geometry, wkt_geom, GSP.wktLiteral)
+        assert self._triple(g, spatial[0][2], LOCN.geometry, wkt_geom, GSP.wktLiteral)
 
         distribution_ref = self._triple(g, dataset_ref, DCAT.distribution, None)[2]
         resource = dataset_dict["resources"][0]

ckanext/dcat/tests/profiles/dcat_us_3/test_dcat_us_3_profile_serialize.py

@@ -260,10 +260,10 @@ def test_e2e_ckan_to_dcat(self):
             g, spatial[0][2], SKOS.prefLabel, dataset["spatial_coverage"][0]["text"]
         )
 
-        assert len([t for t in g.triples((spatial[0][2], LOCN.Geometry, None))]) == 1
+        assert len([t for t in g.triples((spatial[0][2], LOCN.geometry, None))]) == 1
         # Geometry in WKT
         wkt_geom = wkt.dumps(dataset["spatial_coverage"][0]["geom"], decimals=4)
-        assert self._triple(g, spatial[0][2], LOCN.Geometry, wkt_geom, GSP.wktLiteral)
+        assert self._triple(g, spatial[0][2], LOCN.geometry, wkt_geom, GSP.wktLiteral)
 
         # Alternate identifiers
         ids = []

ckanext/dcat/tests/shacl/test_shacl.py

@@ -199,6 +199,9 @@ def test_validate_dcat_ap_3_graph():
     known_failures = [
         "Value does not have class skos:Concept",
         "Value does not have class dcat:Dataset",
+        # ckanext-dcat#381
+        "Value does not have class <http://www.w3.org/ns/locn#Geometry>",
+        "Value is not of Node Kind shacl:BlankNodeOrIRI"
     ]
 
     assert set(failures) - set(known_failures) == set(), results_text