Skip to content

Commit

Permalink
update metadata doc links (relates to #231)
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed May 25, 2021
1 parent 858ea46 commit acc0e9c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ Changes

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

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

`3.1.0 <https://github.com/crim-ca/weaver/tree/3.1.0>`_ (2021-04-23)
========================================================================
Expand Down
2 changes: 1 addition & 1 deletion docs/source/references.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
.. |ogc-home| replace:: |ogc| Homepage
.. _ogc-home: `ogc`_
.. |ogc-proc-api| replace:: OGC API - Processes
.. _ogc-proc-api: https://github.com/opengeospatial/wps-rest-binding
.. _ogc-proc-api: https://github.com/opengeospatial/ogcapi-processes
.. |pywps| replace:: PyWPS
.. _pywps: https://github.com/geopython/pywps/
.. |pywps-status| replace:: Progress and Status Report
Expand Down
20 changes: 18 additions & 2 deletions weaver/wps_restapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def api_frontpage_body(settings):
weaver_links = [
{"href": weaver_url, "rel": "self", "type": CONTENT_TYPE_APP_JSON, "title": "This document"},
{"href": weaver_conform_url, "rel": "conformance", "type": CONTENT_TYPE_APP_JSON,
"title": "WPS conformance classes implemented by this service."},
"title": "Conformance classes implemented by this service."},
]
if weaver_api:
weaver_links.extend([
Expand Down Expand Up @@ -130,6 +130,10 @@ def api_frontpage_body(settings):
doc_type = CONTENT_TYPE_TEXT_PLAIN # default most basic type
weaver_links.append({"href": weaver_api_doc, "rel": "documentation", "type": doc_type,
"title": "API reference documentation about this service."})
else:
weaver_links.append({"href": __meta__.__documentation_url__, "rel": "documentation",
"type": CONTENT_TYPE_TEXT_HTML,
"title": "API reference documentation about this service."})
if weaver_wps:
weaver_links.extend([
{"href": weaver_wps_url,
Expand Down Expand Up @@ -177,7 +181,16 @@ def api_versions(request): # noqa: F811
def api_conformance(request): # noqa: F811
# type: (Request) -> HTTPException
"""Weaver specification conformance information."""
# TODO: follow updates with https://github.com/geopython/pygeoapi/issues/198
# see references:
# - https://github.com/opengeospatial/ogcapi-common/tree/Working/collections/requirements
# - https://github.com/opengeospatial/ogcapi-common/tree/Working/collections/recommendations
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/core/requirements
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/core/recommendations
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/transactions/standard/requirements
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/transactions/standard/recommendations
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/workflows/standard/requirements
# - https://github.com/opengeospatial/ogcapi-processes/tree/master/extensions/workflows/standard/recommendations

conformance = {"conformsTo": [
# "http://www.opengis.net/spec/wfs-1/3.0/req/core",
# "http://www.opengis.net/spec/wfs-1/3.0/req/oas30",
Expand Down Expand Up @@ -205,6 +218,9 @@ def api_conformance(request): # noqa: F811
# "http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/callback",
# FIXME: https://github.com/crim-ca/weaver/issues/228
# "http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/dismiss",
# FIXME: https://github.com/crim-ca/weaver/issues/231
# List all supported requirements, recommendations and abstract tests
"http://www.opengis.net/spec/ogcapi-processes-1/1.0/req/core/process",

]}
return HTTPOk(json=conformance)
Expand Down

0 comments on commit acc0e9c

Please sign in to comment.