Merge branch 'master' into master

GeoLabs · Sep 18, 2023 · 7398bf5 · 7398bf5
2 parents 5de8eb1 + e62c087
commit 7398bf5
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 180 deletions.
diff --git a/core/examples/json/Execute.json b/core/examples/json/Execute.json
@@ -1,18 +1,3 @@
-
-
-http://www.someserver.com/processes/echo/execution?
-stringInput=Value2&
-measureInput={measurement=10.3,uom=m,referece=https://ucum.org/ucum-essence.xml}&
-dateInput=2021-03-06T07:21:00&
-doubleInput=3.14159&
-arrayInput=1,2,3,4,5,6&
-complexObjectInput={...JSON or XML string...}&
-geometryInput=<WKTstring>,<WKTstring>&
-boundingBoxInput=51.9,7,52,7.1;bbox-crs=http://www.opengis.net/def/crs/OGC/1.3/CRS84&
-
-
-
-
 {
   "inputs": {
     "measureInput": {
@@ -73,37 +58,17 @@ boundingBoxInput=51.9,7,52,7.1;bbox-crs=http://www.opengis.net/def/crs/OGC/1.3/C
     }
   },
   "outputs": {
-    "stringOutput": {
-      "transmissionMode": "value"
-    },
-    "measureOutput": {
-      "transmissionMode": "value"
-    },
-    "dateOutput": {
-      "transmissionMode": "value"
-    },
-    "doubleOutput": {
-      "transmissionMode": "value"
-    },
-    "arrayOutput": {
-      "transmissionMode": "value"
-    },
-    "complexObjectOutput": {
-      "transmissionMode": "value"
-    },
-    "geometryOutput": {
-      "transmissionMode": "value"
-    },
-    "boundingBoxOutput": {
-      "transmissionMode": "value"
-    },
+    "stringOutput": { },
+    "measureOutput": { },
+    "dateOutput": { },
+    "doubleOutput": { },
+    "arrayOutput": { },
+    "complexObjectOutput": { },
+    "geometryOutput": { },
+    "boundingBoxOutput": { },
     "imageOutput": {
-      "format": { "mediaType": "image/tiff; application=geotiff" },
-      "transmissionMode": "value"
+      "format": { "mediaType": "image/tiff; application=geotiff" }
     },
-    "featureCollectionOutput": {
-      "transmissionMode": "value"
-    }
-  },
-  "response": "document"
+    "featureCollectionOutput": { }
+  }
 }
diff --git a/core/recommendations/core/REC_core_process-execute-sync-document-ref.adoc b/core/recommendations/core/REC_core_process-execute-sync-document-ref.adoc
diff --git a/core/recommendations/core/REC_process-execute-sync-document-ref.adoc b/core/recommendations/core/REC_process-execute-sync-document-ref.adoc
diff --git a/core/sections/clause_7_core.adoc b/core/sections/clause_7_core.adoc
@@ -375,16 +375,6 @@ include::../../openapi/schemas/processes-core/jobControlOptions.yaml[]
 
 NOTE: This schema can also be obtained from https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/jobControlOptions.yaml[`jobControlOptions.yaml`].
 
-[[transmission-mode-schema]]
-.Schema for the transmission mode
-[source,yaml]
-----
-include::../../openapi/schemas/processes-core/transmissionMode.yaml[]
-----
-
-NOTE: This schema can also be obtained from https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/transmissionMode.yaml[`transmissionMode.yaml`].
-
-
 The number of process summaries returned depends on the server and the parameter `limit.`
 
 See the discussion about the `limit` parameter in the <<sc_limit_parameter,Limit parameter>> section.

diff --git a/openapi/ogcapi-processes.bundled.json b/openapi/ogcapi-processes.bundled.json
@@ -4713,12 +4713,6 @@
                   "$ref": "#/components/schemas/jobControlOptions"
                 }
               },
-              "outputTransmission": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/transmissionMode"
-                }
-              },
               "links": {
                 "type": "array",
                 "items": {
@@ -4793,41 +4787,6 @@
           }
         }
       },
-      "additionalParameter": {
-        "type": "object",
-        "required": [
-          "name",
-          "value"
-        ],
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "value": {
-            "type": "array",
-            "items": {
-              "oneOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "array",
-                  "items": {}
-                },
-                {
-                  "type": "object"
-                }
-              ]
-            }
-          }
-        }
-      },
       "bbox-processes": {
         "type": "object",
         "required": [
@@ -4889,24 +4848,6 @@
             "items": {
               "$ref": "#/components/schemas/metadata"
             }
-          },
-          "additionalParameters": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/metadata"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "parameters": {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/components/schemas/additionalParameter"
-                    }
-                  }
-                }
-              }
-            ]
           }
         }
       },
@@ -5344,14 +5285,6 @@
           }
         }
       },
-      "transmissionMode": {
-        "type": "string",
-        "enum": [
-          "value",
-          "reference"
-        ],
-        "default": "value"
-      },
       "inlineOrRefData": {
         "oneOf": [
           {

diff --git a/openapi/ogcapi-processes.yaml b/openapi/ogcapi-processes.yaml
@@ -109,9 +109,6 @@ components:
          $ref: 'schemas/processes-core/processList.yaml'
       jobList:
          $ref: 'schemas/processes-core/jobList.yaml'
-
-      additionalParameter:
-         $ref: 'schemas/processes-core/additionalParameter.yaml'
       bbox-processes:
          $ref: 'schemas/processes-core/bbox.yaml'
       descriptionType:
@@ -148,8 +145,6 @@ components:
          $ref: 'schemas/processes-core/statusCode.yaml'
       subscriber:
          $ref: 'schemas/processes-core/subscriber.yaml'
-      transmissionMode:
-         $ref: 'schemas/processes-core/transmissionMode.yaml'
       inlineOrRefData:
          $ref: 'schemas/processes-core/inlineOrRefData.yaml'
       statusInfo:

diff --git a/openapi/schemas/processes-core/descriptionType.yaml b/openapi/schemas/processes-core/descriptionType.yaml
@@ -12,12 +12,3 @@ properties:
     type: array
     items:
       $ref: "metadata.yaml"
-  additionalParameters:
-    allOf:
-      - $ref: "metadata.yaml"
-      - type: object
-        properties:
-          parameters:
-            type: array
-            items:
-              $ref: "additionalParameter.yaml"
diff --git a/openapi/schemas/processes-core/processSummary.yaml b/openapi/schemas/processes-core/processSummary.yaml
@@ -13,10 +13,6 @@ allOf:
         type: array
         items:
           $ref: "jobControlOptions.yaml"
-      outputTransmission:
-        type: array
-        items:
-          $ref: "transmissionMode.yaml"
       links:
         type: array
         items:

diff --git a/openapi/schemas/processes-core/transmissionMode.yaml b/openapi/schemas/processes-core/transmissionMode.yaml
diff --git a/workshops/2023/code-sprint-1/2023_09_code_sprint.adoc b/workshops/2023/code-sprint-1/2023_09_code_sprint.adoc
@@ -27,31 +27,31 @@ All times on the agenda are in EDT (New York time).
 
 | 10:00 - 12:00 | Practical work
 
-| 12:00 - 13:00 | Catch-up Plenary &#10036; To be discussed
+| 12:00 - 13:00 | Catch-up Plenary &#10036; https://www4.gotomeeting.com/join/114950445[Join]
 
 | 13:00 - 16:30 | Practical work
 
-| 16:30 - 17:30 | Daily brief back &#10036; To be discussed
+| 16:30 - 17:30 | Daily brief back &#10036; https://www4.gotomeeting.com/join/406703461[Join]
 
 2+| Tuesday 19th September 2023
 
-| 09:00 - 10:00 | A short stand-up &#10036; To be discussed
+| 09:00 - 10:00 | A short stand-up &#10036; https://www4.gotomeeting.com/join/830601005[Join]
 
 | 10:00 - 12:00 | Practical work
 
-| 12:00 - 12:30 | A short stand-up  &#10036; To be discussed
+| 12:00 - 12:30 | A short stand-up  &#10036; https://www4.gotomeeting.com/join/644425061[Join]
 
 | 12:30 - 16:30 | Practical work
 
 | 16:30 - 17:30 | Daily brief back &#10036; To be discussed
 
 2+| Wednesday 20st September 2023
 
-| 09:00 - 10:00 | A short stand-up &#10036; To be discussed
+| 09:00 - 10:00 | A short stand-up &#10036; https://www4.gotomeeting.com/join/487350701[Join]
 
 | 10:00 - 12:00 | Practical work
 
-| 12:00 - 12:30 | A short stand-up  &#10036; To be discussed
+| 12:00 - 12:30 | A short stand-up  &#10036; https://www4.gotomeeting.com/join/624154357[Join]
 
 | 12:30 - 16:30 | Practical work
 

diff --git a/workshops/2023/code-sprint-1/components.adoc b/workshops/2023/code-sprint-1/components.adoc
@@ -24,6 +24,10 @@
 | OGC API - Processes with STAC Catalog (ongoing development)
 | https://github.com/gfenoy[Gérald Fenoy]
 
+| https://maps.gnosis.earth/ogcapi/[GNOSIS Map Server]
+| OGC API - Processes
+| https://github.com/jerstlouis[Jerome St-Louis]
+
 | TBA
 | TBA
 | TBA
@@ -41,6 +45,10 @@
 | OGC API - Processes
 | https://github.com/gardengeek99[Steve McDaniel]
 
+| https://ecere.ca[GNOSIS Cartographer]
+| OGC API - Processes
+| https://github.com/jerstlouis[Jerome St-Louis]
+
 | TBA
 | TBA
 | TBA