Clarify 200 responses for JSON and HTML content.

core/examples/json/ProcessDescription.json

@@ -132,7 +132,7 @@
             "format": "ogc-bbox"
           },
           {
-            "$ref": "../../openapi/schemas/bbox.yaml"
+            "$ref": "bbox.json"
           }
         ]
       }
@@ -285,7 +285,7 @@
                 "format": "geojson-geometry"
               },
               {
-                "$ref": "http://schemas.opengis.net/ogcapi/features/part1/1.0/openapi/schemas/geometryGeoJSON.yaml"
+                "$ref": "https://geojson.org/schema/Geometry.json"
               }
             ]
           }
@@ -299,7 +299,7 @@
              "format": "ogc-bbox"
            },
            {
-             "$ref": "../../openapi/schemas/bbox.yaml"
+             "$ref": "bbox.json"
            }
         ]
       }

core/examples/json/bbox.json

@@ -0,0 +1,44 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Bounding Box",
+  "type": "object",
+  "required": [
+    "bbox"
+  ],
+  "properties": {
+    "bbox": {
+      "type": "array",
+      "oneOf": [
+        {
+          "minItems": 4,
+          "maxItems": 4
+        },
+        {
+          "minItems": 6,
+          "maxItems": 6
+        }
+      ],
+      "items": {
+        "type": "number"
+      }
+    },
+    "crs": {
+      "anyOf": [
+        {
+          "type": "string",
+          "format": "uri",
+          "enum": [
+            "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
+            "http://www.opengis.net/def/crs/OGC/0/CRS84h"
+          ],
+          "default": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+        },
+        {
+          "type": "string",
+          "format": "uri",
+          "default": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+        }
+      ]
+    }
+  }
+}

core/recommendations/html/PER_media-types.adoc

@@ -0,0 +1,9 @@
+[[per_html_media-types]]
+[permission]
+====
+[%metadata]
+identifier:: /per/html/media-types
+label:: /per/html/media-types
+
+A HTML media type may be further qualified with additional subtype, suffix and parameter components.  For example, `test/html; charset=UTF-8`.
+====

core/recommendations/json/PER_media-types.adoc

@@ -0,0 +1,9 @@
+[[per_json_media-types]]
+[permission]
+====
+[%metadata]
+identifier:: /per/json/media-types
+label:: /per/json/media-types
+
+A JSON media type may be further qualified with additional subtype, suffix and parameter components.  For example, `application/ld+json; charset=UTF-8`.
+====

core/requirements/html/REQ_definition.adoc

@@ -5,6 +5,20 @@
 identifier:: /req/html/definition
 label:: /req/html/definition
 
-Every `200`-response of an operation of the server
-SHALL support the media type `text/html`.
+`200`-responses of the server SHALL support the following media type:
+
+* `text/html`
+
+for the following API endpoints:
+
+* <<sc_landing_page,`/`>>,
+* <<sc_conformance_classes,`/conformance`>>,
+* <<sc_process_list,`/processes`>>,
+* <<sc_process_description,`/processes/{processID}`>>,
+* <<sc_retrieve_status_info,`/jobs/{jobID}`>>
+====
+
+[NOTE]
+====
+Responses from the execution endpoint <<sc_execute_process,`/processes/{processID}/execution`>> may or may not generate HTML depending on the process being executed, the <<sc_execution_mode,negotiated execution mode>>, the negotiated response format (specified using the https://www.rfc-editor.org/rfc/rfc2616#section-14.1[HTTP Accept] header or the <<req_kvp-execute_f-definition,`f`>> query parameter) and the <<req_core_process-execute-sync-many-json,number of requested outputs>>.
 ====

core/requirements/json/REQ_definition.adoc

@@ -16,10 +16,9 @@ for the following API endpoints:
 * <<sc_process_list,`/processes`>>,
 * <<sc_process_description,`/processes/{processID}`>>,
 * <<sc_retrieve_status_info,`/jobs/{jobID}`>>
+====
 
-and for the following API endpoint:
-
-* <<sc_execute_process,`/processes/{processID}/execution`>>
-
-when the negotiated response format using the https://www.rfc-editor.org/rfc/rfc2616#section-14.1[HTTP Accept] header or the <<req_kvp-execute_f-definition,`f`>> parameter is JSON, or the <<req_core_process-execute-sync-many-json,number of requested outputs is greater than one>> or the <<sc_execution_mode,negotiated execution mode>> is asynchronous.
+[NOTE]
+====
+Responses from the execution endpoint <<sc_execute_process,`/processes/{processID}/execution`>> may or may not generate JSON depending on the process being executed, the <<sc_execution_mode,negotiated execution mode>>, the negotiated response format (specified using the https://www.rfc-editor.org/rfc/rfc2616#section-14.1[HTTP Accept] header or the <<req_kvp-execute_f-definition,`f`>> query parameter) and the <<req_core_process-execute-sync-many-json,number of requested outputs>>.
 ====

core/sections/clause_10_encodings.adoc

@@ -42,6 +42,7 @@ include::../requirements/requirements_class_json.adoc[]
 
 include::../requirements/json/REQ_definition.adoc[]
 
+include::../recommendations/json/PER_media-types.adoc[]
 
 [[sc_requirements_class_html]]
 === Requirement Class "HTML"
@@ -52,4 +53,6 @@ include::../requirements/requirements_class_html.adoc[]
 
 include::../requirements/html/REQ_definition.adoc[]
 
+include::../recommendations/html/PER_media-types.adoc[]
+
 include::../requirements/html/REQ_content.adoc[]

core/sections/clause_7_core.adoc

@@ -30,7 +30,7 @@ A HTTP POST request to the execution-endpoint creates a new job. The inputs and
 
 The URL for accessing status information is delivered in the HTTP header `location`.
 
-After a process is finished (status = success/failed), the results/exceptions can be retrieved.
+After a process is finished (status = successful/failed), the results/exceptions can be retrieved.
 
 [[img_core]]
 .Resources in the Core requirements class

openapi/responses/processes-job-management/rLocked.yaml

@@ -1,4 +1,4 @@
-description: Job is locked. For example, the `status` of the job is currently something else than `succeeded`, `failed` and `created`.
+description: Job is locked. For example, the `status` of the job is currently something else than `successful`, `failed` and `created`.
 content:
    application/json:
       schema:

openapi/schemas/processes-core/inputValueNoObject.yaml

@@ -1,9 +1,10 @@
-oneOf:
+anyOf:
   - type: string
   - type: number
   - type: integer
   - type: boolean
   - type: array
-    items: {}
+    items:
+      $ref: "inputValue.yaml"
   - $ref: "binaryInputValue.yaml"
   - $ref: "bbox.yaml"

openapi/schemas/processes-core/statusCode.yaml

@@ -3,6 +3,6 @@ nullable: false
 enum:
   - accepted
   - running
-  - succeeded
+  - successful
   - failed
   - dismissed

openapi/schemas/processes-job-management/statusCode.yaml

@@ -4,6 +4,6 @@ enum:
   - created
   - accepted
   - running
-  - succeeded
+  - successful
   - failed
   - dismissed