Building blocks postprocessing

ogcincubator · Feb 14, 2024 · 67c53d9 · 67c53d9
1 parent 883efb4
commit 67c53d9
Show file tree

Hide file tree

Showing 17 changed files with 369 additions and 175 deletions.
diff --git a/build/annotated/ogc-utils/prov/schema-oas3.0.json b/build/annotated/ogc-utils/prov/schema-oas3.0.json
@@ -5,10 +5,7 @@
       "$defs": {
         "objectref": {},
         "oneOrMoreObjectref": {
-          "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/x-defs/ogc.ogc-utils.iri-or-curie/$defs/MultipleOrObject"
-        },
-        "curie": {
-          "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/x-defs/ogc.ogc-utils.iri-or-curie"
+          "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/x-defs/ogc.ogc-utils.iri-or-curie_/$defs/MultipleOrObject"
         },
         "oneOrMoreActivitiesOrRefIds": {
           "oneOf": [
@@ -1279,6 +1276,10 @@
       "x-schema-version": "https://json-schema.org/draft/2020-12/schema",
       "x-schema-source": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json"
     },
+    "ogc.ogc-utils.iri-or-curie_": {
+      "x-schema-version": "https://json-schema.org/draft/2020-12/schema",
+      "x-schema-source": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml"
+    },
     "ogc.ogc-utils.json-link": {
       "description": "JSON Link",
       "type": "object",

diff --git a/build/annotated/ogc-utils/prov/schema-oas3.0.yaml b/build/annotated/ogc-utils/prov/schema-oas3.0.yaml
@@ -6,8 +6,6 @@ x-defs:
       objectref: {}
       oneOrMoreObjectref:
         $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/x-defs/ogc.ogc-utils.iri-or-curie/$defs/MultipleOrObject
-      curie:
-        $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/x-defs/ogc.ogc-utils.iri-or-curie
       oneOrMoreActivitiesOrRefIds:
         oneOf:
         - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/x-defs/ogc.ogc-utils.prov/$defs/objectref
@@ -717,7 +715,7 @@ x-defs:
     x-schema-source: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml
   ogc.ogc-utils.iri-or-curie:
     x-schema-version: https://json-schema.org/draft/2020-12/schema
-    x-schema-source: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json
+    x-schema-source: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml
   ogc.ogc-utils.json-link:
     description: JSON Link
     type: object
@@ -754,6 +752,6 @@ x-defs:
       rdfs: http://www.w3.org/2000/01/rdf-schema#
       dct: http://purl.org/dc/terms/
     x-schema-version: https://json-schema.org/draft/2020-12/schema
-    x-schema-source: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/json-link/schema.json
+    x-schema-source: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/json-link/schema.yaml
 allOf:
 - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/x-defs/ogc.ogc-utils.prov
diff --git a/build/annotated/ogc-utils/prov/schema.json b/build/annotated/ogc-utils/prov/schema.json
@@ -7,10 +7,7 @@
       "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json"
     },
     "oneOrMoreObjectref": {
-      "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json#/$defs/MultipleOrObject"
-    },
-    "curie": {
-      "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json"
+      "$ref": "https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml#/$defs/MultipleOrObject"
     },
     "oneOrMoreActivitiesOrRefIds": {
       "oneOf": [
@@ -136,7 +133,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "featureType": {
@@ -434,7 +431,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "activityType": {
@@ -636,7 +633,7 @@
           "x-jsonld-id": "http://www.w3.org/2000/01/rdf-schema#label"
         },
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "actedOnBehalfOf": {
@@ -740,7 +737,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -788,7 +785,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -823,7 +820,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -858,7 +855,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -898,7 +895,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -998,7 +995,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -1077,7 +1074,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -1128,7 +1125,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -1167,7 +1164,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "type": {
@@ -1216,7 +1213,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "#/$defs/curie",
+          "$ref": "#/$defs/objectref",
           "x-jsonld-id": "@id"
         },
         "influencer": {

diff --git a/build/annotated/ogc-utils/prov/schema.yaml b/build/annotated/ogc-utils/prov/schema.yaml
@@ -4,11 +4,9 @@ description: Provenance Chain using PROV-O core model supporting both an ID base
 $defs:
   objectref:
     $anchor: objectref
-    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json
+    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml
   oneOrMoreObjectref:
-    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json#/$defs/MultipleOrObject
-  curie:
-    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.json
+    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml#/$defs/MultipleOrObject
   oneOrMoreActivitiesOrRefIds:
     oneOf:
     - $ref: '#/$defs/objectref'
@@ -38,7 +36,7 @@ $defs:
         - $ref: '#/$defs/objectref'
         - $ref: '#/$defs/Agent'
   externalLink:
-    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/json-link/schema.json
+    $ref: https://opengeospatial.github.io/bblocks/annotated-schemas/ogc-utils/json-link/schema.yaml
   influenced:
     type: object
     properties:
@@ -64,7 +62,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       featureType:
         $ref: '#/$defs/oneOrMoreObjectref'
@@ -237,7 +235,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       activityType:
         $ref: '#/$defs/oneOrMoreObjectref'
@@ -348,7 +346,7 @@ $defs:
         type: string
         x-jsonld-id: http://www.w3.org/2000/01/rdf-schema#label
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       actedOnBehalfOf:
         $ref: '#/$defs/oneOrMoreAgentsOrRefIds'
@@ -408,7 +406,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -437,7 +435,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -459,7 +457,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -481,7 +479,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -503,7 +501,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -551,7 +549,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -594,7 +592,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -622,7 +620,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -644,7 +642,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       type:
         oneOf:
@@ -674,7 +672,7 @@ $defs:
     type: object
     properties:
       id:
-        $ref: '#/$defs/curie'
+        $ref: '#/$defs/objectref'
         x-jsonld-id: '@id'
       influencer:
         anyOf:

diff --git a/build/bblocks.jsonld b/build/bblocks.jsonld
@@ -101,12 +101,12 @@
   "name": "JSON schema for W3C PROV model",
   "abstract": "Defines a graph structure based on an array of objects implementing PROV defined classes with object cross references",
   "description": "Provenance defined using the [W3C PROV-O model](https://www.w3.org/TR/prov-o/) is a DAG (non-cyclic graph) based on three main object types: Entity, Activity and Agent.\n\nThis repository defines a JSON schema and matching JSON-LD context for this model, using the canonical terminology used in the PROV ontology as element names.\n\nIt also defines a context for an optional schema property \"has_provenance\" that can be used to wrap a provenance graph as an array of such objects, to extend the prov:wasGeneratedBy (whose range is one or more Entity objects) with an explicit schema.\n\n![](https://www.w3.org/TR/prov-o/diagrams/starting-points.svg)\n",
-  "modified": "2024-02-14T01:05:35.265609",
+  "modified": "2024-02-14T13:13:40.560760",
   "tooling": {
     "bblocks-postprocess": {
-      "commitId": "\"14ee607a3043861f45036785e2601c2f26d55790",
-      "shortCommitId": "\"14ee60",
-      "date": "2024-02-08T21:40:56+00:00\""
+      "commitId": "\"f1524d4be86ad518fe2171afb718331441cbbafa",
+      "shortCommitId": "\"f1524d",
+      "date": "2024-02-14T11:39:04+00:00\""
     }
   },
   "gitRepository": "https://github.com/ogcincubator/bblock-prov-schema",
@@ -147,8 +147,8 @@
       ],
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.json-link",
-        "ogc.ogc-utils.iri-or-curie"
+        "ogc.ogc-utils.iri-or-curie",
+        "ogc.ogc-utils.json-link"
       ],
       "ldContext": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/context.jsonld",
       "schema": {
@@ -158,7 +158,7 @@
       "sourceLdContext": "https://ogcincubator.github.io/bblock-prov-schema/_sources/context.jsonld",
       "sourceSchema": "https://ogcincubator.github.io/bblock-prov-schema/_sources/schema.json",
       "sourceFiles": "https://ogcincubator.github.io/bblock-prov-schema/_sources/",
-      "validationPassed": true,
+      "validationPassed": false,
       "testOutputs": "https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/",
       "documentation": {
         "markdown": {

diff --git a/build/bblocks.ttl b/build/bblocks.ttl
@@ -15,10 +15,10 @@
     dct:created "2023-07-10T00:00:00+00:00"^^xsd:dateTime ;
     dct:description [ dct:format "text/html" ;
             rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/slate-build/ogc-utils/prov/" ],
-        [ dct:format "text/markdown" ;
-            rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/markdown/ogc-utils/prov/index.md" ],
         [ dct:format "text/html" ;
             rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/bblock/ogc.ogc-utils.prov" ],
+        [ dct:format "text/markdown" ;
+            rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/markdown/ogc-utils/prov/index.md" ],
         [ dct:format "application/json" ;
             rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/json-full/ogc-utils/prov/index.json" ] ;
     dct:hasVersion "0.1" ;
@@ -55,15 +55,15 @@ It also defines a context for an optional schema property "has_provenance" that
 <https://www.w3.org/TR/prov-o/> rdfs:label "The PROV-O vocabulary" .
 
 [] a prov:Activity ;
-    prov:endedAtTime "2024-02-14T01:05:44.554419"^^xsd:dateTime ;
-    prov:startedAtTime "2024-02-14T01:05:44.494456"^^xsd:dateTime ;
+    prov:endedAtTime "2024-02-14T13:13:49.480158"^^xsd:dateTime ;
+    prov:startedAtTime "2024-02-14T13:13:49.420400"^^xsd:dateTime ;
     prov:used [ a prov:Entity ;
-            dct:format "application/yaml" ;
-            rdfs:seeAlso <file:///src/ogc/bblocks/register-context.yaml> ],
-        [ a prov:Entity ;
             dct:format "application/json" ;
-            dct:hasVersion "git:ee4d619cc0988dcde4be0b657f59e555c947695c" ;
-            rdfs:seeAlso <https://ogcincubator.github.io/bblock-prov-schema/build/register.json> ] ;
+            dct:hasVersion "git:883efb4bd1f96f722356711cc3940f4695012188" ;
+            rdfs:seeAlso <https://ogcincubator.github.io/bblock-prov-schema/build/register.json> ],
+        [ a prov:Entity ;
+            dct:format "application/yaml" ;
+            rdfs:seeAlso <file:///src/ogc/bblocks/register-context.yaml> ] ;
     prov:wasAssociatedWith [ a prov:Agent,
                 schema:SoftwareApplication ;
             rdfs:label "OGC-NA tools" ;