Skip to content

Commit acc0e9c

Browse files
committed
update metadata doc links (relates to #231)
1 parent 858ea46 commit acc0e9c

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

CHANGES.rst

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ Changes
1010

1111
Changes:
1212
--------
13-
- No change.
13+
- Add reference link to ReadTheDocs URL of `Weaver` in API landing page.
14+
- Add references to `OGC-API Processes` requirements and recommendations for eventual conformance listing
15+
(relates to `#231 <https://github.com/crim-ca/weaver/issues/231>`_).
1416

1517
Fixes:
1618
------
@@ -21,6 +23,7 @@ Fixes:
2123
(see issue `#526 <https://github.com/geopython/pywps/issues/526>`_).
2224
- Fix default execution mode specification in process job control options
2325
(fixes `#182 <https://github.com/opengeospatial/ogcapi-processes/pull/182>`_).
26+
- Fix old OGC-API WPS REST bindings link in landing page for the more recent `OGC-API Processes` specification.
2427

2528
`3.1.0 <https://github.com/crim-ca/weaver/tree/3.1.0>`_ (2021-04-23)
2629
========================================================================

docs/source/references.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
.. |ogc-home| replace:: |ogc| Homepage
4848
.. _ogc-home: `ogc`_
4949
.. |ogc-proc-api| replace:: OGC API - Processes
50-
.. _ogc-proc-api: https://github.com/opengeospatial/wps-rest-binding
50+
.. _ogc-proc-api: https://github.com/opengeospatial/ogcapi-processes
5151
.. |pywps| replace:: PyWPS
5252
.. _pywps: https://github.com/geopython/pywps/
5353
.. |pywps-status| replace:: Progress and Status Report

weaver/wps_restapi/api.py

+18-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def api_frontpage_body(settings):
7777
weaver_links = [
7878
{"href": weaver_url, "rel": "self", "type": CONTENT_TYPE_APP_JSON, "title": "This document"},
7979
{"href": weaver_conform_url, "rel": "conformance", "type": CONTENT_TYPE_APP_JSON,
80-
"title": "WPS conformance classes implemented by this service."},
80+
"title": "Conformance classes implemented by this service."},
8181
]
8282
if weaver_api:
8383
weaver_links.extend([
@@ -130,6 +130,10 @@ def api_frontpage_body(settings):
130130
doc_type = CONTENT_TYPE_TEXT_PLAIN # default most basic type
131131
weaver_links.append({"href": weaver_api_doc, "rel": "documentation", "type": doc_type,
132132
"title": "API reference documentation about this service."})
133+
else:
134+
weaver_links.append({"href": __meta__.__documentation_url__, "rel": "documentation",
135+
"type": CONTENT_TYPE_TEXT_HTML,
136+
"title": "API reference documentation about this service."})
133137
if weaver_wps:
134138
weaver_links.extend([
135139
{"href": weaver_wps_url,
@@ -177,7 +181,16 @@ def api_versions(request): # noqa: F811
177181
def api_conformance(request): # noqa: F811
178182
# type: (Request) -> HTTPException
179183
"""Weaver specification conformance information."""
180-
# TODO: follow updates with https://github.com/geopython/pygeoapi/issues/198
184+
# see references:
185+
# - https://github.com/opengeospatial/ogcapi-common/tree/Working/collections/requirements
186+
# - https://github.com/opengeospatial/ogcapi-common/tree/Working/collections/recommendations
187+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/core/requirements
188+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/core/recommendations
189+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/transactions/standard/requirements
190+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/transactions/standard/recommendations
191+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/workflows/standard/requirements
192+
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/workflows/standard/recommendations
193+
181194
conformance = {"conformsTo": [
182195
# "http://www.opengis.net/spec/wfs-1/3.0/req/core",
183196
# "http://www.opengis.net/spec/wfs-1/3.0/req/oas30",
@@ -205,6 +218,9 @@ def api_conformance(request): # noqa: F811
205218
# "http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/callback",
206219
# FIXME: https://github.com/crim-ca/weaver/issues/228
207220
# "http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/dismiss",
221+
# FIXME: https://github.com/crim-ca/weaver/issues/231
222+
# List all supported requirements, recommendations and abstract tests
223+
"http://www.opengis.net/spec/ogcapi-processes-1/1.0/req/core/process",
208224

209225
]}
210226
return HTTPOk(json=conformance)

0 commit comments

Comments
 (0)