#308 fix manifest_files and platform_family_name

nansencenter · Apr 5, 2018 · 98f4b89 · 98f4b89
1 parent f98c6f6
commit 98f4b89
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nansat/mappers/mapper_sentinel1_l1.py b/nansat/mappers/mapper_sentinel1_l1.py
@@ -97,7 +97,7 @@ def __init__(self, filename, gdalDataset, gdalMetadata, fast=False, **kwargs):
             manifest_files = glob.glob('%s/manifest.safe' % filename)
 
         if (not mds_files or not calibration_files or not noise_files or
-            not annotation_files or not manifest_file):
+            not annotation_files or not manifest_files):
             raise WrongMapperError(filename)
 
         # convert list of MDS files into dictionary. Keys - polarizations in upper case.
@@ -494,7 +494,7 @@ def _init_empty(self, manifest_data, annotation_data):
         # set metadata
         self.dataset.SetMetadataItem('time_coverage_start', manifest_data['time_coverage_start'])
         self.dataset.SetMetadataItem('time_coverage_end', manifest_data['time_coverage_end'])
-        platform_name = manifest_data['platform_familyName'] + manifest_data['platform_number']
+        platform_name = manifest_data['platform_family_name'] + manifest_data['platform_number']
         self.dataset.SetMetadataItem('platform', json.dumps(pti.get_gcmd_platform(platform_name)))
         self.dataset.SetMetadataItem('instrument', json.dumps(pti.get_gcmd_instrument('SAR')))
         self.dataset.SetMetadataItem('Entry Title', platform_name + ' SAR')
@@ -625,7 +625,7 @@ def read_manifest_data(self, input_file):
                                                    node('safe:acquisitionPeriod')['safe:stopTime']
                                                    )).isoformat()
             if str(nn.getAttribute('ID')) == 'platform':
-                data['platform_familyName'] = str(nn.node('metadataWrap').
+                data['platform_family_name'] = str(nn.node('metadataWrap').
                                                      node('xmlData').
                                                      node('safe:platform')['safe:familyName'])
                 data['platform_number'] = str(nn.node('metadataWrap').