Browse Source

UI improvements

* Highlight polygon
* Clarify list
Petra Lamborn 3 years ago
parent
commit
72eaf1c10c
1 changed files with 18 additions and 7 deletions
  1. 18
    7
      viz/app.R

+ 18
- 7
viz/app.R View File

109
       codvs <- tencols[codvs$MAX]
109
       codvs <- tencols[codvs$MAX]
110
       fcols <- ifelse(is.na(codvs), "#808080", codvs)
110
       fcols <- ifelse(is.na(codvs), "#808080", codvs)
111
     }
111
     }
112
-    leafletProxy("map", data = shpf) %>%
112
+    lp <- leafletProxy("map", data = shpf) %>%
113
       setShapeStyle(layerId = ~SA22018_V1, fillColor = fcols) %>%
113
       setShapeStyle(layerId = ~SA22018_V1, fillColor = fcols) %>%
114
       clearControls() %>%
114
       clearControls() %>%
115
       addLegend(position = "topleft",
115
       addLegend(position = "topleft",
116
                 colors = c(tencols, "#808080"),
116
                 colors = c(tencols, "#808080"),
117
-                labels = transport.t, opacity = 1)
118
-    p.layers <<- rev(p.layers)
117
+                labels = transport.t, opacity = 1) %>%
118
+      clearGroup("hpoly")
119
+    if (selcode %in% shpf@data$SA22018_V1) {
120
+      lp %>% addPolygons(group = "hpoly",
121
+                          weight = 4,
122
+                          data = shpf[which(shpf@data$SA22018_V1 == selcode),],
123
+                          color = "#000000",
124
+                         fill = FALSE, opacity = 1)
125
+    }
119
     shinyjs::hideElement(selector="#loading p", asis=TRUE, 
126
     shinyjs::hideElement(selector="#loading p", asis=TRUE, 
120
-                         anim=TRUE, animType = "slide")
127
+                         anim=TRUE, animType = "slide",
128
+                         time = 1)
121
   }
129
   }
122
   observeEvent(input$map_shape_click, {
130
   observeEvent(input$map_shape_click, {
123
     p <- input$map_shape_click
131
     p <- input$map_shape_click
137
     if (seled == 0) {
145
     if (seled == 0) {
138
       HTML("")
146
       HTML("")
139
     } else {
147
     } else {
140
-      str <- sprintf("<hr style='border-top: 1px solid #000;'/><h4>%s</h4>", 
148
+      hrstr <- "<hr style='border-top: 1px solid #000;'/>"
149
+      str <- sprintf("<p><b>%s</b></p>", 
141
                      shpf@data$SA22018__1[shpf@data$SA22018_V1 == seled])
150
                      shpf@data$SA22018__1[shpf@data$SA22018_V1 == seled])
142
       if (input$radioinout == "work") {
151
       if (input$radioinout == "work") {
152
+        str <- paste0("<p>People who work in</p>", str)
143
         vals <- as.numeric(work_to[work_to$work_code == seled, 5:15])
153
         vals <- as.numeric(work_to[work_to$work_code == seled, 5:15])
144
         vals <- ifelse(is.na(vals), 0, vals)
154
         vals <- ifelse(is.na(vals), 0, vals)
145
         vals <- ifelse(vals < 0, "~0", as.character(vals))
155
         vals <- ifelse(vals < 0, "~0", as.character(vals))
146
         listi <- paste0(sprintf("<li>%s: %s</li>", cols.labs, 
156
         listi <- paste0(sprintf("<li>%s: %s</li>", cols.labs, 
147
                 vals),
157
                 vals),
148
                 collapse="")
158
                 collapse="")
149
-        str <- paste0(str, "<ul>", listi, "</ul>")
159
+        str <- paste0(hrstr, str, "<ul>", listi, "</ul>")
150
       } else {
160
       } else {
161
+        str <- paste0("<p>People who live in</p>", str)
151
         vals <- as.numeric(work_from[work_from$res_code == seled, 5:15])
162
         vals <- as.numeric(work_from[work_from$res_code == seled, 5:15])
152
         vals <- ifelse(is.na(vals), 0, vals)
163
         vals <- ifelse(is.na(vals), 0, vals)
153
         vals <- ifelse(vals < 0, "~0", as.character(vals))
164
         vals <- ifelse(vals < 0, "~0", as.character(vals))
154
         listi <- paste0(sprintf("<li>%s: %s</li>", cols.labs, 
165
         listi <- paste0(sprintf("<li>%s: %s</li>", cols.labs, 
155
                 vals),
166
                 vals),
156
                 collapse="")
167
                 collapse="")
157
-        str <- paste0(str, "<ul>", listi, "</ul>")
168
+        str <- paste0(hrstr, str, "<ul>", listi, "</ul>")
158
       }
169
       }
159
       HTML(str)
170
       HTML(str)
160
     }
171
     }