Merge pull request #1395 from girder/geojson-binary

Fix an issue emitting geojson annotations
girder · Dec 1, 2023 · 19c44bf · 19c44bf
2 parents 21d6864 + 83a4c95
commit 19c44bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.26.3
+
+### Bug Fixes
+- Fix an issue emitting geojson annotations ([#1395](../../pull/1395))
+
 ## 1.26.2
 
 ### Improvements
@@ -436,6 +441,7 @@
 ### Bug Fixes
 - Use open.read rather than download to access files in Girder ([#989](../../pull/989))
 - Fix nd2 source scale ([#990](../../pull/990))
+- Do not raise a login request when checking if the user can write annotations ([#991](../../pull/991))
 
 ## 1.17.3
 

diff --git a/girder_annotation/girder_large_image_annotation/rest/annotation.py b/girder_annotation/girder_large_image_annotation/rest/annotation.py
@@ -197,7 +197,8 @@ def getAnnotationWithFormat(self, annotation, format):
             raise RestException(msg, 404)
 
         def generateResult():
-            yield from Annotation().geojson(annotation)
+            for chunk in Annotation().geojson(annotation):
+                yield chunk.encode()
 
         setResponseHeader('Content-Type', 'application/json')
         return generateResult