Missing colours severe bugfix

scripts/functionWriter.js

@@ -140,7 +140,12 @@ function getSurvivalGuideTableData(uid) {
   } 
   var cindexns = [];
   for (let ct of pal) {
-    cindexns.push(ColourTokens.indexOf(ct));
+    let index = ColourTokens.indexOf(ct);
+    if (index === -1) {
+      alert("Unexpected Error\n\nSome colours in the palette are invalid (Is this image data restored from an older session?). Please re-upload the image and try in a new form.");
+      throw new Error(`Missing colour ${ct}`);
+    }
+    cindexns.push(index);
   }
 
   return { uid, 

scripts/imageProcessor.js

@@ -41,6 +41,9 @@ function analyseImage(uid, image, area, palette, is3D, dither) {
         p.push(darkPixel(clr.rgb)); 
         p.push(lightPixel(clr.rgb));
       }
+    } else {
+      alert("Unexpected Error\n\nSome colours in the palette are invalid (Is this image data restored from an older session?). Please re-upload the image and try in a new form.");
+      throw new Error(`Missing colour ${cn}`);
     }
   }
   // Resize the image to fit number of pixels in minceraft maps, using browser canvas

scripts/main.js

@@ -520,8 +520,8 @@ function submitImgFormHandler(uid, event) {
   // Read the uploaded image data from stored base64 URI, and disable the form and begin analysis
   var image = new Image();
   image.onload = function() {
-    var analysis = analyseImage(uid, image, area, palette, d3, dither);
-    if (!analysis) {
+    try {
+      analyseImage(uid, image, area, palette, d3, dither);
       $("form#imageForm_"+uid+" :input").prop('disabled', true);
       $("form#imageForm_"+uid+" :radio").prop('disabled', true);
       $("form#imageForm_"+uid+" :checkbox").prop('disabled', true);
@@ -534,10 +534,8 @@ function submitImgFormHandler(uid, event) {
           makeTabLabelContent(uid)
       );
       deleteSurvivalGuide(uid, true);
-
-    } else {
-      alert("Error\n\nAn unknown error occurred while processing");
-      console.error("Error processing image "+uid);
+    } catch (error) {
+      console.error(error);
     }
     $("#spinnerModal").addClass('d-none'); $("#spinnerModal").removeClass('d-block');
   }
@@ -960,8 +958,13 @@ function createSurvivalGuide(uid, area) {
   $("#survGuidePlaceholderText").addClass('d-none');
 
   // Add the html string to DOM
-  $("#guideTab_"+uid).html(
-    ejs.render(EJStemplates.survivalGuide, getSurvivalGuideTableData(uid)));
+  try {
+    $("#guideTab_"+uid).html(
+      ejs.render(EJStemplates.survivalGuide, getSurvivalGuideTableData(uid)));
+  } catch (err) {
+    console.error(err);
+    return;
+  }
 
   $(`#guidePageBar_${uid} li.page-item`).click(function() {
     switchActiveGuidePage(this);

sw.js

@@ -3,7 +3,7 @@ Service Worker to enable the webpage to be used even offline, once installed
 Cached site should require only ~ 3 MB space
 */
 
-const CURRENT_CACHE_VERSION = 'mapart-cache-5.2.0';
+const CURRENT_CACHE_VERSION = 'mapart-cache-5.2.1';
 
 const CACHE_URLS_LOCAL = [
     /* Important : `/` doesn't automatically fetch `/index.html` locally, explicitly cache it