Merge pull request #359 from will-moore/validate_zoomLevelScaling

validate zoomLevelScaling
ome · Feb 16, 2021 · 2c9294f · 2c9294f
2 parents 726a906 + 89a1372
commit 2c9294f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/viewers/viewer/Viewer.js b/src/viewers/viewer/Viewer.js
@@ -380,8 +380,16 @@ class Viewer extends OlObject {
         var dims = this.image_info_['size'];
         if (this.image_info_['zoomLevelScaling']) {
             var tmp = [];
-            for (var r in this.image_info_['zoomLevelScaling'])
-                tmp.push(1 / this.image_info_['zoomLevelScaling'][r]);
+            for (var r in this.image_info_['zoomLevelScaling']) {
+                // Data from server. Don't need to check for zero division
+                var scale = 1 / this.image_info_['zoomLevelScaling'][r];
+                if (scale <= tmp[tmp.length - 1]) {
+                    // "Resolutions must be in descending order"
+                    // https://github.com/ome/omero-iviewer/issues/358
+                    break;
+                }
+                tmp.push(scale);
+            }
             zoomLevelScaling = tmp.reverse();
         }
         var zoom = zoomLevelScaling ? zoomLevelScaling.length : -1;