Skip to content

Commit

Permalink
Merge pull request #33 from jessecambon/1.0.0
Browse files Browse the repository at this point in the history
1.0.0
  • Loading branch information
jessecambon authored Jul 15, 2020
2 parents aa1322d + 838ec68 commit 0e6ed87
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 37 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: tidygeocoder
Type: Package
Title: Geocoding Made Easy
Version: 0.3.0.9000
Version: 1.0.0
Authors@R:
c(person(given = "Jesse",
family = "Cambon",
Expand Down
13 changes: 8 additions & 5 deletions R/geo.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ geo <- function(address = NULL,
## OR the user has explicitly specified single address geocoding.. call the
## single address geocoder in a loop
if ((num_unique_addresses > 1) & ((method %in% c('osm', 'iq')) | (mode == 'single'))) {
if (verbose == TRUE) message('Executing single address geocoding...\n')
if (verbose == TRUE) {
message('Executing single address geocoding...')
message()
}

# construct args for single address query
# note that non-address related fields go to the MoreArgs argument of mapply
Expand Down Expand Up @@ -287,11 +290,11 @@ geo <- function(address = NULL,
# Name the latitude and longitude columns in accordance with lat/long arguments
names(results)[1] <- lat
names(results)[2] <- long

### Make sure the proper amount of time has elapsed for the query per min_time
pause_until(start_time, min_time, debug = verbose)
if (verbose == TRUE) message() # insert ending line break if verbose
}

### Make sure the proper amount of time has elapsed for the query per min_time
pause_until(start_time, min_time, debug = verbose)
if (verbose == TRUE) message() # insert ending line break if verbose

return(unpackage_addresses(address_pack, results, unique_only, return_addresses))
}
2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.html

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

21 changes: 11 additions & 10 deletions docs/articles/tidygeocoder.html

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

2 changes: 1 addition & 1 deletion docs/authors.html

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

2 changes: 1 addition & 1 deletion docs/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 1.5.1
pkgdown_sha: ~
articles:
tidygeocoder: tidygeocoder.html
last_built: 2020-07-14T20:28Z
last_built: 2020-07-15T12:56Z
urls:
reference: https://jessecambon.github.io/tidygeocoder/reference
article: https://jessecambon.github.io/tidygeocoder/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/api_parameter_reference.html

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

2 changes: 1 addition & 1 deletion docs/reference/extract_results.html

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

2 changes: 1 addition & 1 deletion docs/reference/geo.html

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

2 changes: 1 addition & 1 deletion docs/reference/geo_cascade.html

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

2 changes: 1 addition & 1 deletion docs/reference/geo_census.html

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

2 changes: 1 addition & 1 deletion docs/reference/geocode.html

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

2 changes: 1 addition & 1 deletion docs/reference/get_api_query.html

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

2 changes: 1 addition & 1 deletion docs/reference/index.html

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

2 changes: 1 addition & 1 deletion docs/reference/louisville.html

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

2 changes: 1 addition & 1 deletion docs/reference/query_api.html

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

2 changes: 1 addition & 1 deletion docs/reference/sample_addresses.html

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

2 changes: 1 addition & 1 deletion docs/reference/tidygeocoder-package.html

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

4 changes: 2 additions & 2 deletions vignettes/tidygeocoder.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ cairo_geo <- geo('Cairo, Egypt', method = 'osm', full_results = TRUE,
glimpse(cairo_geo)
```

To test a query without sending any data to a geocoder service, you can use `no_query = TRUE` (NA results are returned). In this example, the `mode` argument is used to prevent batch geocoding from being used.
To test a query without sending any data to a geocoder service, you can use `no_query = TRUE` (NA results are returned).

```{r}
geo(c('Vancouver, Canada', 'Las Vegas, NV'), no_query = TRUE,
method = 'geocodio', mode = 'single')
method = 'osm')
```

Here are some additional usage notes for the `geocode()` and `geo()` functions:
Expand Down

0 comments on commit 0e6ed87

Please sign in to comment.