Skip to content

Commit

Permalink
update changelog - fix #53, #58, #86
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Mar 7, 2020
1 parent 7a67035 commit 7c57c18
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
15 changes: 15 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ Changes
Unreleased
==========

Changes:
--------

- Provide HTTP links to corresponding items of job in status JSON body (#58).
- Provide OGC compliance of ``<job-uri>/results`` response schema as well as some expected ``code``/``description``
fields in case where the request fails.
- Add ``<job-uri>/outputs`` providing the 'old' format of the job results as well as ``<job-uri>/inputs`` to retrieve
the inputs that were provided during job submission (#86).
- Add more reference/documentation links to `WPS-1/2` and update conformance references (#53).

Fixes:
------

- Handle additional trailing slash resulting in ``NotFound`` that corresponds to a valid route without the slash.

1.2.0 (2020-03-06)
==================

Expand Down
2 changes: 2 additions & 0 deletions config/weaver.ini.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ weaver.wps_output = true
weaver.wps_output_dir = /tmp
weaver.wps_output_url =
weaver.wps_output_path = /wpsoutputs
weaver.wps_ref = http://schemas.opengis.net/wps/
weaver.wps_doc = http://docs.opengeospatial.org/is/14-065/14-065.html
# WPS metadata
weaver.wps_metadata_identification_title=Weaver
weaver.wps_metadata_identification_abstract=Weaver internal WPS used for demo and testing.
Expand Down
17 changes: 12 additions & 5 deletions weaver/wps_restapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ def api_frontpage(request):
weaver_api_ref = settings.get("weaver.wps_restapi_ref", None) if weaver_api else None
weaver_wps = asbool(settings.get("weaver.wps"))
weaver_wps_url = weaver_url + get_wps_path(settings) if weaver_wps else None
weaver_wps_doc = settings.get("weaver.wps_doc", None) if weaver_wps else None
weaver_wps_ref = settings.get("weaver.wps_ref", None) if weaver_wps else None
weaver_conform_url = weaver_url + sd.api_conformance_service.path
weaver_process_url = weaver_url + sd.processes_service.path
weaver_links = [
Expand Down Expand Up @@ -90,7 +92,9 @@ def api_frontpage(request):
"api": weaver_api_def,
"ref": weaver_api_ref},
{"name": "wps", "enabled": weaver_wps,
"url": weaver_wps_url},
"url": weaver_wps_url,
"doc": weaver_wps_doc,
"ref": weaver_wps_ref},
],
"links": weaver_links,
}
Expand All @@ -112,13 +116,16 @@ def api_conformance(request): # noqa: F811
"""Weaver specification conformance information."""
# TODO: follow updates with https://github.com/geopython/pygeoapi/issues/198
conformance = {"conformsTo": [
"http://www.opengis.net/spec/wfs-1/3.0/req/core",
"http://www.opengis.net/spec/wfs-1/3.0/req/oas30",
# "http://www.opengis.net/spec/wfs-1/3.0/req/core",
# "http://www.opengis.net/spec/wfs-1/3.0/req/oas30",
# "http://www.opengis.net/spec/wfs-1/3.0/req/html",
"http://www.opengis.net/spec/wfs-1/3.0/req/geojson",
# "http://www.opengis.net/spec/wfs-1/3.0/req/geojson",
"http://schemas.opengis.net/wps/1.0.0/",
"http://schemas.opengis.net/wps/2.0/",
"http://www.opengis.net/spec/WPS/2.0/req/service/binding/rest-json/core",
"http://www.opengis.net/spec/WPS/2.0/req/service/binding/rest-json/oas30",
# "http://www.opengis.net/spec/WPS/2.0/req/service/binding/rest-json/oas30",
# "http://www.opengis.net/spec/WPS/2.0/req/service/binding/rest-json/html"
"https://github.com/opengeospatial/wps-rest-binding",
]}
return HTTPOk(json=conformance)

Expand Down

0 comments on commit 7c57c18

Please sign in to comment.