Merge pull request #176 from IIIF/allow_strings_anno_page

Allowing strings for AnnotationPage references

Author: glenrobson

schema/iiif_3_0.json

@@ -598,18 +598,25 @@
             ]    
         },  
         "annotationPageRef": {
-            "allOf": [
-                { "$ref": "#/types/reference" },
+            "oneOf": [
                 {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string",
-                            "pattern": "^AnnotationPage$"
+                    "type": "string"
+                },
+                {
+                    "allOf": [
+                        { "$ref": "#/types/reference" },
+                        {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string",
+                                    "pattern": "^AnnotationPage$"
+                                }
+                            }
                         }
-                    }
+                    ]    
                 }
-            ]    
+            ]
         }, 
         "canvas": {
             "allOf": [
@@ -812,6 +819,10 @@
                         "first": { "$ref": "#/classes/annotationPageRef" },
                         "last": { "$ref": "#/classes/annotationPageRef" },
                         "service": { "$ref": "#/classes/service" },
+                        "total": {
+                            "type": "integer",
+                            "exclusiveMinimum": 0
+                        },
                         "thumbnail": {
                             "type": "array",
                             "items": { "$ref": "#/classes/resource" }
@@ -876,6 +887,7 @@
                             }
                         },
                         "next": { "$ref": "#/classes/annotationPageRef" },
+                        "prev": { "$ref": "#/classes/annotationPageRef" },
                         "first": { "$ref": "#/classes/annotationPageRef" },
                         "last": { "$ref": "#/classes/annotationPageRef" }
                     },
@@ -1151,6 +1163,7 @@
     "oneOf": [
         { "$ref": "#/classes/manifest" },
         { "$ref": "#/classes/collection" },
+        { "$ref": "#/classes/annotationCollection" },
         { "$ref": "#/classes/annotationPage" }
      ]
 }