aggregate bare keywords

geopython · Sep 22, 2023 · 22cab2d · 22cab2d
1 parent f59224c
commit 22cab2d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/pygeometa/schemas/ogcapi_records/__init__.py b/pygeometa/schemas/ogcapi_records/__init__.py
@@ -183,6 +183,8 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
         record['properties']['contacts'] = self.generate_contacts(
             mcf['contact'])
 
+        all_keywords = []
+
         LOGGER.debug('Checking for keywords')
         for key, value in mcf['identification']['keywords'].items():
             theme = {'concepts': []}
@@ -198,17 +200,21 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
                     scheme = value['vocabulary']['name']
 
             if scheme is None:
-                record['properties']['keywords'] = keywords[0]
-                continue
-
+                LOGGER.debug('Keywords found without vocabulary')
+                LOGGER.debug('Aggregating as bare keywords')
+                all_keywords.extend(keywords[0])
             else:
+                LOGGER.debug('Adding as theme/concepts')
                 for kw in keywords[0]:
                     theme['concepts'].append({'id': kw})
 
                 theme['scheme'] = scheme
 
                 record['properties']['themes'].append(theme)
 
+        if all_keywords:
+            record['properties']['keywords'] = all_keywords
+
         LOGGER.debug('Checking for licensing')
         if mcf['identification'].get('license') is not None:
             license = mcf['identification']['license']