Merge branch 'devel'

ropensci-archive · Jun 3, 2017 · e16e146 · e16e146
2 parents 8b729bd + 49f2a91
commit e16e146
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 253 deletions.
diff --git a/R/data.R b/R/data.R
@@ -1,4 +1,9 @@
 #'AAC_codes
+#'
+#'@description
+#'BOM forecast locations and longitude and latitude
+#'
+#'@details
 #' \describe{
 #'   \item{AAC}{Unique identifier for each location}
 #'   \item{PT_NAME}{Human readable location name}
@@ -16,6 +21,11 @@
 "AAC_codes"
 
 #'stations_site_list
+#'
+#'@description
+#'A database of station locations and other metadata used for the ag bulletin
+#'
+#'@details
 #'\describe{
 #'    \item{site}{Unique BOM identifier for each station}
 #'    \item{dist}{BOM rainfall district}
@@ -35,6 +45,12 @@
 "stations_site_list"
 
 #'JSONurl_latlon_by_station_name
+#'
+#'@description
+#'A database of URLs that provide a JSON file of current weather conditions
+#'for BOM weather stations.
+#'
+#'@details
 #'\describe{
 #'    \item{site}{Unique BOM identifier for each station}
 #'    \item{dist}{BOM rainfall district}

diff --git a/README.md b/README.md
@@ -220,33 +220,33 @@ head(Melbourne_weather)
     ## 5          4 95936 Melbourne (Olympic Park)        IDV60801
     ## 6          5 95936 Melbourne (Olympic Park)        IDV60801
     ##   local_date_time local_date_time_full        aifstime_utc   lat lon
-    ## 1      03/03:00pm  2017-06-03 15:00:00 2017-06-03 05:00:00 -37.8 145
-    ## 2      03/02:30pm  2017-06-03 14:30:00 2017-06-03 04:30:00 -37.8 145
-    ## 3      03/02:00pm  2017-06-03 14:00:00 2017-06-03 04:00:00 -37.8 145
-    ## 4      03/01:30pm  2017-06-03 13:30:00 2017-06-03 03:30:00 -37.8 145
-    ## 5      03/01:00pm  2017-06-03 13:00:00 2017-06-03 03:00:00 -37.8 145
-    ## 6      03/12:30pm  2017-06-03 12:30:00 2017-06-03 02:30:00 -37.8 145
+    ## 1      03/04:00pm  2017-06-03 16:00:00 2017-06-03 06:00:00 -37.8 145
+    ## 2      03/03:30pm  2017-06-03 15:30:00 2017-06-03 05:30:00 -37.8 145
+    ## 3      03/03:00pm  2017-06-03 15:00:00 2017-06-03 05:00:00 -37.8 145
+    ## 4      03/02:30pm  2017-06-03 14:30:00 2017-06-03 04:30:00 -37.8 145
+    ## 5      03/02:00pm  2017-06-03 14:00:00 2017-06-03 04:00:00 -37.8 145
+    ## 6      03/01:30pm  2017-06-03 13:30:00 2017-06-03 03:30:00 -37.8 145
     ##   apparent_t cloud cloud_type delta_t gust_kmh gust_kt air_temp dewpt
-    ## 1       10.6     -          -     2.3       19      10     13.1   8.4
-    ## 2       11.2     -          -     2.5       15       8     13.3   8.2
-    ## 3       11.7     -          -     3.0       13       7     13.9   7.7
-    ## 4       11.2     -          -     3.0       13       7     13.5   7.3
-    ## 5       10.8     -          -     3.2       15       8     13.3   6.6
-    ## 6       11.3     -          -     3.0       13       7     13.3   7.1
+    ## 1       10.6     -          -     2.0       15       8     12.6   8.5
+    ## 2       11.4     -          -     2.4       11       6     13.1   8.2
+    ## 3       10.6     -          -     2.3       19      10     13.1   8.4
+    ## 4       11.2     -          -     2.5       15       8     13.3   8.2
+    ## 5       11.7     -          -     3.0       13       7     13.9   7.7
+    ## 6       11.2     -          -     3.0       13       7     13.5   7.3
     ##    press press_msl press_qnh press_tend rain_trace rel_hum sea_state
-    ## 1 1031.3    1031.3    1031.3          -          0      73         -
-    ## 2 1031.4    1031.4    1031.4          -          0      71         -
-    ## 3 1031.7    1031.7    1031.7          -          0      66         -
-    ## 4 1032.1    1032.1    1032.1          -          0      66         -
-    ## 5 1032.5    1032.5    1032.5          -          0      64         -
-    ## 6 1032.9    1032.9    1032.9          -          0      66         -
+    ## 1 1031.4    1031.4    1031.4          -          0      76         -
+    ## 2 1031.4    1031.4    1031.4          -          0      72         -
+    ## 3 1031.3    1031.3    1031.3          -          0      73         -
+    ## 4 1031.4    1031.4    1031.4          -          0      71         -
+    ## 5 1031.7    1031.7    1031.7          -          0      66         -
+    ## 6 1032.1    1032.1    1032.1          -          0      66         -
     ##   swell_dir_worded vis_km weather wind_dir wind_spd_kmh wind_spd_kt
-    ## 1                -     10       -      SSW           11           6
-    ## 2                -     10       -        S            9           5
-    ## 3                -     10       -      SSW            9           5
-    ## 4                -     10       -      SSW            9           5
-    ## 5                -     10       -        S            9           5
-    ## 6                -     10       -        S            7           4
+    ## 1                -     10       -      SSW            9           5
+    ## 2                -     10       -      SSW            7           4
+    ## 3                -     10       -      SSW           11           6
+    ## 4                -     10       -        S            9           5
+    ## 5                -     10       -      SSW            9           5
+    ## 6                -     10       -      SSW            9           5
 
 Meta
 ----

diff --git a/docs/articles/bomrang.html b/docs/articles/bomrang.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/AAC_codes.html b/docs/reference/AAC_codes.html