Merge pull request #653 from sbesson/imgData_resolution_descriptions

Update imgData endpoint to return more metadata about the resolutions

Author: knabar

omeroweb/webgateway/marshal.py

@@ -185,11 +185,17 @@ def imageMarshal(image, key=None, request=None):
     rv["tiles"] = tiles
     if tiles:
         width, height = image._re.getTileSize()
-        zoomLevelScaling = image.getZoomLevelScaling()
-
         rv.update({"tile_size": {"width": width, "height": height}, "levels": levels})
-        if zoomLevelScaling is not None:
-            rv["zoomLevelScaling"] = zoomLevelScaling
+
+        resolution_descriptions = image._re.getResolutionDescriptions()
+        rv["resolutions"] = {
+            index: {"sizeX": r.sizeX, "sizeY": r.sizeY}
+            for index, r in enumerate(resolution_descriptions)
+        }
+        rv["zoomLevelScaling"] = {
+            index: r.sizeX / resolution_descriptions[0].sizeX
+            for index, r in enumerate(resolution_descriptions)
+        }
 
     nominalMagnification = (
         image.getObjectiveSettings() is not None