Switch order of work at home and other

scratch.R

@@ -46,8 +46,8 @@ work_travel %>% select(
   bus = Public_bus,
   train = Train,
   ferry = Ferry,
-  home = Work_at_home,
   other = Other,
+  home = Work_at_home,
   total = Total
 ) -> work_simp
 
@@ -65,8 +65,8 @@ work_simp %>%
     bus = sum(ifelse(bus < 0, 0, bus)),
     train = sum(ifelse(train < 0, 0, train)),
     ferry = sum(ifelse(ferry < 0, 0, ferry)),
-    home = sum(ifelse(home < 0, 0, home)),
     other = sum(ifelse(other < 0, 0, other)),
+    home = sum(ifelse(home < 0, 0, home)),
     total = sum(ifelse(total < 0, 0, total)), .groups="drop"
   ) -> work_from
     
@@ -85,8 +85,8 @@ work_simp %>%
     bus = sum(ifelse(bus < 0, 0, bus)),
     train = sum(ifelse(train < 0, 0, train)),
     ferry = sum(ifelse(ferry < 0, 0, ferry)),
-    home = sum(ifelse(home < 0, 0, home)),
     other = sum(ifelse(other < 0, 0, other)),
+    home = sum(ifelse(home < 0, 0, home)),
     total = sum(ifelse(total < 0, 0, total)), .groups="drop"
   ) -> work_to
 
@@ -107,8 +107,8 @@ edu_simp <- education_travel %>% select(
   pubbus = Public_bus,
   train = Train,
   ferry = Ferry,
-  home = Study_at_home,
   other = Other,
+  home = Study_at_home,
   total = Total
 )
 
@@ -122,8 +122,8 @@ edu_simp %>% group_by(res_code, res_name, res_east, res_north) %>%
     pubbus = sum(ifelse(pubbus < 0, 0, pubbus)),
     train = sum(ifelse(train < 0, 0, train)),
     ferry = sum(ifelse(ferry < 0, 0, ferry)),
-    home = sum(ifelse(home < 0, 0, home)),
     other = sum(ifelse(other < 0, 0, other)),
+    home = sum(ifelse(home < 0, 0, home)),
     total = sum(ifelse(total < 0, 0, total)), .groups="drop"
   ) -> edu_from
 
@@ -137,38 +137,38 @@ edu_simp %>% group_by(edu_code, edu_name, edu_east, edu_north) %>%
     pubbus = sum(ifelse(pubbus < 0, 0, pubbus)),
     train = sum(ifelse(train < 0, 0, train)),
     ferry = sum(ifelse(ferry < 0, 0, ferry)),
-    home = sum(ifelse(home < 0, 0, home)),
     other = sum(ifelse(other < 0, 0, other)),
+    home = sum(ifelse(home < 0, 0, home)),
     total = sum(ifelse(total < 0, 0, total)), .groups="drop"
   ) -> edu_to
 
 tencols <-  c("#f85654", "#e31a1c", "#1f78b4", "#6a3d9a", "#b2df8a", 
-              "#33a02c", "#fdbf6f", "#ff7f00", "#af8ac1", "#cab2d6")
+              "#33a02c", "#fdbf6f", "#ff7f00", "#cab2d6", "#af8ac1")
 tencols[which.max(work_from[1, 5:14])]
 
 
-work_from$MAX <- work_from %>% select(private:other) %>% as.matrix() %>% 
+work_from$MAX <- work_from %>% select(private:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })
-work_to$MAX <- work_to %>% select(private:other) %>% as.matrix() %>% 
+work_to$MAX <- work_to %>% select(private:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })
-work_simp$MAX <- work_simp %>% select(private:other) %>% as.matrix() %>% 
+work_simp$MAX <- work_simp %>% select(private:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })
 
-edu_from$MAX <- edu_from %>% select(drive:other) %>% as.matrix() %>% 
+edu_from$MAX <- edu_from %>% select(drive:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })
-edu_to$MAX <- edu_to %>% select(drive:other) %>% as.matrix() %>% 
+edu_to$MAX <- edu_to %>% select(drive:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })
-edu_simp$MAX <- edu_simp %>% select(drive:other) %>% as.matrix() %>% 
+edu_simp$MAX <- edu_simp %>% select(drive:home) %>% as.matrix() %>% 
   apply(1, function(x) {
     ifelse(max(x) <= 0, NA, which.max(x))
     })

viz/app.R

@@ -16,10 +16,10 @@ sa.in.dest <- shpf@data$SA22018_V1 %in% work_to$work_code
 sa.in.home <- shpf@data$SA22018_V1 %in% work_from$res_code
 transport.t <- c("Private car", "Passenger in car",
                  "Walk", "Bicycle", "Company car", "Bus", "Train",
-                 "Ferry", "Work at home", "Other", "None/Unknown")
+                 "Ferry", "Other", "(Work at home)", "None/Unknown")
 edu.t <- c("Drive self", "Passenger in car", "Walk", "Bicycle",
-           "School bus", "Public bus", "Train", "Ferry", "Study at home",
-           "Other", "None/Unknown")
+           "School bus", "Public bus", "Train", "Ferry",
+           "Other", "(Study at home)", "None/Unknown")
 cols.labs <- c(transport.t[1:10], "Total")
 cols.edu.labs <- c(edu.t[1:10], "Total")