Merge pull request #1743 from girder/harden-geojson-parsing

Harden the geojson annotation parser
girder · Dec 13, 2024 · 23c0a55 · 23c0a55
2 parents a5b46d1 + 7d373b8
commit 23c0a55
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.30.6
+
+### Improvements
+
+- Harden the geojson annotation parser ([#1743](../../pull/1743))
+
 ## 1.30.5
 
 ### Improvements

diff --git a/girder_annotation/girder_large_image_annotation/utils/__init__.py b/girder_annotation/girder_large_image_annotation/utils/__init__.py
@@ -244,7 +244,7 @@ def __init__(self, geojson):
         self._annotation = {'elements': self._elements}
         self._parseFeature(geojson)
 
-    def _parseFeature(self, geoelem):
+    def _parseFeature(self, geoelem):  # noqa
         if isinstance(geoelem, (list, tuple)):
             for entry in geoelem:
                 self._parseFeature(entry)
@@ -268,8 +268,11 @@ def _parseFeature(self, geoelem):
             if not isinstance(element['label'], dict):
                 element['label'] = {'value': element['label']}
             element['label']['value'] = str(element['label']['value'])
-        if 'annotation' in geoelem.get('properties', {}):
-            self._annotation.update(geoelem['properties']['annotation'])
+        if geoelem.get('properties', {}).get('annotation'):
+            try:
+                self._annotation.update(geoelem['properties']['annotation'])
+            except Exception:
+                pass
             self._annotation['elements'] = self._elements
         elemtype = geoelem.get('properties', {}).get('type', '') or geoelem['geometry']['type']
         func = getattr(self, elemtype.lower() + 'Type', None)