geopython#80 - bugfix

 1. Provider hateoas.py _modify_content_for_display
    content['assets'] is None, so the assigment content['assets']['default'] failed.

 2. stac.py get_stac_search, empty collection return from get_stac_collection is checked.

Author: Tik

pygeoapi/api/stac.py

@@ -398,9 +398,13 @@ def _recursiveCollections(api, request, path):
         tmp = []
         children = []
         for c in queries["collections"]:
+            # there are 2 possible returns from get_stac_collection,
+            # if the collection not exists, it return an empty collection list :  {'collections': []}
+            # otherwise, it returns the collection details in json  : {'id': 'xxx', 'type': 'Collection', ....}
             collect = json.loads(get_stac_collections(api, request, f'collections/{c}')[2])
-            children += ['collections/' + l['href'].split('/')[-1] for l in collect['links'] if (l.get('entry:type') == 'Collection')]
-            tmp += [collect] if (len(children) == 0) else []
+            if (collect.get('collections') is None):
+                children += ['collections/' + l['href'].split('/')[-1] for l in collect['links'] if (l.get('entry:type') == 'Collection')]
+                tmp += [collect] if (len(children) == 0) else []
         for c in children:
             tmp +=  _recursiveCollections(api, request, c)
         queries['collections'] = tmp
@@ -462,15 +466,6 @@ def _recursiveCollections(api, request, path):
     result = [r for i, r in enumerate(result) if (i in find_idx)]
     result = sorted(result, key=lambda k: k.get(sortby['field'], ''))
 
-    # for r in result:
-    #    if (r['assets']['image']['type'] == asset_cogtype):
-    #        try:
-    #            s=r['assets']['image']['href']
-    #            s=urllib.parse.unquote(s)
-    #            s=s.split('?')[0]
-    #            r['assets']['image']['href']="/".join(s.split('/')[7:8]+s.split('/')[9:])
-    #        except KeyError:
-    #            pass
     LOGGER.info(f'STAC search filtered results : {len(result)}')
     # "context": { "returned":len(result), "limit":"0", "matched":len(find_idx) }
     max_items = len(result) if (max_items == -1) else max_items

pygeoapi/provider/hateoas.py

@@ -352,9 +352,11 @@ def _modify_content_for_display(
 
     :returns: `dict` of JSON item
     """
-    content['assets']['default'] = {
-        'href': os.path.join(baseurl, urlpath).replace('\\', '/'),
-    }
+    if(content.get('assets') is None):
+        content['assets']={'default': {
+                'href': os.path.join(baseurl, urlpath).replace('\\', '/'),
+             }
+        }
     for key in content['assets']:
         content['assets'][key]['file:size'] = 0
         try: