Skip to content

Commit

Permalink
Merge pull request #10 from jmlondon/develop
Browse files Browse the repository at this point in the history
REMOVE LEFTOVER REFERENCES TO nPacMaps; Fixes #9
  • Loading branch information
jmlondon authored Oct 25, 2018
2 parents 68b1506 + d189acf commit 83b2c3e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Description: This package contains functions for creating basemap polygons
Walter H. F. Smith (NOAA Geosciences Lab, National Ocean Service, Silver
Spring, MD) for there dedication and maintenance of the GSHHG. Please cite
their work if you use this package in a publication.
Version: 1.0.0
Date: 2018-10-24
Version: 1.0.1
Date: 2018-10-25
URL: https://github.com/jmlondon/ptolemy
BugReports: https://github.com/jmlondon/ptolemy/issues
Encoding: UTF-8
Expand Down
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# ptolemy 1.0
# ptolemy 1.0.1

* There were some leftover references to nPacMaps that prevented install. These
were removed and replaced with references to the new pkg name, ptolemy

# ptolemy 1.0.0

* Added a `NEWS.md` file to track changes to the package.
* Renamed the package from "nPacMaps" to "ptolemy"
Expand Down
6 changes: 3 additions & 3 deletions R/install_gshhg.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#' @export
#'
install_gshhg <- function() {
if (!dir.exists(system.file("extData", package = "nPacMaps"))) {
dir.create(system.file("extData", package = "nPacMaps"))
if (!dir.exists(system.file("extData", package = "ptolemy"))) {
dir.create(system.file("extData", package = "ptolemy"))
}
data_path <- system.file("extData", package = "nPacMaps")
data_path <- system.file("extData", package = "ptolemy")

if (!file.exists(paste(data_path, "gshhg-bin-2.3.7", sep = "/"))) {
cont <- readline(
Expand Down
10 changes: 5 additions & 5 deletions R/nPacMaps.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' North Pacific Maps
#' ptolemy: an R package for accessing global high-resolution geography
#'
#' @docType package
#' @name nPacMaps
#' @name ptolemy
NULL

.onAttach <- function(library, pkgname)
Expand All @@ -10,13 +10,13 @@ NULL
package <- info$Package
version <- info$Version
date <- info$Date
if (dir.exists(system.file("extData", package = "nPacMaps"))) {
data_path <- system.file("extData", package = "nPacMaps")
if (dir.exists(system.file("extData", package = "ptolemy"))) {
data_path <- system.file("extData", package = "ptolemy")
}
if (!file.exists(paste(data_path, "gshhg-bin-2.3.7", sep = "/"))) {
packageStartupMessage(
paste(paste(package, version, paste0("(",date, ")"), "\n"),
"The nPacMaps package requires an additional installation step.\n",
"The ptolemy package requires an additional installation step.\n",
"Please type 'install_gshhg()' to install GSHHG v 2.3.7.\n"
)
)
Expand Down

0 comments on commit 83b2c3e

Please sign in to comment.