adapt vignette and examples to uses cartography 2.0.1, following cran…

… note
riatelab · Sep 25, 2017 · 701427a · 701427a
1 parent 6e92380
commit 701427a
Show file tree

Hide file tree

Showing 84 changed files with 788 additions and 39 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: MTA
 Title: Multiscalar Territorial Analysis
-Version: 0.1.0
-Date: 2017-02-28
+Version: 0.1.1
+Date: 2017-09-25
 Authors@R: c(person("Ronan", "Ysebaert", 
       email = "ronan.ysebaert@cnrs.fr", role = c("aut")),
       person("Nicolas", "Lambert", 

diff --git a/R/gdev.R b/R/gdev.R
@@ -41,12 +41,13 @@
 #'              breaks = bks, border = NA,
 #'              col = cols)
 #'   # add symbols proportional to the absolute general deviation
-#'   propSymbolsLayer(spdf = com.spdf, df = com, var = "gdevabs",
-#'                    legend.pos = "left",legend.values.rnd = -2,
-#'                    legend.title.txt = "Absolute Deviation",
-#'                    col = "#ff000050",col2 = "#0000ff50",
-#'                    legend.style = "e", inches = 0.2,
-#'                    breakval = 0)
+#'   com$sign <- ifelse(test = com$gdevabs<0, yes = "negative", no = "positive")
+#'   propSymbolsTypoLayer(spdf = com.spdf, df = com, var = "gdevabs",var2 = "sign",
+#'                        legend.var.pos = "left",legend.values.rnd = -2, 
+#'                        legend.var2.values.order = c("positive", "negative"),
+#'                        legend.var.title.txt = "Absolute Deviation",
+#'                        col = c("#ff000050","#0000ff50"),legend.var2.pos = "n",
+#'                        legend.var.style = "e", inches = 0.2)
 #'   # add EPT boundaries
 #'   plot(ept.spdf, add=TRUE)
 #'   # add a layout

diff --git a/R/sdev.R b/R/sdev.R
@@ -70,12 +70,13 @@
 #'              breaks = bks, border = NA,
 #'              col = cols)
 #'   # add symbols proportional to the absolute spatial deviation
-#'   propSymbolsLayer(spdf = com.spdf, df = com, var = "scardevabs",
-#'                    legend.pos = "left",legend.values.rnd = -5,
-#'                    legend.title.txt = "Absolute Deviation",
-#'                    col = "#ff000050",col2 = "#0000ff50",
-#'                    legend.style = "e", inches = 0.2,
-#'                    breakval = 0)
+#'   com$sign <- ifelse(test = com$scardevabs<0, yes = "negative", no = "positive")
+#'   propSymbolsTypoLayer(spdf = com.spdf, df = com, var = "scardevabs",var2 = "sign",
+#'                        legend.var.pos = "left",legend.values.rnd = -2, 
+#'                        legend.var2.values.order = c("positive", "negative"),
+#'                        legend.var.title.txt = "Absolute Deviation",
+#'                        col = c("#ff000050","#0000ff50"),legend.var2.pos = "n",
+#'                        legend.var.style = "e", inches = 0.2)
 #'   # add a layout
 #'   layoutLayer(title = "Spatial Deviation (neighborhoud: 10 minutes by car)",
 #'               sources = "GEOFLA® 2015 v2.1, impots.gouv.fr", north = TRUE,

diff --git a/R/tdev.R b/R/tdev.R
@@ -44,11 +44,13 @@
 #'              breaks = bks, border = NA,
 #'              col = cols)
 #'   # add symbols proportional to the absolute territorial deviation
-#'   propSymbolsLayer(spdf = com.spdf, df = com, var = "tdevabs",
-#'                    legend.pos = "left",legend.values.rnd = -5,
-#'                    col = "#ff000050",col2 = "#0000ff50",
-#'                    legend.style = "c", inches = 0.2,
-#'                    breakval = 0)
+#'   com$sign <- ifelse(test = com$tdevabs<0, yes = "negative", no = "positive")
+#'   propSymbolsTypoLayer(spdf = com.spdf, df = com, var = "tdevabs",var2 = "sign",
+#'                        legend.var.pos = "left",legend.values.rnd = -2, 
+#'                        legend.var2.values.order = c("positive", "negative"),
+#'                        legend.var.title.txt = "Absolute Deviation",
+#'                        col = c("#ff000050","#0000ff50"),legend.var2.pos = "n",
+#'                        legend.var.style = "e", inches = 0.2)
 #'   # add EPT boundaries
 #'   plot(ept.spdf, add=TRUE)
 #'   # add a layout

diff --git a/man/gdev.Rd b/man/gdev.Rd
diff --git a/man/sdev.Rd b/man/sdev.Rd
diff --git a/man/tdev.Rd b/man/tdev.Rd
diff --git a/vignettes/MTA.R b/vignettes/MTA.R
@@ -0,0 +1,14 @@
+## ----fig.width=7,echo=FALSE----------------------------------------------
+library(png)
+library(grid)
+img <- readPNG("./img/figure_MTA1.png")
+grid.raster(img)
+
+## ----fig.width=7,echo=FALSE----------------------------------------------
+img <- readPNG("./img/figure_MTA2.png")
+grid.raster(img)
+
+## ----fig.width=7,echo=FALSE----------------------------------------------
+img <- readPNG("./img/figure_MTA3.png")
+grid.raster(img)
+