Commit graph

213 commits

Author SHA1 Message Date
Hugh Rundle 63f29c31c0 fix workflow 2021-01-26 17:25:19 +11:00
Hugh Rundle 0f66a28ff7
add website column to csv
Add website column to library_services_information.csv and an entry for ACT
2021-01-26 17:21:53 +11:00
Hugh Rundle c408f2baed
Merge pull request #36 from hughrun/setup-actions
add github action scripts
2021-01-26 17:17:24 +11:00
Hugh Rundle d3884a4e62 add github action scripts
- moves python script to .github directory
- also cleans up .gitignore
2021-01-26 16:56:43 +11:00
Hugh Rundle ec038c6059
Merge pull request #35 from hughrun/prep-new-workflow
normalise service names
2021-01-26 14:45:32 +11:00
Hugh Rundle 23aee37ca8 normalise service names
- titlecase all library service short names in csv file
- rename `short_name` to `name` in csv
- replace merge_service_data.py with merge_to_topo.py in preparation to resolve #18 and #34

NEW WORKFLOW if changing boundary shapes

- update boundaries.geojson if needed
- geo2topo -q 12000
- THEN run merge_to_topo.py (i.e. we merge the topoJSON not the geoJSON)

NEW WORKFLOW if changing service data

- merge pull request containing changes to library_services_information.csv
- run Action which runs merge_to_topo and then updates main HEAD topofile
2021-01-26 14:37:22 +11:00
Hugh Rundle 5632eabb75
Merge pull request #33 from lissertations/master
Correct LMS names and add mechanics institutes phone numbers
2021-01-26 07:37:18 +11:00
Alissa M afb73777d4 Update load-map.js
edited getIlsColor function to match library_services_information.csv
2021-01-25 22:06:51 +11:00
Alissa M 8dea756913 Update Isaac RC
Formerly WMS, now Libero
2021-01-25 21:56:25 +11:00
Alissa M 8649c3f251 Adding mechanics institute phone numbers
and editing ACTHL number for consistency
2021-01-25 21:24:50 +11:00
Alissa M 2e34d10e50 Update library_services_information.csv
Editing typos
2021-01-25 21:09:18 +11:00
Hugh Rundle 131136c97d
Merge pull request #29 from hughrun/mode-switch
change naming of library view modes
2021-01-25 14:35:57 +11:00
Hugh Rundle 87a470f39f change naming of library view modes
Summary
=======

- changes "White Fragility mode" to "Colonial Mode"
- changes "General mode" to "Standard Mode"
- changes "Worker Pacification Centres" to "Mechanics Institutes"

Explanation
===========
The point of two modes is to invite map users to think about the work libraries do as institutions, and how certain types of cultural organisation are normalised and certain types are othered. In particular, why are "Indigenous Knowledge Centres" different from "public libraries", and precisely *how*?

Calling the non-standard view "White Fragility Mode" implies that the individual using it is at fault, not woke enough, fragile. This is not helpful as an invitation to be thoughtful and consider the language and perspectives that are normalised.

Changing it to 'colonial' mode shifts the emphasis to that of an institutional and structural concern, rather than an individual fault.

The change for Mechanics Institutes follows more reading about them. Their history is complicated, a mixture of genuine self-help and mutual aid, and attempts by capitalists to control their workers.
2021-01-25 14:32:18 +11:00
Hugh Rundle f9050f5e32 remove unnecessary blank line 2021-01-25 13:51:25 +11:00
Hugh Rundle 3b41f76280
Merge pull request #27 from hughrun/ils
Add ILS layer to map
2021-01-25 13:48:47 +11:00
Hugh Rundle 82b01eb45c add outstanding ILS data for library services 2021-01-25 13:46:30 +11:00
Hugh Rundle 21c0c10f08 add ILS map
Adds a layer to view the library software for each library service.
Each software system is colour-coded.
Adds the ILS to the infobox on hover and the popup on select.
2021-01-25 13:43:10 +11:00
Hugh Rundle 18ebf05ec5
Merge pull request #23 from hughrun/add-regions
Add regions
2021-01-24 20:53:16 +11:00
Hugh Rundle b0e2b5a9d2 add Norfolk Island library location
Precise location is a little vague, but I did my best.
2021-01-24 20:48:56 +11:00
Hugh Rundle e82d2267fd add Norfolk Island and Boulia Shire
- Add Norfolk Island as a library service region
- add Boulia Shire as a library service region
2021-01-24 20:43:28 +11:00
Hugh Rundle 31550bb512 impprove python merge script for smaller geojson files 2021-01-24 20:42:31 +11:00
Hugh Rundle 2beebe8099
Merge pull request #21 from hughrun/contrib
update contributing guide
2021-01-24 17:33:42 +11:00
Hugh Rundle 08311866c6 update contributing guide
fix #13
2021-01-24 17:32:25 +11:00
Hugh Rundle ae5c04c533 zoom out more on mobile
Mobile screens are likely narrower (portrait) so zooming out a little more shows an equivalent width for the Australian continent.
2021-01-24 17:00:28 +11:00
Hugh Rundle f6839d7aef
Merge pull request #20 from hughrun/mobile-friendly
fix text wrap for code
2021-01-24 16:55:08 +11:00
Hugh Rundle dd645ceac9 fix text wrap for code 2021-01-24 13:06:51 +11:00
Hugh Rundle 1c1a898417
Merge pull request #19 from hughrun/mobile-friendly
merge mobile-friendly
2021-01-24 13:00:18 +11:00
Hugh Rundle 0a79419508
Merge branch 'master' into mobile-friendly 2021-01-24 12:59:38 +11:00
Hugh Rundle 8c99dfc3fa keep infoboxes regardless of overlays active
This does not apply on smaller screens, where we hide the infoboxes

fixes #9
2021-01-24 12:53:55 +11:00
Hugh Rundle bd664dd17d fix styling for mobile
- remove overlays on small screens
- minimise control on small screens
- add popup on zooming to area (since touchscreen devices have no 'hover')
- fix navigation menu for small screens
- add footer with licensing info
- fix table display on small screens

fixes #4
fixes #11
2021-01-24 12:40:17 +11:00
Hugh Rundle 259a29be22 add contributing info to readme 2021-01-24 12:18:03 +11:00
Hugh Rundle 7df9b47dda update contributing page info 2021-01-24 12:17:14 +11:00
Hugh Rundle 2bca19e47c fix link formatting in sources page 2021-01-24 12:10:42 +11:00
Hugh Rundle 72ee1d3880
fix typo in filepath 2021-01-23 19:56:27 +11:00
Hugh Rundle 695fc7ae8a Merge branch 'master' of github.com:hughrun/public_library_map 2021-01-23 19:53:39 +11:00
Hugh Rundle 883195cf83 update docs and merge file
- add instructions for updating CSV and not JSON
- fix filepaths in merge_service_data.py
- add info about license agreement for contributors
- explain about large files that are currently missing

Fixes #7
Fixes #15
2021-01-23 19:43:03 +11:00
Hugh Rundle fafbf5e6b3 fix fragility toggle
mapControl was declared as a const instead of a var, which prevented switchMode() from working properly.

This fixes that by using var rather than const, and also moves the Controls and initial layer declarations above switchMode() so we don't have to rely on hoisting to use variables declared later.

Fixes #16
2021-01-23 18:15:25 +11:00
Hugh Rundle 32c5ead71d
Merge pull request #17 from PaulSchulz/master
add details for Port Adelaide Enfield Library Service
2021-01-23 16:31:32 +11:00
Paul Schulz 1d43e10121 add details for Port Adelaide Enfield Library Service 2021-01-23 15:25:27 +10:30
Hugh Rundle 8dd718a618 remove reference to goglam talk
Turns out I won't be talking about white fragility mode after all.
2021-01-22 18:39:01 +11:00
Hugh Rundle 4c48c96e01 reduce opacity of overlays
The fines and loan period overlays were too opaque and made it hard to see what they were overlayed onto - especially in Queensland with the whacky coastal shire boundaries. Reduced to make things more transparent literally and figuratively.
2021-01-22 18:34:14 +11:00
Hugh Rundle 1f64423368 update filenames in data directory 2021-01-22 18:29:30 +11:00
Hugh Rundle f4942ccf2b remove unecessary js files
Instead of using js files we now pull the data in directly using fetch() from the website/data directory.
2021-01-22 18:16:39 +11:00
Hugh Rundle 51eb01eec5 udpate readme and contributing
- update to correct filepaths for licensing info in README
- add more detail in contributing.md
2021-01-22 18:04:46 +11:00
Hugh Rundle dd5b28ca1d remove old data directory 2021-01-20 09:35:29 +11:00
Hugh Rundle 0bd4b4892f restructure website for better data integration
Big commit here.
This moves the "data" directory inside the website, and then uses fetch to bring the csv and geoJSON files into the map instead of copy-pasting into JS files. Much cleaner and reduces steps from updating a CSV to updating the actual website. Now we simply need to git pull on the webserver (unless the updated data is for library services rather than library locations).

Also cleans up some styling.

Also removes my MapBox secrets from the Git repo whoops. These are now brought in via a secrets.js file that simply declares a constant. This file will not be visible in the repo.

Fixes #14
2021-01-20 09:28:43 +11:00
Hugh Rundle 93a357226d fix gitignore paths again 2021-01-20 09:12:09 +11:00
Hugh Rundle 578dfa09bc fix gitignore paths 2021-01-20 08:51:15 +11:00
Hugh Rundle 9e8e1581b2 ignore secrets 2021-01-20 08:49:43 +11:00
Hugh Rundle f9c6b9274d clean up variable declarations and indentation 2021-01-19 18:21:36 +11:00