cozy-iiif 0.3.0 → 0.3.1

package/README.md

@@ -135,6 +135,9 @@ console.log(image.getRegionURL(bounds));
 // With custom minimum shorted dimension
 console.log(image.getRegionURL(bounds, 800));
 
+// Full image with custom minimum shorted dimension
+console.log(image.getImageURL(800));
+
 // Resolves the actual image pixel size from the info.json
 // or the image file (which may **differ**) from the canvas size!
 console.log(image.getPixelSize());

package/dist/core/canvas.d.ts

@@ -1,6 +1,5 @@
 import { Canvas } from '@iiif/presentation-3';
 import { CozyImageResource } from '../types';
 export declare const getThumbnailURL: (canvas: Canvas, images?: CozyImageResource[]) => (minSize?: number) => string | undefined;
-export declare const getImageURL: (canvas: Canvas, images?: CozyImageResource[]) => (minSize?: number) => string | undefined;
 export declare const normalizeServiceUrl: (url: string) => string;
 export declare const getImages: (canvas: Canvas) => CozyImageResource[];

package/dist/core/image-service.d.ts

@@ -6,7 +6,7 @@ export declare const parseImageService: (service: Service) => {
     majorVersion: number;
     profileLevel: number;
 } | undefined;
-export declare const getImageURLFromService: (service: ImageService2 | ImageService3, width: number, height: number) => string;
-export declare const getRegionURLFromService: (service: ImageService2 | ImageService3, bounds: Bounds, minSize: number) => string | undefined;
+export declare const getImageURLFromService: (service: Service, width: number, height: number) => string;
+export declare const getRegionURLFromService: (service: Service, bounds: Bounds, minSize: number) => string | undefined;
 export declare const getRegionURL: (image: CozyImageResource) => (bounds: Bounds, minSize?: number) => string | undefined;
 export {};

package/dist/index.js

@@ -1,8 +1,8 @@
 import { imageSize as ce } from "image-size";
-import { g as m, a as j, b as S } from "./resource-DS2brz47.js";
+import { g, a as j, b as S } from "./resource-DS2brz47.js";
 import { c as zt } from "./resource-DS2brz47.js";
-var le = "http://library.stanford.edu/iiif/image-api/compliance.html#level0", pe = "http://library.stanford.edu/iiif/image-api/compliance.html#level1", V = "http://library.stanford.edu/iiif/image-api/compliance.html#level2", ve = "http://library.stanford.edu/iiif/image-api/conformance.html#level0", he = "http://library.stanford.edu/iiif/image-api/conformance.html#level1", F = "http://library.stanford.edu/iiif/image-api/conformance.html#level2", ue = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0", fe = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1", W = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2", me = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level0", ge = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level1", H = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level2", de = "http://iiif.io/api/image/1/level0.json", ye = "http://iiif.io/api/image/1/profiles/level0.json", Ae = "http://iiif.io/api/image/1/level1.json", Ce = "http://iiif.io/api/image/1/profiles/level1.json", J = "http://iiif.io/api/image/1/level2.json", z = "http://iiif.io/api/image/1/profiles/level2.json", be = "http://iiif.io/api/image/2/level0.json", Re = "http://iiif.io/api/image/2/profiles/level0.json", Le = "http://iiif.io/api/image/2/level1.json", we = "http://iiif.io/api/image/2/profiles/level1.json", G = "http://iiif.io/api/image/2/level2.json", K = "http://iiif.io/api/image/2/profiles/level2.json", Ie = "level0", Se = "level1", Q = "level2", xe = "http://iiif.io/api/image/2/level0", Te = "http://iiif.io/api/image/2/level1", X = "http://iiif.io/api/image/2/level2", $e = [X, V, F, W, H, J, z, G, K, Q], Me = [xe, Te, X, le, pe, V, ve, he, F, ue, fe, W, me, ge, H, de, ye, Ae, Ce, J, z, be, Re, Le, we, G, K, Ie, Se, Q], je = Me;
-function g(t) {
+var le = "http://library.stanford.edu/iiif/image-api/compliance.html#level0", pe = "http://library.stanford.edu/iiif/image-api/compliance.html#level1", V = "http://library.stanford.edu/iiif/image-api/compliance.html#level2", ve = "http://library.stanford.edu/iiif/image-api/conformance.html#level0", he = "http://library.stanford.edu/iiif/image-api/conformance.html#level1", F = "http://library.stanford.edu/iiif/image-api/conformance.html#level2", ue = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0", fe = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1", W = "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2", ge = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level0", me = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level1", H = "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level2", de = "http://iiif.io/api/image/1/level0.json", ye = "http://iiif.io/api/image/1/profiles/level0.json", Ae = "http://iiif.io/api/image/1/level1.json", Ce = "http://iiif.io/api/image/1/profiles/level1.json", J = "http://iiif.io/api/image/1/level2.json", z = "http://iiif.io/api/image/1/profiles/level2.json", be = "http://iiif.io/api/image/2/level0.json", Re = "http://iiif.io/api/image/2/profiles/level0.json", Le = "http://iiif.io/api/image/2/level1.json", we = "http://iiif.io/api/image/2/profiles/level1.json", G = "http://iiif.io/api/image/2/level2.json", K = "http://iiif.io/api/image/2/profiles/level2.json", Ie = "level0", Se = "level1", Q = "level2", xe = "http://iiif.io/api/image/2/level0", Te = "http://iiif.io/api/image/2/level1", X = "http://iiif.io/api/image/2/level2", $e = [X, V, F, W, H, J, z, G, K, Q], Me = [xe, Te, X, le, pe, V, ve, he, F, ue, fe, W, ge, me, H, de, ye, Ae, Ce, J, z, be, Re, Le, we, G, K, Ie, Se, Q], je = Me;
+function m(t) {
   for (let e in t) (typeof t[e] > "u" || t[e] === null) && delete t[e];
   return t;
 }
@@ -337,17 +337,17 @@ function R(t) {
   let e = t.related ? Array.isArray(t.related) ? t.related : [t.related] : [], r = t.contentLayer;
   return { provider: t.logo || e.length ? [{ id: k.providerId, type: "Agent", homepage: e.length ? [e[0]] : void 0, logo: t.logo ? Array.isArray(t.logo) ? t.logo : [t.logo] : void 0, label: I(k.providerName) }] : void 0, partOf: ft(t), rendering: t.rendering, seeAlso: t.seeAlso, start: t.startCanvas, service: t.service ? w(t.service) : void 0, supplementary: r ? [r] : void 0 };
 }
-function mt(t) {
+function gt(t) {
   return { chars: t.chars, format: t.format ? t.format : void 0, language: t.language };
 }
-function gt(t) {
-  return g({ ...A(t), ...C(t), ...R(t), items: t.members });
+function mt(t) {
+  return m({ ...A(t), ...C(t), ...R(t), items: t.members });
 }
 function dt(t) {
   let e = [], r = [], i;
   for (let n of t.sequences || []) n.canvases.length && e.push(...n.canvases), n.behavior && r.push(...n.behavior), n.startCanvas && (i = n.startCanvas);
   let s = A(t);
-  return r.length && (s.behavior ? s.behavior.push(...r) : s.behavior = r), g({ ...s, ...C(t), ...R(t), start: i, items: e, structures: yt(t.structures) });
+  return r.length && (s.behavior ? s.behavior.push(...r) : s.behavior = r), m({ ...s, ...C(t), ...R(t), start: i, items: e, structures: yt(t.structures) });
 }
 function yt(t) {
   if (!t) return t;
@@ -361,10 +361,10 @@ function yt(t) {
   return t.filter((i) => r.indexOf(i.id) === -1);
 }
 function At(t) {
-  return g({ ...A(t), ...C(t), ...R(t), annotations: t.otherContent && t.otherContent.length ? t.otherContent : void 0, items: t.images && t.images.length ? [{ id: ee(t, "annotation-page"), type: "AnnotationPage", items: t.images }] : void 0 });
+  return m({ ...A(t), ...C(t), ...R(t), annotations: t.otherContent && t.otherContent.length ? t.otherContent : void 0, items: t.images && t.images.length ? [{ id: ee(t, "annotation-page"), type: "AnnotationPage", items: t.images }] : void 0 });
 }
 function Ct(t) {
-  return g({ ...A(t), ...C(t), ...R(t), items: t.resources && t.resources.length ? t.resources : void 0 });
+  return m({ ...A(t), ...C(t), ...R(t), items: t.resources && t.resources.length ? t.resources : void 0 });
 }
 function bt(t) {
   return !t.canvases || t.canvases.length === 0 ? { canvases: [], behavior: [] } : { canvases: t.canvases, behavior: t.viewingHint ? [t.viewingHint] : [], startCanvas: t.startCanvas };
@@ -385,30 +385,30 @@ function Rt(t) {
       return { type: "SpecificResource", source: i, selector: P(r.selector) };
     } else return encodeURI(r["@id"]).trim();
   }
-  return g({ ...A(t), ...C(t), ...R(t), target: e(t.on), body: Array.isArray(t.resource) ? t.resource.map(_) : _(t.resource) });
+  return m({ ...A(t), ...C(t), ...R(t), target: e(t.on), body: Array.isArray(t.resource) ? t.resource.map(_) : _(t.resource) });
 }
 function _(t) {
   return t.type === "Choice" ? t : te(t);
 }
 function te(t) {
   let e = t;
-  return g({ ...A(e), ...C(e), ...R(e), ...mt(e) });
+  return m({ ...A(e), ...C(e), ...R(e), ...gt(e) });
 }
 function Lt(t) {
   let e = [];
-  return t.default && t.default !== "rdf:nil" && e.push(t.default), t.item && t.item !== "rdf:nil" && e.push(...t.item), g({ ...A(t), ...C(t), items: e });
+  return t.default && t.default !== "rdf:nil" && e.push(t.default), t.item && t.item !== "rdf:nil" && e.push(...t.item), m({ ...A(t), ...C(t), items: e });
 }
 function wt(t) {
-  return g({ ...A(t), ...C(t), ...R(t), items: t.members });
+  return m({ ...A(t), ...C(t), ...R(t), items: t.members });
 }
 function It(t) {
   let { "@id": e, "@type": r, "@context": i, profile: s, ...n } = t, o = {};
-  return e && (o["@id"] = e), o["@type"] = U(t), o["@type"] === "unknown" && (i && i.length && (o["@context"] = i), o["@type"] = "Service"), s && (o.profile = Z(s)), g({ ...o, ...n });
+  return e && (o["@id"] = e), o["@type"] = U(t), o["@type"] === "unknown" && (i && i.length && (o["@context"] = i), o["@type"] = "Service"), s && (o.profile = Z(s)), m({ ...o, ...n });
 }
 function St(t) {
-  return g({ ...A(t), ...C(t), ...R(t) });
+  return m({ ...A(t), ...C(t), ...R(t) });
 }
-var xt = new Ue({ collection: [gt], manifest: [dt], canvas: [At], annotationList: [Ct], sequence: [bt], annotation: [Rt], contentResource: [te], choice: [Lt], range: [wt], service: [It], layer: [St] });
+var xt = new Ue({ collection: [mt], manifest: [dt], canvas: [At], annotationList: [Ct], sequence: [bt], annotation: [Rt], contentResource: [te], choice: [Lt], range: [wt], service: [It], layer: [St] });
 function re(t) {
   return t && t["@context"] && (t["@context"] === "http://iiif.io/api/presentation/2/context.json" || t["@context"].indexOf("http://iiif.io/api/presentation/2/context.json") !== -1 || t["@context"] === "http://www.shared-canvas.org/ns/context.json") || t["@context"] === "http://iiif.io/api/image/2/context.json" ? xt.traverseUnknown(t) : t;
 }
@@ -553,15 +553,15 @@ var D = class ie {
     }
   }
 };
-const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.profile.toString().includes("iiif.io/api/image/"), ne = (t) => {
-  const e = m(t, "type"), r = m(t, "context");
+const se = (t) => g(t, "type").startsWith("ImageService") || t.profile && t.profile.toString().includes("iiif.io/api/image/"), ne = (t) => {
+  const e = g(t, "type"), r = g(t, "context");
   if (e === "ImageService2" || r != null && r.includes("image/2")) {
     const i = t, s = ["level0", "level1", "level2"];
     return { majorVersion: 2, profileLevel: (Array.isArray(i.profile) ? i.profile : [i.profile]).map((c) => s.findIndex((a) => c.toString().includes(a))).filter((c) => c > -1).sort((c, a) => a - c)[0] };
   } else if (e || r)
     return { majorVersion: 3, profileLevel: parseInt(t.profile) };
 }, O = (t, e, r) => {
-  const i = m(t, "id"), s = t.profile || "";
+  const i = g(t, "id"), s = t.profile || "";
   if (typeof s == "string" && (s.includes("level0") || s.includes("level:0"))) {
     if ("sizes" in t && Array.isArray(t.sizes)) {
       const o = t.sizes.sort((c, a) => a.width * a.height - c.width * c.height).filter((c) => c.width * c.height >= e * r)[0];
@@ -572,7 +572,7 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
   }
   return `${i}/full/!${e},${r}/0/default.jpg`;
 }, $t = (t, e, r) => {
-  const i = m(t, "id"), s = t.profile || "";
+  const i = g(t, "id"), s = t.profile || "";
   if (typeof s == "string" && (s.includes("level0") || s.includes("level:0"))) return;
   const { x: o, y: c, w: a, h: l } = e, u = a / l, v = u < 1, d = Math.ceil(v ? r / u : r), p = Math.ceil(v ? r : r / u), f = `${Math.round(o)},${Math.round(c)},${Math.round(a)},${Math.round(l)}`;
   return `${i}/${f}/!${p},${d}/0/default.jpg`;
@@ -599,17 +599,11 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
     if (l.type === "static")
       return l.url;
   }
-}, kt = (t, e = []) => (r = 800) => {
-  const { width: i, height: s } = t;
-  if (!i || !s) return;
-  const n = i / s, o = n < 1, c = Math.ceil(o ? r / n : r), a = Math.ceil(o ? r : r / n);
-  for (const l of e) {
-    if (l.type === "dynamic" || l.type === "level0")
-      return O(l.service, a, c);
-    if (l.type === "static")
-      return l.url;
-  }
-}, ae = (t) => t.endsWith("/info.json") ? t : `${t.endsWith("/") ? t : `${t}/`}info.json`, Pt = (t) => () => fetch(t).then((e) => e.json()).then((e) => {
+}, ae = (t) => t.endsWith("/info.json") ? t : `${t.endsWith("/") ? t : `${t}/`}info.json`, kt = (t, e, r) => (i = 800) => {
+  if (!t || !e) return;
+  const s = t / e, n = s < 1, o = Math.ceil(n ? i / s : i), c = Math.ceil(n ? i : i / s);
+  return O(r, c, o);
+}, Pt = (t) => () => fetch(t).then((e) => e.json()).then((e) => {
   const r = e.width, i = e.height;
   return r !== void 0 && i !== void 0 ? { width: r, height: i } : void 0;
 }), Ot = (t) => () => {
@@ -619,9 +613,9 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
     return i.close(), { width: s, height: n };
   }) : r.arrayBuffer().then((i) => ce(new Uint8Array(i))));
 }, Ut = (t) => {
-  const { format: e, height: r, width: i } = t, s = m(t, "id"), n = (t.service || []).find(se), o = n ? ne(n) : void 0;
-  if (o) {
-    const c = ae(m(n, "id")), a = {
+  const { format: e, height: r, width: i } = t, s = g(t, "id"), n = (t.service || []).find(se), o = n ? ne(n) : void 0;
+  if (n && o) {
+    const c = ae(g(n, "id")), a = {
       source: t,
       type: o.profileLevel === 0 ? "level0" : "dynamic",
       service: n,
@@ -629,6 +623,7 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
       height: r,
       majorVersion: o.majorVersion,
       serviceUrl: c,
+      getImageURL: kt(i, r, n),
       getPixelSize: Pt(c)
     };
     return o.profileLevel === 0 ? a : {
@@ -643,6 +638,7 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
       height: r,
       url: s,
       format: e,
+      getImageURL: () => s,
       getPixelSize: Ot(s)
     };
 }, Dt = (t) => {
@@ -756,7 +752,7 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
       code: "INVALID_MANIFEST",
       message: "Missing @context"
     };
-  const i = m(t, "id");
+  const i = g(t, "id");
   if (!i)
     return {
       type: "error",
@@ -765,7 +761,7 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
     };
   if (r.includes("presentation/2") || r.includes("presentation/3")) {
     const s = r.includes("presentation/2") ? 2 : 3;
-    return m(t, "type").includes("Collection") ? {
+    return g(t, "type").includes("Collection") ? {
       type: "collection",
       url: e || i,
       resource: qt(t, s)
@@ -832,7 +828,8 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
         height: p.height,
         images: f,
         annotations: p.annotations || [],
-        getImageURL: kt(p, f),
+        getImageURL: f.length > 0 ? f[0].getImageURL : () => {
+        },
         getLabel: S(p),
         getMetadata: j(p),
         getThumbnailURL: jt(p, f)
@@ -870,17 +867,16 @@ const se = (t) => m(t, "type").startsWith("ImageService") || t.profile && t.prof
       width: e,
       height: r,
       majorVersion: i.majorVersion,
-      serviceUrl: ae(m(t, "id"))
+      serviceUrl: ae(g(t, "id"))
     };
 }, Wt = { parse: oe, parseURL: Et };
 export {
   Wt as Cozy,
-  kt as getImageURL,
   O as getImageURLFromService,
   Dt as getImages,
   S as getLabel,
   j as getMetadata,
-  m as getPropertyValue,
+  g as getPropertyValue,
   Mt as getRegionURL,
   $t as getRegionURLFromService,
   zt as getStringValue,

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Manifest, Canvas, ImageService2, ImageService3, IIIFExternalWebResource, Collection, Range, AnnotationPage } from '@iiif/presentation-3';
+import { Manifest, Canvas, IIIFExternalWebResource, Collection, Range, AnnotationPage, Service } from '@iiif/presentation-3';
 export type CozyParseResult = {
     type: 'collection';
     url: string;
@@ -94,6 +94,7 @@ interface BaseImageResource {
     readonly type: 'static' | 'dynamic' | 'level0';
     readonly width: number;
     readonly height: number;
+    getImageURL(minSize?: number): string;
     getPixelSize(): Promise<{
         width: number;
         height: number;
@@ -105,7 +106,7 @@ export interface StaticImageResource extends BaseImageResource {
 }
 export interface DynamicImageServiceResource extends BaseImageResource {
     readonly type: 'dynamic';
-    readonly service: ImageService2 | ImageService3;
+    readonly service: Service;
     readonly serviceUrl: string;
     readonly majorVersion: number;
     getRegionURL(bounds: Bounds, minSize?: number): string;
@@ -113,7 +114,7 @@ export interface DynamicImageServiceResource extends BaseImageResource {
 export interface Level0ImageServiceResource extends BaseImageResource {
     readonly type: 'level0';
     readonly majorVersion: number;
-    readonly service: ImageService2 | ImageService3;
+    readonly service: Service;
     readonly serviceUrl: string;
 }
 export interface ImageRequestOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-iiif",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A developer-friendly collection of abstractions and utilities built on top of @iiif/presentation-3 and @iiif/parser",
   "license": "MIT",
   "author": "Rainer Simon",

package/src/Cozy.ts

@@ -2,8 +2,7 @@ import type { Canvas, Collection, Manifest, Range } from '@iiif/presentation-3';
 import { convertPresentation2  } from '@iiif/parser/presentation-2';
 import { Traverse } from '@iiif/parser';
 import { 
-  getImages, 
-  getImageURL, 
+  getImages,
   getLabel, 
   getMetadata, 
   getPropertyValue, 
@@ -15,7 +14,7 @@ import {
 import type { 
   CozyCanvas, 
   CozyCollection, 
-  CozyCollectionItem, 
+  CozyCollectionItem,
   CozyManifest, 
   CozyParseResult, 
   CozyRange, 
@@ -194,7 +193,7 @@ const parseManifestResource = (resource: any, majorVersion: number): CozyManifes
         height: c.height,
         images,
         annotations: (c.annotations || []),
-        getImageURL: getImageURL(c, images),
+        getImageURL: images.length > 0 ? images[0].getImageURL : () => undefined,
         getLabel: getLabel(c),
         getMetadata: getMetadata(c),
         getThumbnailURL: getThumbnailURL(c, images)

package/src/core/canvas.ts

@@ -1,5 +1,5 @@
 import { imageSize } from 'image-size';
-import type { Canvas, IIIFExternalWebResource } from '@iiif/presentation-3';
+import type { Canvas, IIIFExternalWebResource, Service } from '@iiif/presentation-3';
 import { Traverse } from '@iiif/parser';
 import { getPropertyValue } from './resource';
 import { getImageURLFromService, getRegionURL, isImageService, parseImageService } from './image-service';
@@ -43,9 +43,14 @@ export const getThumbnailURL = (canvas: Canvas, images: CozyImageResource[] = []
   }
 }
 
-export const getImageURL = (canvas: Canvas, images: CozyImageResource[] = []) => (minSize = 800) => {
-  const { width, height } = canvas;
+export const normalizeServiceUrl = (url: string) =>
+  url.endsWith('/info.json') ? url : `${url.endsWith('/') ? url : `${url}/`}info.json`;
 
+const getImageURL = (
+  width: number | undefined, 
+  height: number | undefined, 
+  service: Service  
+) => (minSize = 800) => {
   if (!width || !height) return;
 
   const aspect = width / height;
@@ -54,18 +59,9 @@ export const getImageURL = (canvas: Canvas, images: CozyImageResource[] = []) =>
   const h = Math.ceil(isPortrait ? minSize / aspect : minSize);
   const w = Math.ceil(isPortrait ? minSize : minSize / aspect);
 
-  for (const image of images) {
-    if (image.type === 'dynamic' || image.type === 'level0') {
-      return getImageURLFromService(image.service, w, h);
-    } else if (image.type === 'static') {
-      return image.url;
-    }    
-  }
+  return getImageURLFromService(service!, w, h);
 }
 
-export const normalizeServiceUrl = (url: string) =>
-  url.endsWith('/info.json') ? url : `${url.endsWith('/') ? url : `${url}/`}info.json`;
-
 const getPixelSizeFromServiceUrl = (serviceUrl: string) => () =>
   fetch(serviceUrl).then(res => res.json()).then(data => {
     const width: number = data.width;
@@ -83,8 +79,7 @@ const getStaticImagePixelSize = (url: string) => () => {
         bitmap.close(); 
         return { width, height }
       });
-    } else {
-      return blob.arrayBuffer().then(buffer => 
+    } else {      return blob.arrayBuffer().then(buffer => 
         imageSize(new Uint8Array(buffer)));
     }
   });
@@ -99,7 +94,7 @@ const toCozyImageResource = (resource: IIIFExternalWebResource) => {
 
   const service = imageService ? parseImageService(imageService) : undefined; 
 
-  if (service) {
+  if (imageService && service) {
     const serviceUrl = normalizeServiceUrl(getPropertyValue<string>(imageService, 'id'));
 
     const image = {
@@ -110,6 +105,7 @@ const toCozyImageResource = (resource: IIIFExternalWebResource) => {
       height,
       majorVersion: service.majorVersion,
       serviceUrl,
+      getImageURL: getImageURL(width, height, imageService),
       getPixelSize: getPixelSizeFromServiceUrl(serviceUrl)
     } as ImageServiceResource;
 
@@ -129,6 +125,7 @@ const toCozyImageResource = (resource: IIIFExternalWebResource) => {
       height,
       url: id,
       format,
+      getImageURL: () => id,
       getPixelSize: getStaticImagePixelSize(id)
     } as StaticImageResource;
   }

package/src/core/image-service.ts

@@ -36,7 +36,7 @@ export const parseImageService = (service: Service) => {
 }
 
 export const getImageURLFromService = (
-  service: ImageService2 | ImageService3,
+  service: Service,
   width: number,
   height: number
 ): string => {
@@ -66,7 +66,7 @@ export const getImageURLFromService = (
 }
 
 export const getRegionURLFromService = (
-  service: ImageService2 | ImageService3,
+  service: Service,
   bounds: Bounds,
   minSize: number
 ): string | undefined => {

package/src/types.ts

@@ -1,12 +1,11 @@
 import type {
   Manifest, 
-  Canvas, 
-  ImageService2, 
-  ImageService3, 
+  Canvas,
   IIIFExternalWebResource, 
   Collection, 
   Range, 
-  AnnotationPage 
+  AnnotationPage, 
+  Service
 } from '@iiif/presentation-3';
 
 export type CozyParseResult = 
@@ -169,6 +168,8 @@ interface BaseImageResource {
 
   readonly height: number;
 
+  getImageURL(minSize?: number): string;
+
   getPixelSize(): Promise<{ width: number, height: number }>;
 
 }
@@ -185,7 +186,7 @@ export interface DynamicImageServiceResource extends BaseImageResource {
 
   readonly type: 'dynamic';
 
-  readonly service: ImageService2 | ImageService3;
+  readonly service: Service;
 
   readonly serviceUrl: string;
 
@@ -201,7 +202,7 @@ export interface Level0ImageServiceResource extends BaseImageResource {
 
   readonly majorVersion: number;
 
-  readonly service: ImageService2 | ImageService3;
+  readonly service: Service;
 
   readonly serviceUrl: string;