diff --git a/src/Image.js b/src/Image.js index 2447a33..21b7ebd 100644 --- a/src/Image.js +++ b/src/Image.js @@ -7,7 +7,7 @@ const splitter = { NIR: splitNIR, DN: splitDNO, DO: splitDNO, - //HSI: splitHSI + HSI: splitHSI }; function splitNIR(filename) { @@ -18,6 +18,17 @@ function splitNIR(filename) { return {baseFolder, subfolder}; } +/** + * @todo Redundant... + */ +function splitHSI(filename) { + let splitFilename = filename.split('_'); + const papyrusNumb = splitFilename[0].split('-')[2]; + const baseFolder = `PHerc_${papyrusNumb}`; + const subfolder = `PHerc_${papyrusNumb}_${splitFilename[2]}`; + + return {baseFolder, subfolder}; +} function splitDNO(filename) { let splitFilename = filename.split('_'); diff --git a/src/Metadata.js b/src/Metadata.js index 889d289..a303314 100644 --- a/src/Metadata.js +++ b/src/Metadata.js @@ -59,7 +59,7 @@ class ManifestMetadata { metadataObj.push({label:"Principal Component Analysis",value: this.pca}); } - metadataObj.concat([ + metadataObj = metadataObj.concat([ {label:"Date (Year)", value: this.date}, {label:"Image Author", value: this.imageAuthor}, {label:"License", value: this.license}, diff --git a/src/common.js b/src/common.js index fb1dd99..7c8f8bc 100644 --- a/src/common.js +++ b/src/common.js @@ -13,7 +13,7 @@ const TECH_NAMES = { dn: "Disegni Napoletani", do: "Disegni Oxoniensi", nir: "Near Infrared Imaging 1000nm", - hsi: "Hyperspectral Imaging", + hsi: "SWIR Hyperspectral Imaging", uvf: "Technical Photography UVF", } const authors = { @@ -38,7 +38,7 @@ function extractNIRMetadata(imgFilename) { */ function extractHSIMetadata(imgFilename) { let hsi = extractNIRMetadata(imgFilename); - hsi.pca = imgFilename.split('_')[1].split('_')[2]; + hsi.pca = imgFilename.split('_')[3].replace(/\..*$/,''); return hsi; } @@ -152,6 +152,7 @@ Common.createCanvas = async function (manifest, filename) { const namePos = { nir: 1, + hsi: 1, do: 3, dn: 3 }; @@ -231,7 +232,7 @@ Common.getMetadataFromImgName = function (imgFilename, technique) { nir: extractNIRMetadata, dn: extractDNMetadata, do: extractDOMetadata, - his: extractHSIMetadata, + hsi: extractHSIMetadata, } return extractor[technique](imgFilename);