Skip to content

Commit

Permalink
Merge pull request #100 from olivroy/fix
Browse files Browse the repository at this point in the history
Random fiixes
  • Loading branch information
tim-salabim authored Nov 22, 2024
2 parents 5985337 + e4c49c6 commit 988c9cb
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 54 deletions.
4 changes: 2 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
^\.travis\.yml$
^CODE_OF_CONDUCT\.md$
^README\.Rmd$
^.*\.Rproj$
Expand All @@ -8,4 +7,5 @@
^docs$
^pkgdown$
^private$
^figures$
^man/figures$
^README\.md$
17 changes: 11 additions & 6 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check
name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
Expand All @@ -18,7 +19,7 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
Expand All @@ -29,7 +30,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand All @@ -41,6 +42,10 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,4 @@ Suggests:
terra,
tools
Encoding: UTF-8
LazyData: false
RoxygenNote: 7.3.2
2 changes: 2 additions & 0 deletions R/homebutton.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
#' @export addHomeButton
#' @name addHomeButton
#' @rdname addHomeButton
#' @param css,hover_css list of valid CSS key-value pairs. See e.g.
#' \url{https://www.w3schools.com/cssref/index.php} for possible values.
#' @aliases addHomeButton
addHomeButton <- function(map, ext, group = "layer",
position = 'bottomright', add = TRUE,
Expand Down
2 changes: 1 addition & 1 deletion R/keys.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' Add JavaScript functioality to enable copying of the current view bouding box
#' to the clipboard. The \code{copy.btn} argument expects a valid keycode
#' \code{event.code} such as "KeyE" (the default).
#' Use \url{https://www.toptal.com/developers/keycode/} to find the
#' Use \url{https://www.toptal.com/developers/keycode} to find the
#' approprate codes for your keyboard.
#'
#' @param map a mapview or leaflet object.
Expand Down
20 changes: 10 additions & 10 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ knitr::opts_chunk$set(
# leafem - leaflet extensions for mapview

<!-- badges: start -->
[![R-CMD-check](https://github.com/r-spatial/leafem/workflows/R-CMD-check/badge.svg)](https://github.com/r-spatial/leafem/actions)
[![R-CMD-check](https://github.com/r-spatial/leafem/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-spatial/leafem/actions/workflows/R-CMD-check.yaml)
[![cran checks](https://badges.cranchecks.info/worst/leafem.svg)](https://cran.r-project.org/web/checks/check_results_leafem.html)
![monthly](http://cranlogs.r-pkg.org/badges/leafem)
![total](http://cranlogs.r-pkg.org/badges/grand-total/leafem)
[![CRAN](http://www.r-pkg.org/badges/version/leafem?color=009999)](https://cran.r-project.org/package=leafem)
![monthly](https://cranlogs.r-pkg.org/badges/leafem)
![total](https://cranlogs.r-pkg.org/badges/grand-total/leafem)
[![CRAN](https://www.r-pkg.org/badges/version/leafem?color=009999)](https://cran.r-project.org/package=leafem)
<!-- badges: end -->

`leafem` provides extensions for package `leaflet` many of which are used by package `mapview`. The intention of this package is to enhance `leaflet` functionality to provide a more GIS-like feeling when plotting spatial data interactively.
Expand All @@ -44,7 +44,7 @@ library(leaflet)
leaflet() %>% addProviderTiles("OpenStreetMap") %>% addFeatures(data = breweries91)
```

![](figures/README-features.png)
![](man/figures/README-features.png)

#### addMouseCoordinates

Expand All @@ -54,7 +54,7 @@ leaflet() %>%
addMouseCoordinates()
```

![](figures/README-garnish.png)
![](man/figures/README-garnish.png)

#### garnishMap

Expand All @@ -65,7 +65,7 @@ m <- leaflet() %>% addProviderTiles("OpenStreetMap")
garnishMap(m, addMouseCoordinates)
```

![](figures/README-garnish.png)
![](man/figures/README-garnish.png)

#### addHomeButton

Expand All @@ -80,7 +80,7 @@ m <- leaflet() %>%
m
```

![](figures/README-home.png)
![](man/figures/README-home.png)

#### addImageQuery

Expand All @@ -97,7 +97,7 @@ leaflet() %>%
addLayersControl(overlayGroups = "poppendorf")
```

![](figures/README-query.png)
![](man/figures/README-query.png)

#### addLogo

Expand All @@ -107,7 +107,7 @@ img <- "https://www.r-project.org/logo/Rlogo.svg"
leaflet() %>% addTiles() %>% addLogo(img, url = "https://www.r-project.org/logo/")
```

![](figures/README-logo.png)
![](man/figures/README-logo.png)

### Code of Conduct

Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<!-- badges: start -->

[![R-CMD-check](https://github.com/r-spatial/leafem/workflows/R-CMD-check/badge.svg)](https://github.com/r-spatial/leafem/actions)
[![R-CMD-check](https://github.com/r-spatial/leafem/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-spatial/leafem/actions/workflows/R-CMD-check.yaml)
[![cran
checks](https://badges.cranchecks.info/worst/leafem.svg)](https://cran.r-project.org/web/checks/check_results_leafem.html)
![monthly](http://cranlogs.r-pkg.org/badges/leafem)
![total](http://cranlogs.r-pkg.org/badges/grand-total/leafem)
[![CRAN](http://www.r-pkg.org/badges/version/leafem?color=009999)](https://cran.r-project.org/package=leafem)
![monthly](https://cranlogs.r-pkg.org/badges/leafem)
![total](https://cranlogs.r-pkg.org/badges/grand-total/leafem)
[![CRAN](https://www.r-pkg.org/badges/version/leafem?color=009999)](https://cran.r-project.org/package=leafem)
<!-- badges: end -->

`leafem` provides extensions for package `leaflet` many of which are
Expand All @@ -37,7 +37,7 @@ library(leaflet)
leaflet() %>% addProviderTiles("OpenStreetMap") %>% addFeatures(data = breweries91)
```

![](figures/README-features.png)
![](man/figures/README-features.png)

#### addMouseCoordinates

Expand All @@ -47,7 +47,7 @@ leaflet() %>%
addMouseCoordinates()
```

![](figures/README-garnish.png)
![](man/figures/README-garnish.png)

#### garnishMap

Expand All @@ -58,7 +58,7 @@ m <- leaflet() %>% addProviderTiles("OpenStreetMap")
garnishMap(m, addMouseCoordinates)
```

![](figures/README-garnish.png)
![](man/figures/README-garnish.png)

#### addHomeButton

Expand All @@ -73,7 +73,7 @@ m <- leaflet() %>%
m
```

![](figures/README-home.png)
![](man/figures/README-home.png)

#### addImageQuery

Expand All @@ -90,7 +90,7 @@ leaflet() %>%
addLayersControl(overlayGroups = "poppendorf")
```

![](figures/README-query.png)
![](man/figures/README-query.png)

#### addLogo

Expand All @@ -100,7 +100,7 @@ img <- "https://www.r-project.org/logo/Rlogo.svg"
leaflet() %>% addTiles() %>% addLogo(img, url = "https://www.r-project.org/logo/")
```

![](figures/README-logo.png)
![](man/figures/README-logo.png)

### Code of Conduct

Expand Down
2 changes: 1 addition & 1 deletion man/addCopyExtent.Rd

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

3 changes: 3 additions & 0 deletions man/addHomeButton.Rd

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

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit 988c9cb

Please sign in to comment.