From 85939109b1946f2bc951f7e2ebce603561318ee6 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sat, 22 Aug 2020 10:49:18 -0400 Subject: [PATCH] minor docs updates and test cleanups --- .../data-publishing/ogcapi-features.rst | 2 + docs/source/tour.rst | 41 +++++++++++++++++-- tests/test_mongo_provider.py | 2 - tests/test_ogr_csv_provider.py | 1 - tests/test_ogr_esrijson_provider.py | 1 - tests/test_ogr_gpkg_provider.py | 2 - tests/test_ogr_shapefile_provider.py | 2 - tests/test_ogr_sqlite_provider.py | 1 - tests/test_ogr_wfs_provider.py | 3 -- 9 files changed, 40 insertions(+), 15 deletions(-) diff --git a/docs/source/data-publishing/ogcapi-features.rst b/docs/source/data-publishing/ogcapi-features.rst index 63d2cdd..45f7de6 100644 --- a/docs/source/data-publishing/ogcapi-features.rst +++ b/docs/source/data-publishing/ogcapi-features.rst @@ -162,6 +162,8 @@ Data access examples - http://localhost:5000/collections - overview of dataset - http://localhost:5000/collections/foo +- queryables + - http://localhost:5000/collections/foo/queryables - browse features - http://localhost:5000/collections/foo/items - paging diff --git a/docs/source/tour.rst b/docs/source/tour.rst index 426cb69..ba01690 100644 --- a/docs/source/tour.rst +++ b/docs/source/tour.rst @@ -54,9 +54,11 @@ The 'View' section provides the default to start browsing the data. The 'Queryables' section provides a link to the dataset's properties. +Vector data +----------- Collection queryables ---------------------- +^^^^^^^^^^^^^^^^^^^^^ http://localhost:5000/collections/obs/queryables @@ -64,7 +66,7 @@ The queryables endpoint provides a list of queryable properties and their associ Collection items ----------------- +^^^^^^^^^^^^^^^^ http://localhost:5000/collections/obs/items @@ -76,13 +78,42 @@ Let's inspect the feature close to `Toronto, Ontario, Canada`_. Collection item ---------------- +^^^^^^^^^^^^^^^ http://localhost:5000/collections/obs/items/297 This page provides an overview of the feature and its full set of properties, along with an interactive map. +.. seealso:: + :ref:`ogcapi-features` for more OGC API - Features request examples. + +Raster data +----------- + +Collection coverage domainset +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This page provides information on a collection coverage spatial properties and axis information. + +http://localhost:5000/collections/gdps-temperature/coverage/domainset + +Collection coverage rangetype +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This page provides information on a collection coverage rangetype (bands) information. + +http://localhost:5000/collections/gdps-temperature/coverage/rangetype + +Collection coverage data +^^^^^^^^^^^^^^^^^^^^^^^^ + +This page provides a coverage in CoverageJSON format. + +http://localhost:5000/collections/gdps-temperature/coverage + +.. seealso:: + :ref:`ogcapi-coverages` for more OGC API - Coverages request exampless. SpatioTemporal Assets --------------------- @@ -94,6 +125,8 @@ click to browse directory contentsor inspect files. Clicking on a file will att file's properties/metadata, as well as an interactive map with a footprint of the spatial extent of the file. +.. seealso:: + :ref:`stac` for more STAC request examples. Processes --------- @@ -103,6 +136,8 @@ The processes page provides a list of process integrated onto the server, along .. todo:: Expand with more info once OAProc HTML is better flushed out. +.. seealso:: + :ref:`ogcapi-processes` for more OGC API - Processes request examples. API Documentation ----------------- diff --git a/tests/test_mongo_provider.py b/tests/test_mongo_provider.py index e0ee674..7c63c86 100644 --- a/tests/test_mongo_provider.py +++ b/tests/test_mongo_provider.py @@ -94,8 +94,6 @@ def test_query(config): results = p.query(sortby=[{'property': 'scalerank', 'order': 'D'}]) assert results['features'][0]['properties']['scalerank'] == 8 - print(results['features'][0]) - print(len(results['features'][0]['properties'])) assert len(results['features'][0]['properties']) == 37 diff --git a/tests/test_ogr_csv_provider.py b/tests/test_ogr_csv_provider.py index 77fbab5..0bc60e8 100644 --- a/tests/test_ogr_csv_provider.py +++ b/tests/test_ogr_csv_provider.py @@ -123,7 +123,6 @@ def test_query_bbox_hits_vsicurl(config_vsicurl_csv): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits > 1 diff --git a/tests/test_ogr_esrijson_provider.py b/tests/test_ogr_esrijson_provider.py index d780b3d..b028347 100644 --- a/tests/test_ogr_esrijson_provider.py +++ b/tests/test_ogr_esrijson_provider.py @@ -138,7 +138,6 @@ def test_query_bbox_hits_agol(config_ArcGIS_ESRIJSON): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits > 1 diff --git a/tests/test_ogr_gpkg_provider.py b/tests/test_ogr_gpkg_provider.py index 7f46e60..5c1271e 100644 --- a/tests/test_ogr_gpkg_provider.py +++ b/tests/test_ogr_gpkg_provider.py @@ -198,7 +198,6 @@ def test_query_bbox_hits_4326(config_gpkg_4326): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 @@ -216,7 +215,6 @@ def test_query_bbox_hits_28992(config_gpkg_28992): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 diff --git a/tests/test_ogr_shapefile_provider.py b/tests/test_ogr_shapefile_provider.py index 9274c82..4341db9 100644 --- a/tests/test_ogr_shapefile_provider.py +++ b/tests/test_ogr_shapefile_provider.py @@ -154,7 +154,6 @@ def test_query_bbox_hits_4326(config_shapefile_4326): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 @@ -172,7 +171,6 @@ def test_query_bbox_hits_28992(config_shapefile_28992): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 diff --git a/tests/test_ogr_sqlite_provider.py b/tests/test_ogr_sqlite_provider.py index cadabc8..e5dc12c 100644 --- a/tests/test_ogr_sqlite_provider.py +++ b/tests/test_ogr_sqlite_provider.py @@ -113,7 +113,6 @@ def test_query_bbox_hits_4326(config_sqlite_4326): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 diff --git a/tests/test_ogr_wfs_provider.py b/tests/test_ogr_wfs_provider.py index 0a79f27..5fe5786 100644 --- a/tests/test_ogr_wfs_provider.py +++ b/tests/test_ogr_wfs_provider.py @@ -308,7 +308,6 @@ def test_query_bbox_hits_ms(config_MapServer_WFS): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits > 1 @@ -326,7 +325,6 @@ def test_query_bbox_hits_gs(config_GeoServer_WFS): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1 @@ -344,7 +342,6 @@ def test_query_bbox_hits_geosol_gs(config_geosol_gs_WFS): assert len(features) == 0 hits = feature_collection.get('numberMatched', None) assert hits is not None - print('hits={}'.format(hits)) assert hits == 1