diff --git a/Leaflet.AreaCapture.js b/Leaflet.AreaCapture.js
index b58331d..786b062 100644
--- a/Leaflet.AreaCapture.js
+++ b/Leaflet.AreaCapture.js
@@ -178,6 +178,15 @@ function EllipseData(Inte) {
Inte.ellipseVisualAssets.reload();
}
+ /**
+ * Clear JSON data.
+ * @function
+ */
+ EllipseData.prototype.clearJSON = function() {
+ this.data = [];
+ this.reloadJSON();
+ }
+
/**
* Undo recent changes.
* @function
@@ -502,9 +511,9 @@ function NewEllipse(Inte) {
() => { this.disable() },
);
- // Crtl-E to create a new ellipse.
+ // Shift-E to create a new ellipse.
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 69 && e.getModifierState("Control") && window.name.includes('popout')) {
+ if (e.keyCode == 69 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) {
e.preventDefault();
e.stopPropagation();
Inte.treering.disableTools();
@@ -627,8 +636,8 @@ function NewEllipse(Inte) {
* @param {object} Inte - AreaCaptureInterface object. Allows access to all other tools.
*/
function NewEllipseDialog(Inte) {
- let minWidth = 170;
- let minHeight = 115;
+ let minWidth = 130;
+ let minHeight = 130;
this.size = [minWidth, minHeight];
this.anchor = [50, 0];
@@ -733,18 +742,18 @@ function NewEllipseDialog(Inte) {
* @function
*/
NewEllipseDialog.prototype.createShortcutEventListeners = function () {
- // Keyboard short cut for subtracting year: Ctrl - 1
+ // Keyboard short cut for subtracting year: Shift - 1
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 49 && !e.shiftKey && e.ctrlKey && this.dialogOpen) {
+ if (e.keyCode == 49 && e.shiftKey && !e.ctrlKey && this.dialogOpen) {
Inte.ellipseData.decreaseYear();
Inte.ellipseVisualAssets.cycleColorsDown();
this.update();
}
}, this);
- // Keyboard short cut for confirming a new year: Ctrl - 2
+ // Keyboard short cut for confirming a new year: Shift - 2
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 50 && !e.shiftKey && e.ctrlKey && this.dialogOpen) {
+ if (e.keyCode == 50 && e.shiftKey && !e.ctrlKey && this.dialogOpen) {
let year = $("#AreaCapture-newYear-input").val();
if (year || year == 0) {
Inte.ellipseVisualAssets.cycleColorsMulti(year);
@@ -754,9 +763,9 @@ function NewEllipseDialog(Inte) {
}
}, this);
- // Keyboard short cut for adding year: Ctrl - 3
+ // Keyboard short cut for adding year: Shift - 3
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 51 && !e.shiftKey && e.ctrlKey && this.dialogOpen) {
+ if (e.keyCode == 51 && e.shiftKey && !e.ctrlKey && this.dialogOpen) {
Inte.ellipseData.increaseYear();
Inte.ellipseVisualAssets.cycleColorsUp();
this.update();
diff --git a/Leaflet.DataAccess.js b/Leaflet.DataAccess.js
index 949da51..a15ca16 100644
--- a/Leaflet.DataAccess.js
+++ b/Leaflet.DataAccess.js
@@ -39,17 +39,17 @@ function ViewData(Inte) {
() => { this.enable() },
() => { this.disable() });
- this.active= false;
+ this.active = false;
ViewData.prototype.enable = function() {
this.btn.state('active');
- this.active= true;
+ this.active = true;
Inte.viewDataDialog.open();
}
ViewData.prototype.disable = function() {
this.btn.state('inactive');
- this.active= false;
+ this.active = false;
Inte.viewDataDialog.close();
}
}
@@ -85,10 +85,6 @@ function ViewDataDialog(Inte) {
}
});
- Handlebars.registerHelper("log", function(something) {
- console.log(something);
- });
-
let html = document.getElementById("DataAccess-dialog-template").innerHTML;
this.template = Handlebars.compile(html);
@@ -106,7 +102,7 @@ function ViewDataDialog(Inte) {
$(this.dialog._map).on('dialog:closed', (dialog) => {
Inte.viewData.btn.state('inactive');
- Inte.viewData.active= false;
+ Inte.viewData.active = false;
if (Inte.deleteData?.dialog) Inte.deleteData.dialog.close()
});
@@ -162,7 +158,7 @@ function ViewDataDialog(Inte) {
data: dat,
savePermissions: Inte.treering.meta.savePermission,
});
-
+
this.dialog.setContent(content);
document.getElementById('DataAccess-table-body').style.height = this.tableHeight + "px";
@@ -300,6 +296,8 @@ function JSONFileUpload(Inte) {
Inte.treering.data = new MeasurementData(newDataJSON, Inte.treering);
Inte.treering.aData = new AnnotationData(newDataJSON.annotations);
+ if (newDataJSON?.ellipses) Inte.treering.areaCaptureInterface.ellipseData.loadJSON(newDataJSON.ellipses);
+ else Inte.treering.areaCaptureInterface.ellipseData.clearJSON();
// If the JSON has PPM data, use that instead of loaded data.
if (newDataJSON.ppm) {
@@ -309,6 +307,12 @@ function JSONFileUpload(Inte) {
Inte.treering.loadData();
Inte.treering.metaDataText.updateText();
+
+ // Temporary solution to refresh data. Size does not update unless opened twice. Race condition?
+ Inte.viewDataDialog.close();
+ Inte.viewDataDialog.open();
+ Inte.viewData.disable();
+ Inte.viewData.enable();
};
fr.readAsText(files.item(0));
@@ -322,9 +326,9 @@ function JSONFileUpload(Inte) {
* @param {object} Inte - DataAccessInterface objects. Allows access to DataAccess tools.
*/
function CloudUpload(Inte) {
- // Trigger save action with CTRL-S
+ // Trigger save action with Shift-S
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 83 && e.getModifierState("Control") && window.name.includes('popout')) { // 83 refers to 's'
+ if (e.keyCode == 83 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 83 refers to 's'
e.preventDefault();
e.stopPropagation();
this.action();
@@ -389,23 +393,13 @@ function CloudUpload(Inte) {
if (Inte.treering.meta.savePermission && Inte.treering.meta.saveURL != "") {
Inte.treering.data.clean();
this.updateDate();
- var dataJSON = {
- 'SaveDate': Inte.treering.data.saveDate,
- 'year': Inte.treering.data.year,
- 'forwardDirection': Inte.treering.measurementOptions.forwardDirection,
- 'subAnnual': Inte.treering.measurementOptions.subAnnual,
- 'earlywood': Inte.treering.data.earlywood,
- 'index': Inte.treering.data.index,
- 'points': Inte.treering.data.points,
- 'attributesObjectArray': Inte.treering.annotationAsset.attributesObjectArray,
- 'annotations': Inte.treering.aData.annotations,
- 'ppm': Inte.treering.meta.ppm,
- };
+ var dataJSON = Inte.download.formatJSON();
// Do not serialize our default value.
if (Inte.treering.meta.ppm != Inte.treering.defaultResolution || Inte.treering.meta.ppmCalibration) {
dataJSON.ppm = Inte.treering.meta.ppm;
}
+
$.post(Inte.treering.meta.saveURL, {sidecarContent: JSON.stringify(dataJSON)})
.done((msg) => {
this.displayDate();
@@ -511,6 +505,30 @@ function DeleteDataDialog(Inte) {
* @param {object} Inte - DataAccessInterface objects. Allows access to DataAccess tools.
*/
function Download(Inte) {
+ /**
+ * Format data into full JSON data package.
+ * @function
+ */
+ Download.prototype.formatJSON = function() {
+ Inte.treering.data.clean();
+ let data = {
+ 'SaveDate': Inte.treering.data.saveDate,
+ 'year': Inte.treering.data.year,
+ 'forwardDirection': Inte.treering.measurementOptions.forwardDirection,
+ 'subAnnual': Inte.treering.measurementOptions.subAnnual,
+ 'earlywood': Inte.treering.data.earlywood,
+ 'index': Inte.treering.data.index,
+ 'points': Inte.treering.data.points,
+ 'attributesObjectArray': Inte.treering.annotationAsset.attributesObjectArray,
+ 'annotations': Inte.treering.aData.annotations,
+ 'ppm': Inte.treering.meta.ppm,
+ 'ptWidths': Inte.treering.helper.findDistances(),
+ 'ellipses': Inte.treering.areaCaptureInterface.ellipseData.getJSON(),
+ };
+
+ return data;
+ }
+
/**
* Format data into seperated text and return as a single string.
* @function
@@ -526,7 +544,7 @@ function Download(Inte) {
for (var i = 0; i < dat.tw.x.length; i++) {
outStr += dat.tw.x[i] + sep + dat.tw.y[i].toFixed(3);
- if (dat?.ew) outStr += sep + dat.ew.y[i].toFixed(3) + sep + dat.ew.y[i].toFixed(3);
+ if (dat?.ew) outStr += sep + dat.ew.y[i].toFixed(3) + sep + dat.lw.y[i].toFixed(3);
if (i < dat.tw.x.length - 1) outStr += "\n"
}
@@ -570,25 +588,29 @@ function Download(Inte) {
* Create zip folder.
* @function
*
- * @param {string} fileExt - File type (i.e. csv, tsv).
+ * @param {string} fileType - File type (i.e. csv, tsv).
+ * @param {string} fileExt - Extension at end of file.
* @param {string} twDatString - String of total width data.
* @param {string} [o] allDatString - Optional string of all data.
* @param {string} [o] ewDatString - Optional string of earlywood width data.
* @param {string} [o] lwDatString - Optional string of latewood width data.
*/
- Download.prototype.zipFiles = function(fileExt, twDatString, allDatString, ewDatString, lwDatString) {
+ Download.prototype.zipFiles = function(fileType, fileExt, twDatString, allDatString, ewDatString, lwDatString) {
let zip = new JSZip();
if (ewDatString && lwDatString) {
- zip.file((Inte.treering.meta.assetName + "_EW_" + fileExt + "." + fileExt), ewDatString);
- zip.file((Inte.treering.meta.assetName + "_LW_" + fileExt + "." + fileExt), lwDatString);
- zip.file((Inte.treering.meta.assetName + "_all_" + fileExt + "." + fileExt), allDatString);
+ zip.file((Inte.treering.meta.assetName + "_EW_" + fileType + "." + fileExt), ewDatString);
+ zip.file((Inte.treering.meta.assetName + "_LW_" + fileType + "." + fileExt), lwDatString);
+ }
+
+ if (allDatString) {
+ zip.file((Inte.treering.meta.assetName + "_all_" + fileType + "." + fileExt), allDatString);
}
- zip.file((Inte.treering.meta.assetName + "_TW_" + fileExt + "." + fileExt), twDatString);
+ zip.file((Inte.treering.meta.assetName + "_TW_" + fileType + "." + fileExt), twDatString);
zip.generateAsync({type: 'blob'})
.then((blob) => {
- saveAs(blob, (Inte.treering.meta.assetName + "_" + fileExt + ".zip"));
+ saveAs(blob, (Inte.treering.meta.assetName + "_" + fileType + ".zip"));
});
}
@@ -607,8 +629,8 @@ function Download(Inte) {
Download.prototype.csv = function() {
let allDatString = this.seperateDataCombined(",");
let datStringLst = this.seperateDataDifferent(",");
- if (datStringLst.length > 1) this.zipFiles("csv", datStringLst[0], allDatString, datStringLst[1], datStringLst[2]);
- else this.zipFiles("csv", datStringLst[0]);
+ if (datStringLst.length > 1) this.zipFiles("csv", "csv", datStringLst[0], allDatString, datStringLst[1], datStringLst[2]);
+ else this.zipFiles("csv", "csv", datStringLst[0]);
}
/**
@@ -618,353 +640,83 @@ function Download(Inte) {
Download.prototype.tsv = function() {
let allDatString = this.seperateDataCombined("\t");
let datStringLst = this.seperateDataDifferent("\t");
- if (datStringLst.length > 1) this.zipFiles("tsv", datStringLst[0], allDatString, datStringLst[1], datStringLst[2]);
- else this.zipFiles("tsv", datStringLst[0]);
+ if (datStringLst.length > 1) this.zipFiles("tsv", "tsv", datStringLst[0], allDatString, datStringLst[1], datStringLst[2]);
+ else this.zipFiles("tsv", "tsv", datStringLst[0]);
}
/**
- * Download .rwl file. REFACTOR
+ * Download .rwl file.
* @function
*/
Download.prototype.rwl = function() {
- var toFourCharString = function(n) {
- var string = n.toString();
-
- if (string.length == 1) {
- string = ' ' + string;
- } else if (string.length == 2) {
- string = ' ' + string;
- } else if (string.length == 3) {
- string = ' ' + string;
- } else if (string.length == 4) {
- string = string;
- } else if (string.length >= 5) {
- alert('Value exceeds 4 characters');
- throw 'error in toFourCharString(n)';
- } else {
- alert('toFourCharString(n) unknown error');
- throw 'error';
- }
- return string;
- };
-
- var toSixCharString = function(n) {
- var string = n.toString();
-
- if (string.length == 1) {
- string = ' ' + string;
- } else if (string.length == 2) {
- string = ' ' + string;
- } else if (string.length == 3) {
- string = ' ' + string;
- } else if (string.length == 4) {
- string = ' ' + string;
- } else if (string.length == 5) {
- string = ' ' + string;
- } else if (string.length >= 6) {
- alert('Value exceeds 5 characters');
- throw 'error in toSixCharString(n)';
- } else {
- alert('toSixCharString(n) unknown error');
- throw 'error';
- }
- return string;
- };
-
- var toEightCharString = function(n) {
- var string = n.toString();
-
- if (string.length == 0) {
- string = string + ' ';
- } else if (string.length == 1) {
- string = string + ' ';
- } else if (string.length == 2) {
- string = string + ' ';
- } else if (string.length == 3) {
- string = string + ' ';
- } else if (string.length == 4) {
- string = string + ' ';
- } else if (string.length == 5) {
- string = string + ' ';
- } else if (string.length == 6) {
- string = string + ' ';
- } else if (string.length == 7) {
- string = string + ' ';
- } else if (string.length == 8) {
- return string;
- } else if (string.length > 8) {
- alert('Value exceeds 8 characters');
- throw 'error in toEightCharString(n)';
- } else {
- alert('toEightCharString(n) unknown error');
- throw 'error';
+ let dat = Inte.treering.helper.findDistances();
+
+ let name = this.constructNameRWL(Inte.treering.meta.assetName);
+ let stopMarker = " -9999";
+
+ let outTWStr = name + dat.tw.x[0] + this.formatDataPointRWL(dat.tw.y[0]);
+ let outEWStr = "";
+ let outLWStr = "";
+
+ if (dat?.ew) {
+ outEWStr = name + dat.ew.x[0] + this.formatDataPointRWL(dat.ew.y[0]);
+ outLWStr = name + dat.lw.x[0] + this.formatDataPointRWL(dat.lw.y[0]);
+ }
+
+ for (let i = 1; i < dat.tw.x.length; i++) {
+ let year = dat.tw.x[i];
+ outTWStr += this.formatDataPointRWL(dat.tw.y[i]);
+
+ if (dat?.ew) {
+ outEWStr += this.formatDataPointRWL(dat.ew.y[i]);
+ outLWStr += this.formatDataPointRWL(dat.lw.y[i]);
}
- return string;
- };
-
- if (Inte.treering.measurementOptions.forwardDirection) { // years ascend in value
- var pts = Inte.treering.data.points;
- } else { // otherwise years descend in value
- var pts = Inte.treering.helper.reverseData();
- }
-
- if (Inte.treering.data.points != undefined && Inte.treering.data.points[1] != undefined) {
-
- var sum_points;
- var sum_string = '';
- var last_latLng;
- var break_length;
- var length_string;
-
- if (Inte.treering.measurementOptions.subAnnual) {
-
- var sum_string = '';
- var ew_string = '';
- var lw_string = '';
-
- y = pts[1].year;
- var sum_points = pts.filter(e => {
- if (e.earlywood != undefined) {
- return !(e.earlywood);
- } else {
- return true;
- }
- });
-
- if (sum_points[1].year % 10 > 0) {
- sum_string = sum_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(sum_points[1].year));
- }
-
- var break_point = false;
- sum_points.map((e, i, a) => {
- if (e.start) {
- last_latLng = e.latLng;
- } else if (e.break) {
- break_length =
- Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- break_point = true;
- } else {
- if (e.year % 10 == 0) {
- if(sum_string.length > 0) {
- sum_string = sum_string.concat('\n');
- }
- sum_string = sum_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- }
- while (e.year > y) {
- sum_string = sum_string.concat(' -1');
- y++;
- if (y % 10 == 0) {
- sum_string = sum_string.concat('\n' +
- toFourCharString(e.year));
- }
- }
-
- if (!last_latLng) {
- last_latLng = e.latLng;
- };
-
- var length = Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- if (break_point) {
- length += break_length;
- break_point = false;
- }
- if (length == 9999) {
- length = 9998;
- }
- if (length == 999) {
- length = 998;
- }
-
- length_string = toSixCharString(length);
-
- sum_string = sum_string.concat(length_string);
- last_latLng = e.latLng;
- y++;
- }
- });
-
- // if we ended at the end of a decade, we need to add a new line
- if (y % 10 == 0) {
- sum_string = sum_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(y));
- }
- sum_string = sum_string.concat(' -9999');
-
- y = pts[1].year;
-
- if (pts[1].year % 10 > 0) {
- ew_string = ew_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(pts[1].year));
- lw_string = lw_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(pts[1].year));
- }
-
- break_point = false;
- pts.map((e, i, a) => {
- if (e.start) {
- last_latLng = e.latLng;
- } else if (e.break) {
- break_length =
- Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- break_point = true;
- } else {
- if (e.year % 10 == 0) {
- if (e.earlywood) {
- if (ew_string.length >0) {
- ew_string = ew_string.concat('\n');
- }
- ew_string = ew_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- } else {
- if (lw_string.length >0) {
- lw_string = lw_string.concat('\n');
- }
- lw_string = lw_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- }
- }
- while (e.year > y) {
- ew_string = ew_string.concat(' -1');
- lw_string = lw_string.concat(' -1');
- y++;
- if (y % 10 == 0) {
- ew_string = ew_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- lw_string = lw_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- }
- }
-
- length = Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- if (break_point) {
- length += break_length;
- break_point = false;
- }
- if (length == 9999) {
- length = 9998;
- }
- if (length == 999) {
- length = 998;
- }
-
- length_string = toSixCharString(length);
-
- if (e.earlywood) {
- ew_string = ew_string.concat(length_string);
- last_latLng = e.latLng;
- } else {
- lw_string = lw_string.concat(length_string);
- last_latLng = e.latLng;
- y++;
- }
- }
- });
-
- if (y % 10 == 0) {
- ew_string = ew_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(y));
- lw_string = lw_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(y));
- }
- ew_string = ew_string.concat(' -9999');
- lw_string = lw_string.concat(' -9999');
-
- console.log(sum_string);
- console.log(ew_string);
- console.log(lw_string);
-
- var zip = new JSZip();
- zip.file((Inte.treering.meta.assetName + '_TW_rwl.txt'), sum_string);
- zip.file((Inte.treering.meta.assetName + '_LW_rwl.txt'), lw_string);
- zip.file((Inte.treering.meta.assetName + '_EW_rwl.txt'), ew_string);
-
- } else {
-
- var y = pts[1].year;
- sum_points = pts;
-
- if (sum_points[1].year % 10 > 0) {
- sum_string = sum_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(sum_points[1].year));
- }
- sum_points.map((e, i, a) => {
- if(e.start) {
- last_latLng = e.latLng;
- }
- else if (e.break) {
- break_length =
- Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- break_point = true;
- } else {
- if (e.year % 10 == 0) {
- if(sum_string.length > 0) {
- sum_string = sum_string.concat('\n');
- }
- sum_string = sum_string.concat(
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(e.year));
- }
- while (e.year > y) {
- sum_string = sum_string.concat(' -1');
- y++;
- if (y % 10 == 0) {
- sum_string = sum_string.concat('\n' +
- toFourCharString(e.year));
- }
- }
-
- length = Math.round(Inte.treering.helper.trueDistance(last_latLng, e.latLng) * 1000);
- if (break_point) {
- length += break_length;
- break_point = false;
- }
- if (length == 9999) {
- length = 9998;
- }
- if (length == 999) {
- length = 998;
- }
-
- length_string = toSixCharString(length);
-
- sum_string = sum_string.concat(length_string);
- last_latLng = e.latLng;
- y++;
+
+ if ((year + 1) % 10 == 0) {
+ outTWStr += "\n" + name + (year + 1);
+
+ if (dat?.ew) {
+ outEWStr += "\n" + name + (year + 1);
+ outLWStr += "\n" + name + (year + 1);
}
- });
-
- if (y % 10 == 0) {
- sum_string = sum_string.concat('\n' +
- toEightCharString(Inte.treering.meta.assetName) +
- toFourCharString(y));
- }
- sum_string = sum_string.concat(' -9999');
-
- var zip = new JSZip();
- zip.file((Inte.treering.meta.assetName + '_TW_rwl.txt'), sum_string);
}
-
- zip.generateAsync({type: 'blob'})
- .then((blob) => {
- saveAs(blob, (Inte.treering.meta.assetName + '_rwl.zip'));
- });
- } else {
- alert('There is no data to download');
- }
+ }
+ outTWStr += stopMarker;
+ if (dat?.ew) {
+ outEWStr += stopMarker;
+ outLWStr += stopMarker;
+ }
+
+ if (outEWStr.length > 1) this.zipFiles("rwl", "txt", outTWStr, null, outEWStr, outLWStr);
+ else this.zipFiles("rwl", "txt", outTWStr);
+ }
+
+ /**
+ * Converts measurement points into RWL format.
+ * @function
+ *
+ * @param {float} dataPoint - Measurement value.
+ */
+ Download.prototype.formatDataPointRWL = function(dataPoint) {
+ dataPoint *= 1000;
+ dataPoint = Math.round(dataPoint);
+ dataPoint = String(dataPoint);
+ dataPoint = " ".repeat(6 - dataPoint.length) + dataPoint;
+
+ return dataPoint;
+ }
+
+ /**
+ * Converts asset name into RWL format.
+ * @function
+ *
+ * @param {strong} str - Name of asset.
+ */
+ Download.prototype.constructNameRWL = function(str) {
+ let nameSpaces = 8 - str.length;
+ let name = str + " ".repeat(nameSpaces);
+
+ return name;
}
/**
@@ -972,20 +724,7 @@ function Download(Inte) {
* @function
*/
Download.prototype.json = function() {
- Inte.treering.data.clean();
- var dataJSON = {
- 'SaveDate': Inte.treering.data.saveDate,
- 'year': Inte.treering.data.year,
- 'forwardDirection': Inte.treering.measurementOptions.forwardDirection,
- 'subAnnual': Inte.treering.measurementOptions.subAnnual,
- 'earlywood': Inte.treering.data.earlywood,
- 'index': Inte.treering.data.index,
- 'points': Inte.treering.data.points,
- 'attributesObjectArray': Inte.treering.annotationAsset.attributesObjectArray,
- 'annotations': Inte.treering.aData.annotations,
- 'ppm': Inte.treering.meta.ppm,
- 'ptWidths': Inte.treering.helper.findDistances(),
- };
+ let dataJSON = this.formatJSON();
// Do not serialize our default value
if (Inte.treering.meta.ppm != Inte.treering.defaultResolution || Inte.treering.meta.ppmCalibration) {
diff --git a/Template.AreaCapture.html b/Template.AreaCapture.html
index 0461bf8..24d870b 100644
--- a/Template.AreaCapture.html
+++ b/Template.AreaCapture.html
@@ -27,11 +27,11 @@
- Ctrl - 1
+ Shift - 1
- Ctrl - 3
+ Shift - 3
@@ -45,10 +45,17 @@
type="number"
placeholder="{{ year }}">
-
+
diff --git a/_layouts/core_layout.html b/_layouts/core_layout.html
index 08f7ae0..4ff4d0c 100644
--- a/_layouts/core_layout.html
+++ b/_layouts/core_layout.html
@@ -113,7 +113,7 @@
layers: [],
doubleClickZoom: false,
zoomControl: false,
- trackResize: true
+ trackResize: true,
}).setView([0, 0], 0);
var baseLayer = L.tileLayer.elevator(function(coords, tile, done) {
@@ -122,13 +122,13 @@
return "https://s3.amazonaws.com/" + params.Bucket + "/" + params.Key;
},
{
- width: width,
+ width: width,
height: height,
tileSize :254,
- maxNativeZoom: maxNativeZoom,
+ maxNativeZoom: maxNativeZoom,
maxZoom: maxNativeZoom + 1,
overlap: 1,
- detectRetina: false,
+ detectRetina: false,
pixelsPerMillimeter: 480, //(NEW)
lineColor: 'blue'
}).addTo(map);
diff --git a/_site/leaflet-treering.js b/_site/leaflet-treering.js
index 4df2be3..7e1df81 100644
--- a/_site/leaflet-treering.js
+++ b/_site/leaflet-treering.js
@@ -1671,7 +1671,7 @@ function AnnotationAsset(Lt) {
this.createBtn = new Button (
'comment',
- 'Create annotations (Ctrl-a)',
+ 'Create annotations (Shift-a)',
() => { Lt.disableTools(); this.enable(this.createBtn) },
() => { this.disable(this.createBtn) }
);
@@ -1679,7 +1679,7 @@ function AnnotationAsset(Lt) {
// crtl-a to activate createBtn
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 65 && e.getModifierState("Control") && window.name.includes('popout')) { // 65 refers to 'a'
+ if (e.keyCode == 65 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 65 refers to 'a'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3371,14 +3371,14 @@ function Dating(Lt) {
this.active = false;
this.btn = new Button(
'access_time',
- 'Edit measurement point dating (Ctrl-d)',
+ 'Edit measurement point dating (Shift-d)',
() => { Lt.disableTools(); Lt.collapseTools(); this.enable() },
() => { this.disable() }
);
- // enable with ctrl-d
+ // enable with shift-d
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 68 && !(e.getModifierState("Shift")) && e.getModifierState("Control") && window.name.includes('popout')) { // 68 refers to 'd'
+ if (e.keyCode == 68 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 68 refers to 'd'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3532,14 +3532,14 @@ function CreatePoint(Lt) {
this.startPoint = true;
this.btn = new Button(
'linear_scale',
- 'Create measurement points (Ctrl-m)',
+ 'Create measurement points (Shift-m)',
() => { Lt.disableTools(); this.enable() },
() => { this.disable() }
);
- // create measurement w. ctrl-m
+ // create measurement w. shift-m
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 77 && e.getModifierState("Control")) {
+ if (e.keyCode == 77 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) {
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3547,9 +3547,9 @@ function CreatePoint(Lt) {
}
}, this);
- // resume measurement w. ctrl-k
+ // resume measurement w. shift-k
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 75 && e.getModifierState("Control")) {
+ if (e.keyCode == 75 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) {
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3739,7 +3739,7 @@ function CreateBreak(Lt) {
);
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 66 && e.getModifierState("Control") && window.name.includes('popout')) { // 66 refers to 'b'
+ if (e.keyCode == 66 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 66 refers to 'b'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3941,14 +3941,14 @@ function InsertPoint(Lt) {
this.active = false;
this.btn = new Button(
'add_circle_outline',
- 'Insert a point between two other points (Ctrl-i)',
+ 'Insert a point between two other points (Shift-i)',
() => { Lt.disableTools(); this.enable() },
() => { this.disable() }
);
- // enable w. ctrl-i
+ // enable w. shift-i
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 73 && !(e.getModifierState("Shift")) && e.getModifierState("Control") && window.name.includes('popout')) { // 73 refers to 'i'
+ if (e.keyCode == 73 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 73 refers to 'i'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -4790,51 +4790,51 @@ function Panhandler(La) {
La.viewer.pan.enable();
}
/**
- * copy text to clipboard
- * @function enable
- */
- function copyToClipboard(allData){
- console.log('copying...', allData);
- const el = document.createElement('textarea');
- el.value = allData;
- document.body.appendChild(el);
- el.select();
- document.execCommand('copy');
- document.body.removeChild(el);
- }
+ * copy text to clipboard
+ * @function enable
+ */
+function copyToClipboard(allData){
+ console.log('copying...', allData);
+ const el = document.createElement('textarea');
+ el.value = allData;
+ document.body.appendChild(el);
+ el.select();
+ document.execCommand('copy');
+ document.body.removeChild(el);
+}
- /**
- * Download CSV ZIP file
- * @function
- */
- function downloadCSVFiles(Lt,TWoodcsvDataString,EWoodcsvDataString,LWoodcsvDataString) {
- var zip = new JSZip();
- if(Lt.measurementOptions.subAnnual)
- {
- zip.file((Lt.meta.assetName + '_LW_csv.csv'), LWoodcsvDataString);
- zip.file((Lt.meta.assetName + '_EW_csv.csv'), EWoodcsvDataString);
- }
- zip.file((Lt.meta.assetName + '_TW_csv.csv'), TWoodcsvDataString)
- zip.generateAsync({type: 'blob'})
- .then((blob) => {
- saveAs(blob, (Lt.meta.assetName + '_csv.zip'));
- });
+/**
+ * Download CSV ZIP file
+ * @function
+ */
+function downloadCSVFiles(Lt,TWoodcsvDataString,EWoodcsvDataString,LWoodcsvDataString) {
+ var zip = new JSZip();
+ if(Lt.measurementOptions.subAnnual)
+ {
+ zip.file((Lt.meta.assetName + '_LW_csv.csv'), LWoodcsvDataString);
+ zip.file((Lt.meta.assetName + '_EW_csv.csv'), EWoodcsvDataString);
}
+ zip.file((Lt.meta.assetName + '_TW_csv.csv'), TWoodcsvDataString)
+ zip.generateAsync({type: 'blob'})
+ .then((blob) => {
+ saveAs(blob, (Lt.meta.assetName + '_csv.zip'));
+ });
+}
- function downloadTabFiles(Lt,TWTabDataString,EWTabDataString,LWTabDataString)
+function downloadTabFiles(Lt,TWTabDataString,EWTabDataString,LWTabDataString)
+{
+ var zip = new JSZip();
+ if(Lt.measurementOptions.subAnnual)
{
- var zip = new JSZip();
- if(Lt.measurementOptions.subAnnual)
- {
- zip.file((Lt.meta.assetName + '_LW_tab.txt'), LWTabDataString);
- zip.file((Lt.meta.assetName + '_EW_tab.txt'), EWTabDataString);
- }
- zip.file((Lt.meta.assetName + '_TW_tab.txt'), TWTabDataString)
- zip.generateAsync({type: 'blob'})
- .then((blob) => {
- saveAs(blob, (Lt.meta.assetName + '_tab.zip'));
- });
- }
+ zip.file((Lt.meta.assetName + '_LW_tab.txt'), LWTabDataString);
+ zip.file((Lt.meta.assetName + '_EW_tab.txt'), EWTabDataString);
+ }
+ zip.file((Lt.meta.assetName + '_TW_tab.txt'), TWTabDataString)
+ zip.generateAsync({type: 'blob'})
+ .then((blob) => {
+ saveAs(blob, (Lt.meta.assetName + '_tab.zip'));
+ });
+}
/**
* Opens dialog box with all keyboard shortcuts
@@ -4855,7 +4855,7 @@ function KeyboardShortCutDialog (Lt) {
let anchor = this.anchor || [1, 442];
this.dialog = L.control.dialog ({
- 'size': [310, 300],
+ 'size': [310, 380],
'anchor': anchor,
'initOpen': true,
'position': 'topleft',
@@ -4871,31 +4871,35 @@ function KeyboardShortCutDialog (Lt) {
'use': 'Toggle magnification loupe on/off',
},
{
- 'key': 'Ctrl-m',
+ 'key': 'Shift-m',
'use': 'Create new measurement path',
},
{
- 'key': 'Ctrl-k',
+ 'key': 'Shift-k',
'use': 'Resume last measurement path',
},
{
- 'key': 'Ctrl-i',
+ 'key': 'Shift-i',
'use': 'Insert measurement point',
},
{
- 'key': 'Ctrl-d',
+ 'key': 'Shift-d',
'use': 'Edit measurement point dating',
},
{
- 'key': 'Ctrl-a',
+ 'key': 'Shift-e',
+ 'use': 'Create new ellipse'
+ },
+ {
+ 'key': 'Shift-a',
'use': 'Create new annotation',
},
{
- 'key': 'Ctrl-b',
+ 'key': 'Shift-b',
'use': 'Create within-year break',
},
{
- 'key': 'Ctrl-s',
+ 'key': 'Shift-s',
'use': 'Save changes to cloud (if permitted)',
},
{
diff --git a/leaflet-treering.js b/leaflet-treering.js
index 4df2be3..7e1df81 100644
--- a/leaflet-treering.js
+++ b/leaflet-treering.js
@@ -1671,7 +1671,7 @@ function AnnotationAsset(Lt) {
this.createBtn = new Button (
'comment',
- 'Create annotations (Ctrl-a)',
+ 'Create annotations (Shift-a)',
() => { Lt.disableTools(); this.enable(this.createBtn) },
() => { this.disable(this.createBtn) }
);
@@ -1679,7 +1679,7 @@ function AnnotationAsset(Lt) {
// crtl-a to activate createBtn
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 65 && e.getModifierState("Control") && window.name.includes('popout')) { // 65 refers to 'a'
+ if (e.keyCode == 65 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 65 refers to 'a'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3371,14 +3371,14 @@ function Dating(Lt) {
this.active = false;
this.btn = new Button(
'access_time',
- 'Edit measurement point dating (Ctrl-d)',
+ 'Edit measurement point dating (Shift-d)',
() => { Lt.disableTools(); Lt.collapseTools(); this.enable() },
() => { this.disable() }
);
- // enable with ctrl-d
+ // enable with shift-d
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 68 && !(e.getModifierState("Shift")) && e.getModifierState("Control") && window.name.includes('popout')) { // 68 refers to 'd'
+ if (e.keyCode == 68 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 68 refers to 'd'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3532,14 +3532,14 @@ function CreatePoint(Lt) {
this.startPoint = true;
this.btn = new Button(
'linear_scale',
- 'Create measurement points (Ctrl-m)',
+ 'Create measurement points (Shift-m)',
() => { Lt.disableTools(); this.enable() },
() => { this.disable() }
);
- // create measurement w. ctrl-m
+ // create measurement w. shift-m
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 77 && e.getModifierState("Control")) {
+ if (e.keyCode == 77 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) {
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3547,9 +3547,9 @@ function CreatePoint(Lt) {
}
}, this);
- // resume measurement w. ctrl-k
+ // resume measurement w. shift-k
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 75 && e.getModifierState("Control")) {
+ if (e.keyCode == 75 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) {
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3739,7 +3739,7 @@ function CreateBreak(Lt) {
);
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 66 && e.getModifierState("Control") && window.name.includes('popout')) { // 66 refers to 'b'
+ if (e.keyCode == 66 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 66 refers to 'b'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -3941,14 +3941,14 @@ function InsertPoint(Lt) {
this.active = false;
this.btn = new Button(
'add_circle_outline',
- 'Insert a point between two other points (Ctrl-i)',
+ 'Insert a point between two other points (Shift-i)',
() => { Lt.disableTools(); this.enable() },
() => { this.disable() }
);
- // enable w. ctrl-i
+ // enable w. shift-i
L.DomEvent.on(window, 'keydown', (e) => {
- if (e.keyCode == 73 && !(e.getModifierState("Shift")) && e.getModifierState("Control") && window.name.includes('popout')) { // 73 refers to 'i'
+ if (e.keyCode == 73 && e.getModifierState("Shift") && !e.getModifierState("Control") && window.name.includes('popout')) { // 73 refers to 'i'
e.preventDefault();
e.stopPropagation();
Lt.disableTools();
@@ -4790,51 +4790,51 @@ function Panhandler(La) {
La.viewer.pan.enable();
}
/**
- * copy text to clipboard
- * @function enable
- */
- function copyToClipboard(allData){
- console.log('copying...', allData);
- const el = document.createElement('textarea');
- el.value = allData;
- document.body.appendChild(el);
- el.select();
- document.execCommand('copy');
- document.body.removeChild(el);
- }
+ * copy text to clipboard
+ * @function enable
+ */
+function copyToClipboard(allData){
+ console.log('copying...', allData);
+ const el = document.createElement('textarea');
+ el.value = allData;
+ document.body.appendChild(el);
+ el.select();
+ document.execCommand('copy');
+ document.body.removeChild(el);
+}
- /**
- * Download CSV ZIP file
- * @function
- */
- function downloadCSVFiles(Lt,TWoodcsvDataString,EWoodcsvDataString,LWoodcsvDataString) {
- var zip = new JSZip();
- if(Lt.measurementOptions.subAnnual)
- {
- zip.file((Lt.meta.assetName + '_LW_csv.csv'), LWoodcsvDataString);
- zip.file((Lt.meta.assetName + '_EW_csv.csv'), EWoodcsvDataString);
- }
- zip.file((Lt.meta.assetName + '_TW_csv.csv'), TWoodcsvDataString)
- zip.generateAsync({type: 'blob'})
- .then((blob) => {
- saveAs(blob, (Lt.meta.assetName + '_csv.zip'));
- });
+/**
+ * Download CSV ZIP file
+ * @function
+ */
+function downloadCSVFiles(Lt,TWoodcsvDataString,EWoodcsvDataString,LWoodcsvDataString) {
+ var zip = new JSZip();
+ if(Lt.measurementOptions.subAnnual)
+ {
+ zip.file((Lt.meta.assetName + '_LW_csv.csv'), LWoodcsvDataString);
+ zip.file((Lt.meta.assetName + '_EW_csv.csv'), EWoodcsvDataString);
}
+ zip.file((Lt.meta.assetName + '_TW_csv.csv'), TWoodcsvDataString)
+ zip.generateAsync({type: 'blob'})
+ .then((blob) => {
+ saveAs(blob, (Lt.meta.assetName + '_csv.zip'));
+ });
+}
- function downloadTabFiles(Lt,TWTabDataString,EWTabDataString,LWTabDataString)
+function downloadTabFiles(Lt,TWTabDataString,EWTabDataString,LWTabDataString)
+{
+ var zip = new JSZip();
+ if(Lt.measurementOptions.subAnnual)
{
- var zip = new JSZip();
- if(Lt.measurementOptions.subAnnual)
- {
- zip.file((Lt.meta.assetName + '_LW_tab.txt'), LWTabDataString);
- zip.file((Lt.meta.assetName + '_EW_tab.txt'), EWTabDataString);
- }
- zip.file((Lt.meta.assetName + '_TW_tab.txt'), TWTabDataString)
- zip.generateAsync({type: 'blob'})
- .then((blob) => {
- saveAs(blob, (Lt.meta.assetName + '_tab.zip'));
- });
- }
+ zip.file((Lt.meta.assetName + '_LW_tab.txt'), LWTabDataString);
+ zip.file((Lt.meta.assetName + '_EW_tab.txt'), EWTabDataString);
+ }
+ zip.file((Lt.meta.assetName + '_TW_tab.txt'), TWTabDataString)
+ zip.generateAsync({type: 'blob'})
+ .then((blob) => {
+ saveAs(blob, (Lt.meta.assetName + '_tab.zip'));
+ });
+}
/**
* Opens dialog box with all keyboard shortcuts
@@ -4855,7 +4855,7 @@ function KeyboardShortCutDialog (Lt) {
let anchor = this.anchor || [1, 442];
this.dialog = L.control.dialog ({
- 'size': [310, 300],
+ 'size': [310, 380],
'anchor': anchor,
'initOpen': true,
'position': 'topleft',
@@ -4871,31 +4871,35 @@ function KeyboardShortCutDialog (Lt) {
'use': 'Toggle magnification loupe on/off',
},
{
- 'key': 'Ctrl-m',
+ 'key': 'Shift-m',
'use': 'Create new measurement path',
},
{
- 'key': 'Ctrl-k',
+ 'key': 'Shift-k',
'use': 'Resume last measurement path',
},
{
- 'key': 'Ctrl-i',
+ 'key': 'Shift-i',
'use': 'Insert measurement point',
},
{
- 'key': 'Ctrl-d',
+ 'key': 'Shift-d',
'use': 'Edit measurement point dating',
},
{
- 'key': 'Ctrl-a',
+ 'key': 'Shift-e',
+ 'use': 'Create new ellipse'
+ },
+ {
+ 'key': 'Shift-a',
'use': 'Create new annotation',
},
{
- 'key': 'Ctrl-b',
+ 'key': 'Shift-b',
'use': 'Create within-year break',
},
{
- 'key': 'Ctrl-s',
+ 'key': 'Shift-s',
'use': 'Save changes to cloud (if permitted)',
},
{