Building blocks postprocessing

opengeospatial · Dec 18, 2023 · 0a34c9b · 0a34c9b
1 parent 3651ffd
commit 0a34c9b
Show file tree

Hide file tree

Showing 164 changed files with 8,746 additions and 751 deletions.
diff --git a/annotated-schemas/ogc-utils/iri-or-curie/schema-oas3.0.json b/annotated-schemas/ogc-utils/iri-or-curie/schema-oas3.0.json
@@ -5,15 +5,15 @@
       "$defs": {
         "IRI": {
           "type": "string",
-          "pattern": "^\\w+:(\\/?\\/?)[^\\s]+$"
+          "pattern": "^\\w+:/*([^:<>{}|\\\\^`\"\\s/]+[^<>{}|\\\\^`\"\\s]*(:[^:<>{}|\\\\^`\"\\s]+)?)?$"
         },
         "CURIE": {
           "type": "string",
-          "pattern": "^[A-Za-z_][^\\s:]*:.*$"
+          "pattern": "^[A-Za-z_][^\\s:/]*:[^:<>{}|\\\\^`\"\\s]*(\\?[^<>{}|\\\\^`\" ]*)?(#[^<>{}|\\\\^`\"\\s]*)?$"
         },
         "LocalPart": {
           "type": "string",
-          "pattern": "^[^:<>\\{\\}\\|\\\\\\^`\" ]*(\\?[^<>\\{\\}\\|\\\\\\^`\" ]*)?(#[^<>\\{\\}\\|\\\\\\^`\" ]*)?$"
+          "pattern": "^[^:<>{}|\\\\^`\"\\s]*(\\?[^<>{}|\\\\^`\"\\s]*)?(#[^<>{}|\\\\^`\"\\s]*)?$"
         },
         "Single": {
           "anyOf": [

diff --git a/annotated-schemas/ogc-utils/iri-or-curie/schema-oas3.0.yaml b/annotated-schemas/ogc-utils/iri-or-curie/schema-oas3.0.yaml
@@ -4,13 +4,13 @@ x-defs:
     $defs:
       IRI:
         type: string
-        pattern: ^\w+:(\/?\/?)[^\s]+$
+        pattern: ^\w+:/*([^:<>{}|\\^`"\s/]+[^<>{}|\\^`"\s]*(:[^:<>{}|\\^`"\s]+)?)?$
       CURIE:
         type: string
-        pattern: ^[A-Za-z_][^\s:]*:.*$
+        pattern: ^[A-Za-z_][^\s:/]*:[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`" ]*)?(#[^<>{}|\\^`"\s]*)?$
       LocalPart:
         type: string
-        pattern: ^[^:<>\{\}\|\\\^`" ]*(\?[^<>\{\}\|\\\^`" ]*)?(#[^<>\{\}\|\\\^`" ]*)?$
+        pattern: ^[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`"\s]*)?(#[^<>{}|\\^`"\s]*)?$
       Single:
         anyOf:
         - $ref: '#/$defs/IRI'

diff --git a/annotated-schemas/ogc-utils/iri-or-curie/schema.json b/annotated-schemas/ogc-utils/iri-or-curie/schema.json
@@ -4,15 +4,15 @@
   "$defs": {
     "IRI": {
       "type": "string",
-      "pattern": "^\\w+:(\\/?\\/?)[^\\s]+$"
+      "pattern": "^\\w+:/*([^:<>{}|\\\\^`\"\\s/]+[^<>{}|\\\\^`\"\\s]*(:[^:<>{}|\\\\^`\"\\s]+)?)?$"
     },
     "CURIE": {
       "type": "string",
-      "pattern": "^[A-Za-z_][^\\s:]*:.*$"
+      "pattern": "^[A-Za-z_][^\\s:/]*:[^:<>{}|\\\\^`\"\\s]*(\\?[^<>{}|\\\\^`\" ]*)?(#[^<>{}|\\\\^`\"\\s]*)?$"
     },
     "LocalPart": {
       "type": "string",
-      "pattern": "^[^:<>\\{\\}\\|\\\\\\^`\" ]*(\\?[^<>\\{\\}\\|\\\\\\^`\" ]*)?(#[^<>\\{\\}\\|\\\\\\^`\" ]*)?$"
+      "pattern": "^[^:<>{}|\\\\^`\"\\s]*(\\?[^<>{}|\\\\^`\"\\s]*)?(#[^<>{}|\\\\^`\"\\s]*)?$"
     },
     "Single": {
       "anyOf": [

diff --git a/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml b/annotated-schemas/ogc-utils/iri-or-curie/schema.yaml
@@ -3,13 +3,13 @@ description: IRI or CURIE
 $defs:
   IRI:
     type: string
-    pattern: ^\w+:(\/?\/?)[^\s]+$
+    pattern: ^\w+:/*([^:<>{}|\\^`"\s/]+[^<>{}|\\^`"\s]*(:[^:<>{}|\\^`"\s]+)?)?$
   CURIE:
     type: string
-    pattern: ^[A-Za-z_][^\s:]*:.*$
+    pattern: ^[A-Za-z_][^\s:/]*:[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`" ]*)?(#[^<>{}|\\^`"\s]*)?$
   LocalPart:
     type: string
-    pattern: ^[^:<>\{\}\|\\\^`" ]*(\?[^<>\{\}\|\\\^`" ]*)?(#[^<>\{\}\|\\\^`" ]*)?$
+    pattern: ^[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`"\s]*)?(#[^<>{}|\\^`"\s]*)?$
   Single:
     anyOf:
     - $ref: '#/$defs/IRI'

diff --git a/bblocks.jsonld b/bblocks.jsonld
@@ -588,8 +588,8 @@
       "group": "Common",
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.common.data_types.geojson"
+        "ogc.geo.common.data_types.geojson",
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/features/feature/schema.yaml",
@@ -874,8 +874,8 @@
         ]
       },
       "dependsOn": [
-        "ogc.ogc-utils.iri-or-curie",
-        "ogc.unstable.sosa.properties.observation"
+        "ogc.unstable.sosa.properties.observation",
+        "ogc.ogc-utils.iri-or-curie"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/properties/observationCollection/schema.yaml",
@@ -926,8 +926,8 @@
       "group": "Common",
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.features.feature"
+        "ogc.geo.features.feature",
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/features/featureCollection/schema.yaml",
@@ -975,8 +975,8 @@
       "group": "JSON-FG",
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.features.feature"
+        "ogc.geo.features.feature",
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature/schema.yaml",
@@ -1028,8 +1028,8 @@
       "group": "JSON-FG",
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.features.feature"
+        "ogc.geo.features.feature",
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/feature-lenient/schema.yaml",
@@ -1084,8 +1084,8 @@
       "group": "SOSA",
       "shaclRules": {},
       "dependsOn": [
-        "ogc.ogc-utils.iri-or-curie",
-        "ogc.unstable.sosa.properties.sensor"
+        "ogc.unstable.sosa.properties.sensor",
+        "ogc.ogc-utils.iri-or-curie"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/properties/platform/schema.yaml",
@@ -1134,9 +1134,9 @@
       "group": "JSON-FG",
       "shaclRules": {},
       "dependsOn": [
+        "ogc.geo.json-fg.feature",
         "ogc.geo.features.featureCollection",
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.json-fg.feature"
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection/schema.yaml",
@@ -1190,8 +1190,8 @@
       "shaclRules": {},
       "dependsOn": [
         "ogc.geo.features.featureCollection",
-        "ogc.ogc-utils.json-link",
-        "ogc.geo.json-fg.feature-lenient"
+        "ogc.geo.json-fg.feature-lenient",
+        "ogc.ogc-utils.json-link"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/geo/json-fg/featureCollection-lenient/schema.yaml",
@@ -1316,9 +1316,9 @@
         ]
       },
       "dependsOn": [
-        "ogc.unstable.sosa.features.observation",
+        "ogc.geo.json-fg.featureCollection-lenient",
         "ogc.unstable.sosa.properties.observationCollection",
-        "ogc.geo.json-fg.featureCollection-lenient"
+        "ogc.unstable.sosa.features.observation"
       ],
       "schema": {
         "application/yaml": "https://opengeospatial.github.io/bblocks/annotated-schemas/unstable/sosa/features/observationCollection/schema.yaml",
@@ -1366,10 +1366,10 @@
       "maturity": "development",
       "scope": "unstable",
       "dependsOn": [
+        "ogc.unstable.sosa.examples.vectorObservation",
         "ogc.unstable.sosa.features.observationCollection",
         "ogc.unstable.sosa.features.observation",
-        "ogc.unstable.sosa.properties.observation",
-        "ogc.unstable.sosa.examples.vectorObservation"
+        "ogc.unstable.sosa.properties.observation"
       ],
       "tags": [
         "sosa",