Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix grid argument handling in overlaying #959

Merged
merged 1 commit into from
Nov 7, 2019
Merged

Fix grid argument handling in overlaying #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions satpy/tests/test_writers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import errno
import shutil
import unittest
import warnings

import numpy as np
import xarray as xr
Expand Down Expand Up @@ -622,6 +623,29 @@ def test_add_overlay_basic_rgb(self):
pil_args, pil_kwargs, fun_args, fun_kwargs)
ContourWriterAGG.assert_called_with(coast_dir)

# test legacy call

grid = {'minor_is_tick': True}
color = 'red'
expected_overlays = {'coasts': {'outline': color, 'width': 0.5, 'level': 1},
'borders': {'outline': color, 'width': 0.5, 'level': 1},
'grid': grid}
with warnings.catch_warnings(record=True) as wns:
warnings.simplefilter("always")
new_img = add_overlay(self.orig_rgb_img, self.area_def, coast_dir,
color=color, grid=grid, fill_value=0)
assert len(wns) == 1
assert issubclass(wns[0].category, DeprecationWarning)
assert "deprecated" in str(wns[0].message)

pil_args = None
pil_kwargs = {'fill_value': 0}
fun_args = (self.orig_rgb_img.data.area, ContourWriterAGG.return_value, expected_overlays)
fun_kwargs = None
apply_pil.assert_called_with(_burn_overlay, self.orig_rgb_img.mode,
pil_args, pil_kwargs, fun_args, fun_kwargs)
ContourWriterAGG.assert_called_with(coast_dir)

def test_add_overlay_basic_l(self):
"""Test basic add_overlay usage with L data."""
from satpy.writers import add_overlay
Expand Down
11 changes: 6 additions & 5 deletions satpy/writers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,12 @@ def add_overlay(orig_img, area, coast_dir, color=None, width=None, resolution=No
level_borders = 1
overlays.setdefault('borders', {}).setdefault('level', level_borders)

if grid is not None and 'major_lonlat' in grid and grid['major_lonlat']:
major_lonlat = grid.pop('major_lonlat')
minor_lonlat = grid.pop('minor_lonlat', major_lonlat)
grid_params = {'Dlonlat': major_lonlat, 'dlonlat': minor_lonlat}
for key, val in grid_params.items():
if grid is not None:
if 'major_lonlat' in grid and grid['major_lonlat']:
major_lonlat = grid.pop('major_lonlat')
minor_lonlat = grid.pop('minor_lonlat', major_lonlat)
grid.update({'Dlonlat': major_lonlat, 'dlonlat': minor_lonlat})
for key, val in grid.items():
overlays.setdefault('grid', {}).setdefault(key, val)

cw_ = ContourWriterAGG(coast_dir)
Expand Down