Merge pull request #38 from mraspaud/fix-level-list

Remove unnecessary casting in adding overlay from dictionary
pytroll · Dec 6, 2019 · eb35e25 · eb35e25
2 parents 6bb2b07 + 36ae7c6
commit eb35e25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/pycoast/cw_base.py b/pycoast/cw_base.py
@@ -649,8 +649,8 @@ def _iterate_db(self, db_name, tag, resolution, level, zero_pad, db_root_path=No
         else:
             format_string += 'L%s.shp'
 
-        if type(level) not in (list,):
-            level = range(1,level+1)
+        if not isinstance(level, list):
+            level = range(1, level + 1)
 
         for i in level:
 
@@ -792,13 +792,6 @@ def add_overlay_from_dict(self, overlays, area_def, cache_epoch=None, background
                 params = DEFAULT.copy()
                 params.update(overlays[section])
 
-                params['level'] = int(params['level'])
-                params['x_offset'] = float(params['x_offset'])
-                params['y_offset'] = float(params['y_offset'])
-                params['width'] = float(params['width'])
-                params['outline_opacity'] = int(params['outline_opacity'])
-                params['fill_opacity'] = int(params['fill_opacity'])
-
                 if section != "coasts":
                     params.pop('fill_opacity', None)
                     params.pop('fill', None)

diff --git a/pycoast/tests/test_pycoast.py b/pycoast/tests/test_pycoast.py
@@ -753,7 +753,7 @@ def test_foreground(self):
         self.assertTrue(fft_metric(euro_data, res),
                         'Writing of contours failed')
 
-        overlays = {'coasts': {'level': 4, 'resolution': 'l'},
+        overlays = {'coasts': {'level': [1, 2, 3, 4], 'resolution': 'l'},
                     'borders': {'outline': (255, 0, 0), 'resolution': 'c'},
                     'rivers': {'outline': 'blue', 'resolution': 'c', 'level': 5}}