Skip to content

Commit

Permalink
Add progress bars and deprecate amenities (#38)
Browse files Browse the repository at this point in the history
* Add progress bars

* Update tests

* Deprecate geo amenities

* Update wordlist

* Update docs with pkgdev

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
dieghernan and github-actions[bot] authored Jan 8, 2024
1 parent eaa28d9 commit 5f9d124
Show file tree
Hide file tree
Showing 56 changed files with 796 additions and 1,362 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/wipe-cache.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Clear all Github actions caches manually
on:
workflow_dispatch:
schedule:
- cron: '0 16 15 * *'

jobs:
cache-clear:
Expand Down
49 changes: 32 additions & 17 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ message: 'To cite package "nominatimlite" in publications use:'
type: software
license: MIT
title: 'nominatimlite: Interface with ''Nominatim'' API Service'
version: 0.2.1
version: 0.2.1.9000
doi: 10.5281/zenodo.5113195
abstract: Lite interface for getting data from 'OSM' service 'Nominatim' <https://nominatim.org/release-docs/latest/>.
Extract coordinates from addresses, find places near a set of coordinates, search
for amenities and return spatial objects on 'sf' format.
Extract coordinates from addresses, find places near a set of coordinates and return
spatial objects on 'sf' format.
authors:
- family-names: Hernangómez
given-names: Diego
Expand All @@ -26,13 +26,13 @@ preferred-citation:
given-names: Diego
email: [email protected]
orcid: https://orcid.org/0000-0001-8457-4658
year: '2023'
version: 0.2.1
year: '2024'
version: 0.2.1.9000
doi: 10.5281/zenodo.5113195
url: https://dieghernan.github.io/nominatimlite/
abstract: Lite interface for getting data from OSM service Nominatim <https://nominatim.org/release-docs/latest/>.
Extract coordinates from addresses, find places near a set of coordinates, search
for amenities and return spatial objects on sf format.
Extract coordinates from addresses, find places near a set of coordinates and
return spatial objects on sf format.
repository: https://CRAN.R-project.org/package=nominatimlite
repository-code: https://github.com/dieghernan/nominatimlite
url: https://dieghernan.github.io/nominatimlite/
Expand Down Expand Up @@ -65,7 +65,7 @@ references:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
year: '2024'
institution:
name: R Foundation for Statistical Computing
version: '>= 3.6.0'
Expand All @@ -92,7 +92,7 @@ references:
given-names: Davis
email: [email protected]
orcid: https://orcid.org/0000-0003-4777-038X
year: '2023'
year: '2024'
version: '>= 1.0.0'
- type: software
title: jsonlite
Expand All @@ -105,11 +105,26 @@ references:
given-names: Jeroen
email: [email protected]
orcid: https://orcid.org/0000-0002-4035-0289
year: '2023'
year: '2024'
identifiers:
- type: url
value: https://arxiv.org/abs/1403.2805
version: '>= 1.7.0'
- type: software
title: lifecycle
abstract: 'lifecycle: Manage the Life Cycle of your Package Functions'
notes: Imports
url: https://lifecycle.r-lib.org/
repository: https://CRAN.R-project.org/package=lifecycle
authors:
- family-names: Henry
given-names: Lionel
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: [email protected]
orcid: https://orcid.org/0000-0003-4757-117X
year: '2024'
- type: software
title: sf
abstract: 'sf: Simple Features for R'
Expand All @@ -121,7 +136,7 @@ references:
given-names: Edzer
email: [email protected]
orcid: https://orcid.org/0000-0001-8049-7069
year: '2023'
year: '2024'
version: '>= 0.9.0'
- type: software
title: utils
Expand All @@ -131,7 +146,7 @@ references:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
year: '2024'
institution:
name: R Foundation for Statistical Computing
- type: software
Expand Down Expand Up @@ -168,7 +183,7 @@ references:
- family-names: Dunnington
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
year: '2023'
year: '2024'
version: '>= 3.0.0'
- type: software
title: knitr
Expand All @@ -181,7 +196,7 @@ references:
given-names: Yihui
email: [email protected]
orcid: https://orcid.org/0000-0003-0645-5666
year: '2023'
year: '2024'
- type: software
title: rmarkdown
abstract: 'rmarkdown: Dynamic Documents for R'
Expand Down Expand Up @@ -224,7 +239,7 @@ references:
given-names: Richard
email: [email protected]
orcid: https://orcid.org/0000-0003-3925-190X
year: '2023'
year: '2024'
- type: software
title: testthat
abstract: 'testthat: Unit Testing for R'
Expand All @@ -235,7 +250,7 @@ references:
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2023'
year: '2024'
version: '>= 3.0.0'
- type: software
title: tidygeocoder
Expand All @@ -260,4 +275,4 @@ references:
given-names: Daniel
email: [email protected]
orcid: https://orcid.org/0000-0002-6738-9845
year: '2023'
year: '2024'
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: nominatimlite
Title: Interface with 'Nominatim' API Service
Version: 0.2.1
Version: 0.2.1.9000
Authors@R: c(
person("Diego", "Hernangómez", , "[email protected]", role = c("aut", "cre", "cph"),
comment = c(ORCID = "0000-0001-8457-4658")),
Expand All @@ -10,8 +10,8 @@ Authors@R: c(
)
Description: Lite interface for getting data from 'OSM' service
'Nominatim' <https://nominatim.org/release-docs/latest/>. Extract
coordinates from addresses, find places near a set of coordinates,
search for amenities and return spatial objects on 'sf' format.
coordinates from addresses, find places near a set of coordinates and
return spatial objects on 'sf' format.
License: MIT + file LICENSE
URL: https://dieghernan.github.io/nominatimlite/,
https://github.com/dieghernan/nominatimlite
Expand All @@ -21,6 +21,7 @@ Depends:
Imports:
dplyr (>= 1.0.0),
jsonlite (>= 1.7.0),
lifecycle,
sf (>= 0.9.0),
utils
Suggests:
Expand All @@ -37,7 +38,6 @@ Config/testthat/parallel: true
Copyright: Data © OpenStreetMap contributors, ODbL 1.0.
<https://www.openstreetmap.org/copyright>
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
X-schema.org-applicationCategory: cartography
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ export(nominatim_check_access)
export(reverse_geo_lite)
export(reverse_geo_lite_sf)
importFrom(utils,download.file)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# nominatimlite (development version)

- Add a `progressbar` parameter to `geo_lite()`, `geo_lite_sf()`,
`reverse_geo_lite()` and `reverse_geo_lite_sf()` to display progress in the
console.

## Deprecated

- `geo_amenity()` and `geo_amenity_sf()`, see
[Nominatim/issues/1311](https://github.com/osm-search/Nominatim/issues/1311).
- `nominatimlite::osm_amenities` data set deleted.

# nominatimlite 0.2.1

- Remove **osmdata** from Suggests.
Expand Down
3 changes: 1 addition & 2 deletions R/bbox_to_poly.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#' Create a bounding box `sf` object
#' Create a bounding box \CRANpkg{sf} object
#'
#' @description
#'
Expand All @@ -16,7 +16,6 @@
#' @seealso [sf::st_as_sfc()]
#'
#' @family spatial
#' @family amenity
#'
#' @details
#'
Expand Down
43 changes: 0 additions & 43 deletions R/data.R

This file was deleted.

2 changes: 1 addition & 1 deletion R/geo_address_lookup.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#' @family lookup
#' @family geocoding
#'
#' @return A `tibble` with the results found by the query.
#' @return A \CRANpkg{tibble} with the results found by the query.
#'
#' @examplesIf nominatim_check_access()
#' \donttest{
Expand Down
2 changes: 1 addition & 1 deletion R/geo_address_lookup_sf.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#' \CRANpkg{sf} spatial object associated with the query, see
#' [geo_address_lookup()] for retrieving the data in \CRANpkg{tibble} format.
#'
#' @return A `sf` object with the results.
#' @return A \CRANpkg{sf} object with the results.
#'
#' @inheritParams geo_lite_sf
#' @inheritParams geo_address_lookup
Expand Down
Loading

0 comments on commit 5f9d124

Please sign in to comment.