Merge b46738b into 1e3d9df

IIIF · Apr 29, 2022 · f11df69 · f11df69
2 parents 1e3d9df + b46738b
commit f11df69
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 1 deletion.
diff --git a/fixtures/3/navPlace.json b/fixtures/3/navPlace.json
@@ -0,0 +1,59 @@
+{
+  "@context" : [
+    "http://iiif.io/api/extension/navplace/context.json",
+    "http://iiif.io/api/presentation/3/context.json"
+  ],
+  "id" : "https://iiif.io/api/cookbook/recipe/0154-geo-extension/manifest.json",
+  "type" : "Manifest",
+  "label" : {
+    "it" : [ "Bronzo Laocoonte e i suoi figli" ]
+  },
+  "navPlace" : {
+    "id" : "https://iiif.io/api/cookbook/recipe/0154-geo-extension/location.json",
+    "type" : "FeatureCollection",
+    "features" : [ {
+      "type" : "Feature",
+      "properties" : {
+        "label" : {
+          "en" : [ "The Laocoön Bronze" ],
+          "it" : [ "Bronzo Laocoonte e i suoi figli" ]
+        }
+      },
+      "geometry" : {
+        "type" : "Point",
+        "coordinates" : [ -118.4745559, 34.0776376 ]
+      }
+    } ]
+  },
+  "items" : [ {
+    "id": "https://iiif.io/api/cookbook/recipe/0154-geo-extension/canvas/1",
+    "type" : "Canvas",
+    "height" : 3000,
+    "width" : 2315,
+    "label" : {
+      "en" : [ "Front of Bronze" ]
+    },
+    "items" : [ {
+      "id" : "https://iiif.io/api/cookbook/recipe/0154-geo-extension/anno-page/1",
+      "type" : "AnnotationPage",
+      "items" : [ {
+        "id" : "https://iiif.io/api/cookbook/recipe/0154-geo-extension/anno/1",
+        "type" : "Annotation",
+        "motivation" : "painting",
+        "body" : {
+          "id" : "https://iiif.io/api/image/3.0/example/reference/28473c77da3deebe4375c3a50572d9d3-laocoon/full/max/0/default.jpg",
+          "type" : "Image",
+          "format" : "image/jpg",
+          "height" : 3000,
+          "width" : 2315,
+          "service" : [ {
+            "id" : "https://iiif.io/api/image/3.0/example/reference/28473c77da3deebe4375c3a50572d9d3-laocoon",
+            "profile" : "level1",
+            "type" : "ImageService3"
+          } ]
+        },
+        "target" : "https://iiif.io/api/cookbook/recipe/0154-geo-extension/canvas/1"
+      } ]
+    } ]
+  } ]
+}
diff --git a/schema/iiif_3_0.json b/schema/iiif_3_0.json
@@ -237,6 +237,23 @@
             "type": "string",
             "format": "date-time"
         },
+        "navPlace": {
+            "type": "object",
+            "properties": {
+                "id": { "$ref": "#/types/id" },
+                "type": { 
+                    "type": "string",
+                    "default": "FeatureCollection"
+                },
+                "features": { 
+                    "type": "array",
+                    "items": {
+                        "type": "object"
+                    }
+                }
+            },
+            "required": ["id", "type"]
+        },
         "viewingDirection": {
             "anyOf": [
                 {
@@ -370,6 +387,7 @@
                         "requiredStatement": { "$ref": "#/types/keyValueString" },
                         "rights": { "$ref": "#/classes/rights" },
                         "navDate": { "$ref": "#/classes/navDate" },
+                        "navPlace": { "$ref": "#/classes/navPlace" },
                         "provider": { "$ref": "#/classes/provider" },
                         "seeAlso": { "$ref": "#/classes/seeAlso" },
                         "services": { "$ref": "#/classes/service" },
@@ -444,6 +462,7 @@
                             "items": { "$ref": "#/classes/resource" }
                         },
                         "navDate": { "$ref": "#/classes/navDate" },
+                        "navPlace": { "$ref": "#/classes/navPlace" },
                         "provider": { "$ref": "#/classes/provider" },
                         "seeAlso": { "$ref": "#/classes/seeAlso" },
                         "thumbnail": {
@@ -523,6 +542,7 @@
                         "requiredStatement": { "$ref": "#/types/keyValueString" },
                         "rights": { "$ref": "#/classes/rights" },
                         "navDate": { "$ref": "#/classes/navDate" },
+                        "navPlace": { "$ref": "#/classes/navPlace" },
                         "provider": { "$ref": "#/classes/provider" },
                         "seeAlso": { "$ref": "#/classes/seeAlso" },
                         "thumbnail": {

diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -143,7 +143,8 @@ def test07_check_manifest3(self):
                      'fixtures/3/rightsstatement_license.json',
                      'fixtures/3/extension_anno.json',
                      'fixtures/3/multi_bodies.json',
-                     'fixtures/3/publicdomain.json'
+                     'fixtures/3/publicdomain.json',
+                     'fixtures/3/navPlace.json'
                      ]:
             with open(good, 'r') as fh:
                 data = fh.read()