update vignettes

vignettes/innosense.Rmd

@@ -12,9 +12,9 @@ library(friendlyr)
 knitr::opts_chunk$set(collapse = T, comment = "#>")
 ```
 
-# Get the Public data from Innosense database
+# Get the data from Innosense database
 
-## Get the timeseries
+## Get the timeseries at specific stations
 
 
 ```R
@@ -22,13 +22,13 @@ fromDate <- "2016/11/6 00:00:00"
 toDate <- "2016/11/10 00:00:00"
 timeResolution <- "hourly"
 precision <- "hourly"
-
-station_id <- "4" #c("4","5","6")
+station_id <- c(1,2,3,4,5,6,10,100,102,103,104,105,107)
+element_id=c("pm25","pm10","no2","rh","tsensor")
 
 # get timeseries data
 df <- friendlyr::ts(service="innolyr",username="****",password="****",
                  fromDate=fromDate,toDate=toDate,precision=precision,timeResolution=timeResolution,
-                 element_id=c("no2","rh","tsensor"),station_id="4")
+                 element_id=element_id,station_id=station_id)
 
 ```
 ## Get metadata
@@ -39,44 +39,11 @@ Get metadata from the innosense database.
 
 # error, no access to metadata permitted
 metadata <- friendlyr::meta(service="innolyr",username="****",password="****",
-                 station_id=c("4"))
-
-```
-
-# Get the Restricted data from Innosense database
-
-## Get the timeseries
-
-
-```R
-fromDate <- "2016/11/6 00:00:00"
-toDate <- "2016/11/10 00:00:00"
-timeResolution <- "hourly"
-precision <- "hourly"
-
-station_id <- "1" 
-
-# get timeseries data
-df <- friendlyr::ts(service="innoRlyr",username="****",password="****",
-                 fromDate=fromDate,toDate=toDate,precision=precision,timeResolution=timeResolution,
-                 element_id=cc("no2","rh","tsensor"),station_id=station_id)
-
-```
-## Get metadata
-
-Get metadata from the innosense database.
-
-```R
-
-# error, no access to metadata permitted
-metadata <- friendlyr::meta(service="innoRlyr",username="****",password="****",
                  station_id=station_id)
 
 ```
 
-# Get the Hackair data from Innosense database
-
-## Get the timeseries
+## Get the timeseries at a location
 
 
 ```R
@@ -84,44 +51,12 @@ fromDate <- "2016/11/6 00:00:00"
 toDate <- "2016/11/10 00:00:00"
 timeResolution <- "hourly"
 precision <- "hourly"
-
-station_id <- "102" #100 101 102 105 110 111 112 113 114 115 116 117 118 119 120
+element_id=c("pm25","pm10","no2","rh","tsensor")
 
 # get timeseries data
-df <- friendlyr::ts(service="ihacklyr",username="****",password="****",
-                 fromDate=fromDate,toDate=toDate,precision=precision,timeResolution=timeResolution,
-                 element_id=c("pm25","pm10"),station_id=station_id)
-
-```
-## Get metadata
-
-Get metadata from the innosense database.
-
-```R
-
-# error, no access to metadata permitted
-metadata <- friendlyr::meta(service="ihacklyr",username="****",password="****",
-                 station_id=station_id)
-
-```
-
-# Get the Purplair data from Innosense database
-
-## Get the timeseries
-
-
-```R
-fromDate <- "2016/11/6 00:00:00"
-toDate <- "2016/11/10 00:00:00"
-timeResolution <- "hourly"
-precision <- "hourly"
-
-station_id <- "108" #103 104 106 107 108 109
-
-# get timeseries data
-df <- friendlyr::ts(service="ipurplyr",username="****",password="****",
+df <- friendlyr::ts(service="innolyr",username="****",password="****",
                  fromDate=fromDate,toDate=toDate,precision=precision,timeResolution=timeResolution,
-                 element_id=c("pm25","pm10"),station_id=station_id)
+                 element_id=element_id,location="Oslo,Norway")
 
 ```
 ## Get metadata
@@ -131,7 +66,7 @@ Get metadata from the innosense database.
 ```R
 
 # error, no access to metadata permitted
-metadata <- friendlyr::meta(service="ipurplyr",username="****",password="****",
-                 station_id=station_id)
+metadata <- friendlyr::meta(service="innolyr",username="****",password="****",
+                 location="Oslo,Norway")
 
 ```

vignettes/wsklima.Rmd

@@ -16,18 +16,12 @@ knitr::opts_chunk$set(collapse = T, comment = "#>")
 Get data from MET wsklima service.
 
 Warning:
-This service is not so young. It will be replaced soon by the MET IT Team.
-I will keep the client api package updated.
 
-So far:
+This service has shut down.
 
-Even though the R client package [wsklmar](https://git.nilu.no/rextapi/wsklimar) , which friendlyr is based on, split requests into small pieces, wsklima is sensitive to large requests.
+Instead, use the service [frostlyr](https://git.nilu.no/rfriendlyr/frostlyr).
+It is based on the R-package [frostr](https://git.nilu.no/rextapi/frostr), client API for the new frost API from MET.
 
-Do not send too many requests at a time.
-
-Do not send large request.
-
-Save your previous downloaded datasets.
 
 
 ```R