Merge branch 'main' into iiif-prezi-issue-122

Author: glenrobson

fixtures/3/anno_source.json

@@ -78,6 +78,7 @@
                               "format": "text/plain"
                             },
                             "target": {
+                              "type":"SpecificResource",
                               "source": "https://iiif.io/api/image/3.0/example/reference/421e65be2ce95439b3ad6ef1f2ab87a9-dee-xray/full/max/0/default.jpg#xywh=810,900,260,370",
                               "scope": "https://preview.iiif.io/cookbook/0326-annotating-image-layer/recipe/0326-annotating-image-layer/canvas/p1"
                             }
@@ -95,4 +96,4 @@
       ]
     }
   ]
-}
+}

schema/iiif_3_0.json

@@ -980,15 +980,6 @@
                 },
                 {
                     "$ref": "#/classes/specificResource"
-                },
-                {
-                    "title": "Annotation target can also contain just scope and source",
-                    "type": "object",
-                    "properties": {
-                        "source": { "$ref": "#/types/id" },
-                        "scope": { "$ref": "#/types/id" }
-                    }, 
-                    "required": ["source", "scope"]
                 }
             ]
         },
@@ -1009,6 +1000,7 @@
                         { "$ref": "#/types/class" }
                     ]
                 },
+                "scope": { "$ref": "#/types/id"},
                 "selector": { 
                     "oneOf": [    
                         { "$ref": "#/classes/selector" },
@@ -1021,7 +1013,7 @@
                     ]
                 }
             },
-            "required": ["source", "selector"]
+            "required": ["source"]
         },
         "selector": {
             "oneOf": [
@@ -1150,6 +1142,7 @@
                                         ]
                                     },
                                     { "$ref": "#/classes/range" },
+                                    { "$ref": "#/classes/rangeRef" },
                                     { "$ref": "#/classes/canvasRef" }
                                 ]
                             }