Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@jerstlouis
jerstlouis committed Jun 12, 2024
1 parent 3c4d800 commit c42afc6
Show file tree
Hide file tree
Showing 2 changed files with 148 additions and 133 deletions.
275 changes: 142 additions & 133 deletions standard/openapi/ogcapi-coverages-1.bundled.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,26 +275,10 @@
"$ref": "#/components/parameters/scale-size"
},
{
"name": "width",
"in": "query",
"description": "Number of cells across the coverage dimension corresponding to the spatial dimension represented horizontally on a map, such as longitude or easting.",
"required": false,
"style": "form",
"explode": false,
"schema": {
"type": "integer"
}
"$ref": "#/components/parameters/width"
},
{
"name": "height",
"in": "query",
"description": "Number of cells across the coverage dimension corresponding to the spatial dimension represented vertically on a 2D map, such as latitude or northing.",
"required": false,
"style": "form",
"explode": false,
"schema": {
"type": "integer"
}
"$ref": "#/components/parameters/height"
},
{
"$ref": "#/components/parameters/subset-crs"
Expand Down Expand Up @@ -341,118 +325,7 @@
"content": {
"application/json": {
"schema": {
"description": "Attributes of the features or rangetypes of a coverage. Defined by a subset of the JSON Schema for the properties of a feature",
"type": "object",
"required": [
"type",
"properties"
],
"properties": {
"type": {
"type": "string",
"enum": [
"object"
]
},
"required": {
"description": "Implements 'multiplicity' by citing property 'name' defined as 'additionalProperties'",
"type": "array",
"minItems": 1,
"items": {
"type": "string"
}
},
"properties": {
"type": "object",
"default": {},
"additionalProperties": {
"description": "No property names are defined but any property name they should be described by JSON Schema. So 'additionalProperties' implements 'name'.",
"type": "object",
"properties": {
"title": {
"type": "string"
},
"description": {
"description": "Implements 'description'",
"type": "string"
},
"type": {
"type": "string",
"enum": [
"array",
"boolean",
"integer",
"null",
"number",
"object",
"string"
]
},
"enum": {
"description": "Implements 'acceptedValues'",
"type": "array",
"minItems": 1,
"items": {},
"uniqueItems": true
},
"format": {
"description": "Complements implementation of 'type'",
"type": "string"
},
"contentMediaType": {
"description": "Implements 'mediaType'",
"type": "string"
},
"maximum": {
"description": "Implements 'range'",
"type": "number"
},
"exclusiveMaximum": {
"description": "Implements 'range'",
"type": "number"
},
"minimum": {
"description": "Implements 'range'",
"type": "number"
},
"exclusiveMinimum": {
"description": "Implements 'range'",
"type": "number"
},
"pattern": {
"type": "string",
"format": "regex"
},
"maxItems": {
"description": "Implements 'upperMultiplicity'",
"type": "integer",
"minimum": 0
},
"minItems": {
"description": "Implements 'lowerMultiplicity'",
"type": "integer",
"default": 0,
"minimum": 0
},
"x-ogc-definition": {
"type": "string",
"format": "uri"
},
"x-ogc-unit": {
"type": "string"
},
"x-ogc-unitLang": {
"type": "string",
"format": "uri"
},
"x-ogc-propertySeq": {
"type": "integer",
"minimum": 0
}
}
}
}
}
"$ref": "#/components/schemas/schema"
}
},
"text/html": {
Expand Down Expand Up @@ -560,10 +433,10 @@
"$ref": "#/components/parameters/scale-size"
},
{
"$ref": "#/paths/~1collections~1%7BcollectionId%7D~1coverage/get/parameters/8"
"$ref": "#/components/parameters/width"
},
{
"$ref": "#/paths/~1collections~1%7BcollectionId%7D~1coverage/get/parameters/9"
"$ref": "#/components/parameters/height"
},
{
"$ref": "#/components/parameters/subset-crs"
Expand Down Expand Up @@ -1548,6 +1421,120 @@
"minimum": 0,
"example": 127
},
"schema": {
"description": "Attributes of the features or rangetypes of a coverage. Defined by a subset of the JSON Schema for the properties of a feature",
"type": "object",
"required": [
"type",
"properties"
],
"properties": {
"type": {
"type": "string",
"enum": [
"object"
]
},
"required": {
"description": "Implements 'multiplicity' by citing property 'name' defined as 'additionalProperties'",
"type": "array",
"minItems": 1,
"items": {
"type": "string"
}
},
"properties": {
"type": "object",
"default": {},
"additionalProperties": {
"description": "No property names are defined but any property name they should be described by JSON Schema. So 'additionalProperties' implements 'name'.",
"type": "object",
"properties": {
"title": {
"type": "string"
},
"description": {
"description": "Implements 'description'",
"type": "string"
},
"type": {
"type": "string",
"enum": [
"array",
"boolean",
"integer",
"null",
"number",
"object",
"string"
]
},
"enum": {
"description": "Implements 'acceptedValues'",
"type": "array",
"minItems": 1,
"items": {},
"uniqueItems": true
},
"format": {
"description": "Complements implementation of 'type'",
"type": "string"
},
"contentMediaType": {
"description": "Implements 'mediaType'",
"type": "string"
},
"maximum": {
"description": "Implements 'range'",
"type": "number"
},
"exclusiveMaximum": {
"description": "Implements 'range'",
"type": "number"
},
"minimum": {
"description": "Implements 'range'",
"type": "number"
},
"exclusiveMinimum": {
"description": "Implements 'range'",
"type": "number"
},
"pattern": {
"type": "string",
"format": "regex"
},
"maxItems": {
"description": "Implements 'upperMultiplicity'",
"type": "integer",
"minimum": 0
},
"minItems": {
"description": "Implements 'lowerMultiplicity'",
"type": "integer",
"default": 0,
"minimum": 0
},
"x-ogc-definition": {
"type": "string",
"format": "uri"
},
"x-ogc-unit": {
"type": "string"
},
"x-ogc-unitLang": {
"type": "string",
"format": "uri"
},
"x-ogc-propertySeq": {
"type": "integer",
"minimum": 0
}
}
}
}
}
},
"coverages": {
"allOf": [
{
Expand Down Expand Up @@ -2704,7 +2691,7 @@
"description": "Properties represented by the features in this layer. Can be the attributes of a feature dataset (datatype=geometries) or the rangeType of a coverage (datatype=coverage)"
},
{
"$ref": "#/paths/~1collections~1%7BcollectionId%7D~1schema/get/responses/200/content/application~1json/schema"
"$ref": "#/components/schemas/schema"
}
]
},
Expand Down Expand Up @@ -3213,6 +3200,28 @@
"type": "string"
}
},
"width": {
"name": "width",
"in": "query",
"description": "Number of cells across the coverage dimension corresponding to the spatial dimension represented horizontally on a map, such as longitude or easting.",
"required": false,
"style": "form",
"explode": false,
"schema": {
"type": "integer"
}
},
"height": {
"name": "height",
"in": "query",
"description": "Number of cells across the coverage dimension corresponding to the spatial dimension represented vertically on a 2D map, such as latitude or northing.",
"required": false,
"style": "form",
"explode": false,
"schema": {
"type": "integer"
}
},
"f-coverage": {
"name": "f",
"description": "The optional f parameter indicates the output format which the server shall provide as part of the response document. It has preference over the HTTP Accept header.",
Expand Down
6 changes: 6 additions & 0 deletions standard/openapi/ogcapi-coverages-1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ components:
$ref: 'schemas/common-geodata/numberReturned.yaml'
numberMatched:
$ref: 'schemas/common-geodata/numberMatched.yaml'
schema:
$ref: 'schemas/tms/propertiesSchema.yaml'

# Coverages - Core (this adds `orderedAxes`, which could possibly be defined in Common as well?)
coverages:
Expand Down Expand Up @@ -173,6 +175,10 @@ components:
$ref: 'parameters/coverages-core/scale-size.yaml'
properties:
$ref: 'parameters/coverages-core/properties.yaml'
width:
$ref: 'parameters/coverages-core/width.yaml'
height:
$ref: 'parameters/coverages-core/height.yaml'

# Coverages - Core (unspecified)
f-coverage:
Expand Down

0 comments on commit c42afc6

Please sign in to comment.