From 1dddbf08493ed0d386c99f79fdfb083adf5836f0 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 17 Dec 2020 17:00:55 +0100
Subject: [PATCH 01/18] Fix Tauxe, 2014 to 2010 (essentials of paleomagnetism

---
 statistics/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/statistics/index.html b/statistics/index.html
index c1b2daa..8e45967 100644
--- a/statistics/index.html
+++ b/statistics/index.html
@@ -195,7 +195,7 @@ <h5> Statistics - Mean Geomagnetic Directions </h5>
                <br>
                <div class="alert alert-light alert-dismissible fade show" role="alert">
                   <h5> Statistics - Common True Mean Directions </h5>
-                  <p> Figures showing <b>1000</b> bootstrapped mean coordinates for the selected collections following the approach of <a href='../references'>Tauxe et al., 2014</a>. Select two collections and click <b>initialize</b> to begin the bootstrap. Overlapping distributions indicidate that two collections are the same within confidence limits.
+                  <p> Figures showing <b>1000</b> bootstrapped mean coordinates for the selected collections following the approach of <a href='../references'>Tauxe et al., 2010</a>. Select two collections and click <b>initialize</b> to begin the bootstrap. Overlapping distributions indicidate that two collections are the same within confidence limits.
                      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                      <span aria-hidden="true">&times;</span>
                      </button>

From 5971b77d4b816516ae4ee487cb9b1d691fe2636d Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Wed, 27 Jan 2021 14:55:35 +0100
Subject: [PATCH 02/18] Add VGP disclaimer and add pole lat/lng to export table
 csv/json

---
 changelog/index.html       | 29 +++++++++++++++++--
 geography/js/graphs.js     |  2 +-
 statistics/index.html      |  2 +-
 statistics/js/exporting.js | 59 +++++++++++++++++++++++++++++++++-----
 4 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/changelog/index.html b/changelog/index.html
index 86d9edd..983dc22 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -78,6 +78,32 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
 
         <div id="accordion">
 
+          <div class="card">
+            <div class="card-header" id="headingSix">
+              <button class="btn btn-link" data-toggle="collapse" data-target="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
+                Paleomagnetism.org 2.2.1 - VGP Fixes <small class="text-muted">&nbsp; XXXX-XX-XX</small>
+              </button>
+            </div>
+            <div id="collapseSix" class="collapse show" aria-labelledby="headingSix" data-parent="#accordion">
+              <div class="card-body">
+              <b> Change Summary </b>
+				<p> Fixes were made to virtual geomagnetic pole calculations. The relative VGP distribution and cutoff algorithm use an arbitrary virtual site at location (0, 0). For the relative VGP distribution this does not matter. However, it means that for correct interpretation, all specimens in a collection should come from geographically adjacent areas.
+
+              <ul>
+                <p> <b> Features </b>
+                <li> Added VGP longitude, latitude to mean downloads CSV and JSON. This VGP is based on the mean of individual poles. It is not the VGP of the mean of directions which may differ slightly.
+              </ul>
+
+              <ul>
+                <p> <b> Fixes </b>
+                <li> Fixed tooltip of site mean VGP in geography portal. The tooltip showed the projected equal area inclination instead of true inclination.
+                <li> Added disclaimer under the VGP distribution in the directions tab in the statistics portal to emphasize it is a relative distribution assuming a single site.
+              </ul>
+
+              </div>
+            </div>
+          </div>
+          <p>
           <div class="card">
             <div class="card-header" id="headingFive">
               <button class="btn btn-link" data-toggle="collapse" data-target="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
@@ -107,7 +133,6 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
 
           <p>
 
-        <div id="accordion">
 
           <div class="card">
             <div class="card-header" id="headingFour">
@@ -173,8 +198,6 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
 
           <p>
 
-        <div id="accordion">
-
           <div class="card">
             <div class="card-header" id="headingTwo">
               <button class="btn btn-link" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
diff --git a/geography/js/graphs.js b/geography/js/graphs.js
index 5c9c7e5..c6f9482 100644
--- a/geography/js/graphs.js
+++ b/geography/js/graphs.js
@@ -613,7 +613,7 @@ function plotPoles(dataSeries) {
       "data": [{
         "x": statistics.dir.mean.dec,
         "y": projectInclination(statistics.dir.mean.inc),
-        "inc": projectInclination(statistics.dir.mean.inc),
+        "inc": statistics.dir.mean.inc,
         "age": 0
       }],
       "lineWidth": 1,
diff --git a/statistics/index.html b/statistics/index.html
index 8e45967..24231e7 100644
--- a/statistics/index.html
+++ b/statistics/index.html
@@ -158,7 +158,7 @@ <h5> Statistics - Geomagnetic Directions </h5>
                         <div id="pole-container"></div>
                      </div>
                   </div>
-
+                  <p><small><b>Note</b>: The illustrated VGP distribution and cutoff is relative to the mean and does not show true VGP positions. All directions are assumed to come from the same geographic location. </small>
                   <div class="text-right">
                      <button class="btn btn-sm btn-light" id="export-png"><i class="far fa-file-image"></i> PNG</button>
                      <button class="btn btn-sm btn-light" id="export-svg"><i class="far fa-file-image"></i> SVG</button>
diff --git a/statistics/js/exporting.js b/statistics/js/exporting.js
index e8b15c0..4f546fd 100644
--- a/statistics/js/exporting.js
+++ b/statistics/js/exporting.js
@@ -63,11 +63,32 @@ function exportMeanJSON() {
     var statistics = getStatisticalParameters(cutofC.components);
     var averageLocation = getAverageLocation(site);
 
+    var lat = null;
+    var lng = null;
+    var pLat = null;
+    var pLon = null;
+
+    if(averageLocation !== null) {
+
+      lat = averageLocation.lat;
+      lng = averageLocation.lng;
+
+      var convertedComps = cutofC.components.filter(x => x.latitude !== null && x.longitude !== null).map(function(x) {
+        var site = new Site(x.longitude, x.latitude);
+        return new Component(x, site.poleFrom(literalToCoordinates(x.coordinates).toVector(Direction)).toCartesian());
+      });
+      
+      var poleStatistics = getStatisticalParameters(convertedComps);
+      pLon = poleStatistics.dir.mean.dec.toFixed(PRECISION);
+      pLat = poleStatistics.dir.mean.inc.toFixed(PRECISION);
+
+    }
+
     // Check if a polarity switch is requested
     statisticsRows.push({
       "collection": site.name,
-      "latitude": averageLocation.lat,
-      "longitude": averageLocation.lng,
+      "latitude": lat,
+      "longitude": lng,
       "numberComponentsUsed": Number(cutofC.components.filter(x => !x.rejected).length),
       "numberComponents": Number(cutofC.components.length),
       "cutoff": Number(cutofC.cutoff.toFixed(PRECISION)),
@@ -83,7 +104,9 @@ function exportMeanJSON() {
       "confidencepolemax": Number(statistics.pole.confidenceMax.toFixed(PRECISION)),
       "declinationconfidence": Number(statistics.butler.dDx.toFixed(PRECISION)),
       "inclinationconfidence": Number(statistics.butler.dIx.toFixed(PRECISION)),
-      "paleolatitude": Number(statistics.dir.lambda.toFixed(PRECISION))
+      "paleolatitude": Number(statistics.dir.lambda.toFixed(PRECISION)),
+      "poleLatitude": Number(pLat),
+      "poleLongitude": Number(pLon)
     });
 
   });
@@ -109,18 +132,38 @@ function exportMeanCSV() {
   }
 
   // Add the header as the first row
-  var statisticsRows = new Array(new Array("Collection", "Latitude", "Longitude", "N", "Ns", "Cutoff", "S", "Dec", "Inc", "R", "k", "a95", "K", "A95", "A95Min", "A95Max", "ΔDx", "ΔIx", "λ").join(","));
+  var statisticsRows = new Array(new Array("Collection", "Latitude", "Longitude", "N", "Ns", "Cutoff", "S", "Dec", "Inc", "R", "k", "a95", "K", "A95", "A95Min", "A95Max", "ΔDx", "ΔIx", "λ", "Pole Lng", "Pole Lat").join(","));
 
   selectedCollections.forEach(function(site) {
 
     var cutofC = doCutoff(site.components.map(x => x.inReferenceCoordinates()));
     var statistics = getStatisticalParameters(cutofC.components);
     var averageLocation = getAverageLocation(site);
+    var lat = null;
+    var lng = null;
+    var pLat = null;
+    var pLon = null;
+
+    if(averageLocation !== null) {
+
+      lat = averageLocation.lat;
+      lng = averageLocation.lng;
+
+      var convertedComps = cutofC.components.filter(x => x.latitude !== null && x.longitude !== null).map(function(x) {
+        var site = new Site(x.longitude, x.latitude);
+        return new Component(x, site.poleFrom(literalToCoordinates(x.coordinates).toVector(Direction)).toCartesian());
+      });
+      
+      var poleStatistics = getStatisticalParameters(convertedComps);
+      pLon = poleStatistics.dir.mean.dec.toFixed(PRECISION);
+      pLat = poleStatistics.dir.mean.inc.toFixed(PRECISION);
+
+    }
 
     statisticsRows.push([
       site.name,
-      averageLocation.lat,
-      averageLocation.lng,
+      lat,
+      lng,
       cutofC.components.filter(x => !x.rejected).length,
       cutofC.components.length,
       cutofC.cutoff.toFixed(PRECISION),
@@ -136,7 +179,9 @@ function exportMeanCSV() {
       statistics.pole.confidenceMax.toFixed(PRECISION),
       statistics.butler.dDx.toFixed(PRECISION),
       statistics.butler.dIx.toFixed(PRECISION),
-      statistics.dir.lambda.toFixed(PRECISION)
+      statistics.dir.lambda.toFixed(PRECISION),
+      pLon,
+      pLat
     ].join(","));
 
   });

From c5941670908bbe865cd31ec494403e8e11f030be Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 25 Feb 2021 15:34:35 +0100
Subject: [PATCH 03/18] Add Anglia format: needs to be checked. Add option to
 add tickmarks to Zijderveld plot

---
 interpretation/index.html      |  5 +++
 interpretation/js/graphs.js    |  2 +-
 interpretation/js/importing.js | 69 ++++++++++++++++++++++++++++++++++
 interpretation/js/index.js     |  6 +++
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/interpretation/index.html b/interpretation/index.html
index bcb1293..b84bf12 100644
--- a/interpretation/index.html
+++ b/interpretation/index.html
@@ -119,6 +119,7 @@ <h5> Paleomagnetism.org 2 - Interpretation </h5>
                         <option value="HELSINKI">University of Helsinki</option>
                         <option value="MONTPELLIER">University of Montpellier</option>
                         <option value="OXFORD">University of Oxford</option>
+                        <option value="ANGLIA">University of East Anglia</option>
                         <option value="RS3">University of Oslo</option>
                         <option value="MUNICH">University of Munich</option>
                         <option value="RENNES">University of Rennes</option>
@@ -416,6 +417,10 @@ <h5> Preferences </h5>
                         <input class="form-check-input" type="checkbox" id="show-labels" value="option1" checked>
                         <label class="form-check-label" for="show-labels"> Show labels</label>
                      </div>
+                     <div class="form-check form-check-inline">
+                        <input class="form-check-input" type="checkbox" id="show-ticks" value="option1" checked>
+                        <label class="form-check-label" for="show-ticks"> Show tick marks</label>
+                     </div>
                      <div class="form-check form-check-inline">
                         <input class="form-check-input" type="checkbox" id="enable-sound" value="option1" checked>
                         <label class="form-check-label" for="enable-sound"> Sound </label>
diff --git a/interpretation/js/graphs.js b/interpretation/js/graphs.js
index 3be7951..fcd75e5 100644
--- a/interpretation/js/graphs.js
+++ b/interpretation/js/graphs.js
@@ -388,7 +388,7 @@ function plotZijderveldDiagram(hover) {
   });
 
   var graphScale = Math.max.apply(Math, graphScale);
-  var tickFlag = false;
+  var tickFlag = document.getElementById("show-ticks").checked;
   var enableLabels = document.getElementById("show-labels").checked;
 
   var vHover;
diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index e3eb520..a14d05f 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -1222,6 +1222,74 @@ function importOxford(file) {
 }
 
 
+function importAnglia(file) {
+
+
+  /*
+   * Function importAnglia
+   * Might be the same as NGU format (see below)
+   */
+
+  var lines = file.data.split(LINE_REGEXP).filter(Boolean);
+  var parsedData = new Array();
+  var parameters = lines[0].split(/[,\s\t]+/);
+  var sampleName = parameters[0];
+
+  // Different convention for core orientation than Utrecht
+  var coreAzimuth = Number(parameters[1]);
+  var coreDip = Number(parameters[2]);
+  var sampleVolume = Number(parameters[5]);
+
+  // Bedding strike needs to be decreased by 90 for input convention
+  var beddingStrike = (Number(parameters[3]) + 270) % 360;
+  var beddingDip = Number(parameters[4]);
+  var info = parameters[5];
+
+  for(var i = 1; i < lines.length; i++) {
+
+    // Reduce empty lines
+    var parameters = lines[i].split(/[,\s\t]+/);
+    parameters = parameters.filter(function(x) {
+      return x !== "";
+    });
+
+    // Get Cartesian coordinates for specimen coordinates (intensities in mA -> bring to μA)
+    var intensity = 1E3 * Number(parameters[1]);
+    var dec = Number(parameters[5]);
+    var inc = Number(parameters[6]);
+
+    var coordinates = new Direction(dec, inc, intensity).toCartesian();
+    // Have to flip x coordinates. Old data format.. different convention?
+    coordinates = new Coordinates(-coordinates.x, coordinates.y, coordinates.z);
+    parsedData.push(new Measurement(parameters[0], coordinates, Number(parameters[4])));
+
+  }
+
+  specimens.push({
+    "demagnetizationType": null,
+    "coordinates": "specimen",
+    "format": "ANGLIA",
+    "version": __VERSION__,
+    "created": new Date().toISOString(),
+    "steps": parsedData,
+    "name": sampleName,
+    "longitude": null,
+    "latitude": null,
+    "age": null,
+    "ageMin": null,
+    "ageMax": null,
+    "sample": sampleName,
+    "volume": sampleVolume,
+    "lithology": null,
+    "beddingStrike": Number(beddingStrike),
+    "beddingDip": Number(beddingDip),
+    "coreAzimuth": Number(coreAzimuth),
+    "coreDip": Number(coreDip),
+    "interpretations": new Array()
+  });
+
+}
+
 function importNGU(file) {
 
   /*
@@ -1276,6 +1344,7 @@ function importNGU(file) {
     "created": new Date().toISOString(),
     "steps": parsedData,
     "name": sampleName,
+    "volume": sampleVolume,
     "longitude": null,
     "latitude": null,
     "age": null,
diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index df9fb98..6c076c2 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -11,6 +11,10 @@ function registerEventHandlers() {
   document.getElementById("save-location").addEventListener("click", handleLocationSave);
   document.getElementById("specimen-age-select").addEventListener("change", handleAgeSelection);
 
+  // Redraw on option change
+  document.getElementById("show-ticks").addEventListener("click", redrawCharts);
+  document.getElementById("show-labels").addEventListener("click", redrawCharts);
+
   // Redraw when requested
   document.getElementById("normalize-intensities").addEventListener("change", plotIntensityDiagram.bind(null, false));
 
@@ -104,6 +108,8 @@ function addDegmagnetizationFiles(format, files) {
       return files.forEach(importNGU);
     case "PALEOMAC":
       return files.forEach(importPaleoMac);
+    case "ANGLIA":
+      return files.forEach(importAnglia);
     case "OXFORD":
       return files.forEach(importOxford);
     case "RS3":

From ae17b7ec5f9685b813617d99f7687d22b7f98341 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 25 Feb 2021 15:39:41 +0100
Subject: [PATCH 04/18] Must use explicit callback. Function crashes with
 callback parameters

---
 interpretation/js/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index 6c076c2..aedb4ee 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -12,8 +12,12 @@ function registerEventHandlers() {
   document.getElementById("specimen-age-select").addEventListener("change", handleAgeSelection);
 
   // Redraw on option change
-  document.getElementById("show-ticks").addEventListener("click", redrawCharts);
-  document.getElementById("show-labels").addEventListener("click", redrawCharts);
+  document.getElementById("show-ticks").addEventListener("click", function() {
+    redrawCharts();
+  });
+  document.getElementById("show-labels").addEventListener("click", function() {
+    redrawCharts();
+  });
 
   // Redraw when requested
   document.getElementById("normalize-intensities").addEventListener("change", plotIntensityDiagram.bind(null, false));

From ce9c5fda57b50a7b53395cd69640393a4b17ac3d Mon Sep 17 00:00:00 2001
From: Jollyfant <m.r.koymans@gmail.com>
Date: Thu, 11 Mar 2021 11:55:46 +0100
Subject: [PATCH 05/18] Fix GC pole bug:

---
 changelog/index.html       |  8 +++++++-
 interpretation/js/index.js | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/changelog/index.html b/changelog/index.html
index 983dc22..0a7ec9a 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -81,7 +81,7 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
           <div class="card">
             <div class="card-header" id="headingSix">
               <button class="btn btn-link" data-toggle="collapse" data-target="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
-                Paleomagnetism.org 2.2.1 - VGP Fixes <small class="text-muted">&nbsp; XXXX-XX-XX</small>
+                Paleomagnetism.org 2.2.1 - Bug Fixes <small class="text-muted">&nbsp; XXXX-XX-XX</small>
               </button>
             </div>
             <div id="collapseSix" class="collapse show" aria-labelledby="headingSix" data-parent="#accordion">
@@ -89,9 +89,15 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
               <b> Change Summary </b>
 				<p> Fixes were made to virtual geomagnetic pole calculations. The relative VGP distribution and cutoff algorithm use an arbitrary virtual site at location (0, 0). For the relative VGP distribution this does not matter. However, it means that for correct interpretation, all specimens in a collection should come from geographically adjacent areas.
 
+              <ul>
+                <p> <b> Fixes </b>
+                <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal.
+              </ul>
+
               <ul>
                 <p> <b> Features </b>
                 <li> Added VGP longitude, latitude to mean downloads CSV and JSON. This VGP is based on the mean of individual poles. It is not the VGP of the mean of directions which may differ slightly.
+                <li> Added option to show tick labels to Zijderveld plot.
               </ul>
 
               <ul>
diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index aedb4ee..8937299 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -2314,10 +2314,20 @@ function makeInterpretation(specimen, options) {
   var geoCoordinates = inReferenceCoordinates("geographic", specimen, PCA.component.coordinates);
   var geoMass = inReferenceCoordinates("geographic", specimen, PCA.component.centerMass);
 
+  // Bug fix when rotating the TAU3 pole may no longer be always negative..
+  if(options.type === "TAU3" && geoCoordinates.z > 0) {
+    geoCoordinates = geoCoordinates.reflect();
+  }
+
   // Rotate component to tectonic coordinates
   var tectCoordinates = inReferenceCoordinates("tectonic", specimen, PCA.component.coordinates);
   var tectMass = inReferenceCoordinates("tectonic", specimen, PCA.component.centerMass);
 
+  // Bug fix when rotating the TAU3 pole may no longer be always negative..
+  if(options.type === "TAU3" && tectCoordinates.z > 0) {
+    tectCoordinates = tectCoordinates.reflect();
+  }
+
   var comment;
 
   if(document.getElementById("auto-comment").checked) {

From 5dcb38a190bd714304f4f5d8815be1fc66a523ce Mon Sep 17 00:00:00 2001
From: Jollyfant <m.r.koymans@gmail.com>
Date: Thu, 11 Mar 2021 17:17:48 +0100
Subject: [PATCH 06/18] zIndex of mean/ellipse

---
 changelog/index.html    | 4 +++-
 statistics/js/graphs.js | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog/index.html b/changelog/index.html
index 0a7ec9a..a6ef5aa 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -91,7 +91,9 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
 
               <ul>
                 <p> <b> Fixes </b>
-                <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal.
+                <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal. The convention is that the pole is presented as negative (this has no effect on results). 
+                <li> Swapped line styles for lower (solid) and upper (dashed) GC in hemisphere plot. 
+                <li> Changed ordering of directions, mean and ellipse. Mean and ellipse should be on top in equal area plots.
               </ul>
 
               <ul>
diff --git a/statistics/js/graphs.js b/statistics/js/graphs.js
index 7a4cd9d..5ad5149 100644
--- a/statistics/js/graphs.js
+++ b/statistics/js/graphs.js
@@ -2243,6 +2243,7 @@ function eqAreaProjection() {
     "name": "Mean Direction",
     "data": new Array(statistics.dir.mean).map(prepareDirectionData),
     "type": "scatter",
+    "zIndex": 10,
     "color": HIGHCHARTS_GREEN,
     "marker": {
       "symbol": "circle",
@@ -2254,6 +2255,7 @@ function eqAreaProjection() {
   }, {
     "name": "Confidence Ellipse",
     "type": "line",
+    "zIndex": 10,
     "color": HIGHCHARTS_RED,
     "data": a95ellipse,
     "enableMouseTracking": false,

From 5dc473227a316fa4446cd1e3dd0d742cad39e2ab Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 8 Apr 2021 13:15:38 +0200
Subject: [PATCH 07/18] Add MAD to component

---
 interpretation/js/importing.js |  1 +
 interpretation/js/index.js     |  4 ++--
 js/classes/Component.js        |  7 ++++---
 js/utils.js                    | 12 ++++++------
 statistics/js/graphs.js        |  4 +++-
 statistics/js/index.js         |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index a14d05f..7a9069a 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -1109,6 +1109,7 @@ function importPaleoMac(file) {
     var x = 1E6 * Number(line.slice(5, 14)) / sampleVolume;
     var y = 1E6 * Number(line.slice(15, 25)) / sampleVolume;
     var z = 1E6 * Number(line.slice(25, 34)) / sampleVolume;
+console.log(Number(line.slice(5, 14)), Number(line.slice(15, 25)), Number(line.slice(25, 34)))
     var a95 = Number(line.slice(69, 73));
 
     var coordinates = new Coordinates(x, y, z);
diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index aedb4ee..d61c810 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -2252,12 +2252,12 @@ function makeInterpretations(options, selectedSteps, reference) {
 
       // Get the coordinates of the maximum eigenvector stored in v3
       var eigenVectorCoordinates = vectorTAU3;
-
+console.log(eigenVectorCoordinates);
       // Always take the negative pole by convention
       if(eigenVectorCoordinates.z > 0) {
         eigenVectorCoordinates = eigenVectorCoordinates.reflect();
       }
-
+console.log(eigenVectorCoordinates.toVector(Direction));
       break;
 
     default:
diff --git a/js/classes/Component.js b/js/classes/Component.js
index a67b764..37d7dd8 100644
--- a/js/classes/Component.js
+++ b/js/classes/Component.js
@@ -1,4 +1,4 @@
-var Component = function(specimen, coordinates) {
+var Component = function(specimen, coordinates, MAD) {
 
   /*
    * Class Component
@@ -7,6 +7,7 @@ var Component = function(specimen, coordinates) {
 
   this.name = specimen.name
   this.rejected = false;
+  this.MAD = MAD;
 
   this.latitude = specimen.latitude;
   this.longitude = specimen.longitude;
@@ -37,7 +38,7 @@ Component.prototype.inReferenceCoordinates = function(coordinates) {
   }
 
   // Return a itself as a new component but in reference coordinates
-  return new Component(this, inReferenceCoordinates(coordinates, this, this.coordinates));
+  return new Component(this, inReferenceCoordinates(coordinates, this, this.coordinates), this.MAD);
 
 }
 
@@ -53,6 +54,6 @@ Component.prototype.fromReferenceCoordinates = function(coordinates) {
   }
 
   // Return a itself as a new component but in reference coordinates
-  return new Component(this, fromReferenceCoordinates(coordinates, this, this.coordinates));
+  return new Component(this, fromReferenceCoordinates(coordinates, this, this.coordinates), this.MAD);
 
 }
diff --git a/js/utils.js b/js/utils.js
index 96165f5..a12f438 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -227,7 +227,7 @@ function addSiteWindowWrapper() {
       "rejected": false
     });
 
-    return new Component(thing, thing.coordinates);
+    return new Component(thing, thing.coordinates, null);
 
   });
 
@@ -675,7 +675,7 @@ function getSelectedComponents() {
 
     // Reflect the coordinates
     comp.forEach(function(x) {
-      components.push(new Component(x, x.coordinates.reflect()));
+      components.push(new Component(x, x.coordinates.reflect(), x.MAD));
     });
 
   });
@@ -1539,7 +1539,7 @@ function importCSV(file) {
     let direction = new Direction(Number(dec), Number(inc));
 
     // Return in the correct reference frame
-    return new Component(object, direction.toCartesian()).fromReferenceCoordinates(coordinates);
+    return new Component(object, direction.toCartesian(), null).fromReferenceCoordinates(coordinates);
 
   }
 
@@ -1648,7 +1648,7 @@ function addData(file) {
          groups[interpretation.group] = new Array();
        }
 
-       groups[interpretation.group].push(new Component(specimen, interpretation.specimen.coordinates));
+       groups[interpretation.group].push(new Component(specimen, interpretation.specimen.coordinates, interpretation.MAD));
 
      });
 
@@ -1738,7 +1738,7 @@ function importPMAG(file) {
         "coreDip": 90,
         "beddingStrike": strike,
         "beddingDip": dip,
-      }, coords);
+      }, coords, null);
 
     });
 
@@ -1880,7 +1880,7 @@ function toComponent(component) {
    * Converts a literal component to a class component
    */
 
-  return new Component(component, component.coordinates);
+  return new Component(component, component.coordinates, component.MAD);
 
 }
 
diff --git a/statistics/js/graphs.js b/statistics/js/graphs.js
index 7a4cd9d..f360487 100644
--- a/statistics/js/graphs.js
+++ b/statistics/js/graphs.js
@@ -2497,13 +2497,15 @@ function eqAreaChart(container, dataSeries, plotBands, tickPositions) {
      * Exports ChRM Distribution to CSV file
      */
     
-    const HEADER = new Array("Sample, Declination, Inclination, Core Azimuth, Core Dip, Bedding Strike, Bedding Dip, Latitude, Longitude, Age, Age Min, Age Max");
+    const HEADER = new Array("Sample, Declination, Inclination, MAD, Core Azimuth, Core Dip, Bedding Strike, Bedding Dip, Latitude, Longitude, Age, Age Min, Age Max");
     
     var csv = HEADER.concat(dataSeries[0].data.map(function(point) {
+
       return new Array(
         point.component.name,
         point.x.toFixed(PRECISION),
         point.inc.toFixed(PRECISION),
+        point.component.MAD,
         point.component.coreAzimuth,
         point.component.coreDip,
         point.component.beddingStrike,
diff --git a/statistics/js/index.js b/statistics/js/index.js
index 9e39dd9..07a7c2f 100644
--- a/statistics/js/index.js
+++ b/statistics/js/index.js
@@ -83,7 +83,7 @@ function __init__() {
     // Convert the saved literals to components
     collections = JSON.parse(item).map(function(x) {
       x.components = x.components.map(function(y) {
-        return new Component(y, y.coordinates);
+        return new Component(y, y.coordinates, y.MAD);
       });
       return x;
     });

From 4ee735d5d061c0c7744d8558c4a5d87c20b23f0e Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 8 Apr 2021 13:19:14 +0200
Subject: [PATCH 08/18] Rm console log

---
 interpretation/js/importing.js | 2 +-
 interpretation/js/index.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index 7a9069a..364fff5 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -1109,7 +1109,7 @@ function importPaleoMac(file) {
     var x = 1E6 * Number(line.slice(5, 14)) / sampleVolume;
     var y = 1E6 * Number(line.slice(15, 25)) / sampleVolume;
     var z = 1E6 * Number(line.slice(25, 34)) / sampleVolume;
-console.log(Number(line.slice(5, 14)), Number(line.slice(15, 25)), Number(line.slice(25, 34)))
+
     var a95 = Number(line.slice(69, 73));
 
     var coordinates = new Coordinates(x, y, z);
diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index f4b6da9..8937299 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -2252,12 +2252,12 @@ function makeInterpretations(options, selectedSteps, reference) {
 
       // Get the coordinates of the maximum eigenvector stored in v3
       var eigenVectorCoordinates = vectorTAU3;
-console.log(eigenVectorCoordinates);
+
       // Always take the negative pole by convention
       if(eigenVectorCoordinates.z > 0) {
         eigenVectorCoordinates = eigenVectorCoordinates.reflect();
       }
-console.log(eigenVectorCoordinates.toVector(Direction));
+
       break;
 
     default:

From ce9d909a947ba4d8463abfa42bd6dcb3db4ffef1 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 8 Apr 2021 16:06:21 +0200
Subject: [PATCH 09/18] Update changelog

---
 changelog/index.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/changelog/index.html b/changelog/index.html
index a6ef5aa..83558aa 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -89,23 +89,20 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
               <b> Change Summary </b>
 				<p> Fixes were made to virtual geomagnetic pole calculations. The relative VGP distribution and cutoff algorithm use an arbitrary virtual site at location (0, 0). For the relative VGP distribution this does not matter. However, it means that for correct interpretation, all specimens in a collection should come from geographically adjacent areas.
 
-              <ul>
-                <p> <b> Fixes </b>
-                <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal. The convention is that the pole is presented as negative (this has no effect on results). 
-                <li> Swapped line styles for lower (solid) and upper (dashed) GC in hemisphere plot. 
-                <li> Changed ordering of directions, mean and ellipse. Mean and ellipse should be on top in equal area plots.
-              </ul>
-
               <ul>
                 <p> <b> Features </b>
                 <li> Added VGP longitude, latitude to mean downloads CSV and JSON. This VGP is based on the mean of individual poles. It is not the VGP of the mean of directions which may differ slightly.
                 <li> Added option to show tick labels to Zijderveld plot.
+                <li> Added MAD angle in statistics portal directional tab CSV exporting. The MAD angle is only carried over from imported .col files since 2.2.1.
               </ul>
 
               <ul>
                 <p> <b> Fixes </b>
                 <li> Fixed tooltip of site mean VGP in geography portal. The tooltip showed the projected equal area inclination instead of true inclination.
                 <li> Added disclaimer under the VGP distribution in the directions tab in the statistics portal to emphasize it is a relative distribution assuming a single site.
+                <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal. The convention is that the pole is presented as negative (this has no effect on results). 
+                <li> Swapped line styles for lower (solid) and upper (dashed) GC in hemisphere plot. 
+                <li> Changed ordering of directions, mean and ellipse. Mean and ellipse should be on top in equal area plots.
               </ul>
 
               </div>

From d890a77a09041565c0e4600513bf6db59c4353ec Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Mon, 17 May 2021 19:59:01 +0200
Subject: [PATCH 10/18] Add option to show samples in mean tab, random color
 option

---
 changelog/index.html    |  4 ++-
 statistics/index.html   |  8 ++++++
 statistics/js/graphs.js | 57 ++++++++++++++++++++++++++++++++++++++---
 statistics/js/index.js  |  5 ++++
 4 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/changelog/index.html b/changelog/index.html
index 83558aa..06401b6 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -81,7 +81,7 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
           <div class="card">
             <div class="card-header" id="headingSix">
               <button class="btn btn-link" data-toggle="collapse" data-target="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
-                Paleomagnetism.org 2.2.1 - Bug Fixes <small class="text-muted">&nbsp; XXXX-XX-XX</small>
+                Paleomagnetism.org 2.3.0 - Bug Fixes and Features <small class="text-muted">&nbsp; XXXX-XX-XX</small>
               </button>
             </div>
             <div id="collapseSix" class="collapse show" aria-labelledby="headingSix" data-parent="#accordion">
@@ -94,6 +94,8 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
                 <li> Added VGP longitude, latitude to mean downloads CSV and JSON. This VGP is based on the mean of individual poles. It is not the VGP of the mean of directions which may differ slightly.
                 <li> Added option to show tick labels to Zijderveld plot.
                 <li> Added MAD angle in statistics portal directional tab CSV exporting. The MAD angle is only carried over from imported .col files since 2.2.1.
+                <li> Added option in settings tab to overlay individual samples in the collection mean tab.
+                <li> Added option in settings tab to set each mean collection to a random color.
               </ul>
 
               <ul>
diff --git a/statistics/index.html b/statistics/index.html
index 24231e7..9516a56 100644
--- a/statistics/index.html
+++ b/statistics/index.html
@@ -407,6 +407,14 @@ <h5> Preferences </h5>
                         <input class="form-check-input" type="checkbox" id="flip-ellipse" value="option1" checked>
                         <label class="form-check-label" for="flip-ellipse"> Flip Confidence Ellipses </label>
                      </div>
+                     <div class="form-check form-check-inline">
+                        <input class="form-check-input" type="checkbox" id="random-mean-color" value="option1" checked>
+                        <label class="form-check-label" for="random-mean-color"> Random Mean Color </label>
+                     </div>
+                     <div class="form-check form-check-inline">
+                        <input class="form-check-input" type="checkbox" id="show-samples-mean" value="option1" checked>
+                        <label class="form-check-label" for="show-samples-mean"> Show Samples Mean </label>
+                     </div>
                   </div>
                </div>
 
diff --git a/statistics/js/graphs.js b/statistics/js/graphs.js
index ddfc297..37f396d 100644
--- a/statistics/js/graphs.js
+++ b/statistics/js/graphs.js
@@ -1934,6 +1934,14 @@ function eqAreaProjectionMean() {
 
   selectedCollections.forEach(function(site) {
 
+    let sampleColor = HIGHCHARTS_BLUE;
+    let meanColor = HIGHCHARTS_GREEN;
+    let ellipseColor = HIGHCHARTS_RED;
+
+    if(document.getElementById("random-mean-color").checked) {
+      sampleColor = meanColor = ellipseColor = '#'+(0x1000000+Math.random()*0xffffff).toString(16).substr(1,6);
+    }
+
     var cutofC = doCutoff(site.components.map(x => x.inReferenceCoordinates()));
     var statistics = getStatisticalParameters(cutofC.components);
 
@@ -1950,19 +1958,20 @@ function eqAreaProjectionMean() {
       "name": "Mean Direction " + site.name,
       "type": "scatter",
       "data": new Array(statistics.dir.mean).map(prepareDirectionData),
-      "color": HIGHCHARTS_GREEN,
+      "color": meanColor,
+      "zIndex": 100,
       "marker": {
         "symbol": "circle",
         "radius": 6,
-        "lineColor": HIGHCHARTS_GREEN,
+        "lineColor": meanColor,
         "lineWidth": 1,
-        "fillColor": (statistics.dir.mean.inc < 0 ? HIGHCHARTS_WHITE : HIGHCHARTS_GREEN)
+        "fillColor": (statistics.dir.mean.inc < 0 ? HIGHCHARTS_WHITE : meanColor)
       }
     }, {
       "name": "Confidence Ellipse",
       "linkedTo": ":previous",
       "type": "line",
-      "color": HIGHCHARTS_RED,
+      "color": ellipseColor,
       "data": a95ellipse,
       "enableMouseTracking": false,
       "marker": {
@@ -1970,6 +1979,46 @@ function eqAreaProjectionMean() {
       }
     });
 
+    if(document.getElementById("show-samples-mean").checked) {
+
+      let componentSeries = new Array();
+
+      site.components.forEach(function(component) {
+      
+          // Go over each step
+          var direction = literalToCoordinates(component.coordinates).toVector(Direction);
+
+          // Do not show rejected
+          if(component.rejected) {
+            return;
+          }
+      
+          componentSeries.push({
+            "x": direction.dec, 
+            "y": projectInclination(direction.inc), 
+            "inc": direction.inc,
+            "component": component,
+            "marker": {
+              "fillColor": (direction.inc < 0 ? HIGHCHARTS_WHITE : sampleColor),
+              "lineWidth": 1,
+              "lineColor": sampleColor,
+              "symbol": "circle"
+            }
+          })
+
+      });
+
+      dataSeries.push({
+        "name": "",
+        "type": "scatter",
+        "data": componentSeries,
+        "color": sampleColor,
+        "linkedTo": ":previous",
+        "enableMouseTracking": false
+      });
+
+    }
+
     if(site.doi) {
       var icon = "<span class='text-success'><i class='fas fa-id-card'></i></span>";
     } else {
diff --git a/statistics/js/index.js b/statistics/js/index.js
index 07a7c2f..7733e2d 100644
--- a/statistics/js/index.js
+++ b/statistics/js/index.js
@@ -215,11 +215,16 @@ function registerEventHandlers() {
   document.getElementById("cutoff-selection").addEventListener("change", redrawCharts);
   document.getElementById("enable-deenen").addEventListener("change", redrawCharts);
 
+  document.getElementById("random-mean-color").addEventListener("change", redrawCharts);
+  document.getElementById("show-samples-mean").addEventListener("change", redrawCharts);
+
   // The keyboard handler
   document.addEventListener("keydown", keyboardHandler);
  
   // Flipping is off by default
   document.getElementById("flip-ellipse").checked = false;
+  document.getElementById("random-mean-color").checked = false;
+  document.getElementById("show-samples-mean").checked = false;
 
   updateTextAreaCounter();
 

From 01a88c4746b167a3b672b4599efb949d1296583e Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Tue, 18 May 2021 10:51:55 +0200
Subject: [PATCH 11/18] Show samples in proper coords

---
 statistics/js/graphs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/statistics/js/graphs.js b/statistics/js/graphs.js
index 37f396d..3410944 100644
--- a/statistics/js/graphs.js
+++ b/statistics/js/graphs.js
@@ -1939,7 +1939,7 @@ function eqAreaProjectionMean() {
     let ellipseColor = HIGHCHARTS_RED;
 
     if(document.getElementById("random-mean-color").checked) {
-      sampleColor = meanColor = ellipseColor = '#'+(0x1000000+Math.random()*0xffffff).toString(16).substr(1,6);
+      sampleColor = meanColor = ellipseColor = "#" + (0x1000000 + Math.random() * 0xFFFFFF).toString(16).substr(1, 6);
     }
 
     var cutofC = doCutoff(site.components.map(x => x.inReferenceCoordinates()));
@@ -1983,7 +1983,7 @@ function eqAreaProjectionMean() {
 
       let componentSeries = new Array();
 
-      site.components.forEach(function(component) {
+      site.components.map(x => x.inReferenceCoordinates()).forEach(function(component) {
       
           // Go over each step
           var direction = literalToCoordinates(component.coordinates).toVector(Direction);

From c6bf5d0554b95951ddd8ccc4758b68f5e8762eac Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Thu, 8 Jul 2021 19:34:46 +0200
Subject: [PATCH 12/18] Magstrat respect ref. coordinates

---
 geography/js/magstrat.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/geography/js/magstrat.js b/geography/js/magstrat.js
index 58c6c2d..6ab72a4 100644
--- a/geography/js/magstrat.js
+++ b/geography/js/magstrat.js
@@ -237,7 +237,10 @@ function plotStrat() {
   // Get all accepted/rejected directions and sort by strat. level
   var stratigraphicData = new Array();
 
-  collections.pop().components.forEach(function(component) {
+  // Change to requested reference coordinates and apply the cutoff
+  var cutoff = doCutoff(collections.pop().components.map(x => x.inReferenceCoordinates()));
+
+  cutoff.components.forEach(function(component) {
 
     var direction = component.coordinates.toVector(Direction);
 

From 9a0bfcbf98d8526edd9b64c53fd3c5f62036f9e9 Mon Sep 17 00:00:00 2001
From: Jollyfant <m.r.koymans@gmail.com>
Date: Tue, 5 Oct 2021 17:17:43 +0200
Subject: [PATCH 13/18] Add block

---
 interpretation/index.html      |  1 +
 interpretation/js/importing.js | 69 ++++++++++++++++++++++++++++++++++
 interpretation/js/index.js     |  2 +
 3 files changed, 72 insertions(+)

diff --git a/interpretation/index.html b/interpretation/index.html
index b84bf12..3574b84 100644
--- a/interpretation/index.html
+++ b/interpretation/index.html
@@ -117,6 +117,7 @@ <h5> Paleomagnetism.org 2 - Interpretation </h5>
                         <option value="BCN2G">University of Barcelona</option>
                         <!-- Uses BCN2G -->
                         <option value="HELSINKI">University of Helsinki</option>
+                        <option value="HELSINKIBLOCK">University of Helsinki (Block)</option>
                         <option value="MONTPELLIER">University of Montpellier</option>
                         <option value="OXFORD">University of Oxford</option>
                         <option value="ANGLIA">University of East Anglia</option>
diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index 364fff5..4d8a7d7 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -2054,3 +2054,72 @@ function importHelsinki(file) {
   });
 
 }
+
+function importHelsinkiBlock(file) {
+
+  /*
+   * Function importHelsinki
+   * Imports demagnetization data in the Helsinki format (plain-text csv)
+   */
+
+  var lines = file.data.split(LINE_REGEXP);
+
+  // Get some header metadata
+  var sampleName = lines[5].split(";")[1]
+  var coreAzimuth = Number(lines[5].split(";")[7])
+  var coreDip = Number(lines[6].split(";")[7])
+  var sampleVolume = Number(lines[7].split(";")[2]);
+  var demagnetizationType = lines[7].split(";")[7];
+
+  // Bedding is not included: always set to 0, 0
+  var beddingStrike = 0;
+  var beddingDip = 0;
+
+  var steps = new Array();
+
+  // Skip the header (12 lines)
+  lines.slice(12).forEach(function(line) {
+
+    var parameters = line.split(";");
+
+    if(parameters.length !== 24) {
+      return;
+    }
+
+    var step = parameters[1];
+
+    // Take mA/m and set to microamps (multiply by 1E3)
+    var x = Number(parameters[13]) * 1E3;
+    var z = Number(parameters[14]) * 1E3;
+    var y = -Number(parameters[15]) * 1E3;
+
+    var coordinates = new Coordinates(x, y, z);
+    steps.push(new Measurement(step, coordinates, null));
+
+  });
+
+  specimens.push({
+    "demagnetizationType": demagnetizationType,
+    "coordinates": "specimen",
+    "format": "HELSINKI",
+    "version": __VERSION__,
+    "created": new Date().toISOString(),
+    "steps": steps,
+    "level": null,
+    "longitude": null,
+    "latitude": null,
+    "age": null,
+    "ageMin": null,
+    "ageMax": null,
+    "lithology": null,
+    "sample": sampleName,
+    "name": sampleName,
+    "volume": Number(sampleVolume),
+    "beddingStrike": Number(beddingStrike),
+    "beddingDip": Number(beddingDip),
+    "coreAzimuth": Number(coreAzimuth),
+    "coreDip": Number(coreDip),
+    "interpretations": new Array()
+  });
+
+}
diff --git a/interpretation/js/index.js b/interpretation/js/index.js
index 8937299..4adfbf3 100644
--- a/interpretation/js/index.js
+++ b/interpretation/js/index.js
@@ -102,6 +102,8 @@ function addDegmagnetizationFiles(format, files) {
       return files.forEach(importApplicationSaveOld);
     case "HELSINKI":
       return files.forEach(importHelsinki);
+    case "HELSINKIBLOCK":
+      return files.forEach(importHelsinkiBlock);
     case "GTK":
       return files.forEach(importGTK);
     case "CALTECH":

From e65266dfbe10f0d6a28629c0871324c1c7bed36f Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Tue, 5 Oct 2021 20:41:21 +0200
Subject: [PATCH 14/18] Fix coords for Helsinki Block

---
 interpretation/js/importing.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index 4d8a7d7..217d9a0 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -2066,8 +2066,10 @@ function importHelsinkiBlock(file) {
 
   // Get some header metadata
   var sampleName = lines[5].split(";")[1]
-  var coreAzimuth = Number(lines[5].split(";")[7])
-  var coreDip = Number(lines[6].split(";")[7])
+  // Strike not azimuth
+  var coreAzimuth = (Number(lines[5].split(";")[7]) - 90).toFixed(1);
+  // 90 is vertical, 0 is horizontal (other convention)
+  var coreDip = 90 - Number(lines[6].split(";")[7]);
   var sampleVolume = Number(lines[7].split(";")[2]);
   var demagnetizationType = lines[7].split(";")[7];
 
@@ -2088,10 +2090,13 @@ function importHelsinkiBlock(file) {
 
     var step = parameters[1];
 
+    let dec = Number(parameters[5])
+    let inc = Number(parameters[6])
+
     // Take mA/m and set to microamps (multiply by 1E3)
-    var x = Number(parameters[13]) * 1E3;
-    var z = Number(parameters[14]) * 1E3;
-    var y = -Number(parameters[15]) * 1E3;
+    var y = Number(parameters[13]) * 1E3;
+    var x = -Number(parameters[14]) * 1E3;
+    var z = Number(parameters[15]) * 1E3;
 
     var coordinates = new Coordinates(x, y, z);
     steps.push(new Measurement(step, coordinates, null));

From 0ed73827f0ef9e336020664f290b62bdb11cc2a4 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Wed, 6 Oct 2021 17:11:54 +0200
Subject: [PATCH 15/18] fix GTK

---
 interpretation/js/importing.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index 217d9a0..b0a03dc 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -12,7 +12,7 @@ function importGTK(file) {
   let metadata = lines[7].split(/\s+/);
   let latitude = Number(metadata[1]);
   let longitude = Number(metadata[2]);
-  let coreAzimuth = Number(metadata[3]);
+  let coreAzimuth = 270 + Number(metadata[3]);
   let coreDip = 90 - Number(metadata[4]);
   let beddingStrike = Number(metadata[5]);
   let beddingDip = Number(metadata[6]);
@@ -27,12 +27,25 @@ function importGTK(file) {
   for(var i = 9; i < lines.length - 1; i++) {
     let line = lines[i];
     let step = line.slice(0, 4);
-    let dec = Number(line.slice(7, 12));
+    let dec = Number(line.slice(6, 12));
     let inc = Number(line.slice(13, 19));
-    // Intensity in mA/m (Satu, pers. comm. 2020)
+    // Intensity in mA/m (Satu, pers. comm. 2020) (not used)
     let intensity = 1E3 * Number(line.slice(24, 30));
-    let coordinates = new Direction(dec, inc, intensity).toCartesian();
-    steps.push(new Measurement(step, coordinates, null))
+
+    let y = 1E3 * Number(line.slice(50, 57));
+    let x = -1E3 * Number(line.slice(61, 68));
+    let z = 1E3 * Number(line.slice(72, 79));
+
+    let coordinates = new Coordinates(x, y, z);
+    let dir = coordinates.rotateTo(coreAzimuth, coreDip).toVector(Direction);
+
+    // Verify
+    if(dir.dec.toFixed(0) !== dec.toFixed(0) || dir.inc.toFixed(0) !== inc.toFixed(0)) {
+      throw("The given geographic coordinates do not match the rotated specimen coordinates for this file!");
+    }
+
+    steps.push(new Measurement(step, coordinates, null));
+
   }
 
   // Add the data to the application

From de248687c569c95f80ea0502b20b745f096b92d4 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Wed, 6 Oct 2021 17:14:23 +0200
Subject: [PATCH 16/18] Mod

---
 interpretation/js/importing.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interpretation/js/importing.js b/interpretation/js/importing.js
index b0a03dc..4ae35e4 100644
--- a/interpretation/js/importing.js
+++ b/interpretation/js/importing.js
@@ -12,7 +12,7 @@ function importGTK(file) {
   let metadata = lines[7].split(/\s+/);
   let latitude = Number(metadata[1]);
   let longitude = Number(metadata[2]);
-  let coreAzimuth = 270 + Number(metadata[3]);
+  let coreAzimuth = (270 + Number(metadata[3])) % 360;
   let coreDip = 90 - Number(metadata[4]);
   let beddingStrike = Number(metadata[5]);
   let beddingDip = Number(metadata[6]);

From 87823a5a0543a45b2c66b73060f0c77992d62644 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Wed, 6 Oct 2021 17:20:14 +0200
Subject: [PATCH 17/18] Update changelog

---
 changelog/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog/index.html b/changelog/index.html
index 06401b6..4b9d065 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -96,6 +96,7 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
                 <li> Added MAD angle in statistics portal directional tab CSV exporting. The MAD angle is only carried over from imported .col files since 2.2.1.
                 <li> Added option in settings tab to overlay individual samples in the collection mean tab.
                 <li> Added option in settings tab to set each mean collection to a random color.
+                <li> Added format for University of Helsinki (using block orientation).
               </ul>
 
               <ul>
@@ -105,6 +106,7 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
                 <li> Fixed bug in great circle PCA in geographic and tectonic coordinates where the pole to the plane was presented antipodal. The convention is that the pole is presented as negative (this has no effect on results). 
                 <li> Swapped line styles for lower (solid) and upper (dashed) GC in hemisphere plot. 
                 <li> Changed ordering of directions, mean and ellipse. Mean and ellipse should be on top in equal area plots.
+                <li> Fixed multiple problems with the Geological Survey of Finland format. Geographic coordinates were interpreted as specimen coordinates and some leading numerals were dropped reading the file. Data interpreted with this format before version 2.3.0 are therefore incorrect.
               </ul>
 
               </div>

From 6bd6644766b65da59dce5b1bfbf28085031ebd90 Mon Sep 17 00:00:00 2001
From: Jollyfant <koymans@knmi.nl>
Date: Wed, 27 Oct 2021 21:27:47 +0200
Subject: [PATCH 18/18] Set date

---
 changelog/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/index.html b/changelog/index.html
index 4b9d065..fc3be5c 100644
--- a/changelog/index.html
+++ b/changelog/index.html
@@ -81,7 +81,7 @@ <h5> Paleomagnetism.org 2 - Changelog </h5>
           <div class="card">
             <div class="card-header" id="headingSix">
               <button class="btn btn-link" data-toggle="collapse" data-target="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
-                Paleomagnetism.org 2.3.0 - Bug Fixes and Features <small class="text-muted">&nbsp; XXXX-XX-XX</small>
+                Paleomagnetism.org 2.3.0 - Bug Fixes and Features <small class="text-muted">&nbsp; 2021-10-27</small>
               </button>
             </div>
             <div id="collapseSix" class="collapse show" aria-labelledby="headingSix" data-parent="#accordion">