Skip to content

Commit

Permalink
Fix invalid URLs
Browse files Browse the repository at this point in the history
Per CRAN submission failure
  • Loading branch information
pdil committed Oct 5, 2020
1 parent 6205390 commit de6547b
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 19 deletions.
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2020-10-05.
Once it is accepted, delete this file and tag the release (commit 985fc8d).
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Released Sunday, September 16, 2018.
Released Sunday, June 3, 2018.

### Improvements
* Update shape files to [2017 versions](https://www.census.gov/geo/maps-data/data/tiger-cart-boundary.html).
* Update shape files to [2017 versions](https://www.census.gov/geographies/mapping-files/time-series/geo/tiger-line-file.2017.html).
* Improvements to `fips` and `fips_info`:
* Vectorization support (e.g. enter multiple states in `fips` to receive a vector of corresponding FIPS codes)
* e.g. `fips(c("AK", "AL"))` or `fips(c("Alaska", "Alabama"))`
Expand Down
2 changes: 1 addition & 1 deletion R/datasets.R
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
#' @docType data
#' @references
#' \itemize{
#' \item \url{https://earthquake.usgs.gov/earthquakes/}
#' \item \url{https://www.usgs.gov/natural-hazards/earthquake-hazards/earthquakes}
#' \item \url{https://earthquake.usgs.gov/earthquakes/search/}
#' }
#' @keywords data
Expand Down
11 changes: 5 additions & 6 deletions R/usmap.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,18 @@
#' @author Paolo Di Lorenzo \cr
#' \itemize{
#' \item Email: \email{paolo@@dilorenzo.pl}
#' \item Website: \url{http://dilorenzo.pl}
#' \item Twitter: \url{http://twitter.com/dilorenzopl}
#' \item Github: \url{http://www.github.com/pdil/}
#' \item Website: \url{https://dilorenzo.pl}
#' \item Github: \url{https://github.com/pdil/}
#' }
#'
#' @seealso
#' Helpful links:
#' \itemize{
#' \item FIPS code information \cr
#' \url{http://en.wikipedia.org/wiki/FIPS_county_code}
#' \url{http://en.wikipedia.org/wiki/FIPS_state_code}
#' \url{https://en.wikipedia.org/wiki/FIPS_county_code}
#' \url{https://en.wikipedia.org/wiki/FIPS_state_code}
#' \item US Census Shapefiles \cr
#' \url{https://www.census.gov/geo/maps-data/data/tiger-cart-boundary.html}
#' \url{https://www.census.gov/geographies/mapping-files/time-series/geo/tiger-line-file.html}
#' \item Map Features \cr
#' \url{https://en.wikipedia.org/wiki/Map_projection}
#' \url{https://en.wikipedia.org/wiki/Albers_projection}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ View code used to generate these plots: [resources/examples.R](https://github.co
Typically in R it is difficult to create nice US [choropleths](https://en.wikipedia.org/wiki/Choropleth_map) that include Alaska and Hawaii. The functions presented here attempt to elegantly solve this problem by manually moving these states to a new location and providing a fortified data frame for mapping and visualization. This allows the user to easily add data to color the map.

## Shape Files
The shape files that we use to plot the maps in R are located in the `data-raw` folder. For more information refer to the [US Census Bureau](https://www.census.gov/geo/maps-data/data/tiger-cart-boundary.html). Maps at both the state and county levels are included for convenience (zip code maps may be included in the future).
The shape files that we use to plot the maps in R are located in the `data-raw` folder. For more information refer to the [US Census Bureau](https://www.census.gov/geographies/mapping-files/time-series/geo/tiger-line-file.html). Maps at both the state and county levels are included for convenience (zip code maps may be included in the future).

## Installation
To install from CRAN _(recommended)_, run the following code in an R console:
Expand Down Expand Up @@ -165,7 +165,7 @@ usmap::usmap_crs()

To obtain the projection used by `usmap`, use `usmap_crs()`.

Alternatively, the CRS ([coordinate reference system](https://www.nceas.ucsb.edu/~frazier/RSpatialGuides/OverviewCoordinateReferenceSystems.pdf)) can be created manually with the following command:
Alternatively, the CRS ([coordinate reference system](https://www.nceas.ucsb.edu/sites/default/files/2020-04/OverviewCoordinateReferenceSystems.pdf)) can be created manually with the following command:
```r
sp::CRS("+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0
+a=6370997 +b=6370997 +units=m +no_defs")
Expand Down
4 changes: 4 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Resubmission
This is a resubmission. In this version I have:

* Fixed invalid URLs.

## Test environments
* local macOS install, R 4.0.2
Expand Down
2 changes: 1 addition & 1 deletion man/earthquakes.Rd

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

11 changes: 5 additions & 6 deletions man/usmap.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/introduction.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ usmap::fips_info(c("01001", "01003", "01005", "01007"))

#### Further reading

More information about FIPS can be read [here](http://en.wikipedia.org/wiki/Federal_Information_Processing_Standards).
More information about FIPS can be read [here](https://en.wikipedia.org/wiki/Federal_Information_Processing_Standards).

---

Expand Down
2 changes: 1 addition & 1 deletion vignettes/mapping.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ knitr::opts_chunk$set(

## Extending `plot_usmap` with `ggplot2`

The nice thing about `usmap::plot_usmap` is it returns a [ggplot object](http://docs.ggplot2.org/current/) object, which means we can add `ggplot` layers to the plot right out of the box.
The nice thing about `usmap::plot_usmap` is it returns a [ggplot object](https://ggplot2.tidyverse.org/index.html) object, which means we can add `ggplot` layers to the plot right out of the box.

```{r, fig.align='center', fig.width=7, message=FALSE, warning=FALSE}
library(usmap)
Expand Down

0 comments on commit de6547b

Please sign in to comment.