|
14 | 14 | from matplotlib import gridspec
|
15 | 15 | import matplotlib.pylab as plt
|
16 | 16 | import numpy as np
|
| 17 | +import warnings |
17 | 18 | from pysteps.exceptions import MissingOptionalDependency
|
18 | 19 |
|
19 | 20 | try:
|
20 | 21 | from mpl_toolkits.basemap import Basemap
|
| 22 | + |
21 | 23 | basemap_imported = True
|
22 | 24 | except ImportError:
|
23 | 25 | basemap_imported = False
|
24 | 26 | try:
|
25 | 27 | import cartopy.crs as ccrs
|
26 | 28 | import cartopy.feature as cfeature
|
| 29 | + |
27 | 30 | cartopy_imported = True
|
28 | 31 | except ImportError:
|
29 | 32 | cartopy_imported = False
|
30 | 33 | try:
|
31 | 34 | import pyproj
|
| 35 | + |
32 | 36 | pyproj_imported = True
|
33 | 37 | except ImportError:
|
34 | 38 | pyproj_imported = False
|
@@ -95,15 +99,15 @@ def plot_geography(map, proj4str, extent, shape=None, lw=0.5,
|
95 | 99 | + " 'basemap' or 'cartopy'" % map)
|
96 | 100 | if map == "basemap" and not basemap_imported:
|
97 | 101 | raise MissingOptionalDependency(
|
98 |
| - "map='basemap' option passed to plot_geography function" |
| 102 | + "map='basemap' option passed to plot_geography function " |
99 | 103 | "but the basemap package is not installed")
|
100 | 104 | if map == "cartopy" and not cartopy_imported:
|
101 | 105 | raise MissingOptionalDependency(
|
102 |
| - "map='cartopy' option passed to plot_geography function" |
| 106 | + "map='cartopy' option passed to plot_geography function " |
103 | 107 | "but the cartopy package is not installed")
|
104 | 108 | if map is not None and not pyproj_imported:
|
105 | 109 | raise MissingOptionalDependency(
|
106 |
| - "map!=None option passed to plot_geography function" |
| 110 | + "map!=None option passed to plot_geography function " |
107 | 111 | "but the pyproj package is not installed")
|
108 | 112 |
|
109 | 113 | if map == "basemap":
|
@@ -181,9 +185,13 @@ def plot_map_basemap(bm_params, drawlonlatlines=False,
|
181 | 185 | """
|
182 | 186 | if not basemap_imported:
|
183 | 187 | raise MissingOptionalDependency(
|
184 |
| - "map='basemap' option passed to plot_map_basemap function" |
| 188 | + "map='basemap' option passed to plot_map_basemap function " |
185 | 189 | "but the basemap package is not installed")
|
186 | 190 |
|
| 191 | + warnings.warn( |
| 192 | + "Basemap will be deprecated in a future release of pysteps, use Cartopy instead", |
| 193 | + PendingDeprecationWarning) |
| 194 | + |
187 | 195 | ax = Basemap(**bm_params)
|
188 | 196 |
|
189 | 197 | if coastlinecolor is not None:
|
@@ -238,7 +246,7 @@ def plot_map_cartopy(crs, extent, scale, drawlonlatlines=False,
|
238 | 246 | """
|
239 | 247 | if not cartopy_imported:
|
240 | 248 | raise MissingOptionalDependency(
|
241 |
| - "map='cartopy' option passed to plot_map_cartopy function" |
| 249 | + "map='cartopy' option passed to plot_map_cartopy function " |
242 | 250 | "but the cartopy package is not installed")
|
243 | 251 |
|
244 | 252 | if isinstance(subplot, gridspec.SubplotSpec):
|
|
0 commit comments