Merge pull request #29 from hughrun/mode-switch

change naming of library view modes
This commit is contained in:
Hugh Rundle 2021-01-25 14:35:57 +11:00 committed by GitHub
commit 131136c97d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 22 deletions

View file

@ -42,16 +42,18 @@ Library locations are classified into four types. In general mode these are:
* Settler Knowledge Centres * Settler Knowledge Centres
* Indigenous Knowledge Centres * Indigenous Knowledge Centres
* Worker Pacification Centres * Mechanics Institutes
* Imperial Knowledge Centres * Colonial Knowledge Centres
If this naming convention makes you uncomfortable, you may view the map in *White fragility mode*, in which case the names are: If this naming convention is confusing, you may view the map in *Colonial mode*, in which case the names are:
* Public Libraries * Public Libraries
* Indigenous Knowledge Centres * Indigenous Knowledge Centres
* Mechanics Institutes * Mechanics Institutes
* National & State Libraries * National & State Libraries
Standard Mode invites you to think about the work these institutions do to normalise certain types of knowledge and not others.
### Important files that are not in this repository ### Important files that are not in this repository
If you look at `merge_service_data.py` you will notice that there are two files used in creating `website/data/boundaries.topo.json` that are missing from this repository: If you look at `merge_service_data.py` you will notice that there are two files used in creating `website/data/boundaries.topo.json` that are missing from this repository:

View file

@ -47,20 +47,21 @@
<h3 id="caveats">Caveats</h3> <h3 id="caveats">Caveats</h3>
<p>Most of the data for the map comes from government open data sources. As such it is subject to government bias, and may be out of date or over/under sampled. I make no claim or warranty that the data being complete, accurate, or up to date — though I aim for it to be all of those things. If in doubt, always check with the library directly.</p> <p>Most of the data for the map comes from government open data sources. As such it is subject to government bias, and may be out of date or over/under sampled. I make no claim or warranty that the data being complete, accurate, or up to date — though I aim for it to be all of those things. If in doubt, always check with the library directly.</p>
<h3 id="nomenclature">Nomenclature</h3> <h3 id="nomenclature">Nomenclature</h3>
<p>Library locations are classified into four types. In general mode these are:</p> <p>Library locations are classified into four types. In Standard Mode these are:</p>
<ul> <ul>
<li>Settler Knowledge Centres</li> <li>Settler Knowledge Centres</li>
<li>Indigenous Knowledge Centres</li> <li>Indigenous Knowledge Centres</li>
<li>Worker Pacification Centres</li> <li>Mechanics Institutes</li>
<li>Imperial Knowledge Centres</li> <li>Colonial Knowledge Centres</li>
</ul> </ul>
<p>If this naming convention makes you uncomfortable, you may view the map in <em>White fragility mode</em>, in which case the names are:</p> <p>If this naming convention is confusing, you may view the map in <em>Colonial Mode</em>, in which case the names are:</p>
<ul> <ul>
<li>Public Libraries</li> <li>Public Libraries</li>
<li>Indigenous Knowledge Centres</li> <li>Indigenous Knowledge Centres</li>
<li>Mechanics Institutes</li> <li>Mechanics Institutes</li>
<li>National &amp; State Libraries</li> <li>National &amp; State Libraries</li>
</ul> </ul>
<p>Standard Mode invites you to think about the work these institutions do to normalise certain types of knowledge and not others.</p>
</section> </section>
</main> </main>
<footer> <footer>

View file

@ -49,7 +49,7 @@
<div id="mode-switch"> <div id="mode-switch">
<div></div> <div></div>
<button id="mode-button" name="mode-button">View in White Fragility Mode</button> <button id="mode-button" name="mode-button" class="hidden"></button>
</div> </div>
<!-- div to attach everything to --> <!-- div to attach everything to -->
<div id="mapid"></div> <div id="mapid"></div>

View file

@ -329,24 +329,26 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
overlayMaps = { overlayMaps = {
"Settler Knowledge Centres" : branches, "Settler Knowledge Centres" : branches,
"Indigenous Knowledge Centres" : ikcs, "Indigenous Knowledge Centres" : ikcs,
"Worker Pacification Centres" : mechsAndSoA, "Mechanics Institutes" : mechsAndSoA,
"Imperial Knowledge Centres": otherLibs "Colonial Knowledge Centres" : otherLibs
} }
modeButton.innerText = "View in White Fragility mode"; modeButton.setAttribute('class', 'visible');
modeButton.innerText = "View in Colonial Mode";
} }
function setFragile() { function setColonial() {
overlayMaps = { overlayMaps = {
"Public Libraries" : branches, "Public Libraries" : branches,
"Indigenous Knowledge Centres" : ikcs, "Indigenous Knowledge Centres" : ikcs,
"Mechanics Institutes" : mechsAndSoA, "Mechanics Institutes" : mechsAndSoA,
"National & State Libraries" : otherLibs "National & State Libraries" : otherLibs
}; };
modeButton.innerText = "View in General mode"; modeButton.setAttribute('class', 'visible');
modeButton.innerText = "View in Standard Mode";
} }
if (sessionStorage.getItem('mapMode') === 'fragile') { if (sessionStorage.getItem('mapMode') === 'colonial') {
setFragile() setColonial()
} else { } else {
setGeneral() setGeneral()
} }
@ -369,9 +371,9 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
serviceInfo: L.control({position: 'topleft'}) serviceInfo: L.control({position: 'topleft'})
} }
// switching mode between standard and fragile // switching mode between standard and colonial
function switchMode() { function switchMode() {
if (sessionStorage.getItem('mapMode') === 'fragile') { if (sessionStorage.getItem('mapMode') === 'colonial') {
sessionStorage.setItem('mapMode', 'general'); sessionStorage.setItem('mapMode', 'general');
setGeneral() setGeneral()
mapControl.remove(); mapControl.remove();
@ -381,8 +383,8 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
infoBoxes.branches.addTo(map) infoBoxes.branches.addTo(map)
} }
} else { } else {
sessionStorage.setItem('mapMode', 'fragile'); sessionStorage.setItem('mapMode', 'colonial');
setFragile() setColonial()
mapControl.remove(); mapControl.remove();
infoBoxes.branches.remove() infoBoxes.branches.remove()
mapControl = L.control.layers(baseMaps, overlayMaps, {"collapsed": isSmallScreen}).addTo(map); mapControl = L.control.layers(baseMaps, overlayMaps, {"collapsed": isSmallScreen}).addTo(map);
@ -441,7 +443,6 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
} }
} }
function zoomToFeature(e, props) { function zoomToFeature(e, props) {
map.fitBounds(e.target.getBounds()); map.fitBounds(e.target.getBounds());
e.target.bindPopup(` e.target.bindPopup(`