Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openapi/examples/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "mfc-1",
"title": "moving_feature_collection_sample",
"itemType": "movingfeature",
"updateFrequency": 1000,
"samplingInterval": 1000,
"extent": {
"spatial": {
"bbox": [
Expand All @@ -28,4 +28,4 @@
"type": "application/json"
}
]
}
}
2 changes: 1 addition & 1 deletion openapi/examples/collections.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"title": "MovingFeatureCollection_1",
"description": "a collection of moving features to manage data in a distinct (physical or logical) space",
"itemType": "movingfeature",
"updateFrequency": 1000,
"samplingInterval": 1000,
"extent": {
"spatial": {
"bbox": [
Expand Down
4 changes: 2 additions & 2 deletions openapi/examples/collections_post.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "moving_feature_collection_sample",
"updateFrequency": 1000,
"samplingInterval": 1000,
"description": "example",
"itemType": "movingfeature"
}
}
16 changes: 8 additions & 8 deletions openapi/ogcapi-movingfeatures-1.bundled.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
},
"example": {
"title": "moving_feature_collection_sample",
"updateFrequency": 1000,
"samplingInterval": 1000,
"description": "example",
"itemType": "movingfeature"
}
Expand Down Expand Up @@ -204,7 +204,7 @@
"put": {
"operationId": "replaceMetadata",
"summary": "Replace metadata about the collection",
"description": "A user SHOULD replace metadata with id `collectionId`.\n\nThe request body schema is the same the POST's one. \n\nHowever, `updateFrequency` property is NOT updated.\n",
"description": "A user SHOULD replace metadata with id `collectionId`.\n\nThe request body schema is the same the POST's one. \n\nHowever, `samplingInterval` property is NOT updated.\n",
"tags": [
"MovingFeatureCollection"
],
Expand All @@ -221,7 +221,7 @@
},
"example": {
"title": "moving_feature_collection_sample",
"updateFrequency": 1000,
"samplingInterval": 1000,
"description": "example",
"itemType": "movingfeature"
}
Expand Down Expand Up @@ -1504,7 +1504,7 @@
"https://www.opengis.net/def/crs/EPSG/0/4326"
]
},
"updateFrequency": {
"samplingInterval": {
"description": "a time interval of sampling location. The unit is millisecond.",
"type": "number"
}
Expand Down Expand Up @@ -1541,7 +1541,7 @@
"description": "human readable title of the collection",
"type": "string"
},
"updateFrequency": {
"samplingInterval": {
"description": "a time interval of sampling location. The unit is millisecond.",
"type": "number"
},
Expand Down Expand Up @@ -2719,7 +2719,7 @@
"title": "MovingFeatureCollection_1",
"description": "a collection of moving features to manage data in a distinct (physical or logical) space",
"itemType": "movingfeature",
"updateFrequency": 1000,
"samplingInterval": 1000,
"extent": {
"spatial": {
"bbox": [
Expand Down Expand Up @@ -2769,7 +2769,7 @@
"id": "mfc-1",
"title": "moving_feature_collection_sample",
"itemType": "movingfeature",
"updateFrequency": 1000,
"samplingInterval": 1000,
"extent": {
"spatial": {
"bbox": [
Expand Down Expand Up @@ -3389,4 +3389,4 @@
}
}
}
}
}
16 changes: 8 additions & 8 deletions openapi/ogcapi-movingfeatures-1.bundled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ paths:
$ref: '#/components/schemas/collection-body'
example:
title: moving_feature_collection_sample
updateFrequency: 1000
samplingInterval: 1000
description: example
itemType: movingfeature
responses:
Expand Down Expand Up @@ -141,7 +141,7 @@ paths:

The request body schema is the same the POST's one.

However, `updateFrequency` property is NOT updated.
However, `samplingInterval` property is NOT updated.
tags:
- MovingFeatureCollection
parameters:
Expand All @@ -153,7 +153,7 @@ paths:
$ref: '#/components/schemas/collection-body'
example:
title: moving_feature_collection_sample
updateFrequency: 1000
samplingInterval: 1000
description: example
itemType: movingfeature
responses:
Expand Down Expand Up @@ -1085,7 +1085,7 @@ components:
example:
- https://www.opengis.net/def/crs/OGC/1.3/CRS84
- https://www.opengis.net/def/crs/EPSG/0/4326
updateFrequency:
samplingInterval:
description: a time interval of sampling location. The unit is millisecond.
type: number
collections:
Expand All @@ -1110,7 +1110,7 @@ components:
title:
description: human readable title of the collection
type: string
updateFrequency:
samplingInterval:
description: a time interval of sampling location. The unit is millisecond.
type: number
description:
Expand Down Expand Up @@ -1883,7 +1883,7 @@ components:
title: MovingFeatureCollection_1
description: a collection of moving features to manage data in a distinct (physical or logical) space
itemType: movingfeature
updateFrequency: 1000
samplingInterval: 1000
extent:
spatial:
bbox:
Expand Down Expand Up @@ -1915,7 +1915,7 @@ components:
id: mfc-1
title: moving_feature_collection_sample
itemType: movingfeature
updateFrequency: 1000
samplingInterval: 1000
extent:
spatial:
bbox:
Expand Down Expand Up @@ -2426,4 +2426,4 @@ components:
description: local identifier of a temporal primitive value
required: true
schema:
type: string
type: string
4 changes: 2 additions & 2 deletions openapi/openapi-movingfeatures-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ paths:

The request body schema is the same the POST's one.

However, `updateFrequency` property is NOT updated.
However, `samplingInterval` property is NOT updated.
tags:
- MovingFeatureCollection
parameters:
Expand Down Expand Up @@ -620,4 +620,4 @@ paths:
- Or a temporal property with the specified id was not found.
- Or a temporal primitive primitive with the specified id was not found.
'500':
$ref: "responses/ServerError.yaml"
$ref: "responses/ServerError.yaml"
2 changes: 1 addition & 1 deletion openapi/schemas/collection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ properties:
example:
- 'https://www.opengis.net/def/crs/OGC/1.3/CRS84'
- 'https://www.opengis.net/def/crs/EPSG/0/4326'
updateFrequency:
samplingInterval:
description: a time interval of sampling location. The unit is millisecond.
type: number
4 changes: 2 additions & 2 deletions openapi/schemas/requestBody/collection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ properties:
title:
description: human readable title of the collection
type: string
updateFrequency:
samplingInterval:
description: a time interval of sampling location. The unit is millisecond.
type: number
description:
Expand All @@ -14,4 +14,4 @@ properties:
itemType:
description: indicator about the type of the items in the moving features collection (the default value is 'movingfeature').
type: string
default: "movingfeature"
default: "movingfeature"
4 changes: 2 additions & 2 deletions standard/clause_8_requirements_resource_collection.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The schema for the collection information object presented in this clause is an
|_links_ |M |A list of links for navigating the API (e.g. link to previous or next pages; links to alternative representations, etc.)
|_extent_ |O |The spatiotemporal coverage of the collection.
|*_itemType_* |M |Fixed to the value "movingfeature".
|*_updateFrequency_* |O |A time interval of sampling location. The time unit of this property is millisecond.
|*_samplingInterval* |O |A time interval of sampling location. The time unit of this property is millisecond.
|===

NOTE: The _id_, _title_, _description_, _links_, _extent_, and _itemType_ properties were inherited from link:https://docs.ogc.org/DRAFTS/20-024.html#collection-description[OGC API — Common] and link:https://docs.ogc.org/is/17-069r3/17-069r3.html#_collections_[OGC API — Features].
Expand Down Expand Up @@ -113,4 +113,4 @@ A successful response to the *Collection* DELETE operation is an HTTP status cod
include::requirements/collection_catalog/collection/REQ_response-collection-delete.adoc[]

==== Error situations
General guidance on HTTP status codes and how they should be handled is provided in <<http-status-codes>>.
General guidance on HTTP status codes and how they should be handled is provided in <<http-status-codes>>.
2 changes: 1 addition & 1 deletion standard/examples/collection-post.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| |
| { |
| "title": "MovingFeatureCollection_1", |
| "updateFrequency": 1000, |
| "samplingInterval": 1000, |
| "description": "a collection of moving features to manage data |
| in a distinct (physical or logical) space", |
| "itemType": "movingfeature" |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
^|*Requirement {counter:req-id}* |*/req/mf-collection/collection-put*
^|A |An implementation of the OGC API - Moving Features Standard SHALL comply with the OGC API — Features `PUT` operation requirement http://docs.ogc.org/DRAFTS/20-002.html#_operation_2[`/req/create-replace-delete/update-put-op`].
^|B |An implementation of the OGC API - Moving Features Standard SHALL comply with the OGC API — Features `PUT` request body requirements http://docs.ogc.org/DRAFTS/20-002.html#_request_body_2[`/req/create-replace-delete/update-put-body` and `/req/create-replace-delete/update-put-content-type`].
^|C |The content of the request body SHALL be based upon the <<collection-requestbody-schema, *Collection* request body schema>>, except `updateFrequency`. +
If the `updateFrequency` is included in the request body, the server SHALL ignore it.
^|C |The content of the request body SHALL be based upon the <<collection-requestbody-schema, *Collection* request body schema>>, except `samplingInterval`. +
If the `samplingInterval` is included in the request body, the server SHALL ignore it.
|===
////

Expand All @@ -19,9 +19,9 @@ identifier:: /req/mf-collection/collection-put
// part:: An implementation of the OGC API - Moving Features Standard SHALL comply with the OGC API — Features `PUT` request body requirements http://docs.ogc.org/DRAFTS/20-002.html#_request_body_2[`/req/create-replace-delete/put-body` and `/req/create-replace-delete/put-content-type`].
part:: For every resource in the collection, the server SHALL support the HTTP PUT operation.
part:: The `Content-Type` header SHALL be used to indicate the media type of the request body containing the representation of the new resource content.
part:: The content of the request body SHALL be based upon the <<collection-requestbody-schema, *Collection* request body schema>>, except `updateFrequency`. +
If the `updateFrequency` is included in the request body, the server SHALL ignore it.
part:: The content of the request body SHALL be based upon the <<collection-requestbody-schema, *Collection* request body schema>>, except `samplingInterval`. +
If the `samplingInterval` is included in the request body, the server SHALL ignore it.
====

[NOTE]
See link:https://www.rfc-editor.org/rfc/rfc9110#field.content-type[section 8.3 of RFC 9110] for details of `Content-Type`.
See link:https://www.rfc-editor.org/rfc/rfc9110#field.content-type[section 8.3 of RFC 9110] for details of `Content-Type`.
4 changes: 2 additions & 2 deletions standard/requirements/common/REQ_parameter-datetime.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Only features that have a temporal primitive geometry (and temporal primitive va
--
[.component,class=part]
--
Temporal primitive geometries (and temporal primitive values) are a half-bounded time interval (i.e., *_(t_s, t_e + updateFrequency]_*). The parameter value SHALL conform to the following syntax (using link:https://tools.ietf.org/html/rfc5234[ABNF]):
Temporal primitive geometries (and temporal primitive values) are a half-bounded time interval (i.e., *_(t_s, t_e + samplingInterval]_*). The parameter value SHALL conform to the following syntax (using link:https://tools.ietf.org/html/rfc5234[ABNF]):
[source]
interval-bounded = date-time "/" date-time
interval-half-bounded-start = [".."] "/" date-time
Expand All @@ -55,4 +55,4 @@ When a double-dot (`..`) or an empty string is specified in a time interval, the
--
If the `datetime` parameter is provided by the client and supported by the server, then only collections whose temporal extent intersects the interval or instant of the `datetime` parameter and collections that do not describe a temporal extent SHALL be part of the result set.
--
====
====