update OGC API - Feature to official shortname (#431)

geopython · Aug 2, 2022 · caed374 · caed374
1 parent ed51f94
commit caed374
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/GeoHealthCheck/config_main.py b/GeoHealthCheck/config_main.py
@@ -112,7 +112,7 @@
     'GeoHealthCheck.plugins.probe.http',
     'GeoHealthCheck.plugins.probe.sta',
     'GeoHealthCheck.plugins.probe.wmsdrilldown',
-    'GeoHealthCheck.plugins.probe.wfs3',
+    'GeoHealthCheck.plugins.probe.ogcfeat',
     'GeoHealthCheck.plugins.probe.ogc3dtiles',
     'GeoHealthCheck.plugins.probe.esrifs',
     'GeoHealthCheck.plugins.probe.ghcreport',
@@ -160,8 +160,8 @@
     'OGC:STA': {
         'probe_class': 'GeoHealthCheck.plugins.probe.sta.StaCaps'
     },
-    'OGC:WFS3': {
-        'probe_class': 'GeoHealthCheck.plugins.probe.wfs3.WFS3Caps'
+    'OGCFeat': {
+        'probe_class': 'GeoHealthCheck.plugins.probe.ogcfeat.OGCFeatCaps'
     },
     'OGC:3DTiles': {
         'probe_class': 'GeoHealthCheck.plugins.probe.ogc3dtiles.OGC3DTiles'

diff --git a/GeoHealthCheck/enums.py b/GeoHealthCheck/enums.py
@@ -71,7 +71,7 @@
         'label': 'SensorThings API (STA)',
         'versions': ['1.0']
     },
-    'OGC:WFS3': {
+    'OGCFeat': {
         'label': 'OGC API Features (OAFeat)'
     },
     'OGC:3DTiles': {

diff --git a/GeoHealthCheck/healthcheck.py b/GeoHealthCheck/healthcheck.py
@@ -155,7 +155,7 @@ def sniff_test_resource(config, resource_type, url):
                          'OGC:WPS': [WebProcessingService],
                          'OGC:CSW': [CatalogueServiceWeb],
                          'OGC:SOS': [SensorObservationService],
-                         'OGC:WFS3': [urlopen],
+                         'OGCFeat': [urlopen],
                          'OGC:3DTiles': [urlopen],
                          'ESRI:FS': [urlopen],
                          'OGC:STA': [urlopen],
@@ -241,7 +241,7 @@ def sniff_test_resource(config, resource_type, url):
         elif resource_type.startswith(('OGC:', 'OSGeo', 'ESRI')):
             if resource_type == 'OGC:STA':
                 title = 'OGC STA'
-            elif resource_type == 'OGC:WFS3':
+            elif resource_type == 'OGCFeat':
                 title = 'OGC API Features (OAFeat)'
             elif resource_type == 'ESRI:FS':
                 title = 'ESRI ArcGIS FS'

diff --git a/GeoHealthCheck/models.py b/GeoHealthCheck/models.py
@@ -430,7 +430,7 @@ def run_count(self):
     def get_capabilities_url(self):
         if self.resource_type.startswith('OGC:') \
                 and self.resource_type not in \
-                ['OGC:STA', 'OGC:WFS3', 'ESRI:FS', 'OGC:3DTiles']:
+                ['OGC:STA', 'OGCFeat', 'ESRI:FS', 'OGC:3DTiles']:
             url = '%s%s' % (bind_url(self.url),
                             RESOURCE_TYPES[self.resource_type]['capabilities'])
         else:

diff --git a/GeoHealthCheck/plugins/probe/wfs3.py → GeoHealthCheck/plugins/probe/ogcfeat.py b/GeoHealthCheck/plugins/probe/wfs3.py → GeoHealthCheck/plugins/probe/ogcfeat.py
@@ -5,13 +5,13 @@
 from GeoHealthCheck.result import Result, push_result
 
 
-class WFS3Caps(Probe):
-    """Probe for OGC WFS3 API (OAFeat) main endpoint url"""
+class OGCFeatCaps(Probe):
+    """Probe for OGC API - Features endpoint url"""
 
     NAME = 'OGC API Features (OAFeat) Capabilities'
     DESCRIPTION = 'Validate OGC API Features (OAFeat) ' \
                   'endpoint landing page'
-    RESOURCE_TYPE = 'OGC:WFS3'
+    RESOURCE_TYPE = 'OGCFeat'
 
     REQUEST_METHOD = 'GET'
     REQUEST_HEADERS = {'Accept': 'application/json'}
@@ -59,19 +59,17 @@ def set_accept_header(oa_feat, content_type):
     oa_feat.headers['Accept'] = content_type
 
 
-class WFS3Drilldown(Probe):
+class OGCFeatDrilldown(Probe):
     """
     Probe for OGC API Features (OAFeat) endpoint "drilldown" or
     "crawl": starting with top endpoint: get Collections and fetch
     Features on them etc. Uses the OWSLib owslib.ogcapi package.
-
-    TODO: class needs renaming: WFS3 is now OAFeat.
     """
 
     NAME = 'OGC API Features (OAFeat) Drilldown'
     DESCRIPTION = 'Traverses an OGC API Features (OAFeat) API ' \
                   'endpoint by drilling down'
-    RESOURCE_TYPE = 'OGC:WFS3'
+    RESOURCE_TYPE = 'OGCFeat'
 
     REQUEST_METHOD = 'GET'
     REQUEST_HEADERS = {'Accept': 'application/json'}
@@ -261,7 +259,7 @@ def perform_request(self):
         self.result.add_result(result)
 
 
-class WFS3OpenAPIValidator(Probe):
+class OGCFeatOpenAPIValidator(Probe):
     """
     Probe for OGC API Features (OAFeat) OpenAPI Document Validation.
     Uses https://pypi.org/project/openapi-spec-validator/.
@@ -271,7 +269,7 @@ class WFS3OpenAPIValidator(Probe):
     NAME = 'OGC API Features (OAFeat) OpenAPI Validator'
     DESCRIPTION = 'Validates OGC API Features (OAFeat) api endpoint for ' \
                   'OpenAPI compliance'
-    RESOURCE_TYPE = 'OGC:WFS3'
+    RESOURCE_TYPE = 'OGCFeat'
     REQUEST_HEADERS = {'Accept': 'application/json'}
 
     REQUEST_METHOD = 'GET'
@@ -344,7 +342,7 @@ def perform_request(self):
 #
 #     NAME = 'OGC API Features Collection'
 #     DESCRIPTION = 'Validate an OGC API Features Collection'
-#     RESOURCE_TYPE = 'OGC:WFS3'
+#     RESOURCE_TYPE = 'OGCFeat'
 #
 #     REQUEST_METHOD = 'GET'
 #

diff --git a/docs/plugins.rst b/docs/plugins.rst
@@ -301,7 +301,7 @@ See an example for both below from `config_main.py` for **GHC_PLUGINS** and **GH
        'GeoHealthCheck.plugins.probe.http',
        'GeoHealthCheck.plugins.probe.sta',
        'GeoHealthCheck.plugins.probe.wmsdrilldown',
-       'GeoHealthCheck.plugins.probe.wfs3',
+       'GeoHealthCheck.plugins.probe.ogcfeat',
 
        # Checks
        'GeoHealthCheck.plugins.check.checks',
@@ -336,12 +336,12 @@ See an example for both below from `config_main.py` for **GHC_PLUGINS** and **GH
        'OGC:STA': {
            'probe_class': 'GeoHealthCheck.plugins.probe.sta.StaCaps'
        },
-	   'OGC:WFS3': {
-	       'probe_class': 'GeoHealthCheck.plugins.probe.wfs3.WFS3Drilldown'
-	   },
-	   'ESRI:FS': {
-	       'probe_class': 'GeoHealthCheck.plugins.probe.esrifs.ESRIFSDrilldown'
-	   },
+       'OGCFeat': {
+           'probe_class': 'GeoHealthCheck.plugins.probe.ogcfeat.OGCFeatDrilldown'
+       },
+       'ESRI:FS': {
+           'probe_class': 'GeoHealthCheck.plugins.probe.esrifs.ESRIFSDrilldown'
+       },
        'urn:geoss:waf': {
            'probe_class': 'GeoHealthCheck.plugins.probe.http.HttpGet'
        },
@@ -457,7 +457,7 @@ to override any of the `Probe` baseclass methods.
    :members:
    :show-inheritance:
 
-.. automodule:: GeoHealthCheck.plugins.probe.wfs3
+.. automodule:: GeoHealthCheck.plugins.probe.ogcfeat
    :members:
    :show-inheritance:
 

diff --git a/tests/data/fixtures.json b/tests/data/fixtures.json
@@ -100,7 +100,7 @@
     },
     "LDPROXY FEATURES": {
       "owner": "admin",
-      "resource_type": "OSGeo:WFS3",
+      "resource_type": "OGCFeat",
       "active": true,
       "title": "LDproxy Daraa",
       "url": "https://demo.ldproxy.net/daraa",
@@ -292,7 +292,7 @@
     },
     "LDPROXY - Drilldown": {
       "resource": "LDPROXY FEATURES",
-      "probe_class": "GeoHealthCheck.plugins.probe.wfs3.WFS3Drilldown",
+      "probe_class": "GeoHealthCheck.plugins.probe.ogcfeat.OGCFeatDrilldown",
       "parameters": {
         "drilldown_level": "full"
       }