Fix SensorThings URI field retention (geopython#1924)

Author: webb-ben

pygeoapi/provider/sensorthings.py

@@ -484,8 +484,13 @@ def _expand_properties(self, feature, keys=(), uri='',
             self._expand_location(feature['Thing'])
 
         # Retain URI if present
-        if feature.get('properties') and self.uri_field:
-            uri = feature['properties']
+        try:
+            if self.uri_field is not None:
+                uri = feature['properties'][self.uri_field]
+        except KeyError:
+            msg = f'Unable to find uri field: {self.uri_field}'
+            LOGGER.error(msg)
+            raise ProviderInvalidDataError(msg)
 
         # Create intra links
         for k, v in feature.items():
@@ -506,7 +511,7 @@ def _expand_properties(self, feature, keys=(), uri='',
             ret = {k: feature.pop(k) for k in keys}
             feature = ret
 
-        if self.uri_field is not None and uri != '':
+        if self.uri_field is not None:
             feature[self.uri_field] = uri
 
         return feature

tests/test_sensorthings_provider.py

@@ -29,6 +29,7 @@
 
 import pytest
 
+from pygeoapi.provider.base import ProviderInvalidDataError
 from pygeoapi.provider.sensorthings import SensorThingsProvider
 
 
@@ -185,6 +186,25 @@ def test_custom_expand(config):
     assert 'Sensor' not in fields
 
 
+def test_custom_uri_field(config):
+    config['uri_field'] = 'uri'
+    config['properties'] = ['name']
+    p = SensorThingsProvider(config)
+
+    result = p.get('9')
+    assert result['id'] == '9'
+    assert result['properties']['name'] == 'Depth Below Surface'
+    assert result['properties']['uri'] == \
+        'https://geoconnex.us/iow/sta-demo/timeseries/9'
+    assert len(result['properties']) == 2
+
+    config['uri_field'] = 'bad_uri'
+    p = SensorThingsProvider(config)
+    with pytest.raises(ProviderInvalidDataError,
+                       match=".*Unable to find uri field: bad_uri"):
+        result = p.get('9')
+
+
 def test_transactions(config, post_body):
     p = SensorThingsProvider(config)
     results = p.query(resulttype='hits')