Merge pull request #167 from hughrun/academic

add academic libraries

website/data/academic_library_locations.csv

@@ -0,0 +1,39 @@
+lat,lng,town,address,phone,ils,discovery
+-33.837473,151.202985,Australian Catholic University,PO Box 968 North  Sydney,,Ex Libris Alma,Ex Libris Primo
+-35.277941,149.120431,Australian National University,"Building 15, J B Chifley Library, Acton ACT",+61 2 6125 2003,Ex Libris Alma,Ex Libris Primo
+-28.072442,153.416296,Bond University,Gold Coast QLD 4226,+61 7 5595 1524,Ex Libris Alma,Ex Libris Primo
+-12.371553,130.869393,Charles Darwin University,"PO Box 40146, Casuarina, NT",+61 8 8946 6187,Ex Libris Alma,Ex Libris Primo
+-33.431145,149.559088,Charles Sturt University,"Panorama Avenue, Bathurst, NSW",,Ex Libris Alma,Ex Libris Primo
+-23.324208,150.519476,Central Queensland University,Rockhampton QLD 4702,+61 7 4150 7022 ,Ex Libris Alma,Ex Libris Primo
+-32.005611,115.894527,Curtin University,Perth WA,,Ex Libris Alma,Ex Libris Primo
+-38.143863,144.36037,Deakin University,"1 Gheringhap Street, Geelong, VIC",+61 3 5227 8066,Innovative Sierra,EBSCO Discovery Service
+-31.752468,115.770801,Edith Cowan University,"270 Joondalup Drive, Joondalup, WA",+61 8 6304 3723 ,OCLC WorldShare,Ex Libris Summon
+-37.561366,143.858446,Federation University,Ballarat VIC 3353,+61 3 5327 9342,Innovative Sierra,Ex Libris Primo
+-35.02571,138.572475,Flinders University,Adelaide SA 5001,+61 8 8201 2103,Alma,Ex Libris Primo
+-27.962852,153.379487,Griffith University,Gold Coast QLD 4222,+61 7 3735 9712,OCLC WorldShare,OCLC WorldCat Discovery Service
+-19.328566,146.758333,James Cook University,"1 James Cook Drive, Townsville, QLD",+61 7 4781 4472,Ex Libris Alma,Ex Libris Primo VE
+-37.719904,145.048687,La Trobe University,"Bundoora, VIC 3086",+61 3 9479 2713,Ex Libris Alma,Ex Libris Primo
+-33.775656,151.113334,Macquarie University,NSW 2109,+61 2 9850 7546,Ex Libris Alma,Ex Libris Primo
+-37.909712,145.132315,Monash University,Vic 3800,+61 3 9905 2665 ,Ex Libris Alma,Ex Libris Primo
+-32.067045,115.834896,Murdoch University,"90 South Street, Murdoch WA 6150",+61 8 9360 2513,Innovative Sierra,Ex Libris Summon
+-27.45178,153.01673,Queensland University of Technology,"Kelvin Grove Campus, Brisbane, QLD 4001",+61 7 3138 3373,Ex Libris Alma,Ex Libris Primo VE
+-37.808606,144.96475,RMIT University,Melbourne VIC 3001,+61 3 9925 2077 ,Ex Libris Alma,Ex Libris Primo
+-28.817625,153.298596,Southern Cross University,Lismore NSW 2480,+61 7 5589 3492,Ex Libris Alma,Ex Libris Primo
+-37.821292,145.038503,Swinburne University,Hawthorn VIC 3122,,Ex Libris Alma,Ex Libris Primo
+-34.919634,138.604707,University of Adelaide,Adelaide SA 5001,+61 8 8313 5700,Ex Libris Alma,Ex Libris Primo
+-35.238061,149.083394,University of Canberra,Canberra ACT 2601,+61 2 6201 5782,Ex Libris Alma,Ex Libris Primo
+-37.798438,144.959354,University of Melbourne,VIC 3010,+61 3 9035 3336,Innovative Sierra,EBSCO Discovery Service
+-30.4867,151.643,University of New England ,Armidale NSW 2351,+61 2 6773 1992,Ex Libris Alma,Ex Libris Primo
+-33.917421,151.231299,University of New South Wales,Sydney NSW 2052,+61 2 9065 7631,Ex Libris Alma,Ex Libris Primo
+-32.892637,151.705763,University of Newcastle,Callaghan NSW 2308,+61 2 4921 6465,Innovative Sierra,EBSCO Discovery Service
+-32.056228,115.743868,University of Notre Dame Australia,"19 Mouat Street, Fremantle, WA 6959",+61 8 9433 0702,Ex Libris Alma,
+-27.494649,153.011613,University of Queensland,St Lucia QLD 4072,+61 7 3365 6551,Ex Libris Alma,Ex Libris Primo
+-34.809038,138.619963,University of South Australia,"Mawson Lakes Boulevard, Mawson Lakes SA 5095",+61 8 8302 3575,Ex Libris Alma,Ex Libris Primo
+-27.628941,152.755282,University of Southern Queensland,Raceview QLD 4305,+61 7 4631 1778,Ex Libris Alma,Ex Libris Primo
+-33.888426,151.1874,University of Sydney,The University of Sydney NSW 2006,+61 2 9114 4554,Ex Libris Alma,Ex Libris Primo VE
+-42.903951,147.325435,University of Tasmania,Hobart TAS 7001,+61 3 6226 2826,Innovative Sierra,Ex Libris Summon
+-33.883345,151.200854,University of Technology Sydney,Broadway NSW 2007,+61 2 9514 3332 ,Ex Libris Alma,Ex Libris Primo
+-26.717764,153.062742,University of the Sunshine Coast,Maroochydore DC QLD 4558,,Ex Libris Alma,Ex Libris Primo
+-34.406122,150.878527,University of Wollongong,"Northfields Ave, Wollongong NSW 2522",,Ex Libris Alma,Ex Libris Primo
+-37.793717,144.8987,Victoria University,Melbourne VIC 8001,+61 3 9919 4065,Innovative Sierra,EBSCO Discovery Service
+-33.765605,150.741037,Western Sydney University,Penrith South DC NSW 1797,+61 2 9852 5924,Ex Libris Alma,Ex Libris Primo

website/load-map.js

@@ -13,6 +13,9 @@ const mechanics = fetch('data/mechanics_institute_locations.csv')
 const nslaBranches = fetch('data/nsla_library_locations.csv')
 .then( response => response.text());
 
+const caul = fetch('data/academic_library_locations.csv')
+.then( response => response.text());
+
 var isSmallScreen = window.screen.availWidth < 800;
 
 function BaseMap(id) {
@@ -62,7 +65,8 @@ function LocationsLayer(data, color, outline, type) {
         if (type === 'ils') {
           layer.bindPopup(
             `<strong>${feature.properties.town}</strong>` +
-            `<p>${feature.properties.ils}</p>`
+            `<p>${feature.properties.ils}</p>` +
+            `<p>${feature.properties.discovery}</p>`
             )
         } else {
           layer.bindPopup(
@@ -96,7 +100,7 @@ function LocationsLayer(data, color, outline, type) {
 }
 
 
-Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
+Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches, caul])
 .then( data => {
   // add tile layers for each base map
   const baseMap = new BaseMap('mapbox/dark-v10')
@@ -116,6 +120,7 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
   const mechsAndSoA = new LocationsLayer(data[3], 'rgb(255,165,0)', 800)
   const otherLibs = new LocationsLayer(data[4], '#75f857', 800)
   const nslaLibs = new LocationsLayer(data[4], '#FF3961', 20000, 'ils')
+  const academicLibs = new LocationsLayer(data[5], '#0073A1', 1000, 'ils')
   // add to the initial map on load
   branches.addTo(map)
   ikcs.addTo(map)
@@ -496,6 +501,7 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
   // navigation journey
 
   var ilsMaps = {
+    "Academic Libraries": academicLibs,
     "NSLA Libraries" : nslaLibs,
     "Local Libraries" : ils
   }
@@ -535,11 +541,9 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
       fines.remove()
       loanPeriod.remove()
       // add ILS layer
-      // TODO: here we add NSLA libraries
-      // mapControl.addOverlay(nslaLibs, "National/State libraries")
-      // mapControl.addOverlay(ils, "Local Libraries")
       ils.addTo(map)
       nslaLibs.addTo(map)
+      academicLibs.addTo(map)
       for (let k in ilsMaps ) {
         mapControl.addOverlay(ilsMaps[k], k)
       }
@@ -568,4 +572,4 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches])
   const loadingDiv = document.getElementById("loading");
   loadingDiv.remove()
 
-})
+})