Building blocks postprocessing

opengeospatial · Nov 8, 2023 · 8fe98fe · 8fe98fe
1 parent 96941d6
commit 8fe98fe
Show file tree

Hide file tree

Showing 112 changed files with 816 additions and 895 deletions.
diff --git a/annotated-schemas/geo/json-fg/feature-lenient/context.jsonld b/annotated-schemas/geo/json-fg/feature-lenient/context.jsonld
@@ -23,6 +23,7 @@
     },
     "type": "@type",
     "id": "@id",
+    "featureType": "@type",
     "links": {
       "@context": {
         "href": "oa:hasTarget",

diff --git a/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.json b/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.json
@@ -31,9 +31,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {

diff --git a/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.yaml b/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.yaml
@@ -18,8 +18,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature-lenient/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items:

diff --git a/annotated-schemas/geo/json-fg/feature-lenient/schema.json b/annotated-schemas/geo/json-fg/feature-lenient/schema.json
@@ -30,7 +30,8 @@
           "x-jsonld-id": "@id"
         },
         "featureType": {
-          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json"
+          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json",
+          "x-jsonld-id": "@type"
         },
         "links": {
           "type": "array",

diff --git a/annotated-schemas/geo/json-fg/feature-lenient/schema.yaml b/annotated-schemas/geo/json-fg/feature-lenient/schema.yaml
@@ -18,6 +18,7 @@ allOf:
       x-jsonld-id: '@id'
     featureType:
       $ref: https://beta.schemas.opengis.net/json-fg/featuretype.json
+      x-jsonld-id: '@type'
     links:
       type: array
       items:

diff --git a/annotated-schemas/geo/json-fg/feature/context.jsonld b/annotated-schemas/geo/json-fg/feature/context.jsonld
@@ -23,6 +23,7 @@
     },
     "type": "@type",
     "id": "@id",
+    "featureType": "@type",
     "links": {
       "@context": {
         "href": "oa:hasTarget",

diff --git a/annotated-schemas/geo/json-fg/feature/schema-oas3.0.json b/annotated-schemas/geo/json-fg/feature/schema-oas3.0.json
@@ -35,9 +35,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {

diff --git a/annotated-schemas/geo/json-fg/feature/schema-oas3.0.yaml b/annotated-schemas/geo/json-fg/feature/schema-oas3.0.yaml
@@ -22,8 +22,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items:

diff --git a/annotated-schemas/geo/json-fg/feature/schema.json b/annotated-schemas/geo/json-fg/feature/schema.json
@@ -35,7 +35,8 @@
           "x-jsonld-id": "@id"
         },
         "featureType": {
-          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json"
+          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json",
+          "x-jsonld-id": "@type"
         },
         "links": {
           "type": "array",

diff --git a/annotated-schemas/geo/json-fg/feature/schema.yaml b/annotated-schemas/geo/json-fg/feature/schema.yaml
@@ -23,6 +23,7 @@ allOf:
       x-jsonld-id: '@id'
     featureType:
       $ref: https://beta.schemas.opengis.net/json-fg/featuretype.json
+      x-jsonld-id: '@type'
     links:
       type: array
       items:

diff --git a/annotated-schemas/geo/json-fg/featureCollection-lenient/context.jsonld b/annotated-schemas/geo/json-fg/featureCollection-lenient/context.jsonld
@@ -1,6 +1,7 @@
 {
   "@context": {
     "type": "@type",
+    "featureType": "geojson:collectionFeatureType",
     "links": {
       "@context": {
         "href": "oa:hasTarget",
@@ -20,23 +21,15 @@
     },
     "features": {
       "@context": {
-        "coordinates": {
-          "@container": "@list",
-          "@id": "geojson:coordinates"
-        }
+        "featureType": "@type"
       },
       "@container": "@set",
       "@id": "geojson:features"
     },
     "properties": "@nest",
     "id": "@id",
     "geometry": {
-      "@context": {
-        "coordinates": {
-          "@container": "@list",
-          "@id": "geojson:coordinates"
-        }
-      },
+      "@context": {},
       "@id": "geojson:geometry"
     },
     "bbox": {
@@ -53,8 +46,8 @@
     "Point": "geojson:Point",
     "Polygon": "geojson:Polygon",
     "coordinates": {
-      "x-jsonld-container": "@list",
-      "x-jsonld-id": "https://purl.org/geojson/vocab#coordinates"
+      "@container": "@list",
+      "@id": "geojson:coordinates"
     },
     "geojson": "https://purl.org/geojson/vocab#",
     "rdfs": "http://www.w3.org/2000/01/rdf-schema#",

diff --git a/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.json b/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.json
@@ -18,9 +18,7 @@
               ],
               "x-jsonld-id": "@type"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "geometryDimension": {
               "type": "integer",
               "minimum": 0,
@@ -266,9 +264,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {

diff --git a/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.yaml b/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.yaml
@@ -13,8 +13,7 @@ x-defs:
           enum:
           - FeatureCollection
           x-jsonld-id: '@type'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         geometryDimension:
           type: integer
           minimum: 0
@@ -172,8 +171,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection-lenient/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items:

diff --git a/annotated-schemas/geo/json-fg/featureCollection-lenient/schema.json b/annotated-schemas/geo/json-fg/featureCollection-lenient/schema.json
@@ -18,7 +18,8 @@
           "x-jsonld-id": "@type"
         },
         "featureType": {
-          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json"
+          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json",
+          "x-jsonld-id": "https://purl.org/geojson/vocab#collectionFeatureType"
         },
         "geometryDimension": {
           "type": "integer",

diff --git a/annotated-schemas/geo/json-fg/featureCollection-lenient/schema.yaml b/annotated-schemas/geo/json-fg/featureCollection-lenient/schema.yaml
@@ -14,6 +14,7 @@ allOf:
       x-jsonld-id: '@type'
     featureType:
       $ref: https://beta.schemas.opengis.net/json-fg/featuretype.json
+      x-jsonld-id: https://purl.org/geojson/vocab#collectionFeatureType
     geometryDimension:
       type: integer
       minimum: 0

diff --git a/annotated-schemas/geo/json-fg/featureCollection/context.jsonld b/annotated-schemas/geo/json-fg/featureCollection/context.jsonld
@@ -1,6 +1,7 @@
 {
   "@context": {
     "type": "@type",
+    "featureType": "geojson:collectionFeatureType",
     "links": {
       "@context": {
         "href": "oa:hasTarget",
@@ -20,23 +21,15 @@
     },
     "features": {
       "@context": {
-        "coordinates": {
-          "@container": "@list",
-          "@id": "geojson:coordinates"
-        }
+        "featureType": "@type"
       },
       "@container": "@set",
       "@id": "geojson:features"
     },
     "properties": "@nest",
     "id": "@id",
     "geometry": {
-      "@context": {
-        "coordinates": {
-          "@container": "@list",
-          "@id": "geojson:coordinates"
-        }
-      },
+      "@context": {},
       "@id": "geojson:geometry"
     },
     "bbox": {
@@ -53,8 +46,8 @@
     "Point": "geojson:Point",
     "Polygon": "geojson:Polygon",
     "coordinates": {
-      "x-jsonld-container": "@list",
-      "x-jsonld-id": "https://purl.org/geojson/vocab#coordinates"
+      "@container": "@list",
+      "@id": "geojson:coordinates"
     },
     "geojson": "https://purl.org/geojson/vocab#",
     "rdfs": "http://www.w3.org/2000/01/rdf-schema#",

diff --git a/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.json b/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.json
@@ -21,9 +21,7 @@
               ],
               "x-jsonld-id": "@type"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "geometryDimension": {
               "type": "integer",
               "minimum": 0,
@@ -315,9 +313,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {

diff --git a/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.yaml b/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.yaml
@@ -14,8 +14,7 @@ x-defs:
           enum:
           - FeatureCollection
           x-jsonld-id: '@type'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         geometryDimension:
           type: integer
           minimum: 0
@@ -205,8 +204,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items:

diff --git a/annotated-schemas/geo/json-fg/featureCollection/schema.json b/annotated-schemas/geo/json-fg/featureCollection/schema.json
@@ -21,7 +21,8 @@
           "x-jsonld-id": "@type"
         },
         "featureType": {
-          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json"
+          "$ref": "https://beta.schemas.opengis.net/json-fg/featuretype.json",
+          "x-jsonld-id": "https://purl.org/geojson/vocab#collectionFeatureType"
         },
         "geometryDimension": {
           "type": "integer",

diff --git a/annotated-schemas/geo/json-fg/featureCollection/schema.yaml b/annotated-schemas/geo/json-fg/featureCollection/schema.yaml
@@ -15,6 +15,7 @@ allOf:
       x-jsonld-id: '@type'
     featureType:
       $ref: https://beta.schemas.opengis.net/json-fg/featuretype.json
+      x-jsonld-id: https://purl.org/geojson/vocab#collectionFeatureType
     geometryDimension:
       type: integer
       minimum: 0

diff --git a/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.json b/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.json
@@ -376,9 +376,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {
@@ -735,9 +733,7 @@
               ],
               "x-jsonld-id": "@type"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "geometryDimension": {
               "type": "integer",
               "minimum": 0,

diff --git a/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.yaml b/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.yaml
@@ -266,8 +266,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items:
@@ -513,8 +512,7 @@ x-defs:
           enum:
           - FeatureCollection
           x-jsonld-id: '@type'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/examples/vectorObservationFeature/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         geometryDimension:
           type: integer
           minimum: 0

diff --git a/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.json b/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.json
@@ -157,9 +157,7 @@
               ],
               "x-jsonld-id": "@id"
             },
-            "featureType": {
-              "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.json#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json"
-            },
+            "featureType": {},
             "links": {
               "type": "array",
               "items": {

diff --git a/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.yaml b/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.yaml
@@ -118,8 +118,7 @@ x-defs:
           - type: number
           - type: string
           x-jsonld-id: '@id'
-        featureType:
-          $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/features/observation/schema-oas3.0.yaml#/x-defs/beta.schemas.opengis.net_json-fg_featuretype.json
+        featureType: {}
         links:
           type: array
           items: