update configuration to be resource specific (#393)

Author: tomkralidis

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,8 +21,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Environment**
  - OS:
- - Python version: 
- - pygeoapi version: 
+ - Python version:
+ - pygeoapi version:
 
 **Additional context**
 Add any other context about the problem here.

CONTRIBUTING.md

@@ -84,7 +84,7 @@ Your contribution will be under our [license](https://github.com/geopython/pygeo
       branch, __base your branch off the ``master`` one__.
 
 * Note that depending on how long it takes for the dev team to merge your
-  patch, the copy of ``master`` you worked off of may get out of date! 
+  patch, the copy of ``master`` you worked off of may get out of date!
     * If you find yourself 'bumping' a pull request that's been sidelined for a
       while, __make sure you rebase or merge to latest ``master``__ to ensure a
         speedier resolution.
@@ -103,7 +103,7 @@ Your contribution will be under our [license](https://github.com/geopython/pygeo
 
 ### Code Formatting
 
-* __Please follow the coding conventions and style used in the pygeoapi repository.__ 
+* __Please follow the coding conventions and style used in the pygeoapi repository.__
 * pygeoapi follows the [PEP-8](http://www.python.org/dev/peps/pep-0008/) guidelines
 * 80 characters
 * spaces, not tabs

README.md

@@ -35,15 +35,15 @@ Try the swagger ui at `http://localhost:5000/openapi`
 or
 
 ```bash
-# feature collection metadata
+# collection metadata
 curl http://localhost:5000/
 # conformance
 curl http://localhost:5000/conformance
-# feature collection
+# collection
 curl http://localhost:5000/collections/countries
-# feature collection limit 100
+# collection limit 100
 curl http://localhost:5000/collections/countries/items?limit=100
-# feature
+# collection item
 curl http://localhost:5000/collections/countries/items/1
 # number of hits
 curl http://localhost:5000/collections/countries/items?resulttype=hits

aws-lambda/README.md

@@ -35,7 +35,7 @@ zappa undeploy -s zappa_settings.json
 
 ## node/serverless
 
-The included `serverless.yml` and `pygeoapi-serverless-config.yml` can be used to deploy pygeoapi 
+The included `serverless.yml` and `pygeoapi-serverless-config.yml` can be used to deploy pygeoapi
 on AWS Lambda Serverless Environment.
 
 This requires Amazon Credentials and the Serverless deployment tool.

aws-lambda/pygeoapi-serverless-config.yml

@@ -81,8 +81,9 @@ metadata:
         instructions: During hours of service.  Off on weekends.
         role: pointOfContact
 
-datasets:
+resources:
     obs:
+        type: collection
         title: Observations
         description: My cool observations
         keywords:
@@ -116,6 +117,7 @@ datasets:
                 y_field: lat
 
     ne_110m_populated_places_simple:
+        type: collection
         title: Populated Places
         description: Point symbols with name attributes. Includes all admin-0 capitals and some other major cities. We favor regional significance over population census in determining our selection of places. Use the scale rankings to filter the number of towns that appear on your map.
         keywords:
@@ -143,6 +145,7 @@ datasets:
             id_field: geonameid
 
     lakes:
+        type: collection
         title: Large Lakes
         description: lakes of the world, public domain
         keywords:
@@ -167,6 +170,7 @@ datasets:
             id_field: id
 
     countries:
+        type: collection
         title: Countries in the world
         description: Countries of the world
         keywords:
@@ -191,6 +195,7 @@ datasets:
             id_field: ogc_fid
             table: ne_110m_admin_0_countries
     poi:
+        type: collection
         title: Portuguese point of interrest
         description: Portuguese points of interrest obtained from OpenStreetMap. Dataset includes Madeira and Azores islands
         keywords:
@@ -222,6 +227,7 @@ datasets:
             table: poi_portugal
 
     hotosm_bdi_waterways:
+        type: collection
         title: Waterways of Burundi
         description: Waterways of Burundi, Africa. Dataset timestamp  1st Sep 2018 - Humanitarian OpenStreetMap Team (HOT)
         keywords:
@@ -256,6 +262,7 @@ datasets:
             table: hotosm_bdi_waterways
 
     dutch_georef_stations:
+        type: collection
         title: Dutch Georef Stations via OGR WFS
         description: Locations of RD/GNSS-reference stations from Dutch Kadaster PDOK a.k.a RDInfo. Uses MapServer WFS v2 backend via OGRProvider.
         keywords:
@@ -301,7 +308,7 @@ datasets:
             id_field: gml_id
             layer: rdinfo:stations
 
-processes:
     hello-world:
+        type: process
         processor:
             name: HelloWorld

debian/changelog

@@ -1,5 +1,5 @@
 pygeoapi (0.7.0-1~bionic0) bionic; urgency=medium
-  
+
   * Numerous CITE compliance fixes
   * Elasticsearch: update provider to support ES7
   * MongoDB provider implementation

debian/copyright

@@ -5,11 +5,11 @@ Files: *
 Copyright: Copyright 2019 Tom Kralidis
 License: MIT
  Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation 
- files (the "Software"), to deal in the Software without 
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
  restriction, including without limitation the rights to use,
  copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom 
+ sell copies of the Software, and to permit persons to whom
  the Software is furnished to do so, subject to the following
  conditions:
  .
@@ -21,6 +21,6 @@ License: MIT
  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.

docker/README.md

@@ -2,9 +2,9 @@
 
 Docker Image `geopython/pygeoapi:latest` and versions are [available from DockerHub](https://hub.docker.com/r/geopython/pygeoapi).
 
-Each Docker Image contains a default configuration [default.config.yml](default.config.yml) with the project's test data and WFS3/OGC API Features datasets.
+Each Docker Image contains a default configuration [default.config.yml](default.config.yml) with the project's test data and OGC API dataset collections.
 
-You can override this default config via Docker Volume mapping or by extending the Docker Image and copying in your config. See an [example for the geoapi demo server](https://github.com/geopython/demo.pygeoapi.io/tree/master/services/pygeoapi) for the latter method. 
+You can override this default config via Docker Volume mapping or by extending the Docker Image and copying in your config. See an [example for the geoapi demo server](https://github.com/geopython/demo.pygeoapi.io/tree/master/services/pygeoapi) for the latter method.
 
 https://github.com/geopython/demo.pygeoapi.io/tree/master/services Depending on your config you may need specific backends to be available.
 
@@ -19,9 +19,9 @@ So the chain is:
 
 ```
 
-There are a number of examples at [several examples](https://github.com/geopython/pygeoapi/blob/master/docker/examples). 
+There are a number of examples at [several examples](https://github.com/geopython/pygeoapi/blob/master/docker/examples).
 
-### Installation 
+### Installation
 
 Install Docker (Ubuntu)
 
@@ -51,11 +51,11 @@ Run/Create Container
 $ sudo docker run --name geoapi -p 5000:80 -v $(pwd)/my.config.yml:/pygeoapi/local.config.yml -it geopython/pygeoapi
 ```
 
-Go to http://localhost:5000/ and should be up and running. 
+Go to http://localhost:5000/ and should be up and running.
 
 ## Running - Basics
 
-By default this Image will start a `pygeoapi` Docker Container 
+By default this Image will start a `pygeoapi` Docker Container
 using `gunicorn` on internal port 80.
 
 To run with default built-in config and data:
@@ -64,7 +64,7 @@ To run with default built-in config and data:
 	docker run -p 5000:80 -it geopython/pygeoapi run
 	# or simply
 	docker run -p 5000:80 -it geopython/pygeoapi
-	
+
     # then browse to http://localhost:5000/
 ```
 
@@ -111,13 +111,13 @@ COPY ./my.config.yml /pygeoapi/local.config.yml
 
 See how the demo server is setup this way at
 https://github.com/geopython/demo.pygeoapi.io/tree/master/services/pygeoapi_master
- 
+
 ## Running - Running on a sub-path
 
 By default the `pygeoapi` Docker Image will run from the `root` path `/`.
 If you need to run from a sub-path and have all internal URLs correct
 you need to set `SCRIPT_NAME` environment variable.
-  
+
 For example to run with `my.config.yml` on http://localhost:5000/mypygeoapi:
 
 ```
@@ -140,7 +140,7 @@ services:
 
     ports:
       - "5000:80"
-      
+
     environment:
      - SCRIPT_NAME=/pygeoapi
 

docker/default.config.yml

@@ -87,8 +87,9 @@ metadata:
         instructions: During hours of service.  Off on weekends.
         role: pointOfContact
 
-datasets:
+resources:
     obs:
+        type: collection
         title: Observations
         description: My cool observations
         keywords:
@@ -126,6 +127,7 @@ datasets:
                 y_field: lat
 
     lakes:
+        type: collection
         title: Large Lakes
         description: lakes of the world, public domain
         keywords:
@@ -149,6 +151,7 @@ datasets:
             id_field: id
 
     countries:
+        type: collection
         title: Countries in the world (SpatialLite Provider)
         description: Countries of the world (SpatialLite)
         keywords:
@@ -174,6 +177,7 @@ datasets:
             table: ne_110m_admin_0_countries
 
     dutch_georef_stations:
+        type: collection
         title: Dutch Georef Stations via OGR WFS
         description: Locations of RD/GNSS-reference stations from Dutch Kadaster PDOK a.k.a RDInfo. Uses MapServer WFS v2 backend via OGRProvider.
         keywords:
@@ -220,6 +224,7 @@ datasets:
             layer: rdinfo:stations
 
     utah_city_locations:
+        type: collection
         title: Cities in Utah via OGR WFS
         description: Data from the state of Utah. Standard demo dataset from the deegree WFS server that is used as backend WFS.
         keywords:
@@ -265,6 +270,7 @@ datasets:
             layer: app:SGID93_LOCATION_UDOTMap_CityLocations
 
     unesco_pois_italy:
+        type: collection
         title: Unesco POIs in Italy via OGR WFS
         description: Unesco Points of Interest in Italy. Using GeoSolutions GeoServer WFS demo-server as backend WFS.
         keywords:
@@ -309,6 +315,7 @@ datasets:
             layer: unesco:Unesco_point
 
     ogr_gpkg_poi:
+        type: collection
         title: Portuguese Points of Interest via OGR GPKG
         description: Portuguese Points of Interest obtained from OpenStreetMap. Dataset includes Madeira and Azores islands. Uses GeoPackage backend via OGR provider.
         keywords:
@@ -354,6 +361,7 @@ datasets:
             layer: poi_portugal
 
     ogr_geojson_lakes:
+        type: collection
         title: Large Lakes OGR GeoJSON Driver
         description: lakes of the world, public domain
         keywords:
@@ -392,6 +400,7 @@ datasets:
             layer: ne_110m_lakes
 
     ogr_addresses_sqlite:
+        type: collection
         title: Dutch addresses (subset Otterlo). OGR SQLite Driver
         description: Dutch addresses subset.
         keywords:
@@ -433,6 +442,7 @@ datasets:
             layer: ogrgeojson
 
     ogr_addresses_gpkg:
+        type: collection
         title: Dutch addresses (subset Otterlo). OGR GeoPackage Driver
         description: Dutch addresses subset.
         keywords:
@@ -472,7 +482,7 @@ datasets:
             id_field: id
             layer: OGRGeoJSON
 
-processes:
     hello-world:
+        type: process
         processor:
             name: HelloWorld

docker/examples/README.md

@@ -5,5 +5,5 @@ This folder contains the sub-folders:
 - simple
 - elastic
 
-The [simple](simple) example will run pygeoapi with Docker with your local config. 
+The [simple](simple) example will run pygeoapi with Docker with your local config.
 The [elastic](elastic) example demonstrates a docker compose configuration to run pygeoapi with local ElasticSearch backend.