Skip to content

[DLSR-473] Fix static image file handling #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ksclarke merged 3 commits into from
Jul 21, 2026
Merged

[DLSR-473] Fix static image file handling #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dcd747
[DLSR-473] Add full image params and image service in v2
ksclarke Jul 20, 2026
ebd0292
Fix static image file handling
ksclarke Jul 21, 2026
f0c7e2f
Merge branch 'main' into DLSR-473/Fix_v2_resource_IDs
ksclarke Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading