From 1dcd747eae6eb78d646010a2bbfaf489f43981f4 Mon Sep 17 00:00:00 2001
From: "Kevin S. Clarke" <ksclarke@ksclarke.io>
Date: Mon, 20 Jul 2026 14:11:44 -0400
Subject: [PATCH 1/2] [DLSR-473] Add full image params and image service in v2

---
 pom.xml                                                   | 2 +-
 .../library/iiif/fester/verticles/V2ManifestVerticle.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d92bdf4..477f9a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
     <ubuntu.tag>22.04</ubuntu.tag>
     <jdk.version>21.0.11+10-1~22.04.2</jdk.version>
     <python3.version>3.10.6-1~22.04.1</python3.version>
-    <curl.version>7.81.0-1ubuntu1.24</curl.version>
+    <curl.version>7.81.0-1ubuntu1.25</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
index 6ba605f..3379bf0 100644
--- a/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
+++ b/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
@@ -490,13 +490,14 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
             final String accessURI = StringUtils.trimToNull(columns[aCsvHeaders.getContentAccessUrlIndex()]);
             final Optional<String> thumbnail = CsvParser.getMetadata(columns, aCsvHeaders.getThumbnailIndex());
 
-            String resourceURI =
-                    StringUtils.format(Constants.SAMPLE_URI_TEMPLATE, pageURI, Constants.DEFAULT_SAMPLE_SIZE);
             boolean staticImage = false;
+            String resourceURI;
             ImageResource imageResource;
             ImageContent imageContent;
             Canvas canvas;
 
+            resourceURI = StringUtils.format(Constants.SAMPLE_URI_TEMPLATE, pageURI, Constants.DEFAULT_SAMPLE_SIZE);
+
             try {
                 final Optional<String> width = CsvParser.getMetadata(columns, aCsvHeaders.getMediaWidthIndex());
                 final Optional<String> height = CsvParser.getMetadata(columns, aCsvHeaders.getMediaHeightIndex());
@@ -509,9 +510,10 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                         mediaWidth = Integer.parseInt(width.get());
                         mediaHeight = Integer.parseInt(height.get());
 
-                        imageResource = new ImageResource(accessURI);
+                        imageResource = new ImageResource(resourceURI);
                         imageResource.setWidth(mediaWidth);
                         imageResource.setHeight(mediaHeight);
+                        imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
                         staticImage = true;
                     } else {
                         // If we don't have both width and height in the CSV, we can also try to look it up

From ebd0292ed4f25353c946b88e0735aed3647e2e1d Mon Sep 17 00:00:00 2001
From: "Kevin S. Clarke" <ksclarke@ksclarke.io>
Date: Tue, 21 Jul 2026 14:20:44 -0400
Subject: [PATCH 2/2] Fix static image file handling

---
 .../iiif/fester/verticles/V2ManifestVerticle.java      |  8 ++++++--
 .../iiif/fester/verticles/V3ManifestVerticle.java      | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

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
index 3379bf0..28108a9 100644
--- a/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
+++ b/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
@@ -513,8 +513,12 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                         imageResource = new ImageResource(resourceURI);
                         imageResource.setWidth(mediaWidth);
                         imageResource.setHeight(mediaHeight);
-                        imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
-                        staticImage = true;
+
+                        if (!accessURI.matches("^.+\\.[^.]+$")) { // Does the URI have a file extension?
+                            imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
+                        } else {
+                            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);
diff --git a/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java b/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
index 71e9977..9ba88c5 100644
--- a/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
+++ b/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
@@ -577,16 +577,20 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                     if (mediaWidth.isPresent() && mediaHeight.isPresent()) {
                         width = Integer.parseInt(mediaWidth.get());
                         height = Integer.parseInt(mediaHeight.get());
-                        image = new ImageContent(accessURI);
+                        image = new ImageContent(resourceURI);
+
+                        if (!accessURI.matches("^.+\\.[^.]+$")) { // Does the URI have a file extension?
+                            image.setServices(new ImageService2(pageURI));
+                        }
                     } else {
                         final ImageInfoLookup infoLookup = new ImageInfoLookup(pageURI); // Look up w/h for page URI
 
                         width = infoLookup.getWidth();
                         height = infoLookup.getHeight();
-                        image = new ImageContent(resourceURI);
+                        image = new ImageContent(resourceURI).setServices(new ImageService2(pageURI));
                     }
 
-                    image.setWidthHeight(width, height).setServices(new ImageService2(pageURI));
+                    image.setWidthHeight(width, height);
                     canvas.setWidthHeight(width, height).setThumbnails(new ImageContent(thumbnail));
                     canvas.paintWith(image);
                 } catch (final IOException details) {