Skip to content

Commit

Permalink
Fix remaining links and typos
Browse files Browse the repository at this point in the history
  • Loading branch information
olivroy committed Dec 17, 2024
1 parent 0336d6d commit 0466172
Show file tree
Hide file tree
Showing 19 changed files with 53 additions and 53 deletions.
36 changes: 18 additions & 18 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ new features:

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

miscellaneous:

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

## mapview 2.7.8

Expand Down Expand Up @@ -112,7 +112,7 @@ miscellaneous:

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

bugfixes:

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

## mapview 2.5.0

Expand All @@ -156,12 +156,12 @@ new features:

bugfixes:

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

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

enhancements:
Expand All @@ -247,22 +247,22 @@ new features:

bugfixes:

* na.alpha caused list/burst methods to fail.
* 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.
* `na.alpha` caused list/burst methods to fail.
* 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.

## mapview 2.1.0

new features:

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

bugfixes:

* deleted obsolete data.table import.
* fixed #79: colnames of popupTables are now converted to utf-8.
* fixed #79: colnames of popup Tables are now converted to utf-8.
* fixed #78: respect explicit setting of 'layer.name' argument.
* included NEWS file as R-help doesn't render NEWS.md
* highlight now respects alpha/alpha.regions = 0
Expand Down Expand Up @@ -331,7 +331,7 @@ new features:
* mapshot: to save maps as html page or static image or both.
* knitr integration (i.e. no need to call the @map slot anymore to render in knitr).
* 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.
* 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.
* 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.
* new popup functions popupTable, popupGraph and popupImage.
* functions to turn coordinates into spatial lines or spatial polygons.
* mapview objects now work natively on shiny applications (i.e. renderMapview and mapviewOutput now available).
Expand Down
4 changes: 2 additions & 2 deletions R/cubeView.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# #'
# #' @param x a RasterStack or RasterBrick
# #' @param at the breakpoints used for the visualisation. See
# #' \code{\link{levelplot}} for details.
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
# #' \code{\link[lattice]{levelplot}} for details.
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
# #' @param na.color color for missing values.
# #' @param legend logical. Whether to plot a legend.
# #' @param ... currently not used.
Expand Down
4 changes: 2 additions & 2 deletions R/extent.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#' @param layer.name the name of the layer to be shown on the map.
#' @param alpha.regions opacity of the fills or the raster layer(s).
#' @param label a character vector of labels to be shown on mouseover. See
#' \code{\link{addControl}} for details.
#' \code{\link[leaflet]{addControl}} for details.
#' @inheritDotParams leaflet::addRectangles
#'
#' @author
Expand All @@ -27,14 +27,14 @@
#' leaflet() %>% addProviderTiles("OpenStreetMap") %>% leafem::addExtent(breweries)
#' leaflet() %>% addProviderTiles("OpenStreetMap") %>% leafem::addExtent(breweries)
#'
#' @export viewExtent
#' @name viewExtent
#' @aliases viewExtent
#'
NULL

## View Extent ============================================================
#' @rdname viewExtent
#' @export
viewExtent <- function(x,
map = NULL,
popup = NULL,
Expand Down
6 changes: 3 additions & 3 deletions R/mapView.R
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ if ( !isGeneric('mapView') ) {
#' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
#' @param color color (palette) for points/polygons/lines
#' @param col.regions color (palette) pixels.
#' See \code{\link{levelplot}} for details.
#' See \code{\linkp[lattice]{levelplot}} for details.
#' @param at the breakpoints used for the visualisation.
#' See \code{\link{levelplot}} for details.
#' See \code{\link[lattice]{levelplot}} for details.
#' @param na.color color for missing values
#' @param use.layer.names should layer names of the Raster* object be used?
#' @param map.types character specifications for the base maps.
Expand Down Expand Up @@ -1105,7 +1105,7 @@ setMethod('mapView', signature(x = 'numeric'),
#' data.frame method.
#' @param grid whether to plot a (scatter plot) xy-grid to aid interpretation
#' of the visualisation. Only relevant for the data.frame method.
#' @param aspect the ratio of x/y axis corrdinates to adjust the plotting
#' @param aspect the ratio of x/y axis coordinates to adjust the plotting
#' space to fit the screen. Only relevant for the data.frame method.
#' @param crs an optional crs specification for the provided data to enable
#' rendering on a basemap. See argument description in \code{\link[sf]{st_sf}}
Expand Down
4 changes: 2 additions & 2 deletions R/mapshot.R
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ mapshot = function(x,
#' @param file Output \code{.png}, \code{.pdf}, or \code{.jpeg} file.
#' @param remove_controls \code{character} vector of control buttons to be removed
#' from the map when saving to file. Any combination of
#' "zoomControl", "layersControl", "homeButton", "scaleBar", "drawToolbar",
#' "easyButton". If set to \code{NULL} nothing will be removed. Ignored if \code{x}
#' `"zoomControl"`, `"layersControl"`, `"homeButton"`, `"scaleBar"`, `"drawToolbar"`,
#' `"easyButton"`. If set to \code{NULL} nothing will be removed. Ignored if \code{x}
#' is not a mapview or leaflet map.
#' @param ... Further arguments passed on to \code{\link[htmlwidgets]{saveWidget}}
#' and/or \code{\link[webshot2]{webshot}}.
Expand Down
4 changes: 2 additions & 2 deletions R/mapview-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#' and partly consists of breweries downloaded from
#' \url{https://www.bierwandern.de/inhalt/brauereiliste.html} with the kind permission
#' of Rainer Kastl. Note that use of these data is restricted to non-commercial use
#' and that they are explixitly excluded from the GPL lincense that mapview is licensed under.
#' and that they are explicitly excluded from the GPL license that mapview is licensed under.
#' @format \code{sf feature collection POINT}
"breweries"

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

6 changes: 3 additions & 3 deletions R/options.R
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
#' @param legend logical. Whether or not to show a legend for the layer(s).
#' @param legend.opacity opacity of the legend.
#' @param legend.pos Where should the legend be placed?
#' One of "topleft", "topright", "bottomleft", "bottomright".
#' One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
#' @param default logical. If TRUE all options are set to their default values
#' @param console logical. Should the options be printed to the console
#' @param layers.control.pos character. Where should the layer control be
#' placed? One of "topleft", "topright", "bottomleft", "bottomright".
#' placed? One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
#' @param leafletWidth,leafletHeight height and width of the htmlwidget in px.
#' @param viewer.suppress whether to render the map in the browser (\code{TRUE})
#' or the RStudio viewer (\code{FALSE}).
#' @param homebutton logical, whether to add a zoom-to-layer button to the map.
#' @param homebutton.pos character. Where should the homebutton(s) be
#' placed? One of "topleft", "topright", "bottomleft", "bottomright".
#' placed? One of `"topleft"`, `"topright"`, `"bottomleft"`, `"bottomright"`.
#' @param native.crs logical whether to reproject to web map coordinate
#' reference system (web Mercator - epsg:3857) or render using native CRS of
#' the supplied data (can also be NA). Default is FALSE which will render in
Expand Down
4 changes: 2 additions & 2 deletions R/plainView.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# #' @param x a \code{\link{raster}}* object
# #' @param maxpixels integer > 0. Maximum number of cells to use for the plot.
# #' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
# #' @param at the breakpoints used for the visualisation. See
# #' \code{\link{levelplot}} for details.
# #' \code{\link[lattice]{levelplot}} for details.
# #' @param na.color color for missing values.
# #' @param legend either logical or a list specifying any of the components
# #' decribed in the \code{colorkey} section of \link[lattice]{levelplot}.
Expand Down
2 changes: 1 addition & 1 deletion R/slideView.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# #' If maxpixels < \code{ncell(x)}, sampleRegular is used before plotting.
# #' @param color the color palette to be used for visualising RasterLayers
# #' @param na.color the color to be used for NA pixels
# #' @param col.regions color (palette).See \code{\link{levelplot}} for details.
# #' @param col.regions color (palette).See \code{\link[lattice]{levelplot}} for details.
# #' @param legend whether to plot legends for the two images (ignored for
# #' RatserStacks/*Bricks).
# #' @param ... additional arguments passed on to repective functions.
Expand Down
4 changes: 2 additions & 2 deletions R/watch.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Start and/or stop automagic mapviewing of spatial objects in your workspace.
#'
#' @description
#' Use these functions to enable automatic vieweing of all spatial objects
#' Use these functions to enable automatic viewing of all spatial objects
#' currently available in \code{env}. \code{mapviewWatcher} uses
#' \link[later]{later} to set up a watcher function that continuously monitors
#' \code{env} for spatial objects and refreshes the viewer/browser in case
Expand All @@ -22,7 +22,7 @@
#' \code{mapviewWatcher()} once. To switch watching off it is sufficient to set
#' \code{mapviewOptions(watch = FALSE)}.
#'
#' @param env the environemnt that is being watched (default is \code{.GlobalEnv}).
#' @param env the environment that is being watched (default is \code{.GlobalEnv}).
#' @param ... currently not used.
#'
#' @examples
Expand Down
2 changes: 1 addition & 1 deletion man/breweries.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/mapView.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/mapshot.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/mapviewOptions.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/mapviewWatcher.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/trails.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/viewExtent.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vignettes/articles/mapview_03-options.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ In detail, these are:
* `legend` - whether to plot a legend -> default `FALSE`
* `legend.pos` - where to position the legend if shown -> default `topright`
* `layers.control.pos` - where to position the layers control on the map -> default `topleft`
* `leafletWidth`, `leafletHeight` - the width and height of the map widget -> defaul `NULL` which means that the browser will be filled if possible
* `leafletWidth`, `leafletHeight` - the width and height of the map widget -> default `NULL` which means that the browser will be filled if possible

------

Expand Down
Loading

0 comments on commit 0466172

Please sign in to comment.