fix OpenAPI generation (#428)

* fix OpenAPI generation

* fix

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

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

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

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

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

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

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'],

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

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

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

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