From 1d576fd752874960bfdefbf2ce6f834badf5b39c Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Mon, 27 Apr 2020 11:15:04 -0400 Subject: [PATCH] fix OpenAPI generation (#428) * fix OpenAPI generation * fix --- aws-lambda/pygeoapi-serverless-config.yml | 2 +- docker/default.config.yml | 2 +- docker/examples/elastic/pygeoapi/docker.config.yml | 2 +- docker/examples/simple/my.config.yml | 2 +- docs/source/configuration.rst | 2 +- pygeoapi-config.yml | 2 +- pygeoapi/openapi.py | 2 +- tests/cite/ogcapi-features/cite.config.yml | 2 +- tests/pygeoapi-test-config-envvars.yml | 2 +- tests/pygeoapi-test-config.yml | 2 +- tests/pygeoapi-test-ogr-config.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aws-lambda/pygeoapi-serverless-config.yml b/aws-lambda/pygeoapi-serverless-config.yml index f762402..88e6abf 100644 --- a/aws-lambda/pygeoapi-serverless-config.yml +++ b/aws-lambda/pygeoapi-serverless-config.yml @@ -57,7 +57,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/docker/default.config.yml b/docker/default.config.yml index ca2d429..f9b5bfa 100644 --- a/docker/default.config.yml +++ b/docker/default.config.yml @@ -63,7 +63,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: null + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: https://github.com/geopython/pygeoapi license: name: CC-BY 4.0 license diff --git a/docker/examples/elastic/pygeoapi/docker.config.yml b/docker/examples/elastic/pygeoapi/docker.config.yml index dec0261..c68138f 100644 --- a/docker/examples/elastic/pygeoapi/docker.config.yml +++ b/docker/examples/elastic/pygeoapi/docker.config.yml @@ -60,7 +60,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/docker/examples/simple/my.config.yml b/docker/examples/simple/my.config.yml index 7c3ed67..a75deb8 100644 --- a/docker/examples/simple/my.config.yml +++ b/docker/examples/simple/my.config.yml @@ -58,7 +58,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 2ab7486..502cbbd 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -81,7 +81,7 @@ The ``metadata`` section provides settings for overall service metadata and desc - data - api keywords_type: theme # keyword type as per the ISO 19115 MD_KeywordTypeCode codelist). Accepted values are discipline, temporal, place, theme, stratum - terms_of_service: null # terms of service + terms_of_service: https://creativecommons.org/licenses/by/4.0/ # terms of service url: http://example.org # informative URL about the service license: # licensing details name: CC-BY 4.0 license diff --git a/pygeoapi-config.yml b/pygeoapi-config.yml index 507b327..e9db193 100644 --- a/pygeoapi-config.yml +++ b/pygeoapi-config.yml @@ -56,7 +56,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: null + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/pygeoapi/openapi.py b/pygeoapi/openapi.py index 4d86450..1e2001a 100644 --- a/pygeoapi/openapi.py +++ b/pygeoapi/openapi.py @@ -398,7 +398,7 @@ def get_oas_30(cfg): 'explode': False }) - paths['{}/items/{{itemId}}'.format(collection_name_path)] = { + paths['{}/items/{{featureId}}'.format(collection_name_path)] = { 'get': { 'summary': 'Get {} item by id'.format(v['title']), 'description': v['description'], diff --git a/tests/cite/ogcapi-features/cite.config.yml b/tests/cite/ogcapi-features/cite.config.yml index 61d8897..b13f74d 100644 --- a/tests/cite/ogcapi-features/cite.config.yml +++ b/tests/cite/ogcapi-features/cite.config.yml @@ -27,7 +27,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: null + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: https://pygeoapi.io license: name: CC-BY 4.0 license diff --git a/tests/pygeoapi-test-config-envvars.yml b/tests/pygeoapi-test-config-envvars.yml index c8e7bab..91d9cd2 100644 --- a/tests/pygeoapi-test-config-envvars.yml +++ b/tests/pygeoapi-test-config-envvars.yml @@ -56,7 +56,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/tests/pygeoapi-test-config.yml b/tests/pygeoapi-test-config.yml index f9ffd0c..764ef34 100644 --- a/tests/pygeoapi-test-config.yml +++ b/tests/pygeoapi-test-config.yml @@ -56,7 +56,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license diff --git a/tests/pygeoapi-test-ogr-config.yml b/tests/pygeoapi-test-ogr-config.yml index b91feb3..5e63164 100644 --- a/tests/pygeoapi-test-ogr-config.yml +++ b/tests/pygeoapi-test-ogr-config.yml @@ -56,7 +56,7 @@ metadata: - data - api keywords_type: theme - terms_of_service: None + terms_of_service: https://creativecommons.org/licenses/by/4.0/ url: http://example.org license: name: CC-BY 4.0 license