Skip to content

Commit 0466172

Browse files
committed
Fix remaining links and typos
1 parent 0336d6d commit 0466172

19 files changed

+53
-53
lines changed

NEWS.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ new features:
7676

7777
* new function removeMapJunk to remove control elements from a map (e.g. the zoom control).
7878
* added tentative support for platform 'leafgl'.
79-
* stars method now uses leafem::addGeoRaster. https://github.com/r-spatial/leafem/issues/25
80-
* leafem::addCopyExtent now included in all methods.
81-
* sf(c) methods now use leafem::addFgb if GDAL >= 3.1.
79+
* stars method now uses `leafem::addGeoRaster()`. https://github.com/r-spatial/leafem/issues/25
80+
* `leafem::addCopyExtent()` now included in all methods.
81+
* sf(c) methods now use `leafem::addFgb()` if GDAL >= 3.1.
8282
* new | operator to compare two maps side-by-side.
8383

8484
miscellaneous:
8585

8686
* all deprecated functions are now defunct. See ?`mapview-defunct`.
87-
* drop viridisLite dependency and use base::hcl.colors instead. We now depend on R >= 3.6.
87+
* drop viridisLite dependency and use `base::hcl.colors()` instead. We now depend on R >= 3.6.
8888

8989
## mapview 2.7.8
9090

@@ -112,7 +112,7 @@ miscellaneous:
112112

113113
* addMouseCoordinates now also displays native coordinates for leaflet maps. #205 - now moved to package leafem.
114114
* deprecated slideview, cubeview, latticeview & sync, plainview, popup* functions.
115-
* deprecated addFeatures, garnishMap, addHomeButton, addImageQuery, addLogo, addMouseCoordinates.
115+
* deprecated `addFeatures`, `garnishMap`, `addHomeButton`, `addImageQuery`, `addLogo`, `addMouseCoordinates`.
116116

117117
bugfixes:
118118

@@ -139,7 +139,7 @@ bugfixes:
139139
* isFALSE (caused errors on R < 3.5) is now handled properly.
140140
* mapshot does not unintentionally delete url anymore if saving to png with same name.
141141
* mapshot now properly deletes temporary url when saving to png (or png and html).
142-
* internal function mapview:::nrings now calculates number of polygon rings correctly. #181
142+
* internal function `mapview:::nrings` now calculates number of polygon rings correctly. #181
143143

144144
## mapview 2.5.0
145145

@@ -156,12 +156,12 @@ new features:
156156

157157
bugfixes:
158158

159-
* leaflet::addScalebar would prevent Raster* method from rendering correctly for multiple layers.
159+
* `leaflet::addScalebar()` would prevent Raster* method from rendering correctly for multiple layers.
160160
* cex was not respected when burst = TRUE. #149
161-
* popupTable no longer causes a stack overflow with large point data. #154
162-
* popupGraph no longer relies on png files on disk but embeds graphs via base64. #156
161+
* `popupTable()` no longer causes a stack overflow with large point data. #154
162+
* `popupGraph()` no longer relies on png files on disk but embeds graphs via base64. #156
163163
* in mapshot, remove temporary url files only if remove_url = TRUE. #157
164-
* removeMouseCoordinates should work properly now (also exported). #145
164+
* `removeMouseCoordinates()` should work properly now (also exported). #145
165165
* home button for single point now zooms to maximum zoom 18.
166166

167167
miscellaneous:
@@ -227,7 +227,7 @@ new features:
227227
* we now have mapview method for class 'numeric' which enables interactive plots of a numeric variable.
228228
* updated slideView to accommodate more than one incident in a flexdashboard #95
229229
* if supplied data has only one attribute/field column mapview will now colour the plot automatically according to that attribute/field.
230-
* new mapview method for class 'bbox' -> mapview(st_bbox(x)) is equivalent to viewExtent(x)
230+
* new mapview method for class 'bbox' -> `mapview(st_bbox(x))` is equivalent to `viewExtent(x)`
231231
* plainview now provides mouse coordinates
232232

233233
enhancements:
@@ -247,22 +247,22 @@ new features:
247247

248248
bugfixes:
249249

250-
* na.alpha caused list/burst methods to fail.
251-
* legend did not work when zcol only had one unique value. This was actually a delibarate choice as for a single map it doesn't really make sense to have a legend for only one color. However, for latticeView/sync this does actually make sense, hence re-enabled.
250+
* `na.alpha` caused list/burst methods to fail.
251+
* legend did not work when zcol only had one unique value. This was actually a deliberate choice as for a single map it doesn't really make sense to have a legend for only one color. However, for latticeView/sync this does actually make sense, hence re-enabled.
252252

253253
## mapview 2.1.0
254254

255255
new features:
256256

257-
* plainview/cubeview now respects/has gained argument na.color.
258-
* mapview now supports st_GEOMETRY with truely mixed feature types (e.g. LINESTRING and POLYGON) - fixes #85
259-
* addFeatures: one function to add them all. Type agnostic version of leaflet::add* functions for simple features objects.
257+
* plainview/cubeview now respects/has gained argument `na.color`.
258+
* mapview now supports st_GEOMETRY with truly mixed feature types (e.g. LINESTRING and POLYGON) - fixes #85
259+
* `addFeatures()`: one function to add them all. Type agnostic version of leaflet::add* functions for simple features objects.
260260
* mapview (for vector data only) has gained argument na.alpha to control opacity of missing values.
261261

262262
bugfixes:
263263

264264
* deleted obsolete data.table import.
265-
* fixed #79: colnames of popupTables are now converted to utf-8.
265+
* fixed #79: colnames of popup Tables are now converted to utf-8.
266266
* fixed #78: respect explicit setting of 'layer.name' argument.
267267
* included NEWS file as R-help doesn't render NEWS.md
268268
* highlight now respects alpha/alpha.regions = 0
@@ -331,7 +331,7 @@ new features:
331331
* mapshot: to save maps as html page or static image or both.
332332
* knitr integration (i.e. no need to call the @map slot anymore to render in knitr).
333333
* cubeView: view raster bricks or stacks hovmoeller style, use keys up & down, left & right, page up & page down to navigate through y, x, z dimensions, respectively.
334-
* labels: if zcol is set, mouseover will now show the repesctive values of zcol, if zcol is not set moseover shows feature ID. Only available if suitable leaflet package version is installed.
334+
* labels: if zcol is set, mouseover will now show the respective values of zcol, if zcol is not set moseover shows feature ID. Only available if suitable leaflet package version is installed.
335335
* new popup functions popupTable, popupGraph and popupImage.
336336
* functions to turn coordinates into spatial lines or spatial polygons.
337337
* mapview objects now work natively on shiny applications (i.e. renderMapview and mapviewOutput now available).

R/cubeView.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# #'
33
# #' @param x a RasterStack or RasterBrick
44
# #' @param at the breakpoints used for the visualisation. See
5-
# #' \code{\link{levelplot}} for details.
6-
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
5+
# #' \code{\link[lattice]{levelplot}} for details.
6+
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
77
# #' @param na.color color for missing values.
88
# #' @param legend logical. Whether to plot a legend.
99
# #' @param ... currently not used.

R/extent.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#' @param layer.name the name of the layer to be shown on the map.
1313
#' @param alpha.regions opacity of the fills or the raster layer(s).
1414
#' @param label a character vector of labels to be shown on mouseover. See
15-
#' \code{\link{addControl}} for details.
15+
#' \code{\link[leaflet]{addControl}} for details.
1616
#' @inheritDotParams leaflet::addRectangles
1717
#'
1818
#' @author
@@ -27,14 +27,14 @@
2727
#' leaflet() %>% addProviderTiles("OpenStreetMap") %>% leafem::addExtent(breweries)
2828
#' leaflet() %>% addProviderTiles("OpenStreetMap") %>% leafem::addExtent(breweries)
2929
#'
30-
#' @export viewExtent
3130
#' @name viewExtent
3231
#' @aliases viewExtent
3332
#'
3433
NULL
3534

3635
## View Extent ============================================================
3736
#' @rdname viewExtent
37+
#' @export
3838
viewExtent <- function(x,
3939
map = NULL,
4040
popup = NULL,

R/mapView.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ if ( !isGeneric('mapView') ) {
4444
#' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
4545
#' @param color color (palette) for points/polygons/lines
4646
#' @param col.regions color (palette) pixels.
47-
#' See \code{\link{levelplot}} for details.
47+
#' See \code{\linkp[lattice]{levelplot}} for details.
4848
#' @param at the breakpoints used for the visualisation.
49-
#' See \code{\link{levelplot}} for details.
49+
#' See \code{\link[lattice]{levelplot}} for details.
5050
#' @param na.color color for missing values
5151
#' @param use.layer.names should layer names of the Raster* object be used?
5252
#' @param map.types character specifications for the base maps.
@@ -1105,7 +1105,7 @@ setMethod('mapView', signature(x = 'numeric'),
11051105
#' data.frame method.
11061106
#' @param grid whether to plot a (scatter plot) xy-grid to aid interpretation
11071107
#' of the visualisation. Only relevant for the data.frame method.
1108-
#' @param aspect the ratio of x/y axis corrdinates to adjust the plotting
1108+
#' @param aspect the ratio of x/y axis coordinates to adjust the plotting
11091109
#' space to fit the screen. Only relevant for the data.frame method.
11101110
#' @param crs an optional crs specification for the provided data to enable
11111111
#' rendering on a basemap. See argument description in \code{\link[sf]{st_sf}}

R/mapshot.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ mapshot = function(x,
170170
#' @param file Output \code{.png}, \code{.pdf}, or \code{.jpeg} file.
171171
#' @param remove_controls \code{character} vector of control buttons to be removed
172172
#' from the map when saving to file. Any combination of
173-
#' "zoomControl", "layersControl", "homeButton", "scaleBar", "drawToolbar",
174-
#' "easyButton". If set to \code{NULL} nothing will be removed. Ignored if \code{x}
173+
#' `"zoomControl"`, `"layersControl"`, `"homeButton"`, `"scaleBar"`, `"drawToolbar"`,
174+
#' `"easyButton"`. If set to \code{NULL} nothing will be removed. Ignored if \code{x}
175175
#' is not a mapview or leaflet map.
176176
#' @param ... Further arguments passed on to \code{\link[htmlwidgets]{saveWidget}}
177177
#' and/or \code{\link[webshot2]{webshot}}.

R/mapview-package.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#' and partly consists of breweries downloaded from
2020
#' \url{https://www.bierwandern.de/inhalt/brauereiliste.html} with the kind permission
2121
#' of Rainer Kastl. Note that use of these data is restricted to non-commercial use
22-
#' and that they are explixitly excluded from the GPL lincense that mapview is licensed under.
22+
#' and that they are explicitly excluded from the GPL license that mapview is licensed under.
2323
#' @format \code{sf feature collection POINT}
2424
"breweries"
2525

@@ -41,7 +41,7 @@
4141
#' see \url{https://creativecommons.org/licenses/by/3.0/de/} for details.
4242
#' @format \code{sf feature collection MULTILINESTRING}
4343
#' @source
44-
#' Datenquelle: Bayerische Vermessungsverwaltung - www.geodaten.bayern.de
44+
#' Datenquelle: Bayerische Vermessungsverwaltung - `www.geodaten.bayern.de`
4545
#' \url{https://www.ldbv.bayern.de/produkte/weitere/opendata.html}
4646
"trails"
4747

R/options.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
#' @param legend logical. Whether or not to show a legend for the layer(s).
3030
#' @param legend.opacity opacity of the legend.
3131
#' @param legend.pos Where should the legend be placed?
32-
#' One of "topleft", "topright", "bottomleft", "bottomright".
32+
#' One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
3333
#' @param default logical. If TRUE all options are set to their default values
3434
#' @param console logical. Should the options be printed to the console
3535
#' @param layers.control.pos character. Where should the layer control be
36-
#' placed? One of "topleft", "topright", "bottomleft", "bottomright".
36+
#' placed? One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
3737
#' @param leafletWidth,leafletHeight height and width of the htmlwidget in px.
3838
#' @param viewer.suppress whether to render the map in the browser (\code{TRUE})
3939
#' or the RStudio viewer (\code{FALSE}).
4040
#' @param homebutton logical, whether to add a zoom-to-layer button to the map.
4141
#' @param homebutton.pos character. Where should the homebutton(s) be
42-
#' placed? One of "topleft", "topright", "bottomleft", "bottomright".
42+
#' placed? One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
4343
#' @param native.crs logical whether to reproject to web map coordinate
4444
#' reference system (web Mercator - epsg:3857) or render using native CRS of
4545
#' the supplied data (can also be NA). Default is FALSE which will render in

R/plainView.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# #' @param x a \code{\link{raster}}* object
1313
# #' @param maxpixels integer > 0. Maximum number of cells to use for the plot.
1414
# #' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
15-
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
15+
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
1616
# #' @param at the breakpoints used for the visualisation. See
17-
# #' \code{\link{levelplot}} for details.
17+
# #' \code{\link[lattice]{levelplot}} for details.
1818
# #' @param na.color color for missing values.
1919
# #' @param legend either logical or a list specifying any of the components
2020
# #' decribed in the \code{colorkey} section of \link[lattice]{levelplot}.

R/slideView.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# #' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
2323
# #' @param color the color palette to be used for visualising RasterLayers
2424
# #' @param na.color the color to be used for NA pixels
25-
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
25+
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
2626
# #' @param legend whether to plot legends for the two images (ignored for
2727
# #' RatserStacks/*Bricks).
2828
# #' @param ... additional arguments passed on to repective functions.

R/watch.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#' Start and/or stop automagic mapviewing of spatial objects in your workspace.
22
#'
33
#' @description
4-
#' Use these functions to enable automatic vieweing of all spatial objects
4+
#' Use these functions to enable automatic viewing of all spatial objects
55
#' currently available in \code{env}. \code{mapviewWatcher} uses
66
#' \link[later]{later} to set up a watcher function that continuously monitors
77
#' \code{env} for spatial objects and refreshes the viewer/browser in case
@@ -22,7 +22,7 @@
2222
#' \code{mapviewWatcher()} once. To switch watching off it is sufficient to set
2323
#' \code{mapviewOptions(watch = FALSE)}.
2424
#'
25-
#' @param env the environemnt that is being watched (default is \code{.GlobalEnv}).
25+
#' @param env the environment that is being watched (default is \code{.GlobalEnv}).
2626
#' @param ... currently not used.
2727
#'
2828
#' @examples

man/breweries.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/mapView.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/mapshot.Rd

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/mapviewOptions.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/mapviewWatcher.Rd

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/trails.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/viewExtent.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/articles/mapview_03-options.Rmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In detail, these are:
4343
* `legend` - whether to plot a legend -> default `FALSE`
4444
* `legend.pos` - where to position the legend if shown -> default `topright`
4545
* `layers.control.pos` - where to position the layers control on the map -> default `topleft`
46-
* `leafletWidth`, `leafletHeight` - the width and height of the map widget -> defaul `NULL` which means that the browser will be filled if possible
46+
* `leafletWidth`, `leafletHeight` - the width and height of the map widget -> default `NULL` which means that the browser will be filled if possible
4747

4848
------
4949

0 commit comments

Comments
 (0)