Support for IIIF Presentation API 3.0 #224
Conversation
|
Thank you for the PR! And sorry it took so long to review :-( A few things in addition to the line-comments:
As for the length-check on the body, I think the purpose is to check if the resource needs to be fetched from an external URI (in this case the body has a single key, |
| if (!annotationJson.resources.some(hasExternalResource)) { | ||
| if (naiveIIIFv3Check(annotationJson)) { | ||
| // We treat this as IIIF 3.0 | ||
| yield fetchExternalAnnotationResourceIIIFv3({ targetId, annotationId, annotationJson }); |
There was a problem hiding this comment.
Did you verify that this works? I think delegating to other sagas should either use the call effect or yield* to yield all of the effects from the delegated saga?
| } | ||
|
|
||
| /** Fetching external annotation resources IIIF 2.x style */ | ||
| export function* fetchExternalAnnotationResourcesIIIFv2({ |
There was a problem hiding this comment.
I don't think this needs to be exported, since it's an internal API, non?
| @@ -151,8 +180,48 @@ export function* fetchExternalAnnotationResources({ targetId, annotationId, anno | |||
| ); | |||
| } | |||
|
|
|||
| /** Fetching external annotation resources IIIF 3.0 style */ | |||
| export function* fetchExternalAnnotationResourceIIIFv3({ targetId, annotationId, annotationJson }) { | |||
There was a problem hiding this comment.
Same as for v2, I don't the export is needed.
| } | ||
| const resourceUris = uniq(annotationJson.items.map((anno) => anno.body.id.split('#')[0])); | ||
|
|
||
| console.log(resourceUris); |
There was a problem hiding this comment.
I don't think that should be in there :-)
|
|
||
| console.log(resourceUris); | ||
| const contents = yield all(resourceUris.map((uri) => call(fetchAnnotationResource, uri))); | ||
| const contentMap = Object.fromEntries(contents.map((c) => [c.id ?? c['@id'], c])); |
There was a problem hiding this comment.
Is the c.id ?? c['@id'] check neccessary given that we know we're operating in a IIIFv3 context?
| @@ -168,6 +237,24 @@ export function* processTextsFromAnnotations({ targetId, annotationId, annotatio | |||
| } | |||
| } | |||
|
|
|||
| /** Saga for processing texts from IIIF annotations IIIF 3.0 */ | |||
| export function* processTextsFromAnnotationsIIIFv3({ targetId, annotationId, annotationJson }) { | |||
There was a problem hiding this comment.
Same as for the other v2/v3 sagas, I don't think the export is needed.
| anno.motivation === 'supplementing' && | ||
| anno.type === 'Annotation' && | ||
| anno.body && | ||
| anno.body.type === 'TextualBody' // See https://www.w3.org/TR/annotation-model/#embedded-textual-body |
There was a problem hiding this comment.
I think those two can be simplified to anno.body?.type === 'TextualBody'
Based on sauterl's work. Passed test for following kind of annotation.
{ "id": `${this.baseUrl}/c/3/${canvasUuid}/ap/c/a/${annoUuid}`, "type": "Annotation", "motivation": "supplementing", "body": { "type": "TextualBody", "value": comment, "format": "text/plain", "language": "zh-Hants" }, "target": `${this.baseUrl}/c/3/${canvasUuid}#${fragmentSelector}`, }Although not sure what following code means in hasExternalResourceV3