Skip to content

Commit eeb0fac

Browse files
committed
Update mapres option to support cartopy
1 parent 80ab24a commit eeb0fac

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

bin/ccplot

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ class PlotOpts(AutoOpts):
311311
majormeridianslw = 0.3
312312
majorparallelscolor = "#000000"
313313
majorparallelslw = 0.3
314-
mapres = "i"
314+
mapres = None
315315
meridiansbase = 0
316316
minormeridianscolor = "#000000"
317317
minormeridianslw = 0.1
@@ -353,7 +353,7 @@ class PlotOpts(AutoOpts):
353353
elif o == "majormeridianslw": q = self.setfloat(o, v, 0)
354354
elif o == "majorparallelscolor": q = self.setcolor(o, v)
355355
elif o == "majorparallelslw": q = self.setfloat(o, v, 0)
356-
elif o == "mapres": q = self.setenum(o, v, ("c","l","i","h","f"))
356+
elif o == "mapres": q = self.setenum(o, v, ("auto","10m","50m","110m"))
357357
elif o == "meridiansbase": q = self.setfloat(o, v, 0)
358358
elif o == "minormeridianscolor": q = self.setcolor(o, v)
359359
elif o == "minormeridianslw": q = self.setfloat(o, v, 0)
@@ -1871,18 +1871,30 @@ def plot_orbit(fnames, products, fig, axes,
18711871
expand_axes(fig, axes, height*aspect, height, \
18721872
padding=opts.padding)
18731873

1874+
coastline = cfeature.COASTLINE
1875+
borders = cfeature.BORDERS
1876+
land = cfeature.LAND
1877+
ocean = cfeature.OCEAN
1878+
lakes = cfeature.LAKES
1879+
if opts.mapres is not None and opts.mapres != "auto":
1880+
coastline = coastline.with_scale(opts.mapres)
1881+
borders = borders.with_scale(opts.mapres)
1882+
land = land.with_scale(opts.mapres)
1883+
ocean = ocean.with_scale(opts.mapres)
1884+
lakes = lakes.with_scale(opts.mapres)
1885+
18741886
if opts.drawcoastlines:
1875-
axes.add_feature(cfeature.COASTLINE,
1887+
axes.add_feature(coastline,
18761888
linewidth=opts.coastlineslw, color=opts.coastlinescolor)
18771889

18781890
if opts.drawcountries:
1879-
axes.add_feature(cfeature.BORDERS,
1891+
axes.add_feature(borders,
18801892
linewidth=opts.countrieslw, color=opts.countriescolor)
18811893
if opts.drawlsmask:
1882-
axes.add_feature(cfeature.LAND, color=opts.landcolor)
1883-
axes.add_feature(cfeature.OCEAN, color=opts.watercolor)
1894+
axes.add_feature(land, color=opts.landcolor)
1895+
axes.add_feature(ocean, color=opts.watercolor)
18841896
if opts.drawlakes:
1885-
axes.add_feature(cfeature.LAKES, color=opts.watercolor, zorder=-1)
1897+
axes.add_feature(lakes, color=opts.watercolor, zorder=-1)
18861898

18871899
if opts.drawminorparallels:
18881900
axes.gridlines(xlocs=[], ylocs=minorparallels,

man/ccplot.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Major parallels line color\. Default: \fI#000000\fR\.
240240
Major parallels line width\. Default: \fI0\.3\fR\.
241241
.TP
242242
\fBmapres\fR
243-
Map resolution: c (crude), l (low), i (intermediate), h (high), f (full)\. Default: \fIi\fR\.
243+
Map resolution: auto (automatic), 10m (1:10m) 50m (1:50m), 110m (1:110m)\. Default: \fIauto\fR\.
244244
.TP
245245
\fBmeridiansbase\fR
246246
Meridians base, or 0 for automatic\. Default: \fI0\fR\.

man/ccplot.1.html

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/ccplot.1.ronn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ to be plotted is determined by <type>:
275275
Major parallels line width. Default: *0.3*.
276276

277277
* `mapres`:
278-
Map resolution: c (crude), l (low), i (intermediate), h (high), f (full). Default: *i*.
278+
Map resolution: auto (automatic), 10m (1:10m) 50m (1:50m),
279+
110m (1:110m). Default: *auto*.
279280

280281
* `meridiansbase`:
281282
Meridians base, or 0 for automatic. Default: *0*.

0 commit comments

Comments
 (0)