update ISO/WCMP2/OARec import/export (#228)

Author: tomkralidis

pygeometa/schemas/iso19139/__init__.py

@@ -146,7 +146,11 @@ def import_(self, metadata: str) -> dict:
             'temporal': []
         }
 
-        temp_extent = {}
+        temp_extent = {
+            'begin': None,
+            'end': None
+        }
+
         if identification.temporalextent_start:
             temp_extent['begin'] = identification.temporalextent_start
         if identification.temporalextent_end:

pygeometa/schemas/ogcapi_records/__init__.py

@@ -43,6 +43,7 @@
 #
 # =================================================================
 
+from datetime import datetime
 import json
 import logging
 import os
@@ -140,9 +141,12 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
             else:
                 end = str(end)
 
-            record['time'] = {
-                'interval': [begin, end]
-            }
+            if [begin, end] == [None, None]:
+                record['time'] = None
+            else:
+                record['time'] = {
+                    'interval': [begin, end]
+                }
 
             if 'resolution' in  mcf['identification']['extents']['temporal'][0]:  # noqa
                 record['time']['resolution'] =  mcf['identification']['extents']['temporal'][0]['resolution']  # noqa
@@ -153,10 +157,12 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
                 record['properties']['created'] = str(mcf['identification']['dates']['creation'])  # noqa
             if 'revision' in mcf['identification']['dates']:
                 record['properties']['updated'] = str(mcf['identification']['dates']['revision'])  # noqa
-
             if 'publication' in mcf['identification']['dates']:
                 record['properties']['updated'] = normalize_datestring(mcf['identification']['dates']['publication'])  # noqa
 
+        if record['properties'].get('created') is None:
+                record['properties']['created'] = datetime.now().strftime('%Y-%m-%dT%H:%M:%SZ')  # noqa
+
         rights = get_charstring(mcf['identification'].get('rights'),
                                 self.lang1, self.lang2)
 
@@ -260,31 +266,40 @@ def generate_party(self, contact: dict,
         country = get_charstring(contact.get('country'),
                                  self.lang1, self.lang2)
 
-        rp = {}
+        rp = {
+            'addresses': [{}],
+            'roles': []
+        }
 
         if organization_name[0] == contact.get('organization'):
             LOGGER.debug('Contact name is organization')
             rp['name'] = organization_name[0]
 
-        rp.update({
-            'positionName': position_name[0],
-            'phones': [{
-                'value': contact.get('phone')
-            }],
-            'emails': [{
-                'value': contact.get('email')
-            }],
-            'addresses': [{
-                'deliveryPoint': [address[0]],
-                'city': city[0],
-                'administrativeArea': administrative_area[0],
-                'postalCode': postalcode[0],
-                'country': country[0]
-            }],
-            'hoursOfService': hours_of_service[0],
-            'contactInstructions': contact_instructions[0],
-            'roles': []
-        })
+        if position_name[0] is not None:
+            rp['positionName'] = position_name[0]
+        if hours_of_service[0] is not None:
+            rp['positionName'] = hours_of_service[0]
+        if contact_instructions[0] is not None:
+            rp['contactInstructions'] = contact_instructions[0]
+
+        if address[0] is not None:
+            rp['addresses'][0]['deliveryPoint'] = [address[0]]
+        if city[0] is not None:
+            rp['addresses'][0]['city'] = city[0]
+        if administrative_area[0] is not None:
+            rp['addresses'][0]['administrativeArea'] = administrative_area[0]
+        if postalcode[0] is not None:
+            rp['addresses'][0]['postalCode'] = postalcode[0]
+        if country[0] is not None:
+            rp['addresses'][0]['country'] = country[0]
+
+        if contact.get('phone') is not None:
+            rp['phones'] = [{'value': contact.get('phone')}]
+        if contact.get('email') is not None:
+            rp['emails'] = [{'value': contact.get('email')}]
+
+        if rp['addresses'][0] == {}:
+            rp.pop('addresses')
 
         for r in set(roles):
             rp['roles'].append(r)
@@ -350,13 +365,15 @@ def generate_link(self, distribution: dict) -> dict:
 
         name = get_charstring(distribution.get('name'), self.lang1, self.lang2)
 
-        reltype = distribution.get('rel') or distribution.get('function')
-
         link = {
-            'rel': reltype,
             'href': distribution['url'],
             'type': distribution['type']
         }
+
+        reltype = distribution.get('rel') or distribution.get('function')
+        if reltype is not None:
+            link['rel'] = reltype
+
         if title != [None, None]:
             link['title'] = title[0]
         elif name != [None, None]:

pygeometa/schemas/wmo_wcmp2/__init__.py

@@ -88,7 +88,7 @@ def write(self, mcf: dict, stringify: str = True) -> Union[dict, str]:
         record = super().write(mcf, stringify=False)
 
         LOGGER.debug('Setting WCMP2 conformance')
-        record['conformsTo'] = ['http://wis.wmo.int/spec/wcmp/2.0']
+        record['conformsTo'] = ['http://wis.wmo.int/spec/wcmp/2/conf/core']
 
         if 'edition' in mcf['identification']:
             record['properties']['version'] = mcf['identification']['version']