Merge pull request #116 from rOpenSpain/flowmaps-legend

update static flowmaps vignette with new flowmapper colored legend
rOpenSpain · Dec 16, 2024 · edce710 · edce710
2 parents 18cfcb7 + ff45df9
commit edce710
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 22 deletions.
diff --git a/man/figures/flowmapblue-animated.png b/man/figures/flowmapblue-animated.png
diff --git a/man/figures/flowmapblue-standard-01.png b/man/figures/flowmapblue-standard-01.png
diff --git a/man/figures/flowmapblue-standard-02.png b/man/figures/flowmapblue-standard-02.png
diff --git a/man/figures/flowmapblue-standard-time.png b/man/figures/flowmapblue-standard-time.png
diff --git a/man/figures/flows_plot_all_districts.png b/man/figures/flows_plot_all_districts.png
diff --git a/man/figures/flows_plot_barcelona.png b/man/figures/flows_plot_barcelona.png
diff --git a/man/figures/logo-before-hex.png b/man/figures/logo-before-hex.png
diff --git a/man/figures/logo.png b/man/figures/logo.png
diff --git a/man/figures/zones_barcelona_fua_plot.png b/man/figures/zones_barcelona_fua_plot.png
diff --git a/vignettes/flowmaps-static.qmd b/vignettes/flowmaps-static.qmd
@@ -185,15 +185,9 @@ base_plot_districts <- ggplot() +
     panel.background = element_rect(fill='transparent'),
     plot.background = element_rect(fill='transparent', color=NA),
     panel.grid.major = element_blank(),
-    panel.grid.minor = element_blank(),
-    legend.background = element_rect(fill='transparent', colour = NA),
-    legend.box.background = element_rect(fill='transparent', colour = NA),
-    legend.key = element_blank(),  # Remove legend key border
-    legend.title = element_text(size = 12),  # Adjust title size
-    legend.text = element_text(size = 10),  # Adjust text size
-    legend.key.height = unit(1, "cm"),  # Increase the height of legend keys
-    legend.margin = margin(t = 0, r = 0, b = 0, l = 0, unit = "cm")  # Remove margin
-  )
+    panel.grid.minor = element_blank()
+  ) +
+  guides(fill = "none")
 
 # flows_by_ca_twoway_coords |> arrange(desc(flow_ab))
 # add the flows
@@ -208,6 +202,7 @@ flows_plot_all_districts <- base_plot_districts |>
     outline_col = "grey80",
     add_legend = "bottom",
     legend_col = "gray20",
+    legend_gradient = TRUE,
     k_node = 20 # play around with this parameter to aggregate nodes and flows
   )
 
@@ -314,15 +309,9 @@ base_plot_barcelona <- ggplot() +
     panel.background = element_rect(fill='transparent'),
     plot.background = element_rect(fill='transparent', color=NA),
     panel.grid.major = element_blank(),
-    panel.grid.minor = element_blank(),
-    legend.background = element_rect(fill='transparent', colour = NA),
-    legend.box.background = element_rect(fill='transparent', colour = NA),
-    legend.key = element_blank(),  # Remove legend key border
-    legend.title = element_text(size = 12),  # Adjust title size
-    legend.text = element_text(size = 10),  # Adjust text size
-    legend.key.height = unit(1, "cm"),  # Increase the height of legend keys
-    legend.margin = margin(t = 0, r = 0, b = 0, l = 0, unit = "cm")  # Remove margin
-  )
+    panel.grid.minor = element_blank()
+  ) +
+  guides(fill = 'none')
 
 # flows_by_ca_twoway_coords |> arrange(desc(flow_ab))
 # add the flows
@@ -337,6 +326,7 @@ flows_plot_barcelona <- base_plot_barcelona |>
     outline_col = "grey80",
     add_legend = "bottom",
     legend_col = "gray20",
+    legend_gradient = TRUE,
     k_node = 30 # play around with this parameter to aggregate nodes and flows
   )
 
@@ -611,10 +601,9 @@ base_plot <- ggplot() +
     panel.background = element_rect(fill='transparent'),
     plot.background = element_rect(fill='transparent', color=NA),
     panel.grid.major = element_blank(),
-    panel.grid.minor = element_blank(),
-    legend.background = element_rect(fill='transparent'),
-    legend.box.background = element_rect(fill='transparent')
-  )
+    panel.grid.minor = element_blank()
+  ) +
+  guides(fill = 'none')
 
 # flows_by_ca_twoway_coords |> arrange(desc(flow_ab))
 # add the flows