Thumbnail generation allows both width and height as params

episphere · Jan 9, 2024 · 1da19ab · 1da19ab
1 parent 32b7cb0
commit 1da19ab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/imagebox3.js b/imagebox3.js
@@ -254,9 +254,9 @@ var imagebox3 = (() => {
 
     const parsedTileParams = utils.parseTileParams(tileParams)
 
-    const { thumbnailWidthToRender } = parsedTileParams
-    if (!Number.isInteger(thumbnailWidthToRender)) {
-      console.error("Thumbnail Request missing critical parameters!", thumbnailWidthToRender)
+    let { thumbnailWidthToRender, thumbnailHeightToRender } = parsedTileParams
+    if (!Number.isInteger(thumbnailWidthToRender) && !Number.isInteger(thumbnailHeightToRender)) {
+      console.error("Thumbnail Request missing critical parameters!", thumbnailWidthToRender, thumbnailHeightToRender)
       return
     }
 
@@ -265,7 +265,13 @@ var imagebox3 = (() => {
     }
 
     const thumbnailImage = await tiff[imageID].pyramid.getImage(1)
-    const thumbnailHeightToRender = Math.floor(thumbnailImage.getHeight() * thumbnailWidthToRender / thumbnailImage.getWidth())
+
+    if (thumbnailWidthToRender && !thumbnailHeightToRender) {
+      thumbnailHeightToRender = Math.floor(thumbnailImage.getHeight() * thumbnailWidthToRender / thumbnailImage.getWidth())
+    }
+    else if (thumbnailHeightToRender && !thumbnailWidthToRender) {
+      thumbnailWidthToRender = Math.floor(thumbnailImage.getHeight() * thumbnailHeightToRender / thumbnailImage.getWidth())
+    }
 
     let data = await thumbnailImage.readRasters({
       width: thumbnailWidthToRender,

diff --git a/imagebox3.mjs b/imagebox3.mjs
@@ -233,9 +233,9 @@ const imagebox3 = (() => {
 
     const parsedTileParams = utils.parseTileParams(tileParams)
 
-    const { thumbnailWidthToRender } = parsedTileParams
-    if (!Number.isInteger(thumbnailWidthToRender)) {
-      console.error("Thumbnail Request missing critical parameters!", thumbnailWidthToRender)
+    let { thumbnailWidthToRender, thumbnailHeightToRender } = parsedTileParams
+    if (!Number.isInteger(thumbnailWidthToRender) && !Number.isInteger(thumbnailHeightToRender)) {
+      console.error("Thumbnail Request missing critical parameters!", thumbnailWidthToRender, thumbnailHeightToRender)
       return
     }
 
@@ -244,7 +244,13 @@ const imagebox3 = (() => {
     }
 
     const thumbnailImage = await tiff[imageID].pyramid.getImage(1)
-    const thumbnailHeightToRender = Math.floor(thumbnailImage.getHeight() * thumbnailWidthToRender / thumbnailImage.getWidth())
+
+    if (!thumbnailHeightToRender) {
+      thumbnailHeightToRender = Math.floor(thumbnailImage.getHeight() * thumbnailWidthToRender / thumbnailImage.getWidth())
+    }
+    else if (!thumbnailWidthToRender) {
+      thumbnailWidthToRender = Math.floor(thumbnailImage.getHeight() * thumbnailHeightToRender / thumbnailImage.getWidth())
+    }
 
     let data = await thumbnailImage.readRasters({
       width: thumbnailWidthToRender,