From d4f9b708c0c29b5ddbbd2a5851099e698aca7cff Mon Sep 17 00:00:00 2001 From: m-burgoyne Date: Fri, 21 Jan 2022 09:18:51 +0000 Subject: [PATCH] Update documentation to resolve issue #332 --- .../examples/collections_metadata_JSON_1.adoc | 16 +++-- standard/examples/instance_metadata_JSON.adoc | 32 ++++++---- .../examples/instance_metadata_JSON_DEM.adoc | 10 +++- .../instance_metadata_JSON_Metar.adoc | 17 +++++- .../examples/instance_metadata_JSON_gfs.adoc | 60 +++++++++++++++---- standard/openapi/examples/collection.json | 16 +++-- standard/openapi/examples/instance.json | 32 ++++++---- standard/openapi/schemas/extent.yaml | 60 +++++++++++++++---- .../sections/annex_collection_response.adoc | 18 +++--- 9 files changed, 197 insertions(+), 64 deletions(-) diff --git a/standard/examples/collections_metadata_JSON_1.adoc b/standard/examples/collections_metadata_JSON_1.adoc index 36119ee4..d3f20fdb 100644 --- a/standard/examples/collections_metadata_JSON_1.adoc +++ b/standard/examples/collections_metadata_JSON_1.adoc @@ -92,18 +92,21 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-04-19T11:00:00Z/2020-06-30T09:00:00Z" + ["2020-04-19T11:00:00Z","2020-06-30T09:00:00Z"] ], + "values": [ + "2020-04-19T11:00:00Z/2020-06-30T09:00:00Z" + ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } }, @@ -468,16 +471,19 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-06-23T18:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ "2020-06-23T18:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" diff --git a/standard/examples/instance_metadata_JSON.adoc b/standard/examples/instance_metadata_JSON.adoc index 2adf8a98..52d6bbcc 100644 --- a/standard/examples/instance_metadata_JSON.adoc +++ b/standard/examples/instance_metadata_JSON.adoc @@ -97,16 +97,19 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" @@ -467,16 +470,19 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" @@ -837,17 +843,20 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-06-30T03:00:00Z/2020-07-04T21:00:00Z" + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ + "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } @@ -1207,17 +1216,20 @@ There are also links to the license information for the observation and forecast ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-06-30T03:00:00Z/2020-07-04T21:00:00Z" + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ + "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } diff --git a/standard/examples/instance_metadata_JSON_DEM.adoc b/standard/examples/instance_metadata_JSON_DEM.adoc index 5ecb3099..51e45680 100644 --- a/standard/examples/instance_metadata_JSON_DEM.adoc +++ b/standard/examples/instance_metadata_JSON_DEM.adoc @@ -31,7 +31,15 @@ Gregorian calendar). "title": "data", "description": "Global Digital Elevation Model height data", "extent": { - "spatial": [ -180.0, -89.9, 180, 89.9 ] + "spatial": { + "bbox": [[ + -15.0, + 48.0, + 5.0, + 62.0 + ]], + "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" + } }, "links": [ { "href": "https://data.example.org/collection/dem/link-for-more-details", diff --git a/standard/examples/instance_metadata_JSON_Metar.adoc b/standard/examples/instance_metadata_JSON_Metar.adoc index c9d6df3f..72b7344a 100644 --- a/standard/examples/instance_metadata_JSON_Metar.adoc +++ b/standard/examples/instance_metadata_JSON_Metar.adoc @@ -31,9 +31,20 @@ Gregorian calendar). "title": "Raw", "description": "Raw Metar observations", "extent": { - "spatial": [ -180.0, -89.9, 180, 89.9 ], - "temporal": [ "2020-01-30T12:00:00Z/2020-01-13T11:00:00Z" ] - }, + "spatial": { + "bbox": [[ + -180, + -90, + 180, + 90 + ]], + "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" + }, + "temporal": { + "interval" :[["2020-01-30T12:00:00Z","2020-01-13T11:00:00Z"]], + "values" :[ "2020-01-30T12:00:00Z/2020-01-13T11:00:00Z" ] + } + } "dataDetails": { "@context": { "@version": 1.1, diff --git a/standard/examples/instance_metadata_JSON_gfs.adoc b/standard/examples/instance_metadata_JSON_gfs.adoc index 0a981e7b..4f96a048 100644 --- a/standard/examples/instance_metadata_JSON_gfs.adoc +++ b/standard/examples/instance_metadata_JSON_gfs.adoc @@ -40,11 +40,23 @@ Gregorian calendar). "title": "Latest", "description": "GFS parameters based on heights above ground level from the latest model run", "extent": { - "spatial": [ -180.0, -89.9, 180, 89.9 ], - "temporal": [ "2020-02-01T12:00:00Z/2020-02-12T00:00:00Z" ], - "vertical": ["2.0","10.0","80.0"] - }, - + "spatial": { + "bbox": [[ + -15.0, + 48.0, + 5.0, + 62.0 + ]], + "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" + }, + "temporal": { + "interval" :[["2020-02-01T12:00:00Z","2020-02-12T00:00:00Z"]], + "values" :[ "2020-02-01T12:00:00Z/2020-02-12T00:00:00Z" ] + }, + "vertical": { + "interval": [["2.0","80.0"]], + "values": ["2.0","10.0","80.0"]} + }, "links": [ { "href": "http://data.example.org/collections/gfs_time-height_above_ground-lat-lon/instances/latest", "rel": "describedBy", "type": "application/json", @@ -68,9 +80,22 @@ Gregorian calendar). "title": "2020-02-01T12:00:00Z", "description": "GFS parameters based on heights above ground level from the 2020-02-01T12:00:00Z run", "extent": { - "spatial": [ -180.0, -89.9, 180, 89.9 ], - "temporal": [ "2020-02-01T12:00:00Z/2020-02-12T00:00:00Z" ], - "vertical": ["2.0","10.0","80.0"] + "spatial": { + "bbox": [[ + -15.0, + 48.0, + 5.0, + 62.0 + ]], + "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" + }, + "temporal": { + "interval" :[["2020-02-01T12:00:00Z","2020-02-12T00:00:00Z"]], + "values" :[ "2020-02-01T12:00:00Z/2020-02-12T00:00:00Z" ] + }, + "vertical": { + "interval": [["2.0","80.0"]], + "values": ["2.0","10.0","80.0"]} }, "links": [ { "href": "http://data.example.org/collections/gfs_time-height_above_ground-lat-lon/instances/2020-02-01T12:00:00Z", @@ -96,9 +121,22 @@ Gregorian calendar). "title": "2020-02-01T00:00:00Z", "description": "GFS parameters based on heights above ground level from the 2020-02-01T00:00:00Z run", "extent": { - "spatial": [ -180.0, -89.9, 180, 89.9 ], - "temporal": [ "2020-02-01T00:00:00Z/2020-02-11T12:00:00Z" ], - "vertical": ["2.0","10.0","80.0"] + "spatial": { + "bbox": [[ + -15.0, + 48.0, + 5.0, + 62.0 + ]], + "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" + }, + "temporal": { + "interval" :[["2020-02-01T12:00:00Z","2020-02-12T00:00:00Z"]], + "values" :[ "2020-02-01T12:00:00Z/2020-02-12T00:00:00Z" ] + }, + "vertical": { + "interval": [["2.0","80.0"]], + "values": ["2.0","10.0","80.0"]} }, "dataDetails": { "@context": { diff --git a/standard/openapi/examples/collection.json b/standard/openapi/examples/collection.json index 24e1dce4..1e3ad2ea 100644 --- a/standard/openapi/examples/collection.json +++ b/standard/openapi/examples/collection.json @@ -78,16 +78,19 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-04-19T11:00:00Z","2020-06-30T09:00:00Z"] + ], + "values": [ "2020-04-19T11:00:00Z/2020-06-30T09:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" @@ -454,17 +457,20 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-06-23T18:00:00Z/2020-07-04T21:00:00Z" + ["2020-04-19T11:00:00Z","2020-06-30T09:00:00Z"] + ], + "values": [ + "2020-04-19T11:00:00Z/2020-06-30T09:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } diff --git a/standard/openapi/examples/instance.json b/standard/openapi/examples/instance.json index 7c7cf25c..539dad8d 100644 --- a/standard/openapi/examples/instance.json +++ b/standard/openapi/examples/instance.json @@ -81,16 +81,19 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" @@ -451,16 +454,19 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" @@ -821,17 +827,20 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-06-30T03:00:00Z/2020-07-04T21:00:00Z" + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ + "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } @@ -1191,17 +1200,20 @@ ], "extent": { "spatial": { - "bbox": [ + "bbox": [[ -15.0, 48.0, 5.0, 62.0 - ], + ]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { "interval": [ - "2020-06-30T03:00:00Z/2020-07-04T21:00:00Z" + ["2020-06-30T06:00:00Z","2020-07-04T21:00:00Z"] + ], + "values": [ + "2020-06-30T06:00:00Z/2020-07-04T21:00:00Z" ], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" } diff --git a/standard/openapi/schemas/extent.yaml b/standard/openapi/schemas/extent.yaml index 0a1ae3b3..c2b46c08 100644 --- a/standard/openapi/schemas/extent.yaml +++ b/standard/openapi/schemas/extent.yaml @@ -115,11 +115,7 @@ properties: - trs properties: interval: - description: RFC3339 compliant Date and Time, either as a time range specified - as start time / end time / interval (e.g. - 2017-11-14T09:00Z/2017-11-14T21:00Z/PT3H) or a list of time values - (e.g. - 2017-11-14T09:00Z,2017-11-14T12:00Z,2017-11-14T15:00Z,2017-11-14T18:00Z,2017-11-14T21:00Z) + description: RFC3339 compliant Date and Time type: array minItems: 1 items: @@ -135,7 +131,35 @@ properties: format: date-time nullable: true example: - - 2020-11-12T12:15Z,2020-11-12T12:30Z,2020-11-12T12:45Z + - "2020-11-12T12:15Z","2020-11-12T12:15Z" + - "2020-11-12T12:15Z","2020-11-12T12:45Z" + - "2022-01-14T09:00Z","2022-01-15T09:00Z" + - "2022-01-14T09:00Z","2022-01-14T21:00Z" + - "2022-01-14T09:00Z","2022-01-16T09:00Z" + + values: + description: |- + Provides information about the time intervals available in the collection + as ISO8601 compliant dates, either as a time range specified + as start time / end time (e.g. 2017-11-14T09:00Z/2017-11-14T21:00Z) or + as number of repeatitions / end time / interval (e.g. R4/2017-11-14T21:00Z/PT3H) + or a list of time values (e.g. + 2017-11-14T09:00Z,2017-11-14T12:00Z,2017-11-14T15:00Z,2017-11-14T18:00Z,2017-11-14T21:00Z) + type: array + minItems: 1 + items: + description: |- + type: string + minItems: 1 + format: date-time + nullable: true + example: + - "2020-11-12T12:15Z" + - "2020-11-12T12:15Z","2020-11-12T12:30Z","2020-11-12T12:45Z" + - "R12/2022-01-14T09:00Z/2022-01-15T09:00Z" + - "R12/2022-01-14T09:00Z/PT1H" + - "R12/2022-01-14T09:00Z/PT1H","R4/2022-01-14T21:00Z/PT3H","R4/2022-01-15T09:00Z/PT6H" + trs: description: >- Coordinate reference system of the coordinates in the temporal extent @@ -162,11 +186,6 @@ properties: properties: interval: description: >- - One or more height intervals that describe the vertical extent of the - dataset. - - The value `null` is supported and indicates an open vertical interval. - In the Core only a single time interval is supported. Extensions may support multiple intervals. If multiple intervals are provided, the union of the @@ -188,7 +207,24 @@ properties: type: string nullable: true example: - - "850" + - "2","100" + values: + description: |- + Vertical level intervals that data in the collection is available at + these can be defined as follows: + min level / max level (e.g. "2/100") or + as number of repeatitions / min level / interval (e.g."R5/100/50") + or a list of vertical levels (e.g. "2",10,"80","100"} + The value `null` is supported and indicates an open vertical interval. + type: array + minItems: 1 + items: + type: string + nullable: true + example: + - "2/100" + - "R50/1000/-50" + - "2","10","80", "100" vrs: description: |- Coordinate reference system of the coordinates in the vertical extent diff --git a/standard/sections/annex_collection_response.adoc b/standard/sections/annex_collection_response.adoc index 663e02b7..694cb78d 100644 --- a/standard/sections/annex_collection_response.adoc +++ b/standard/sections/annex_collection_response.adoc @@ -150,7 +150,8 @@ The temporal object describes the time period covered by the information availab .Temporal Object |========================== |Field Name|Type|Required|Description -|**interval** | ISO 8601 Date Array|**Yes**| An array of ISO 8601 datestrings, each member of the the array can either be a single time, an ISO8601 time interval or an ISO8601 time duration (see https://en.wikipedia.org/wiki/ISO_8601) +|**interval** | Array of ISO 8601 Date Array|**Yes**| An array of ISO 8601 Date Array, each ISO8601 Date Array should contain two values first being the minimum date time and second the maximum date time for information in the collection (see https://en.wikipedia.org/wiki/ISO_8601) +|**values** | ISO 8601 Date Array|**Yes**| An array of ISO 8601 datestrings which details the time intervals available in the collection, each member of the the array can either be a single time, an ISO8601 time interval or an ISO8601 time duration (see https://en.wikipedia.org/wiki/ISO_8601) |**trs** |String|**Yes**| This defaults to Gregorian, but other temporal systems can be supported following the conventions defined by the http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[Well Known Text] standard. |========================== @@ -162,7 +163,8 @@ The vertical object describes the vertical extent of information available in th .Vertical Object |========================== |Field Name|Type|Required|Description -|**interval** | String Array|**Yes**| Array of height values supported by the collection. +|**interval** | String Array|**Yes**| Array of level values array, each Level value Array should contain two values first being the minimum vertical level and second the maximum vertical level for information in the collection +|**values** | String Array|**Yes**| Array of height values supported by the collection. |**vrs** |String|**Yes**| Follows the conventions defined by the http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[Well Known Text] standard. |========================== @@ -171,7 +173,7 @@ A simple extent object example for collection with no vertical or temporal dimen ---- "extent": { "spatial": { - "bbox": [1393.0196, 13494.9764, 671196.3657, 1230275.0454], + "bbox": [[1393.0196, 13494.9764, 671196.3657, 1230275.0454]], "crs": "PROJCS[\"OSGB 1936 / British National Grid\", GEOGCS[\"OSGB 1936\",DATUM[\"OSGB_1936\", SPHEROID[\"Airy 1830\",6377563.396,299.3249646, @@ -195,7 +197,7 @@ This more complex extent object example is a collection with vertical and tempor ---- "extent": { "spatial": { - "bbox": [-180.0,-90.0,180.0,90.0], + "bbox": [[-180.0,-90.0,180.0,90.0]], "crs": "GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\", SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]], @@ -204,13 +206,15 @@ This more complex extent object example is a collection with vertical and tempor AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]" }, "temporal": { - "interval": ["R82/2021-04-22T00:00:00Z/PT3H", - "R11/2021-05-02T12:00:00Z/PT12H"], + "interval": [["2021-04-22T00:00:00Z","2021-05-03T12:00:00Z"]], + "values": ["R82/2021-04-22T00:00:00Z/PT3H", + "R2/2021-05-02T12:00:00Z/PT12H"], "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"], CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]" }, "vertical": { - "interval": ["1829.0","2743.0","3658.0"], + "interval": [["1829.0","3658.0"]], + "values": ["1829.0","2743.0","3658.0"], "vrs": "VERT_CS['MSL height', VERT_DATUM['Mean Sea Level',2005, AUTHORITY['EPSG','5100']],