Fix JSON-FG "links" and "type"

opengeospatial · Aug 31, 2023 · b02a55c · b02a55c
1 parent 7026a32
commit b02a55c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/registereditems/geo/json-fg/feature/context.jsonld b/registereditems/geo/json-fg/feature/context.jsonld
@@ -28,11 +28,6 @@
     "id": "@id",
     "properties": "@nest",
     "type": "@type",
-    "links": {
-      "@id": "rdfs:seeAlso",
-      "@context": {
-
-      }
-    }
+    "links": "rdfs:seeAlso"
   }
 }
diff --git a/registereditems/geo/json-fg/featureCollection-lenient/context.jsonld b/registereditems/geo/json-fg/featureCollection-lenient/context.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "geojson": "https://purl.org/geojson/vocab#",
+    "features": {
+      "@container": "@set",
+      "@id": "geojson:features"
+    },
+    "links": "rdfs:seeAlso",
+    "type": "@type"
+  }
+}
diff --git a/registereditems/geo/json-fg/featureCollection/bblock.json b/registereditems/geo/json-fg/featureCollection/bblock.json
@@ -13,9 +13,6 @@
       "link": "http://docs.ogc.org/per/21-017r1.html"
     }
   ],
-  "schema": [
-    "https://beta.schemas.opengis.net/json-fg/featurecollection.json"
-  ],
   "scope": "geo",
   "group": "JSON-FG"
 }
diff --git a/registereditems/geo/json-fg/featureCollection/context.jsonld b/registereditems/geo/json-fg/featureCollection/context.jsonld
@@ -4,6 +4,8 @@
     "features": {
       "@container": "@set",
       "@id": "geojson:features"
-    }
+    },
+    "links": "rdfs:seeAlso",
+    "type": "@type"
   }
 }
diff --git a/registereditems/geo/json-fg/featureCollection/schema.json b/registereditems/geo/json-fg/featureCollection/schema.json
@@ -23,13 +23,20 @@
     "links": {
       "type": "array",
       "items": {
-        "$ref": "https://beta.schemas.opengis.net/json-fg/link.json"
+        "allOf": [
+          {
+            "$ref": "https://beta.schemas.opengis.net/json-fg/link.json"
+          },
+          {
+            "$ref": "bblocks://ogc.ogc-utils.json-link"
+          }
+        ]
       }
     },
     "features": {
       "type": "array",
       "items": {
-        "$ref": "bblock://ogc.geo.json-fg.feature"
+        "$ref": "bblocks://ogc.geo.json-fg.feature"
       }
     }
   }