[SERV-1068] Only set fallback thumbail on static images (#239)

* Only set fallback thumbail on static images * Fix tests, update .snyk * Update Docker image deps
UCLALibrary · Apr 8, 2024 · 105e753 · 105e753
1 parent a29e582
commit 105e753
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/.snyk b/.snyk
@@ -15,3 +15,7 @@ ignore:
     - '*':
         reason: Service is deprecated; moving to GoLang
         expires: 2024-12-01
+  'SNYK-JAVA-IONETTY-6483812':
+    - '*':
+        reason: Service is deprecated; moving to GoLang
+        expires: 2024-12-01
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
     <ubuntu.tag>22.04</ubuntu.tag>
     <jdk.version>17.0.10+7-1~22.04.1</jdk.version>
     <python3.version>3.10.6-1~22.04</python3.version>
-    <curl.version>7.81.0-1ubuntu1.15</curl.version>
+    <curl.version>7.81.0-1ubuntu1.16</curl.version>
 
     <!-- Application dependencies -->
     <vertx.version>3.9.16</vertx.version>

diff --git a/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java b/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
@@ -475,6 +475,7 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
 
             String resourceURI =
                     StringUtils.format(Constants.SAMPLE_URI_TEMPLATE, pageURI, Constants.DEFAULT_SAMPLE_SIZE);
+            boolean staticImage = false;
             ImageResource imageResource;
             ImageContent imageContent;
             Canvas canvas;
@@ -494,6 +495,7 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                         imageResource = new ImageResource(accessURI);
                         imageResource.setWidth(mediaWidth);
                         imageResource.setHeight(mediaHeight);
+                        staticImage = true;
                     } else {
                         // If we don't have both width and height in the CSV, we can also try to look it up
                         final ImageInfoLookup infoLookup = new ImageInfoLookup(pageURI);
@@ -524,7 +526,7 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                 // Add a thumbnail if we have one and one hasn't already been added
                 if (thumbnail.isPresent() && canvas.getThumbnail() == null) {
                     canvas.setThumbnail(thumbnail.get());
-                } else {
+                } else if (staticImage) {
                     // Fallback to using the original image as thumbnail and let browser resize
                     canvas.setThumbnail(accessURI);
                 }