Try CSV before spreadsheet; leaflet-providers from CDN

HandsOnDataViz · Sep 29, 2020 · 8926df1 · 8926df1
1 parent 9110459
commit 8926df1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 65 deletions.
diff --git a/csv/Chapters.csv b/csv/Chapters.csv
diff --git a/csv/Options.csv b/csv/Options.csv
diff --git a/index.html b/index.html
@@ -9,11 +9,14 @@
 
   <!-- Load Leaflet CSS and JS-->
   <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
-  integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-  crossorigin=""/>
+    integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
+    crossorigin=""/>
   <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
-  integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-  crossorigin=""></script>
+    integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
+    crossorigin=""></script>
+
+  <!-- Load Leaflet basemap providers -->
+  <script src="https://unpkg.com/[email protected]/leaflet-providers.js"></script>
 
   <!-- Load jQuery  -->
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
@@ -56,7 +59,6 @@
   </script>
 
   <script type="text/javascript" src="google-doc-url.js"></script>
-  <script type="text/javascript" src="scripts/leaflet-providers.js"></script>
   <script type="text/javascript" src="markers/leaflet.extra-markers.min.js"></script>
   <script type="text/javascript" src="scripts/constants.js"></script>
   <script type="text/javascript" src="scripts/jquery.csv.js"></script>

diff --git a/scripts/storymap.js b/scripts/storymap.js
@@ -10,43 +10,49 @@ $(window).on('load', function() {
     scrollPosition = $(this).scrollTop();
   });
 
-  var parse = function(res) {
-    return Papa.parse(Papa.unparse(res[0].values), {header: true} ).data;
-  }
-
-  // First, try reading data from the Google Sheet
-  if (typeof googleDocURL !== 'undefined' && googleDocURL) {
+  // First, try reading Options.csv
+  $.get('csv/Options.csv', function(options) {
 
-    if (typeof googleApiKey !== 'undefined' && googleApiKey) {
+    $.get('csv/Chapters.csv', function(chapters) {
+      initMap(
+        $.csv.toObjects(options),
+        $.csv.toObjects(chapters)
+      )
+    }).fail(function(e) { alert('Found Options.csv, but could not read Chapters.csv') });
 
-      var apiUrl = 'https://sheets.googleapis.com/v4/spreadsheets/'
-      var spreadsheetId = googleDocURL.split('/d/')[1].split('/')[0];
+  // If not available, try from the Google Sheet
+  }).fail(function(e) {
 
-      $.when(
-        $.getJSON(apiUrl + spreadsheetId + '/values/Options?key=' + googleApiKey),
-        $.getJSON(apiUrl + spreadsheetId + '/values/Chapters?key=' + googleApiKey),
-      ).then(function(options, chapters) {
-        initMap(parse(options), parse(chapters))
-      })
+    var parse = function(res) {
+      return Papa.parse(Papa.unparse(res[0].values), {header: true} ).data;
+    }
+
+    // First, try reading data from the Google Sheet
+    if (typeof googleDocURL !== 'undefined' && googleDocURL) {
+
+      if (typeof googleApiKey !== 'undefined' && googleApiKey) {
+
+        var apiUrl = 'https://sheets.googleapis.com/v4/spreadsheets/'
+        var spreadsheetId = googleDocURL.split('/d/')[1].split('/')[0];
+
+        $.when(
+          $.getJSON(apiUrl + spreadsheetId + '/values/Options?key=' + googleApiKey),
+          $.getJSON(apiUrl + spreadsheetId + '/values/Chapters?key=' + googleApiKey),
+        ).then(function(options, chapters) {
+          initMap(parse(options), parse(chapters))
+        })
+
+      } else {
+        alert('You load data from a Google Sheet, you need to add a free Google API key')
+      }
 
     } else {
-      alert('You load data from a Google Sheet, you need to add a free Google API key')
+      alert('You need to specify a valid Google Sheet (googleDocURL)')
     }
+
+  })
 
 
-  }
-  // Else, try csv/Options.csv and csv/Chapters.csv
-  else {
-    $.get('csv/Options.csv', function(options) {
-      $.get('csv/Chapters.csv', function(chapters) {
-        initMap(
-          $.csv.toObjects(options),
-          $.csv.toObjects(chapters)
-        )
-      }).fail(function(e) { alert('Could not read Chapters.csv') });
-    }).fail(function(e) { alert('Could not read Options.csv') })
-  }
-
 
   /**
   * Reformulates documentSettings as a dictionary, e.g.