Changes corresponding to Imagebox3 update

episphere · Oct 10, 2024 · cdf257a · cdf257a
1 parent 03be693
commit cdf257a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/scripts/miscProcessing.js b/scripts/miscProcessing.js
@@ -184,9 +184,9 @@ const getWSIInfo = async (url, imgbox3=false) => {
     imageInfo = await imagebox3Instance[url].getInfo()
   } else {
     const infoURL = `${tileServerBasePath}?iiif=${url}/info.json`
-    imageInfo =  await fetch(infoURL)
+    imageInfo =  await (await fetch(infoURL)).json()
   }
-  return await imageInfo.json()
+  return imageInfo
 }
 
 const getWSIThumbnail = async (url, width, height, imgbox3=false) => {
@@ -202,9 +202,9 @@ const getWSIThumbnail = async (url, width, height, imgbox3=false) => {
     thumbnailImage = await imagebox3Instance[url].getThumbnail(thumbnailWidthToRender)
   } else {
     const thumbnailURL = `${tileServerBasePath}?iiif=${url}/0,0,${width},${height}/256,/0/default.jpg`
-    thumbnailImage = await fetch(thumbnailURL)
+    thumbnailImage = await (await fetch(thumbnailURL)).blob()
   }
-  return thumbnailImage.blob()
+  return thumbnailImage
 }
 
 const handleWSIThumbnailCreation = async (op, imageId, name, wsiThumbnailsFolderId) => {

diff --git a/scripts/modelPrediction.js b/scripts/modelPrediction.js
@@ -173,11 +173,11 @@ onmessage = async (evt) => {
             }
           } else if (!tile) {
             const tileServerRequest = `${tileServerBasePath}/?format=${fileFormat}&iiif=${imageURL}/${x},${y},${width},${height}/${tileWidthRendered},/0/default.jpg`
-            tile = await fetch(tileServerRequest)
+            tile = await (await fetch(tileServerRequest)).blob()
           }
           // const tileServerRequest = `${tileServerBasePath}/?format=${fileFormat}&iiif=${imageURL}/${x},${y},${width},${height}/${width > maxTileImageDimension ? maxTileImageDimension: width},/0/default.jpg`
           try {
-            const tileBlob = await tile.blob()
+            const tileBlob = tile
             const tileImageBitmap = await createImageBitmap(tileBlob)
 
             if (tileImageBitmap) {

diff --git a/scripts/wsi.js b/scripts/wsi.js
@@ -67,7 +67,7 @@ wsi.loadImage = async (id, name, fileMetadata={}) => {
     if (!imageInfo) {
       wsi.imagebox3Instance = new Imagebox3(url, 0)
       await wsi.imagebox3Instance.init()
-      imageInfo = await (await wsi.imagebox3Instance.getInfo()).json()
+      imageInfo = await wsi.imagebox3Instance.getInfo()
     }
     wsi.isImagebox3Compatible = true
   } catch(e) {