Commit graph

156 commits

Author SHA1 Message Date
sallybaker cd1f1cbf0c add Cloncurry to Southern Downs qld URLs 2021-02-05 16:49:19 +10:00
Molly 055a57ae26
Add files via upload
Added websites for WA, NSW, NT
2021-02-05 10:03:26 +08:00
sallybaker e6e60d177e add Cassowary to Cherbourg Qld URLs 2021-02-03 21:17:00 +10:00
hughrun de19a93a50 update contributors 2021-02-02 09:23:02 +00:00
hughrun a7fca9e824 merge csv data to topo 2021-02-02 09:21:54 +00:00
Hugh Rundle 5c47ed8b99 add some nsw websites 2021-02-02 20:20:56 +11:00
sallybaker e955aba744 Merge branch 'master' into QLD-loans
merge updated upstream into branch
2021-02-02 18:04:55 +10:00
sallybaker 4dbe9f0da2 update winton and weipa loan period 2021-02-02 08:48:40 +10:00
hughrun f1e73bfd0a update contributors 2021-02-01 21:35:08 +00:00
sallybaker 39bd2aab4b add loan periods for QLD libraries 2021-02-01 22:33:37 +10:00
Library Map Bot b58ee81a67 Update TopoJSON boundaries 2021-02-01 09:01:21 +00:00
hughrun 7619f02733 update contributors 2021-02-01 05:28:49 +00:00
hughrun 018e26205e merge csv data to topo 2021-02-01 05:14:28 +00:00
Hugh Rundle 5ae9920a67 fix typo in campbelltown nsw name 2021-02-01 16:13:31 +11:00
Hugh Rundle d05f7ba683
Merge pull request #94 from hughrun/geo-to-topo
Update TopoJSON boundaries
2021-02-01 16:07:06 +11:00
hughrun 339280186a Update TopoJSON boundaries 2021-02-01 05:02:05 +00:00
hughrun a7411ef335 update contributors 2021-02-01 05:01:40 +00:00
hughrun f22c8bd151 merge csv data to topo 2021-02-01 04:59:55 +00:00
Hugh Rundle 100f314743 disambiguate campbelltown
- Campbelltowns are now Campbelltown (SA) and Campbelltown (NSW)
- Inverell is now fine free!
2021-02-01 15:54:19 +11:00
hughrun 8e9e058dd0 update contributors 2021-01-31 10:29:27 +00:00
Hugh Rundle 946e71fc65
Merge pull request #92 from hughrun/contributors
Contributors
2021-01-31 21:29:04 +11:00
Hugh Rundle f37280f651 update docs & website
In preparation for new Action to add contributors on each push, this updates various pages in the docs and the website.

Also updates .gitignore to ignore node_modules

Also updates to website to account for the geojson file now being in the repository.
2021-01-31 21:20:34 +11:00
Alissa M 85e7fd3434 Update public_library_locations.csv
edits as per code review
2021-01-30 20:53:43 +11:00
Alissa M f9342e7a3c Update public_library_locations.csv
rectify capitalisation errors introduced in #74, remove GCCC library admin expressly marked in source data as 'not open to public'
2021-01-30 20:25:28 +11:00
hughrun 0ec33775f1 merge csv data to topo 2021-01-29 10:37:02 +00:00
Hugh Rundle 88c0177512 add bathurst website 2021-01-29 21:33:25 +11:00
hughrun 5a5fc82722 merge csv data to topo 2021-01-29 09:50:46 +00:00
Hugh Rundle 76619ef6d2 update ashburton website 2021-01-29 20:49:54 +11:00
hughrun bbba77b523 merge csv data to topo 2021-01-29 09:29:25 +00:00
Hugh Rundle 96bd9bc926 add big sky website 2021-01-29 20:27:06 +11:00
Hugh Rundle d1192d1420 Merge branch 'master' of github.com:hughrun/public_library_map 2021-01-29 19:49:23 +11:00
Hugh Rundle eeba7c9ce0 add armadale website 2021-01-29 19:49:09 +11:00
Hugh Rundle 5ad9504e67
Merge pull request #84 from hughrun/test
add bega website
2021-01-29 19:46:21 +11:00
hughrun fc8938d3d7 merge csv into topo 2021-01-29 08:41:37 +00:00
Hugh Rundle fe32e0fb20 add bega website 2021-01-29 19:40:09 +11:00
Hugh Rundle 5f631f3b16 add albury website 2021-01-29 19:25:56 +11:00
Hugh Rundle c163983d89 add armadale public library 2021-01-29 18:21:21 +11:00
hughrun 4779771fc3 update TopoJSON 2021-01-29 07:15:34 +00:00
Hugh Rundle 8ee6d4c715
Merge pull request #79 from hughrun/add-url
add alice springs website
2021-01-29 18:15:10 +11:00
Hugh Rundle cc75708f60 add goomaling details 2021-01-29 17:57:02 +11:00
Hugh Rundle 47f74881ef add alice springs website 2021-01-29 17:34:43 +11:00
hughrun 5772b60e17 update TopoJSON 2021-01-29 06:30:43 +00:00
Hugh Rundle 44a60dae70
Merge pull request #77 from hughrun/add-url
add banana shire website
2021-01-29 17:26:18 +11:00
Hugh Rundle 0bb522c521
Merge pull request #76 from hughrun/yarra-p
add YPRL website
2021-01-29 17:26:07 +11:00
Hugh Rundle 03b40de83e add banana shire website 2021-01-29 17:19:57 +11:00
Hugh Rundle 83cbc1a83f add YPRL website 2021-01-29 17:14:01 +11:00
Hugh Rundle ac6b8ea3e1 add bayside vic website 2021-01-29 17:03:29 +11:00
Hugh Rundle 2bd57e6e8a
Merge pull request #74 from lissertations/master
fix rockhampton ghost library, titlecase library names, collapse excess whitespace
2021-01-29 17:00:07 +11:00
Alissa M 58d9de69ad Update public_library_locations.csv
collapses excess whitespace, titlecases library names. fixes #42
2021-01-29 16:52:08 +11:00
Alissa M 70d681995a Merge remote-tracking branch 'upstream/master' 2021-01-29 16:42:10 +11:00
hughrun 81dc529d12 update TopoJSON 2021-01-29 05:22:11 +00:00
Hugh Rundle 607b4fd9d5
Merge pull request #72 from hughrun/albany
add albany website
2021-01-29 16:21:50 +11:00
Hugh Rundle 4281634159 add albany website 2021-01-29 16:10:38 +11:00
hughrun d4819d8e21 update TopoJSON 2021-01-29 05:09:20 +00:00
Alissa M d7963573d2 Update public_library_locations.csv
removed rockhampton ghost library. fixes #43
2021-01-29 15:38:50 +11:00
Hugh Rundle 4bdc907847 update Adelaide Hills website 2021-01-29 15:21:53 +11:00
hughrun b830962087 update TopoJSON 2021-01-29 00:17:56 +00:00
Hugh Rundle 53beb62ef9 update armadale libraries info
adds website and fines data
2021-01-29 11:15:03 +11:00
hughrun c3b5bf948f Update TopoJSON boundaries 2021-01-28 23:39:22 +00:00
hughrun 6f909a1383 Update TopoJSON boundaries 2021-01-28 22:57:20 +00:00
hughrun 140ee273b3 Update TopoJSON boundaries 2021-01-28 21:38:43 +00:00
hughrun f22901f869 Update TopoJSON boundaries 2021-01-28 21:04:12 +00:00
hughrun 99dbfa96a4 Update TopoJSON boundaries 2021-01-28 10:13:17 +00: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 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
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 70f22c1d78
Update library_services_information.csv
add website for Adelaide City Libraries
2021-01-26 17:36:08 +11:00
Hugh Rundle 23499de42f
add Yarra Libraries website address 2021-01-26 17:28:40 +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 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
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 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 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 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 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 dd645ceac9 fix text wrap for code 2021-01-24 13:06:51 +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 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 695fc7ae8a Merge branch 'master' of github.com:hughrun/public_library_map 2021-01-23 19:53:39 +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
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 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 f9c6b9274d clean up variable declarations and indentation 2021-01-19 18:21:36 +11:00
Hugh Rundle 632534789d improve popups when clicking on libraries
Allows users to click on the location dots AND the 800m radius (location point is overlayed at long distances).
Also adds phone numbers to all popups and improves code readability.
Fixes #12
2021-01-19 08:17:22 +11:00
Hugh Rundle fca91746d4 remove redundant topojson file 2021-01-18 21:19:36 +11:00
Hugh Rundle a4f555fb0c update directories for cool links 2021-01-18 20:25:14 +11:00
Hugh Rundle 035c593c13 improve menu tabs
Menu tabs now appear consistently on all pages. The active page is colour-reversed and has no link.
Also improved the logo file.
2021-01-18 13:29:43 +11:00