Skip to content
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

Moving away from oneOf #155

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

Moving away from oneOf #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ac36c92
Adding AnnotationPageRef
glenrobson Nov 18, 2022
3db9b43
Fixing json
glenrobson Nov 18, 2022
a89ae52
Adding rendering where it is allowed
glenrobson Dec 9, 2022
85b433e
Adding specific support for accompanyingCanvas and placeholderCanvas
glenrobson Dec 9, 2022
3d1894a
Fixing missing anno page ref
glenrobson Dec 9, 2022
46e2481
Merge branch 'main' into issue-154
glenrobson Dec 9, 2022
87ed148
Only run tests on push
glenrobson Dec 9, 2022
ee463e4
Moving away from oneOf to if/then/else
glenrobson Dec 10, 2022
e888a6e
Adding latest changes
glenrobson Mar 2, 2023
6d0f72c
Removing retrieved from json response
glenrobson Feb 10, 2021
ece3222
Expanding definition for target source
glenrobson Mar 2, 2023
b70ce23
Adding annotationPageRef
glenrobson Mar 2, 2023
d5fe161
Fixing tests
glenrobson Mar 3, 2023
5b53d0b
Moving valid fixtures to separate directory
glenrobson Mar 3, 2023
6046d4a
Moving invalid tests to its own directory
glenrobson Mar 3, 2023
66db536
Moving to if/then/else
glenrobson Mar 8, 2023
e8a6820
Merge branch 'main' into issue-154
glenrobson Mar 8, 2023
18800bb
Typing the point selector
glenrobson Mar 9, 2023
b897aa7
Adding SVG selector
glenrobson Mar 9, 2023
735d31c
Adding ImageApiSelector
glenrobson Mar 9, 2023
6a6d937
Merge branch 'main' into issue-154
glenrobson Mar 9, 2023
9c074fc
Adding specific resource to body
glenrobson Mar 9, 2023
45bf97c
Moving to cascading if statements
glenrobson Mar 9, 2023
9e4c5ad
Simplifying if statement
glenrobson Mar 13, 2023
07785f7
Fixing name clash with other library
glenrobson Mar 13, 2023
b29df86
refactoring if/then/else block
glenrobson Mar 13, 2023
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
0 fixtures/3/broken_choice.json → fixtures/3/invalid/broken_choice.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/broken_collection.json → fixtures/3/invalid/broken_collection.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/broken_embedded_annos.json → ...ures/3/invalid/broken_embedded_annos.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/broken_service.json → fixtures/3/invalid/broken_service.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/broken_simple_image.json → fixtures/3/invalid/broken_simple_image.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/collection_of_canvases.json → ...res/3/invalid/collection_of_canvases.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/non_cc_license.json → fixtures/3/invalid/non_cc_license.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/old_format_label.json → fixtures/3/invalid/old_format_label.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/rights_lang_issues.json → fixtures/3/invalid/rights_lang_issues.json
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions fixtures/3/valid/0306-manifest-link-annos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"@context": "http://iiif.io/api/presentation/3/context.json",
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/annotationpage.json",
"type": "AnnotationPage",
"items": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1/annopage-2/anno-1",
"type": "Annotation",
"motivation": "commenting",
"body": {
"type": "TextualBody",
"language": "de",
"format": "text/plain",
"value": "Der Gänseliesel-Brunnen"
},
"target": {
"type": "SpecificResource",
"source": {
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1",
"type": "Canvas",
"partOf": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/annotationpage.json",
"type": "Manifest"
}
]
},
"selector": {
"type": "FragmentSelector",
"conformsTo": "http://www.w3.org/TR/media-frags/",
"value": "xywh=300,800,1200,1200"
}
}
}
]
}
52 changes: 52 additions & 0 deletions fixtures/3/valid/0306-manifest-link-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"@context": "http://iiif.io/api/presentation/3/context.json",
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/manifest.json",
"type": "Manifest",
"label": {
"en": [
"Picture of Göttingen taken during the 2019 IIIF Conference"
]
},
"items": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1",
"type": "Canvas",
"height": 3024,
"width": 4032,
"items": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1/annopage-1",
"type": "AnnotationPage",
"items": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1/annopage-1/anno-1",
"type": "Annotation",
"motivation": "painting",
"body": {
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen/full/max/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"height": 3024,
"width": 4032,
"service": [
{
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen",
"profile": "level1",
"type": "ImageService3"
}
]
},
"target": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/canvas-1"
}
]
}
],
"annotations": [
{
"id": "https://preview.iiif.io/cookbook/0306-linking-annotations-to-manifests/recipe/0306-linking-annotations-to-manifests/annotationpage.json",
"type": "AnnotationPage"
}
]
}
]
}
0 fixtures/3/accompanyingCanvas.json → fixtures/3/valid/accompanyingCanvas.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/annoPage.json → fixtures/3/valid/annoPage.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/annoPageMultipleMotivations.json → .../3/valid/annoPageMultipleMotivations.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/anno_pointselector.json → fixtures/3/valid/anno_pointselector.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/anno_source.json → fixtures/3/valid/anno_source.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/choice.json → fixtures/3/valid/choice.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/collection.json → fixtures/3/valid/collection.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/collection_of_collections.json → ...es/3/valid/collection_of_collections.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/extension_anno.json → fixtures/3/valid/extension_anno.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion fixtures/3/full_example.json → fixtures/3/valid/full_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
{
"@id": "https://example.org/iiif/auth/token",
"@type": "AuthTokenService1",
"profile": "http://iiif.io/api/auth/1/token"
"profile": "http://iiif.io/api/auth/1/token"
}
]
}
Expand Down
0 fixtures/3/multi_bodies.json → fixtures/3/valid/multi_bodies.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/navPlace.json → fixtures/3/valid/navPlace.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/old_cc_license.json → fixtures/3/valid/old_cc_license.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/placeholderCanvas.json → fixtures/3/valid/placeholderCanvas.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/publicdomain.json → fixtures/3/valid/publicdomain.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/range_range.json → fixtures/3/valid/range_range.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/rightsstatement_license.json → ...ures/3/valid/rightsstatement_license.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/simple_video.json → fixtures/3/valid/simple_video.json
View file
Open in desktop
File renamed without changes.
0 fixtures/3/version2image.json → fixtures/3/valid/version2image.json
View file
Open in desktop
File renamed without changes.
Loading