From 83a4c950728892321af5db3bc14d3ae2e16dda07 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Fri, 1 Dec 2023 13:39:43 -0500 Subject: [PATCH] Fix an issue emitting geojson annotations --- CHANGELOG.md | 6 ++++++ .../girder_large_image_annotation/rest/annotation.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab7785557..1386bb1f0 100644 --- 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 index 60887b211..42a1b4afc 100644 --- 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