Commit ⋅ ropensci/hddtools

Showing 1 of 11 files from the diff.

45.28% 80.00% +16.71%

R/SEPA.R changed.

Other files ignored by Codecov

vignettes/kilphedir.png was deleted.

man/SEPAcatalogue.Rd has changed.

vignettes/sepa.png was deleted.

data/SEPAcatalogue.rda has changed.

tests/testthat/test-catalogueSEPA.R has changed.

R/hddtools-package.R has changed.

vignettes/hddtools_vignette.Rmd has changed.

vignettes/figure/SEPA2-1.png has changed.

.Rbuildignore has changed.

vignettes/figure/SEPA3-1.png has changed.

@@ -30,9 +30,12 @@

catalogueSEPA <- function(columnName = NULL, columnValue = NULL,
                          useCachedData = TRUE){

  if (useCachedData == TRUE){
  theurl <- paste0("http://apps.sepa.org.uk/database/riverlevels/",
                   "SEPA_River_Levels_Web.csv")

    # message("Using cached data.")
  if (RCurl::url.exists(theurl) == FALSE | useCachedData == TRUE){

    message("Using cached data.")

    load(system.file(file.path("data", "SEPAcatalogue.rda"),
                     package = "hddtools"))

@@ -41,34 +44,10 @@


  }else{

    theurl <- "http://pennine.ddns.me.uk/riverlevels/ConciseList.html"

    if (RCurl::url.exists(theurl) == FALSE){

      # message("Using cached data.")

      load(system.file(file.path("data", "SEPAcatalogue.rda"),
                       package = "hddtools"))

      catTMP <- SEPAcatalogue

    }else{

      message("Retrieving data from data provider.")
    message("Retrieving data from data provider.")

      tables <- XML::readHTMLTable(theurl)
      n.rows <- unlist(lapply(tables, function(t) dim(t)[1]))
      catTMP <- tables[[which.max(n.rows)]]
      catTMP <- catTMP[catTMP$stationId!=0,c(1:3,5:9)]
      row.names(catTMP) <- NULL
      names(catTMP) <- c("idNRFA", "aspxpage", "stationId", "River",
                         "Location",
                         "GridRef", "Operator", "CatchmentAreaKm2")

      catTMP[] <- lapply(catTMP, as.character)
      catTMP$CatchmentAreaKm2 <- as.numeric(catTMP$CatchmentAreaKm2)

    }
    catTMP <- read.csv(theurl, stringsAsFactors = FALSE)
    catTMP$WEB_MESSAGE <- as.character(catTMP$WEB_MESSAGE)

  }


@@ -76,16 +55,15 @@


    if (tolower(columnName) %in% tolower(names(catTMP))){

      col2select <- which(tolower(names(catTMP)) ==
                            tolower(columnName))
      col2select <- which(tolower(names(catTMP)) == tolower(columnName))

      if (class(catTMP[,col2select]) == "character"){
        rows2select <- which(tolower(catTMP[,col2select]) ==
      if (class(catTMP[, col2select]) == "character"){
        rows2select <- which(tolower(catTMP[, col2select]) ==
                               tolower(columnValue))
      }
      if (class(catTMP[,col2select]) == "numeric"){
      if (class(catTMP[,col2select]) == "numeric" |
          class(catTMP[, col2select]) == "integer"){

        # rows2select <- which(catTMP[,col2select] == columnValue)
        rows2select <- eval(parse(text =
                                    paste0("which(catTMP[,col2select] ",
                                           columnValue, ")")))

@@ -160,9 +138,9 @@


      if (plotOption == TRUE){

        locationSEPA <- catalogueSEPA(columnName = "stationID",
                                      columnValue = id)
        plot(myTS, main = locationSEPA$Location,
        locationSEPA <- catalogueSEPA(columnName = "LOCATION_CODE",
                                      columnValue = paste("==", id))
        plot(myTS, main = locationSEPA$STATION_NAME,
             xlab = "", ylab = "River level [m]")

      }

Files		•	•	•	Coverage
R	519	184	0	335	35.45%
Project Totals (7 files)	519	184	0	335	35.45%

View CI Build Download

No yaml found.

Create your codecov.yml to customize your Codecov experience

Read the docs

Interact now

The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.

SVG

Learn more about the coverage sunburst graph

41	44
42	45		}else{
43	46
44		-	theurl <- "http://pennine.ddns.me.uk/riverlevels/ConciseList.html"
45		-
46		-	if (RCurl::url.exists(theurl) == FALSE){
47		-
48		-	# message("Using cached data.")
49		-
50		-	load(system.file(file.path("data", "SEPAcatalogue.rda"),
51		-	package = "hddtools"))
52		-
53		-	catTMP <- SEPAcatalogue
54		-
55		-	}else{
56		-
57		-	message("Retrieving data from data provider.")
	47	+	message("Retrieving data from data provider.")
58	48
59		-	tables <- XML::readHTMLTable(theurl)
60		-	n.rows <- unlist(lapply(tables, function(t) dim(t)[1]))
61		-	catTMP <- tables[[which.max(n.rows)]]
62		-	catTMP <- catTMP[catTMP$stationId!=0,c(1:3,5:9)]
63		-	row.names(catTMP) <- NULL
64		-	names(catTMP) <- c("idNRFA", "aspxpage", "stationId", "River",
65		-	"Location",
66		-	"GridRef", "Operator", "CatchmentAreaKm2")
67		-
68		-	catTMP[] <- lapply(catTMP, as.character)
69		-	catTMP$CatchmentAreaKm2 <- as.numeric(catTMP$CatchmentAreaKm2)
70		-
71		-	}
	49	+	catTMP <- read.csv(theurl, stringsAsFactors = FALSE)
	50	+	catTMP$WEB_MESSAGE <- as.character(catTMP$WEB_MESSAGE)
72	51
73	52		}
74	53

76	55
77	56		if (tolower(columnName) %in% tolower(names(catTMP))){
78	57
79		-	col2select <- which(tolower(names(catTMP)) ==
80		-	tolower(columnName))
	58	+	col2select <- which(tolower(names(catTMP)) == tolower(columnName))
81	59
82		-	if (class(catTMP[,col2select]) == "character"){
83		-	rows2select <- which(tolower(catTMP[,col2select]) ==
	60	+	if (class(catTMP[, col2select]) == "character"){
	61	+	rows2select <- which(tolower(catTMP[, col2select]) ==
84	62		tolower(columnValue))
85	63		}
86		-	if (class(catTMP[,col2select]) == "numeric"){
	64	+	if (class(catTMP[,col2select]) == "numeric" \|
	65	+	class(catTMP[, col2select]) == "integer"){
87	66
88		-	# rows2select <- which(catTMP[,col2select] == columnValue)
89	67		rows2select <- eval(parse(text =
90	68		paste0("which(catTMP[,col2select] ",
91	69		columnValue, ")")))

160	138
161	139		if (plotOption == TRUE){
162	140
163		-	locationSEPA <- catalogueSEPA(columnName = "stationID",
164		-	columnValue = id)
165		-	plot(myTS, main = locationSEPA$Location,
	141	+	locationSEPA <- catalogueSEPA(columnName = "LOCATION_CODE",
	142	+	columnValue = paste("==", id))
	143	+	plot(myTS, main = locationSEPA$STATION_NAME,
166	144		xlab = "", ylab = "River level [m]")
167	145
168	146		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

30	30		catalogueSEPA <- function(columnName = NULL, columnValue = NULL,
31	31		useCachedData = TRUE){
32	32
33		-	if (useCachedData == TRUE){
	33	+	theurl <- paste0("http://apps.sepa.org.uk/database/riverlevels/",
	34	+	"SEPA_River_Levels_Web.csv")
34	35
35		-	# message("Using cached data.")
	36	+	if (RCurl::url.exists(theurl) == FALSE \| useCachedData == TRUE){
	37	+
	38	+	message("Using cached data.")
36	39
37	40		load(system.file(file.path("data", "SEPAcatalogue.rda"),
38	41		package = "hddtools"))