|
@@ -50,10 +50,6 @@ html, body {
|
50
|
50
|
#lochtml ul {
|
51
|
51
|
padding-left: 15px;
|
52
|
52
|
}
|
53
|
|
-.radio label span p {
|
54
|
|
- margin-top: 3px;
|
55
|
|
- margin-bottom: 0px;
|
56
|
|
-}
|
57
|
53
|
.leaflet-container {
|
58
|
54
|
background-color: #84e1e1;
|
59
|
55
|
}
|
|
@@ -142,6 +138,12 @@ kbd:hover {
|
142
|
138
|
#infoint li {
|
143
|
139
|
padding-bottom: 10px;
|
144
|
140
|
}
|
|
141
|
+.radio-btn-icon-no {
|
|
142
|
+ color: rgba(255, 255, 255, 0);
|
|
143
|
+}
|
|
144
|
+.btn.radiobtn {
|
|
145
|
+ text-align: left;
|
|
146
|
+}
|
145
|
147
|
"
|
146
|
148
|
|
147
|
149
|
attribhtml <- '
|
|
@@ -170,20 +172,22 @@ infotext <- div(class="overflowable", id="infoint", tabindex="2",
|
170
|
172
|
"https://www.stats.govt.nz/2018-census/there-and-back-
|
171
|
173
|
again-data-visualisation-competition", "data visualisation competition",
|
172
|
174
|
.noWS = "after"),
|
173
|
|
- HTML(". The employment data counts employed persons 15 years or ",
|
174
|
|
- "older who gave an employment location in the 2018 census, while the ",
|
175
|
|
- "education data counts people in education 15 years or older who gave an ",
|
176
|
|
- "education location in the 2018 census—including older highschoolers and ",
|
177
|
|
- "university students, but not e.g. primary school students.")),
|
|
175
|
+ HTML(". The employment portion of the dataset captures employed persons ",
|
|
176
|
+ "15 years or older who gave an employment address or location ",
|
|
177
|
+ "in the 2018 census.",
|
|
178
|
+ "The education dataset counts people in education 15 years or older who ",
|
|
179
|
+ "gave an education location in the 2018 census, ",
|
|
180
|
+ "including older highschoolers and ",
|
|
181
|
+ "university students but not e.g. primary school students.")),
|
178
|
182
|
h4("The data"),
|
179
|
183
|
p("The 2018 New Zealand Census of Population and Dwellings",
|
180
|
184
|
a(href=paste0("https://cdm20045.contentdm.oclc.org/digital/",
|
181
|
|
- "collection/p20045coll2/id/713/rec/3"), "asked"),
|
182
|
|
- "individuals for primary locations of employment and education ",
|
183
|
|
- "and their usual method of transportation. Stats NZ has released",
|
|
185
|
+ "collection/p20045coll2/id/713/rec/3"), "questionnaire"),
|
|
186
|
+ "asked individuals for primary locations of employment and education ",
|
|
187
|
+ "and their usual method of transportation. Stats NZ has",
|
184
|
188
|
a(href=
|
185
|
189
|
"https://datafinder.stats.govt.nz/data/category/census/2018/commuter-view/",
|
186
|
|
- "these data"),
|
|
190
|
+ "released data"),
|
187
|
191
|
"aggregated at the level of",
|
188
|
192
|
a(href=paste0(
|
189
|
193
|
"http://archive.stats.govt.nz/methods/classifications-and-standards/",
|
|
@@ -192,24 +196,26 @@ again-data-visualisation-competition", "data visualisation competition",
|
192
|
196
|
"SA2 boundaries typically enclose areas with a population of a few ",
|
193
|
197
|
"thousand, corresponding approximately to urban suburbs and rural towns. ",
|
194
|
198
|
"The shapes of these areas have been heavily simplified in this map ",
|
195
|
|
- "to reduce bandwidth and memory usage.",
|
|
199
|
+ "to reduce bandwidth and memory usage. ",
|
|
200
|
+ "The original boundaries can be viewed and downloaded",
|
196
|
201
|
a(href=
|
197
|
202
|
"https://datafinder.stats.govt.nz/data/category/census/2018/commuter-view/",
|
198
|
|
- "The original boundaries can be viewed and downloaded from the Stats NZ ",
|
199
|
|
- "datafinder website.")),
|
200
|
|
- h4("Options"),
|
201
|
|
- p("The top right panel (toggleable via the blue switch) allows ",
|
202
|
|
- "you to choose between the employment and education datasets, ",
|
203
|
|
- "visualising the people who commute from ",
|
204
|
|
- "and to each area to both employment and education, and between ",
|
205
|
|
- "showing numbers of people or ",
|
206
|
|
- "their primary mode of transportation."),
|
|
203
|
+ "from the Stats NZ datafinder website", .noWS = "after"), "."),
|
|
204
|
+ h4("Using this tool"),
|
|
205
|
+ p("The options avaliable allow ",
|
|
206
|
+ "you to select the employment or education datasets. ",
|
|
207
|
+ "You may also choose to visualise the people who commute from ",
|
|
208
|
+ "or to each area, and select between showing numbers of people or ",
|
|
209
|
+ "their primary mode of transportation. \"Primary\" is calculated by ",
|
|
210
|
+ "FPP rules: it means the most common, not the majority."),
|
207
|
211
|
p("Select an area by clicking on it; deselect by clicking it again ",
|
208
|
|
- "or clicking in the water. When an area is selected the map is ",
|
|
212
|
+ "or clicking the sea. When an area is selected the map is ",
|
209
|
213
|
"coloured according to the people who commute to or from that area ",
|
210
|
214
|
"(including the people who commute within the area). When no area is ",
|
211
|
215
|
"selected, colouring is according to commutes to or from all ",
|
212
|
216
|
"localities. Hover over areas for a summary (on a tablet, hold press)."),
|
|
217
|
+ p("At rest the map is coloured by the most common type of transportation ",
|
|
218
|
+ "used by people commuting to employment from each area."),
|
213
|
219
|
h4("Keyboard shortcuts"),
|
214
|
220
|
shiny::tags$ul(id="shortcutlist",
|
215
|
221
|
shiny::tags$li(shiny::tags$kbd("I"), ": toggle this info page"),
|
|
@@ -274,32 +280,32 @@ $(function(){
|
274
|
280
|
switch(e.key) {
|
275
|
281
|
case 'p':
|
276
|
282
|
case 'P':
|
277
|
|
- document.getElementsByName('radioeduemp')[0].checked = true;
|
|
283
|
+ document.getElementsByName('radioeduemp')[0].click();
|
278
|
284
|
Shiny.onInputChange('radioeduemp', 'Employment')
|
279
|
285
|
break;
|
280
|
286
|
case 'd':
|
281
|
287
|
case 'D':
|
282
|
|
- document.getElementsByName('radioeduemp')[1].checked = true;
|
|
288
|
+ document.getElementsByName('radioeduemp')[1].click();
|
283
|
289
|
Shiny.onInputChange('radioeduemp', 'Education')
|
284
|
290
|
break;
|
285
|
291
|
case 'f':
|
286
|
292
|
case 'F':
|
287
|
|
- document.getElementsByName('radioinout')[0].checked = true;
|
|
293
|
+ document.getElementsByName('radioinout')[0].click();
|
288
|
294
|
Shiny.onInputChange('radioinout', 'res')
|
289
|
295
|
break;
|
290
|
296
|
case 't':
|
291
|
297
|
case 'T':
|
292
|
|
- document.getElementsByName('radioinout')[1].checked = true;
|
|
298
|
+ document.getElementsByName('radioinout')[1].click();
|
293
|
299
|
Shiny.onInputChange('radioinout', 'work')
|
294
|
300
|
break;
|
295
|
301
|
case 'o':
|
296
|
302
|
case 'O':
|
297
|
|
- document.getElementsByName('radiocolour')[0].checked = true;
|
|
303
|
+ document.getElementsByName('radiocolour')[0].click();
|
298
|
304
|
Shiny.onInputChange('radiocolour', 'type')
|
299
|
305
|
break;
|
300
|
306
|
case 'u':
|
301
|
307
|
case 'U':
|
302
|
|
- document.getElementsByName('radiocolour')[1].checked = true;
|
|
308
|
+ document.getElementsByName('radiocolour')[1].click();
|
303
|
309
|
Shiny.onInputChange('radiocolour', 'number')
|
304
|
310
|
break;
|
305
|
311
|
case 'i':
|