enhanced HVD metadata mapping: now only if extras metadata key hvd_category is present

Author: gdmhrogut

ckanext/hro_dcatapde/mappings/hvd-categories.json

@@ -1,16 +1,8 @@
 {
-  "bevoelkerung": "http://data.europa.eu/bna/c_e1da4e07",
-  "bildung_wissenschaft": "http://data.europa.eu/bna/c_e1da4e07",
-  "geo": "http://data.europa.eu/bna/c_ac64a52d",
-  "gesetze_justiz": "http://data.europa.eu/bna/c_ac64a52d",
-  "gesundheit": "http://data.europa.eu/bna/c_e1da4e07",
-  "infrastruktur_bauen_wohnen": "http://data.europa.eu/bna/c_ac64a52d",
-  "kultur_freizeit_sport_tourismus": "http://data.europa.eu/bna/c_e1da4e07",
-  "politik_wahlen": "http://data.europa.eu/bna/c_e1da4e07",
-  "soziales": "http://data.europa.eu/bna/c_e1da4e07",
-  "transport_verkehr": "http://data.europa.eu/bna/c_b79e35eb",
-  "umwelt_klima": "http://data.europa.eu/bna/c_dd313021",
-  "verbraucher": "http://data.europa.eu/bna/c_e1da4e07",
-  "verwaltung": "http://data.europa.eu/bna/c_ac64a52d",
-  "wirtschaft_arbeit": "http://data.europa.eu/bna/c_e1da4e07"
-}
+  "Erdbeobachtung und Umwelt": "http://data.europa.eu/bna/c_dd313021",
+  "Georaum": "http://data.europa.eu/bna/c_ac64a52d",
+  "Meteorologie": "http://data.europa.eu/bna/c_164e0bf5",
+  "Mobilität": "http://data.europa.eu/bna/c_b79e35eb",
+  "Statistik": "http://data.europa.eu/bna/c_e1da4e07",
+  "Unternehmen und Eigentümerschaft von Unternehmen": "http://data.europa.eu/bna/c_a9135398"
+}

ckanext/hro_dcatapde/profile.py

@@ -107,17 +107,12 @@ def graph_from_dataset(self, dataset_dict, dataset_ref):
     # dcat:landingPage
     g.add((dataset_ref, DCAT.landingPage, URIRef(dataset_ref)))
 
-    # dcatap:applicableLegislation
-    g.add((dataset_ref, DCATAP.applicableLegislation, URIRef('http://data.europa.eu/eli/reg_impl/2023/138/oj')))
-
-    # dcatap:hvdCategory
-    hvd_category = None
-    groups = self._get_dataset_value(dataset_dict, 'groups')
-    for group in groups:
-      hvd_category = self.hvd_category_mapping[group['name']]
-      if hvd_category:
-        g.add((dataset_ref, DCATAP.hvdCategory, URIRef(hvd_category)))
-        break # ignore further groups and thus set only one HVD category
+    # dcatap:hvdCategory and dcatap:applicableLegislation
+    extras = self._get_dataset_value(dataset_dict, 'extras')
+    hvd_category = next((d['value'] for d in extras if d['key'] == 'hvd_category'), None)
+    if hvd_category is not None:
+      g.add((dataset_ref, DCATAP.hvdCategory, URIRef(hvd_category)))
+      g.add((dataset_ref, DCATAP.applicableLegislation, URIRef('http://data.europa.eu/eli/reg_impl/2023/138/oj')))
 
     for prefix, namespace in namespaces.items():
       g.bind(prefix, namespace)
@@ -235,12 +230,10 @@ def graph_from_dataset(self, dataset_dict, dataset_ref):
 
   def enhance_resource(self, g, distribution_ref, resource_dict, dist_additons, hvd_category):
 
-    # dcatap:applicableLegislation
-    g.add((distribution_ref, DCATAP.applicableLegislation, URIRef('http://data.europa.eu/eli/reg_impl/2023/138/oj')))
-
-    # dcatap:hvdCategory
-    if hvd_category:
+    # dcatap:hvdCategory and dcatap:applicableLegislation
+    if hvd_category is not None:
       g.add((distribution_ref, DCATAP.hvdCategory, URIRef(hvd_category)))
+      g.add((distribution_ref, DCATAP.applicableLegislation, URIRef('http://data.europa.eu/eli/reg_impl/2023/138/oj')))
 
     # adms:status
     g.add((distribution_ref, ADMS.status, URIRef('http://purl.org/adms/status/Completed')))

setup.py

@@ -15,7 +15,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # http://packaging.python.org/en/latest/tutorial.html#version
-    version='2.2.0',
+    version='2.2.1',
 
     description='''A custom implementation of DCAT-AP.de for OpenData.HRO, the open data portal of the municipality of Rostock''',
     long_description=long_description,