OARec: emit default keywords as bare keywords, not themes/concepts

Author: tomkralidis

pygeometa/schemas/ogcapi_records/__init__.py

@@ -184,22 +184,27 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
             mcf['contact'])
 
         LOGGER.debug('Checking for keywords')
-        for value in mcf['identification']['keywords'].values():
+        for key, value in mcf['identification']['keywords'].items():
             theme = {'concepts': []}
 
             keywords = get_charstring(value.get('keywords'), self.lang1,
                                       self.lang2)
 
-            for kw in keywords[0]:
-                theme['concepts'].append({'id': kw})
+            if key == 'default':
+                record['properties']['keywords'] = [kw[0] for kw in keywords]
+                continue
 
-            if 'vocabulary' in value:
-                if 'url' in value['vocabulary']:
-                    theme['scheme'] = value['vocabulary']['url']
-                elif 'name' in value['vocabulary']:
-                    theme['scheme'] = value['vocabulary']['name']
+            else:
+                for kw in keywords[0]:
+                    theme['concepts'].append({'id': kw})
+
+                if 'vocabulary' in value:
+                    if 'url' in value['vocabulary']:
+                        theme['scheme'] = value['vocabulary']['url']
+                    elif 'name' in value['vocabulary']:
+                        theme['scheme'] = value['vocabulary']['name']
 
-            record['properties']['themes'].append(theme)
+                record['properties']['themes'].append(theme)
 
         LOGGER.debug('Checking for licensing')
         if mcf['identification'].get('license') is not None:

sample.yml

@@ -26,8 +26,8 @@ identification:
         fr: abstract in French
     edition: 1.8.0
     dates:
-        creation: 2011-11-11
-        publication: 2000-09-01T00:00:00Z
+        creation: 2000-09-01T00:00:00Z
+        publication: 2001-11-11
     keywords:
         default:
             keywords: