Commit graph

382 commits

Author SHA1 Message Date
Hugh Rundle ffdd84f240 fix filepath in action 2021-01-28 18:42:47 +11:00
Hugh Rundle fb209b565a
Merge pull request #47 from hughrun/geo2topo
add geojson file
2021-01-28 18:35:07 +11:00
Hugh Rundle 35130b175a add geojson file
This is the mother geojson file with all the boundaries. It should be processed into topojson automatically on any pushed changes. Let's find out!
2021-01-28 18:31:43 +11:00
Hugh Rundle e8163c68b2
Merge pull request #46 from hughrun/geo2topo
Geo2topo
2021-01-28 18:29:40 +11:00
Hugh Rundle f55bcd97f9 clarify path for GH Action 2021-01-28 18:26:31 +11:00
Hugh Rundle 12997c2eb4 add csv-to-topo to geo-t-topo
We need to merge the csv data into the new topojson file!
2021-01-28 18:25:11 +11:00
Hugh Rundle 4e2851fb1d add GitHub action
Processes geojson to topojson on a change to the geojson file.
2021-01-28 18:15:47 +11:00
Hugh Rundle 8599e4be0d
Merge pull request #45 from hughrun/contributing
update contributing pages
2021-01-28 10:05:15 +11:00
Hugh Rundle d2e3fc77ff update contributing pages
fixes #44 - make it clearer which issues to look at
2021-01-28 09:59:27 +11:00
Hugh Rundle 6b35971d8e
Merge pull request #40 from hughrun/update-docs
update docs
2021-01-26 18:44:55 +11:00
Hugh Rundle a36463cb3b update docs
Now that that the merging GitHub Action is working, the docs need to be updated in regard to the geojson and topojson files. Also cleans up where this info is located, as it was in 'about' but should be in 'contributing'.
2021-01-26 18:42:37 +11:00
Hugh Rundle a40bd76192
Merge pull request #38 from hughrun/auto-update-topo
Update TopoJSON
2021-01-26 17:48:36 +11:00
hughrun ec0ce5bf4c update TopoJSON 2021-01-26 06:40:27 +00:00
Hugh Rundle c88f9dc81b
Update library_services_information.csv
Add Boroondara website address
2021-01-26 17:40:04 +11:00
Hugh Rundle 0a948e38ca
fix filepaths in merge script 2021-01-26 17:37:39 +11:00
Hugh Rundle 70f22c1d78
Update library_services_information.csv
add website for Adelaide City Libraries
2021-01-26 17:36:08 +11:00
Hugh Rundle 8cfa9a50ca
Update merge-csv-to-topojson.yml
Fix missing '.' in filepath
2021-01-26 17:34:35 +11:00
Hugh Rundle 23499de42f
add Yarra Libraries website address 2021-01-26 17:28:40 +11:00
Hugh Rundle 6295780d9c
Merge pull request #37 from hughrun/setup-actions
fix workflow for merging csv to topojson
2021-01-26 17:27:08 +11:00
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