Remove numbering of queries on progress bar

dieghernan · Jan 9, 2024 · e09351c · e09351c
1 parent 5f9d124
commit e09351c
Show file tree

Hide file tree

Showing 15 changed files with 166 additions and 170 deletions.
diff --git a/R/geo_lite.R b/R/geo_lite.R
@@ -82,7 +82,6 @@ geo_lite <- function(address,
     ad <- key[x]
     if (progressbar) {
       setTxtProgressBar(pb, x)
-      cat(paste0(" (", x, "/", ntot, ")  "))
     }
     geo_lite_single(
       address = ad,

diff --git a/R/geo_lite_sf.R b/R/geo_lite_sf.R
@@ -113,7 +113,6 @@ geo_lite_sf <- function(address,
     ad <- key[x]
     if (progressbar) {
       setTxtProgressBar(pb, x)
-      cat(paste0(" (", x, "/", ntot, ")  "))
     }
     geo_lite_sf_single(
       address = ad,

diff --git a/R/reverse_geo_lite.R b/R/reverse_geo_lite.R
@@ -126,7 +126,6 @@ reverse_geo_lite <- function(lat,
   all_res <- lapply(seql, function(x) {
     if (progressbar) {
       setTxtProgressBar(pb, x)
-      cat(paste0(" (", x, "/", ntot, ")  "))
     }
     rw <- key[x, ]
     res_single <- reverse_geo_lite_single(

diff --git a/R/reverse_geo_lite_sf.R b/R/reverse_geo_lite_sf.R
@@ -116,7 +116,6 @@ reverse_geo_lite_sf <- function(lat,
   all_res <- lapply(seql, function(x) {
     if (progressbar) {
       setTxtProgressBar(pb, x)
-      cat(paste0(" (", x, "/", ntot, ")  "))
     }
     rw <- key[x, ]
     res_single <- reverse_geo_lite_sf_single(

diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ some_addresses <- tribble(
 
 # geocode the addresses
 lat_longs <- geo_lite(some_addresses$addr, lat = "latitude", long = "longitude")
-#>   |                                                          |                                                  |   0%  |                                                          |=================                                 |  33% (1/3)    |                                                          |=================================                 |  67% (2/3)    |                                                          |==================================================| 100% (3/3)
+#>   |                                                          |                                                  |   0%  |                                                          |=================                                 |  33%  |                                                          |=================================                 |  67%  |                                                          |==================================================| 100%
 ```
 
 Only latitude and longitude are returned from the geocoder service in
@@ -181,7 +181,7 @@ reverse <- reverse_geo_lite(
   lat = lat_longs$latitude, long = lat_longs$longitude,
   address = "address_found"
 )
-#>   |                                                          |                                                  |   0%  |                                                          |=================                                 |  33% (1/3)    |                                                          |=================================                 |  67% (2/3)    |                                                          |==================================================| 100% (3/3)
+#>   |                                                          |                                                  |   0%  |                                                          |=================                                 |  33%  |                                                          |=================================                 |  67%  |                                                          |==================================================| 100%
 ```
 
 | address_found                                                                                                     |      lat |        lon |

diff --git a/codemeta.json b/codemeta.json
@@ -14,7 +14,7 @@
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.3.2 (2023-10-31 ucrt)",
+  "runtimePlatform": "R version 4.3.2 (2023-10-31)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -187,7 +187,7 @@
   },
   "applicationCategory": "cartography",
   "keywords": ["r", "geocoding", "openstreetmap", "address", "nominatim", "reverse-geocoding", "rstats", "shapefile", "r-package", "spatial", "cran", "api-wrapper", "api", "gis"],
-  "fileSize": "251.765KB",
+  "fileSize": "246.956KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",

diff --git a/inst/schemaorg.json b/inst/schemaorg.json
@@ -34,7 +34,7 @@
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "runtimePlatform": "R version 4.3.2 (2023-10-31 ucrt)",
+      "runtimePlatform": "R version 4.3.2 (2023-10-31)",
       "version": "0.2.1.9000"
     },
     {

diff --git a/man/figures/README-line-object-1.png b/man/figures/README-line-object-1.png
diff --git a/man/figures/README-pizzahut-1.png b/man/figures/README-pizzahut-1.png
diff --git a/man/figures/README-statue_liberty-1.png b/man/figures/README-statue_liberty-1.png
diff --git a/tests/testthat/test-geo_lite.R b/tests/testthat/test-geo_lite.R
@@ -141,7 +141,7 @@ test_that("Progress bar", {
   expect_silent(geo_lite("Madrid", progressbar = TRUE))
 
   # Get a pbar
-  expect_output(aa <- geo_lite(c("Madrid", "Barcelona")), "1/2")
+  expect_output(aa <- geo_lite(c("Madrid", "Barcelona")))
 
   # Not
   expect_silent(aa <- geo_lite(c("Madrid", "Barcelona"), progressbar = FALSE))

diff --git a/tests/testthat/test-geo_lite_sf.R b/tests/testthat/test-geo_lite_sf.R
@@ -165,7 +165,7 @@ test_that("Progress bar", {
   expect_silent(geo_lite_sf("Madrid", progressbar = TRUE))
 
   # Get a pbar
-  expect_output(aa <- geo_lite_sf(c("Madrid", "Barcelona")), "1/2")
+  expect_output(aa <- geo_lite_sf(c("Madrid", "Barcelona")))
 
   # Not
   expect_silent(

diff --git a/tests/testthat/test-reverse_geo_lite.R b/tests/testthat/test-reverse_geo_lite.R
@@ -223,7 +223,7 @@ test_that("Progress bar", {
   expect_silent(reverse_geo_lite(lat[1], long[1], progressbar = TRUE))
 
   # Get a pbar
-  expect_output(aa <- reverse_geo_lite(lat, long), "1/2")
+  expect_output(aa <- reverse_geo_lite(lat, long))
 
   # Not
   expect_silent(aa <- reverse_geo_lite(lat, long, progressbar = FALSE))

diff --git a/tests/testthat/test-reverse_geo_lite_sf.R b/tests/testthat/test-reverse_geo_lite_sf.R
@@ -244,7 +244,7 @@ test_that("Progress bar", {
   expect_silent(reverse_geo_lite_sf(lat[1], long[1], progressbar = TRUE))
 
   # Get a pbar
-  expect_output(aa <- reverse_geo_lite_sf(lat, long), "1/2")
+  expect_output(aa <- reverse_geo_lite_sf(lat, long))
 
   # Not
   expect_silent(aa <- reverse_geo_lite_sf(lat, long, progressbar = FALSE))