merge next_release in master

Merge branch 'next_release' # Conflicts: # .travis.yml # DESCRIPTION # NAMESPACE # R/h5_utils_plot.R # R/map.R # R/map_helpers.R # R/map_layout.R # R/plot_thermal_group_capacities.R # R/stack_map.R # appveyor.yml # inst/application/server.R # inst/application/src/server/01_set_read_data.R # inst/application/src/server/07_write_h5.R # inst/application/src/ui/03_ui_convert_h5.R # inst/application/src/ui/08_ui_map.R # man/exchangesStack.Rd # man/plotMap.Rd # man/prodStack.Rd # tests/testthat/test-ts_plot.R
rte-antares-rpackage · Dec 20, 2017 · e6da7ad · e6da7ad
2 parents 96dbf4e + 67873e1
commit e6da7ad
Show file tree

Hide file tree

Showing 31 changed files with 3,333 additions and 1,562 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,45 @@ dist: trusty
 sudo: required
 cache: packages
 
+
+
+bioc_required: true
+bioc_use_devel: true
+
+os:
+ - linux
+ - osx
+
+
+r:
+ - oldrel
+ - release
+ - devel
+
+r_packages:
+  - covr
+  - devtools
+  - antaresProcessing
+
+r_github_packages:
+ - Bioconductor-mirror/zlibbioc
+ - Bioconductor-mirror/rhdf5
+ - rte-antares-rpackage/manipulateWidget@develop
+ - rte-antares-rpackage/antaresMaps@develop
+ - rte-antares-rpackage/antaresRead@develop
+ - rte-antares-rpackage/antaresProcessing@develop
+
 addons:
   apt:
+    sources:
+      - sourceline: 'ppa:opencpu/jq'
     packages:
+      - libjq-dev
+      - valgrind
       - libgdal-dev
       - libproj-dev
       - libv8-3.14-dev
 
-include:
-  - r: release
-  - r: oldrel
-  - r: devel
-
-r_packages:
-  - covr
-
+
 after_success:
   - Rscript -e 'library(covr); codecov()'
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,17 @@
 Package: antaresViz
 Type: Package
 Title: Antares Visualizations
-Version: 0.11.1
-Date: 2017-07-17
+Version: 0.12.0
+Date: 2017-12-14
 Authors@R: c(
-    person("Francois", "Guillem", , "[email protected]", role = c("aut", "cre")),
-    person("Jalal-Edine", "ZAWAM", , "[email protected]", role = "ctb"),
+    person("Jalal-Edine", "ZAWAM", , "[email protected]", role = c("aut", "cre")),
+    person("Francois", "Guillem", , "[email protected]", role = "aut"),
+    person("Benoit", "Thieurmel", email = "[email protected]", role = "aut"),
+    person(given = "Titouan", family = "Robert", email = "[email protected]", role = "aut"),
+    person("Baptiste", "SEGUINOT", , "[email protected]", role = "ctb"),
     person("RTE", role = "cph")
     )
-Maintainer: Francois Guillem <francois.guillem@rte-france.com>
+Maintainer: Jalal-Edine ZAWAM <jalal-edine.zawam@rte-france.com>
 Description: Visualize results generated by Antares, a powerful software
     developed by RTE to simulate and study electric power systems
     (more information about Antares here: <https://antares.rte-france.com>).
@@ -20,29 +23,35 @@ License: GPL (>= 2) | file LICENSE
 LazyData: TRUE
 Encoding: UTF-8
 Depends:
-    antaresRead (>= 0.14.0),
-    antaresProcessing (>= 0.11.0)
+    antaresRead (>= 2.0.0),
+    antaresProcessing (>= 0.13.0), 
+    spMaps (>= 0.2)
 Imports:
     dygraphs (>= 1.1.1),
     shiny (>= 0.13.0),
-    miniUI,
-    magrittr,
     plotly (>= 4.5.6),
-    tibble,
     htmltools,
     htmlwidgets (>= 0.7.0),
-    manipulateWidget (>= 0.7.0),
+    manipulateWidget (>= 0.8.0),
     leaflet (>= 1.1.0),
     sp,
+    rgeos,
+    raster,
     webshot,
     data.table,
     methods,
     lubridate,
     geojsonio,
     graphics,
     stats,
-    leaflet.minicharts (>= 0.5.0)
+    leaflet.minicharts (>= 0.5.2),
+    assertthat
 RoxygenNote: 6.0.1
 Suggests: testthat,
-    covr
+    covr,
+    rhdf5 (>= 2.20.2),
+    rbokeh,
+    knitr,
+    visNetwork
+VignetteBuilder: knitr
 
diff --git a/NAMESPACE b/NAMESPACE
@@ -9,13 +9,16 @@ export(exchangesStack)
 export(getInteractivity)
 export(mapLayout)
 export(plotMap)
+export(plotMapLayout)
 export(plotMapOptions)
+export(plotThermalGroupCapacities)
 export(prodStack)
 export(prodStackAliases)
 export(prodStackLegend)
 export(savePlotAsPng)
 export(setInteractivity)
 export(setProdStackAlias)
+export(stackMap)
 export(tsLegend)
 export(tsPlot)
 import(antaresProcessing)
@@ -28,6 +31,7 @@ import(leaflet.minicharts)
 import(manipulateWidget)
 import(miniUI)
 import(shiny)
+import(spMaps)
 importFrom(grDevices,col2rgb)
 importFrom(grDevices,colorRampPalette)
 importFrom(grDevices,colors)
@@ -41,6 +45,8 @@ importFrom(plotly,add_heatmap)
 importFrom(plotly,config)
 importFrom(plotly,layout)
 importFrom(plotly,plot_ly)
+importFrom(raster,aggregate)
+importFrom(rgeos,gDistance)
 importFrom(stats,density)
 importFrom(stats,lm)
 importFrom(stats,predict)