From 4d26c800baf2af9deff4a72e3bdd9d9557cf8586 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Fri, 1 Mar 2024 09:25:16 -0800
Subject: [PATCH 01/27] Changelog for #2488

---
 changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 13ee1015..7285e5b0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,7 +5,7 @@ OPENSEADRAGON CHANGELOG
 
 * BREAKING CHANGE: Dropped support for IE11 (#2300, #2361 @AndrewADev)
 * DEPRECATION: The OpenSeadragon.createCallback function is no longer recommended (#2367 @akansjain)
-* The viewer now uses WebGL when available (#2310, #2462, #2466, #2468, #2469, #2472, #2478 @pearcetm, @Aiosa, @thec0keman)
+* The viewer now uses WebGL when available (#2310, #2462, #2466, #2468, #2469, #2472, #2478, #2488 @pearcetm, @Aiosa, @thec0keman)
 * Added webp to supported image formats (#2455 @BeebBenjamin)
 * Introduced maxTilesPerFrame option to allow loading more tiles simultaneously (#2387 @jetic83)
 * Now when creating a viewer or navigator, we leave its position style alone if possible (#2393 @VIRAT9358)

From c1772466758c0184059df411069caa955e8d9f9c Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Mon, 4 Mar 2024 21:28:12 -0500
Subject: [PATCH 02/27] fix #2490

---
 src/navigator.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/navigator.js b/src/navigator.js
index 6a213624..9dafde3e 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -309,6 +309,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
                 this.oldContainerSize = containerSize;
                 this.world.update();
                 this.world.draw();
+                this.update(this.viewer.viewport);
             }
         }
     },

From 2cb1835533ac7e77efafcb89cab6352a37d6b216 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Mon, 4 Mar 2024 21:32:14 -0500
Subject: [PATCH 03/27] fix docs

---
 src/navigator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/navigator.js b/src/navigator.js
index 9dafde3e..32868d07 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -356,7 +356,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
     /**
      * Used to update the navigator minimap's viewport rectangle when a change in the viewer's viewport occurs.
      * @function
-     * @param {OpenSeadragon.Viewport} The viewport this navigator is tracking.
+     * @param {OpenSeadragon.Viewport} viewport The viewport this navigator is tracking.
      */
     update: function( viewport ) {
 

From 3e04c8854e110c9ea525c18097506a9da512a390 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Tue, 5 Mar 2024 13:01:42 -0500
Subject: [PATCH 04/27] make navigator.update's parameter optional, default to
 navigator.viewer.viewport

---
 src/navigator.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/navigator.js b/src/navigator.js
index 32868d07..fb95e4b1 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -356,7 +356,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
     /**
      * Used to update the navigator minimap's viewport rectangle when a change in the viewer's viewport occurs.
      * @function
-     * @param {OpenSeadragon.Viewport} viewport The viewport this navigator is tracking.
+     * @param {OpenSeadragon.Viewport} [viewport] The viewport to display. Default: the viewport this navigator is tracking.
      */
     update: function( viewport ) {
 
@@ -367,6 +367,10 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
             topleft,
             bottomright;
 
+        if(!viewport){
+            viewport = this.viewer.viewport;
+        }
+
         viewerSize = $.getElementSize( this.viewer.element );
         if ( this._resizeWithViewer && viewerSize.x && viewerSize.y && !viewerSize.equals( this.oldViewerSize ) ) {
             this.oldViewerSize = viewerSize;

From 029a40aa21e55d3e57ae22a549402727622a4012 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Tue, 5 Mar 2024 15:39:54 -0500
Subject: [PATCH 05/27] deal with tiles that have padding

---
 src/webgldrawer.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index 5d121e6f..f0b69d00 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -897,19 +897,32 @@
                 let texture = gl.createTexture();
                 let position;
                 let overlap = tiledImage.source.tileOverlap;
+
+                // deal with tiles where there is padding, i.e. the pixel data doesn't take up the entire provided canvas
+                let sourceWidthFraction, sourceHeightFraction;
+                if (tile.sourceBounds) {
+                    sourceWidthFraction = Math.min(tile.sourceBounds.width, canvas.width) / canvas.width;
+                    sourceHeightFraction = Math.min(tile.sourceBounds.height, canvas.height) / canvas.height;
+                } else {
+                    sourceWidthFraction = 1;
+                    sourceHeightFraction = 1;
+                }
+
                 if( overlap > 0){
                     // calculate the normalized position of the rect to actually draw
                     // discarding overlap.
                     let overlapFraction = this._calculateOverlapFraction(tile, tiledImage);
 
-                    let left = tile.x === 0 ? 0 : overlapFraction.x;
-                    let top = tile.y === 0 ? 0 : overlapFraction.y;
-                    let right = tile.isRightMost ? 1 : 1 - overlapFraction.x;
-                    let bottom = tile.isBottomMost ? 1 : 1 - overlapFraction.y;
+                    let left = (tile.x === 0 ? 0 : overlapFraction.x) * sourceWidthFraction;
+                    let top = (tile.y === 0 ? 0 : overlapFraction.y) * sourceHeightFraction;
+                    let right = (tile.isRightMost ? 1 : 1 - overlapFraction.x) * sourceWidthFraction;
+                    let bottom = (tile.isBottomMost ? 1 : 1 - overlapFraction.y) * sourceHeightFraction;
                     position = this._makeQuadVertexBuffer(left, right, top, bottom);
-                } else {
-                    // no overlap: this texture can use the unit quad as its position data
+                } else if (sourceWidthFraction === 1 && sourceHeightFraction === 1) {
+                    // no overlap and no padding: this texture can use the unit quad as its position data
                     position = this._unitQuad;
+                } else {
+                    position = this._makeQuadVertexBuffer(0, sourceWidthFraction, 0, sourceHeightFraction);
                 }
 
                 let textureInfo = {

From 9a92d9e9ad915ef54d02034b4f9fb1efa222b8a2 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Thu, 7 Mar 2024 09:24:47 -0800
Subject: [PATCH 06/27] Changelog for #2491

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index 7285e5b0..d48e2980 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -17,6 +17,7 @@ OPENSEADRAGON CHANGELOG
 * Fixed: dragToPan gesture could not be disabled when flickEnabled was activated (#2464 @jonasengelmann)
 * Fixed: placeholderFillStyle didn't work properly when the image was rotated (#2469 @pearcetm)
 * Fixed: Sometimes exponential springs wouldn't ever settle (#2469 @pearcetm)
+* Fixed: The navigator wouldn't update its tracking rectangle when the navigator was resized (#2491 @pearcetm)
 
 4.1.0:
 

From 9b7fc464ca3ae3fdd9f981b64aea5d8348021616 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Thu, 7 Mar 2024 09:30:00 -0800
Subject: [PATCH 07/27] Changelog for #2492

---
 changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index d48e2980..d01aecfb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,7 +5,7 @@ OPENSEADRAGON CHANGELOG
 
 * BREAKING CHANGE: Dropped support for IE11 (#2300, #2361 @AndrewADev)
 * DEPRECATION: The OpenSeadragon.createCallback function is no longer recommended (#2367 @akansjain)
-* The viewer now uses WebGL when available (#2310, #2462, #2466, #2468, #2469, #2472, #2478, #2488 @pearcetm, @Aiosa, @thec0keman)
+* The viewer now uses WebGL when available (#2310, #2462, #2466, #2468, #2469, #2472, #2478, #2488, #2492 @pearcetm, @Aiosa, @thec0keman)
 * Added webp to supported image formats (#2455 @BeebBenjamin)
 * Introduced maxTilesPerFrame option to allow loading more tiles simultaneously (#2387 @jetic83)
 * Now when creating a viewer or navigator, we leave its position style alone if possible (#2393 @VIRAT9358)

From 6a47104b4f8df1b2b627693de4649eefeb1b9d5c Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 1 Apr 2024 10:12:04 -0700
Subject: [PATCH 08/27] Updated for version 4.1.1

---
 changelog.txt | 5 ++++-
 package.json  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index d01aecfb..1359d231 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -12,13 +12,16 @@ OPENSEADRAGON CHANGELOG
 * Test improvements (#2382 @AndrewADev)
 * MouseTracker options documentation fixes (#2389 @msalsbery)
 * Fixed: Sometimes if the viewport was flipped and the user zoomed in far enough, it would flip back (#2364 @SebDelile)
-* Fixed: Strange behavior if IIIF sizes were not in ascending order (#2416 @lutzhelm)
 * Fixed: Two-finger tap on a Mac trackpad would zoom you out (#2431 @cavenel)
 * Fixed: dragToPan gesture could not be disabled when flickEnabled was activated (#2464 @jonasengelmann)
 * Fixed: placeholderFillStyle didn't work properly when the image was rotated (#2469 @pearcetm)
 * Fixed: Sometimes exponential springs wouldn't ever settle (#2469 @pearcetm)
 * Fixed: The navigator wouldn't update its tracking rectangle when the navigator was resized (#2491 @pearcetm)
 
+4.1.1:
+
+* Fixed: Strange behavior if IIIF sizes were not in ascending order (#2416 @lutzhelm)
+
 4.1.0:
 
 * NEW BEHAVIOR: When `navigatorRotate` is false, while the navigator image doesn't rotate, the red outline now does (#2356 @lcl45)
diff --git a/package.json b/package.json
index b1228eba..7654a199 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openseadragon",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
     "keywords": [
         "image",
@@ -48,4 +48,4 @@
         "test": "grunt test",
         "prepare": "grunt build"
     }
-}
+}
\ No newline at end of file

From 5990e5649bce66251574cb6f5c2c9278c29acbe7 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Wed, 3 Apr 2024 23:06:42 +0800
Subject: [PATCH 09/27] update error message for Viewport.imageToViewportZoom

---
 src/viewport.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/viewport.js b/src/viewport.js
index cfa114cb..0f160bd6 100644
--- a/src/viewport.js
+++ b/src/viewport.js
@@ -1711,7 +1711,7 @@ $.Viewport.prototype = {
      * 1 means original image size, 0.5 half size...
      * Viewport zoom: ratio of the displayed image's width to viewport's width.
      * 1 means identical width, 2 means image's width is twice the viewport's width...
-     * Note: not accurate with multi-image.
+     * Note: not accurate with multi-image; use [TiledImage.imageToViewportZoom] for the specific image of interest.
      * @function
      * @param {Number} imageZoom The image zoom
      * target zoom.
@@ -1723,7 +1723,7 @@ $.Viewport.prototype = {
             if (count > 1) {
                 if (!this.silenceMultiImageWarnings) {
                     $.console.error('[Viewport.imageToViewportZoom] is not accurate ' +
-                        'with multi-image.');
+                        'with multi-image. Instead, use [TiledImage.imageToViewportZoom] for the specific image of interest');
                 }
             } else if (count === 1) {
                 // It is better to use TiledImage.imageToViewportZoom

From 63d8d63c1f8daf85b34042359a14dff63cf47fd3 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Wed, 3 Apr 2024 09:28:56 -0700
Subject: [PATCH 10/27] Changelog for #2505

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index 1359d231..39e6031c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -11,6 +11,7 @@ OPENSEADRAGON CHANGELOG
 * Now when creating a viewer or navigator, we leave its position style alone if possible (#2393 @VIRAT9358)
 * Test improvements (#2382 @AndrewADev)
 * MouseTracker options documentation fixes (#2389 @msalsbery)
+* Improved documentation and error message for Viewport.imageToViewportZoom (#2505 @eug-L)
 * Fixed: Sometimes if the viewport was flipped and the user zoomed in far enough, it would flip back (#2364 @SebDelile)
 * Fixed: Two-finger tap on a Mac trackpad would zoom you out (#2431 @cavenel)
 * Fixed: dragToPan gesture could not be disabled when flickEnabled was activated (#2464 @jonasengelmann)

From b0926b3e69c04d069e6a8c1a9c2966d7eaca5db6 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Thu, 4 Apr 2024 16:02:09 +0800
Subject: [PATCH 11/27] Getter & setter for Viewport.maxZoomPixelRatio

---
 src/viewport.js          | 38 +++++++++++++++++++++++++++++++++++++-
 test/modules/viewport.js | 21 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/viewport.js b/src/viewport.js
index 0f160bd6..60702c33 100644
--- a/src/viewport.js
+++ b/src/viewport.js
@@ -1789,7 +1789,43 @@ $.Viewport.prototype = {
        */
       this.viewer.raiseEvent('flip', {flipped: state});
       return this;
-    }
+    },
+
+    /**
+     * Gets current max zoom pixel ratio
+     * @function
+     * @returns {Number} Max zoom pixel ratio
+     */
+    getMaxZoomPixelRatio: function() {
+        return this.maxZoomPixelRatio;
+    },
+
+    /**
+     * Sets max zoom pixel ratio
+     * @function
+     * @param {Number} ratio - Max zoom pixel ratio
+     * @param {Boolean} [constraints=false] - Apply constraints after setting ratio;
+     * Takes effect only if current zoom is greater than set max zoom pixel ratio
+     * @param {Boolean} [immediately=false] - Whether to animate to new zoom
+     */
+    setMaxZoomPixelRatio: function(ratio, constraints, immediately) {
+        constraints = constraints || false;
+        immediately = immediately || false;
+
+        $.console.assert(!isNaN(ratio), "[Viewport.setMaxZoomPixelRatio] ratio must be a number");
+
+        if (isNaN(ratio)) {
+            return;
+        }
+
+        this.maxZoomPixelRatio = ratio;
+
+        if (constraints) {
+            if (this.getZoom() > this.getMaxZoom()) {
+                this.applyConstraints(immediately);
+            }
+        }
+    },
 
 };
 
diff --git a/test/modules/viewport.js b/test/modules/viewport.js
index 3ac93734..c3620c3c 100644
--- a/test/modules/viewport.js
+++ b/test/modules/viewport.js
@@ -1407,4 +1407,25 @@
       viewer.open(DZI_PATH);
     });
 
+    QUnit.test('setMaxZoomPixelRatio', function(assert) {
+      var done = assert.async();
+      var openHandler = function(event) {
+          viewer.removeHandler('open', openHandler);
+          var viewport = viewer.viewport;
+
+          for (var i = 0; i < testZoomLevels.length; i++) {
+              viewport.setMaxZoomPixelRatio(testZoomLevels[i])
+              assert.equal(viewport.getMaxZoomPixelRatio(), testZoomLevels[i], "Max zoom pixel ratio is set correctly.");
+          }
+
+          viewport.zoomTo(viewport.getMaxZoom())
+          viewport.setMaxZoomPixelRatio(testZoomLevels[0], true)
+          assert.equal(viewport.getZoom(), viewport.getMaxZoom(), "Zoom should be adjusted to max zoom level.");
+
+          done();
+      };
+      viewer.addHandler('open', openHandler);
+      viewer.open(DZI_PATH);
+    });
+
 })();

From 44511319998f93fa5df3d79180063e048b8c2310 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 5 Apr 2024 12:47:15 +0800
Subject: [PATCH 12/27] update flags for setMaxZoomPixelRatio

---
 src/viewport.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/viewport.js b/src/viewport.js
index 60702c33..4d209dc5 100644
--- a/src/viewport.js
+++ b/src/viewport.js
@@ -1804,13 +1804,11 @@ $.Viewport.prototype = {
      * Sets max zoom pixel ratio
      * @function
      * @param {Number} ratio - Max zoom pixel ratio
-     * @param {Boolean} [constraints=false] - Apply constraints after setting ratio;
+     * @param {Boolean} [applyConstraints=true] - Apply constraints after setting ratio;
      * Takes effect only if current zoom is greater than set max zoom pixel ratio
      * @param {Boolean} [immediately=false] - Whether to animate to new zoom
      */
-    setMaxZoomPixelRatio: function(ratio, constraints, immediately) {
-        constraints = constraints || false;
-        immediately = immediately || false;
+    setMaxZoomPixelRatio: function(ratio, applyConstraints = true, immediately = false) {
 
         $.console.assert(!isNaN(ratio), "[Viewport.setMaxZoomPixelRatio] ratio must be a number");
 
@@ -1820,7 +1818,7 @@ $.Viewport.prototype = {
 
         this.maxZoomPixelRatio = ratio;
 
-        if (constraints) {
+        if (applyConstraints) {
             if (this.getZoom() > this.getMaxZoom()) {
                 this.applyConstraints(immediately);
             }

From 31c2c85c4ffda0fd13086b011a3a02a77c47909d Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Fri, 5 Apr 2024 09:20:02 -0700
Subject: [PATCH 13/27] Changelog for #2506

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index 39e6031c..08f5ebac 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -9,6 +9,7 @@ OPENSEADRAGON CHANGELOG
 * Added webp to supported image formats (#2455 @BeebBenjamin)
 * Introduced maxTilesPerFrame option to allow loading more tiles simultaneously (#2387 @jetic83)
 * Now when creating a viewer or navigator, we leave its position style alone if possible (#2393 @VIRAT9358)
+* Added getter & setter for Viewport.maxZoomPixelRatio (#2506 @eug-L)
 * Test improvements (#2382 @AndrewADev)
 * MouseTracker options documentation fixes (#2389 @msalsbery)
 * Improved documentation and error message for Viewport.imageToViewportZoom (#2505 @eug-L)

From 0ba2f7521353a22385c90d6a3a79e24c1c653162 Mon Sep 17 00:00:00 2001
From: frameflare <yangzenghua@outlook.com>
Date: Fri, 5 Apr 2024 14:00:52 +0800
Subject: [PATCH 14/27] Signed-off-by: frameflare <yangzenghua@outlook.com>

chore: fix some comments

Signed-off-by: frameflare <yangzenghua@outlook.com>
---
 src/tilesource.js    | 8 ++++----
 src/viewer.js        | 2 +-
 src/webgldrawer.js   | 2 +-
 test/modules/iiif.js | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tilesource.js b/src/tilesource.js
index 3195a90c..2a5225c0 100644
--- a/src/tilesource.js
+++ b/src/tilesource.js
@@ -569,13 +569,13 @@ $.TileSource.prototype = {
     },
 
     /**
-     * Responsible determining if a the particular TileSource supports the
+     * Responsible for determining if the particular TileSource supports the
      * data format ( and allowed to apply logic against the url the data was
      * loaded from, if any ). Overriding implementations are expected to do
      * something smart with data and / or url to determine support.  Also
-     * understand that iteration order of TileSources is not guarunteed so
+     * understand that iteration order of TileSources is not guaranteed so
      * please make sure your data or url is expressive enough to ensure a simple
-     * and sufficient mechanisim for clear determination.
+     * and sufficient mechanism for clear determination.
      * @function
      * @param {String|Object|Array|Document} data
      * @param {String} url - the url the data was loaded
@@ -776,7 +776,7 @@ $.TileSource.prototype = {
         };
 
         // Load the tile with an AJAX request if the loadWithAjax option is
-        // set. Otherwise load the image by setting the source proprety of the image object.
+        // set. Otherwise load the image by setting the source property of the image object.
         if (context.loadWithAjax) {
             dataStore.request = $.makeAjaxRequest({
                 url: context.src,
diff --git a/src/viewer.js b/src/viewer.js
index 037e3016..5431626f 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -2198,7 +2198,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
      *      viewport which the location coordinates will be treated as relative
      *      to.
      * @param {function} [onDraw] - If supplied the callback is called when the overlay
-     *      needs to be drawn. It it the responsibility of the callback to do any drawing/positioning.
+     *      needs to be drawn. It is the responsibility of the callback to do any drawing/positioning.
      *      It is passed position, size and element.
      * @returns {OpenSeadragon.Viewer} Chainable.
      * @fires OpenSeadragon.Viewer.event:add-overlay
diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index f0b69d00..d36a7b74 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -351,7 +351,7 @@
                         // This can apparently happen on some systems if too many WebGL contexts have been created
                         // in which case maxTextures can be null, leading to out of bounds errors with the array.
                         // For example, when viewers were created and not destroyed in the test suite, this error
-                        // occured in the TravisCI tests, though it did not happen when testing locally either in
+                        // occurred in the TravisCI tests, though it did not happen when testing locally either in
                         // a browser or on the command line via grunt test.
 
                         throw(new Error(`WegGL error: bad value for gl parameter MAX_TEXTURE_IMAGE_UNITS (${maxTextures}). This could happen
diff --git a/test/modules/iiif.js b/test/modules/iiif.js
index e64e34a9..28480766 100644
--- a/test/modules/iiif.js
+++ b/test/modules/iiif.js
@@ -243,7 +243,7 @@
         /*
          * FIXME: following https://iiif.io/api/image/3.0/#47-canonical-uri-syntax and
          * https://iiif.io/api/image/2.1/#canonical-uri-syntax, I'd expect 'max' to be required to
-         * be served by a level 0 compliant service instead of 'w,h', 'full' instead of 'w,' respectivley.
+         * be served by a level 0 compliant service instead of 'w,h', 'full' instead of 'w,' respectively.
          */
         //assert.equal(levelsVersion3[1].url, 'http://example.com/identifier/full/max/0/default.jpg');
     });

From 9f7b18adb6877cf38962af28c9a939af61a7b72f Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 8 Apr 2024 09:36:39 -0700
Subject: [PATCH 15/27] Changelog for #2507

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index 08f5ebac..a479cd2d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -13,6 +13,7 @@ OPENSEADRAGON CHANGELOG
 * Test improvements (#2382 @AndrewADev)
 * MouseTracker options documentation fixes (#2389 @msalsbery)
 * Improved documentation and error message for Viewport.imageToViewportZoom (#2505 @eug-L)
+* Fixed documentation typos (#2507 @frameflare)
 * Fixed: Sometimes if the viewport was flipped and the user zoomed in far enough, it would flip back (#2364 @SebDelile)
 * Fixed: Two-finger tap on a Mac trackpad would zoom you out (#2431 @cavenel)
 * Fixed: dragToPan gesture could not be disabled when flickEnabled was activated (#2464 @jonasengelmann)

From 6a4c3838c8fbaa0333b2674f9f10045e8780b89a Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 8 Apr 2024 09:43:16 -0700
Subject: [PATCH 16/27] Added citation file

---
 CITATION.cff | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 CITATION.cff

diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 00000000..60bcaa97
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,45 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: OpenSeadragon
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Ian
+    family-names: Gilman
+    email: ian@iangilman.com
+  - given-names: Antoine
+    family-names: Vandecreme
+  - given-names: Mark
+    family-names: Salsbery
+  - given-names: Chris
+    family-names: Thatcher
+  - given-names:  Thomas
+    family-names: Pearce
+ identifiers:
+  - type: url
+    value: 'https://openseadragon.github.io/'
+    description: Homepage
+  - type: url
+    value: 'https://github.com/openseadragon/openseadragon'
+    description: Repository
+repository-code: 'https://github.com/openseadragon/openseadragon'
+url: 'https://openseadragon.github.io/'
+abstract: >-
+  An open-source, web-based viewer for high-resolution
+  zoomable images, implemented in pure JavaScript, for
+  desktop and mobile. 
+keywords:
+  - javascript
+  - image
+  - zooming
+  - viewer
+  - image-viewer
+  - high-resolution
+  - iiif
+license: BSD-3-Clause
+version: 4.1.1
+date-released: '2024-04-01'

From 5fefb8f976fa5e162ed31d021ebb55fcb834b844 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Tue, 9 Apr 2024 09:33:03 -0700
Subject: [PATCH 17/27] Added Aseem and changed authors to chronological

---
 CITATION.cff | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 60bcaa97..e0c0ec0f 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -11,12 +11,14 @@ authors:
   - given-names: Ian
     family-names: Gilman
     email: ian@iangilman.com
-  - given-names: Antoine
-    family-names: Vandecreme
-  - given-names: Mark
-    family-names: Salsbery
+  - given-names: Aseem
+    family-names: Kishore
   - given-names: Chris
     family-names: Thatcher
+  - given-names: Mark
+    family-names: Salsbery
+  - given-names: Antoine
+    family-names: Vandecreme
   - given-names:  Thomas
     family-names: Pearce
  identifiers:
@@ -31,7 +33,7 @@ url: 'https://openseadragon.github.io/'
 abstract: >-
   An open-source, web-based viewer for high-resolution
   zoomable images, implemented in pure JavaScript, for
-  desktop and mobile. 
+  desktop and mobile.
 keywords:
   - javascript
   - image

From 86395dfc78ab8f4b8f4dea0c724e4cd29100137a Mon Sep 17 00:00:00 2001
From: Edward Gaibor <78832141+gaiborjosue@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:33:01 -0400
Subject: [PATCH 18/27] Update CITATION.cff

---
 CITATION.cff | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index e0c0ec0f..e17cfe0d 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -3,37 +3,32 @@
 
 cff-version: 1.2.0
 title: OpenSeadragon
-message: >-
-  If you use this software, please cite it using the
-  metadata from this file.
+message: "If you use this software, please cite it using the metadata from this file."
 type: software
 authors:
-  - given-names: Ian
-    family-names: Gilman
-    email: ian@iangilman.com
-  - given-names: Aseem
-    family-names: Kishore
-  - given-names: Chris
-    family-names: Thatcher
-  - given-names: Mark
-    family-names: Salsbery
-  - given-names: Antoine
-    family-names: Vandecreme
-  - given-names:  Thomas
-    family-names: Pearce
+  - given-names: "Ian"
+    family-names: "Gilman"
+    email: "ian@iangilman.com"
+  - given-names: "Aseem"
+    family-names: "Kishore"
+  - given-names: "Chris"
+    family-names: "Thatcher"
+  - given-names: "Mark"
+    family-names: "Salsbery"
+  - given-names: "Antoine"
+    family-names: "Vandecreme"
+  - given-names:  "Thomas"
+    family-names: "Pearce"
  identifiers:
   - type: url
     value: 'https://openseadragon.github.io/'
     description: Homepage
   - type: url
     value: 'https://github.com/openseadragon/openseadragon'
-    description: Repository
+    description: "Repository"
 repository-code: 'https://github.com/openseadragon/openseadragon'
 url: 'https://openseadragon.github.io/'
-abstract: >-
-  An open-source, web-based viewer for high-resolution
-  zoomable images, implemented in pure JavaScript, for
-  desktop and mobile.
+abstract: "An open-source, web-based viewer for high-resolution zoomable images, implemented in pure JavaScript, for desktop and mobile."
 keywords:
   - javascript
   - image

From 3d97ac8ae727920dbb3e1db38bc83fba1794fa3e Mon Sep 17 00:00:00 2001
From: Edward Gaibor <78832141+gaiborjosue@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:33:29 -0400
Subject: [PATCH 19/27] Update CITATION.cff

---
 CITATION.cff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CITATION.cff b/CITATION.cff
index e17cfe0d..8fdf0dbc 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -25,7 +25,7 @@ authors:
     description: Homepage
   - type: url
     value: 'https://github.com/openseadragon/openseadragon'
-    description: "Repository"
+    description: Repository
 repository-code: 'https://github.com/openseadragon/openseadragon'
 url: 'https://openseadragon.github.io/'
 abstract: "An open-source, web-based viewer for high-resolution zoomable images, implemented in pure JavaScript, for desktop and mobile."

From 41c3abb12ab50405b8296a2b75e7f5f6617d4954 Mon Sep 17 00:00:00 2001
From: Edward Gaibor <78832141+gaiborjosue@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:35:30 -0400
Subject: [PATCH 20/27] Update CITATION.cff

---
 CITATION.cff | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 8fdf0dbc..bc1e4a8b 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,33 +1,30 @@
-# This CITATION.cff file was generated with cffinit.
-# Visit https://bit.ly/cffinit to generate yours today!
-
 cff-version: 1.2.0
 title: OpenSeadragon
 message: "If you use this software, please cite it using the metadata from this file."
 type: software
 authors:
-  - given-names: "Ian"
-    family-names: "Gilman"
-    email: "ian@iangilman.com"
-  - given-names: "Aseem"
-    family-names: "Kishore"
-  - given-names: "Chris"
-    family-names: "Thatcher"
-  - given-names: "Mark"
-    family-names: "Salsbery"
-  - given-names: "Antoine"
-    family-names: "Vandecreme"
-  - given-names:  "Thomas"
-    family-names: "Pearce"
- identifiers:
+  - given-names: Ian
+    family-names: Gilman
+    email: ian@iangilman.com
+  - given-names: Aseem
+    family-names: Kishore
+  - given-names: Chris
+    family-names: Thatcher
+  - given-names: Mark
+    family-names: Salsbery
+  - given-names: Antoine
+    family-names: Vandecreme
+  - given-names: Thomas
+    family-names: Pearce
+identifiers:
   - type: url
-    value: 'https://openseadragon.github.io/'
+    value: https://openseadragon.github.io/
     description: Homepage
   - type: url
-    value: 'https://github.com/openseadragon/openseadragon'
+    value: https://github.com/openseadragon/openseadragon
     description: Repository
-repository-code: 'https://github.com/openseadragon/openseadragon'
-url: 'https://openseadragon.github.io/'
+repository-code: https://github.com/openseadragon/openseadragon
+url: https://openseadragon.github.io/
 abstract: "An open-source, web-based viewer for high-resolution zoomable images, implemented in pure JavaScript, for desktop and mobile."
 keywords:
   - javascript
@@ -39,4 +36,4 @@ keywords:
   - iiif
 license: BSD-3-Clause
 version: 4.1.1
-date-released: '2024-04-01'
+date-released: 2024-04-01

From f7c8e4cf330111567401a982f8298cd6013445c7 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Wed, 10 Apr 2024 16:42:15 -0400
Subject: [PATCH 21/27] fix canvas drawer when viewport is flipped and tiled
 image is rotated. fix webgl drawer debug info when viewport is flipped.

---
 src/canvasdrawer.js | 135 +++++++++++++++-----------------------------
 src/webgldrawer.js  | 110 +++++++++++++++++++++++-------------
 2 files changed, 117 insertions(+), 128 deletions(-)

diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js
index f6f37708..e755c97b 100644
--- a/src/canvasdrawer.js
+++ b/src/canvasdrawer.js
@@ -80,6 +80,7 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         // Canvas default is "true", so this will only be changed if user specifies "false" in the options or via setImageSmoothinEnabled.
         this._imageSmoothingEnabled = true;
 
+        this._viewportFlipped = false;
 
         // Since the tile-drawn and tile-drawing events are fired by this drawer, make sure handlers can be added for them
         this.viewer.allowEventHandler("tile-drawn");
@@ -115,7 +116,10 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
      */
     draw(tiledImages) {
         this._prepareNewFrame(); // prepare to draw a new frame
-
+        if(this.viewer.viewport.getFlip() !== this._viewportFlipped){
+            this._flip();
+            this._viewportFlipped = !this._viewportFlipped;
+        }
         for(const tiledImage of tiledImages){
             if (tiledImage.opacity !== 0) {
                 this._drawTiles(tiledImage);
@@ -300,13 +304,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
                     tiledImage.getClippedBounds(true))
                     .getIntegerBoundingBox();
 
-                if(this.viewer.viewport.getFlip()) {
-                    if (this.viewport.getRotation(true) % 360 !== 0 ||
-                        tiledImage.getRotation(true) % 360 !== 0) {
-                        bounds.x = this.viewer.container.clientWidth - (bounds.x + bounds.width);
-                    }
-                }
-
                 bounds = bounds.times($.pixelDensityRatio);
             }
             this._clear(true, bounds);
@@ -315,27 +312,7 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         // When scaling, we must rotate only when blending the sketch canvas to
         // avoid interpolation
         if (!sketchScale) {
-            if (this.viewport.getRotation(true) % 360 !== 0) {
-                this._offsetForRotation({
-                    degrees: this.viewport.getRotation(true),
-                    useSketch: useSketch
-                });
-            }
-            if (tiledImage.getRotation(true) % 360 !== 0) {
-                this._offsetForRotation({
-                    degrees: tiledImage.getRotation(true),
-                    point: this.viewport.pixelFromPointNoRotate(
-                        tiledImage._getRotationPoint(true), true),
-                    useSketch: useSketch
-                });
-            }
-
-            if (this.viewport.getRotation(true) % 360 === 0 &&
-                tiledImage.getRotation(true) % 360 === 0) {
-                if(this.viewer.viewport.getFlip()) {
-                    this._flip();
-                }
-            }
+            this._setRotations(tiledImage, useSketch);
         }
 
         var usedClip = false;
@@ -456,20 +433,7 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
 
         if (useSketch) {
             if (sketchScale) {
-                if (this.viewport.getRotation(true) % 360 !== 0) {
-                    this._offsetForRotation({
-                        degrees: this.viewport.getRotation(true),
-                        useSketch: false
-                    });
-                }
-                if (tiledImage.getRotation(true) % 360 !== 0) {
-                    this._offsetForRotation({
-                        degrees: tiledImage.getRotation(true),
-                        point: this.viewport.pixelFromPointNoRotate(
-                            tiledImage._getRotationPoint(true), true),
-                        useSketch: false
-                    });
-                }
+                this._setRotations(tiledImage);
             }
             this.blendSketch({
                 opacity: tiledImage.opacity,
@@ -488,15 +452,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
             }
         }
 
-        if (!sketchScale) {
-            if (this.viewport.getRotation(true) % 360 === 0 &&
-                tiledImage.getRotation(true) % 360 === 0) {
-                if(this.viewer.viewport.getFlip()) {
-                    this._flip();
-                }
-            }
-        }
-
         this._drawDebugInfo( tiledImage, lastDrawn );
 
         // Fire tiled-image-drawn event.
@@ -607,7 +562,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         }
 
         context.save();
-        // context.globalAlpha = this.options.opacity; // this was deprecated previously and should not be applied as it is set per TiledImage
 
         if (typeof scale === 'number' && scale !== 1) {
             // draw tile at a different scale
@@ -853,21 +807,10 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.strokeStyle = this.debugGridColor[colorIndex];
         context.fillStyle = this.debugGridColor[colorIndex];
 
-        if (this.viewport.getRotation(true) % 360 !== 0 ) {
-            this._offsetForRotation({degrees: this.viewport.getRotation(true)});
-        }
-        if (tiledImage.getRotation(true) % 360 !== 0) {
-            this._offsetForRotation({
-                degrees: tiledImage.getRotation(true),
-                point: tiledImage.viewport.pixelFromPointNoRotate(
-                    tiledImage._getRotationPoint(true), true)
-            });
-        }
-        if (tiledImage.viewport.getRotation(true) % 360 === 0 &&
-            tiledImage.getRotation(true) % 360 === 0) {
-            if(tiledImage._drawer.viewer.viewport.getFlip()) {
-                tiledImage._drawer._flip();
-            }
+        this._setRotations(tiledImage);
+
+        if(this._viewportFlipped){
+            this._flip({point: tile.position.plus(tile.size.divide(2))});
         }
 
         context.strokeRect(
@@ -882,7 +825,8 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
 
         // Rotate the text the right way around.
         context.translate( tileCenterX, tileCenterY );
-        context.rotate( Math.PI / 180 * -this.viewport.getRotation(true) );
+        const angleInDegrees = this.viewport.getRotation(true);
+        context.rotate( Math.PI / 180 * -angleInDegrees );
         context.translate( -tileCenterX, -tileCenterY );
 
         if( tile.x === 0 && tile.y === 0 ){
@@ -935,13 +879,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
             this._restoreRotationChanges();
         }
 
-        if (tiledImage.viewport.getRotation(true) % 360 === 0 &&
-            tiledImage.getRotation(true) % 360 === 0) {
-            if(tiledImage._drawer.viewer.viewport.getFlip()) {
-                tiledImage._drawer._flip();
-            }
-        }
-
         context.restore();
     }
 
@@ -972,6 +909,33 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         return new $.Point(this.canvas.width / 2, this.canvas.height / 2);
     }
 
+    /**
+     * Set rotations for viewport & tiledImage
+     * @private
+     * @param {OpenSeadragon.TiledImage} tiledImage
+     * @param {Boolean} [useSketch=false]
+     */
+    _setRotations(tiledImage, useSketch = false) {
+        var saveContext = false;
+        if (this.viewport.getRotation(true) % 360 !== 0) {
+            this._offsetForRotation({
+                degrees: this.viewport.getRotation(true),
+                useSketch: useSketch,
+                saveContext: saveContext
+            });
+            saveContext = false;
+        }
+        if (tiledImage.getRotation(true) % 360 !== 0) {
+            this._offsetForRotation({
+                degrees: tiledImage.getRotation(true),
+                point: this.viewport.pixelFromPointNoRotate(
+                    tiledImage._getRotationPoint(true), true),
+                useSketch: useSketch,
+                saveContext: saveContext
+            });
+        }
+    }
+
     // private
     _offsetForRotation(options) {
         var point = options.point ?
@@ -982,26 +946,21 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.save();
 
         context.translate(point.x, point.y);
-        if(this.viewer.viewport.flipped){
-          context.rotate(Math.PI / 180 * -options.degrees);
-          context.scale(-1, 1);
-        } else{
-          context.rotate(Math.PI / 180 * options.degrees);
-        }
+        context.rotate(Math.PI / 180 * options.degrees);
         context.translate(-point.x, -point.y);
     }
 
     // private
     _flip(options) {
-      options = options || {};
-      var point = options.point ?
+        options = options || {};
+        var point = options.point ?
         options.point.times($.pixelDensityRatio) :
         this._getCanvasCenter();
-      var context = this._getContext(options.useSketch);
+        var context = this._getContext(options.useSketch);
 
-      context.translate(point.x, 0);
-      context.scale(-1, 1);
-      context.translate(-point.x, 0);
+        context.translate(point.x, 0);
+        context.scale(-1, 1);
+        context.translate(-point.x, 0);
     }
 
     // private
diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index d36a7b74..f23d4666 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -529,10 +529,14 @@
             }
             this._outputContext.restore();
             if(tiledImage.debugMode){
-                let colorIndex = this.viewer.world.getIndexOfItem(tiledImage) % this.debugGridColor.length;
-                let strokeStyle = this.debugGridColor[colorIndex];
-                let fillStyle = this.debugGridColor[colorIndex];
-                this._drawDebugInfo(tilesToDraw, tiledImage, strokeStyle, fillStyle);
+                const flipped = this.viewer.viewport.getFlip();
+                if(flipped){
+                    this._flip();
+                }
+                this._drawDebugInfo(tilesToDraw, tiledImage, flipped);
+                if(flipped){
+                    this._flip();
+                }
             }
 
 
@@ -1067,32 +1071,64 @@
             this._clippingContext.restore();
         }
 
+            /**
+         * Set rotations for viewport & tiledImage
+         * @private
+         * @param {OpenSeadragon.TiledImage} tiledImage
+         */
+        _setRotations(tiledImage) {
+            var saveContext = false;
+            if (this.viewport.getRotation(true) % 360 !== 0) {
+                this._offsetForRotation({
+                    degrees: this.viewport.getRotation(true),
+                    saveContext: saveContext
+                });
+                saveContext = false;
+            }
+            if (tiledImage.getRotation(true) % 360 !== 0) {
+                this._offsetForRotation({
+                    degrees: tiledImage.getRotation(true),
+                    point: this.viewport.pixelFromPointNoRotate(
+                        tiledImage._getRotationPoint(true), true),
+                    saveContext: saveContext
+                });
+            }
+        }
+
         // private
         _offsetForRotation(options) {
             var point = options.point ?
                 options.point.times($.pixelDensityRatio) :
-                new $.Point(this._outputCanvas.width / 2, this._outputCanvas.height / 2);
+                this._getCanvasCenter();
 
             var context = this._outputContext;
             context.save();
 
             context.translate(point.x, point.y);
-            if(this.viewport.flipped){
-                context.rotate(Math.PI / 180 * -options.degrees);
-                context.scale(-1, 1);
-            } else{
-                context.rotate(Math.PI / 180 * options.degrees);
-            }
+            context.rotate(Math.PI / 180 * options.degrees);
             context.translate(-point.x, -point.y);
         }
 
         // private
-        _drawDebugInfo( tilesToDraw, tiledImage, stroke, fill ) {
+        _flip(options) {
+            options = options || {};
+            var point = options.point ?
+            options.point.times($.pixelDensityRatio) :
+            this._getCanvasCenter();
+            var context = this._outputContext;
+
+            context.translate(point.x, 0);
+            context.scale(-1, 1);
+            context.translate(-point.x, 0);
+        }
+
+        // private
+        _drawDebugInfo( tilesToDraw, tiledImage, flipped ) {
 
             for ( var i = tilesToDraw.length - 1; i >= 0; i-- ) {
                 var tile = tilesToDraw[ i ].tile;
                 try {
-                    this._drawDebugInfoOnTile(tile, tilesToDraw.length, i, tiledImage, stroke, fill);
+                    this._drawDebugInfoOnTile(tile, tilesToDraw.length, i, tiledImage, flipped);
                 } catch(e) {
                     $.console.error(e);
                 }
@@ -1100,30 +1136,20 @@
         }
 
         // private
-        _drawDebugInfoOnTile(tile, count, i, tiledImage, stroke, fill) {
+        _drawDebugInfoOnTile(tile, count, i, tiledImage, flipped) {
 
-            var context = this._outputContext;
+            var colorIndex = this.viewer.world.getIndexOfItem(tiledImage) % this.debugGridColor.length;
+            var context = this.context;
             context.save();
             context.lineWidth = 2 * $.pixelDensityRatio;
             context.font = 'small-caps bold ' + (13 * $.pixelDensityRatio) + 'px arial';
-            context.strokeStyle = stroke;
-            context.fillStyle = fill;
+            context.strokeStyle = this.debugGridColor[colorIndex];
+            context.fillStyle = this.debugGridColor[colorIndex];
 
-            if (this.viewport.getRotation(true) % 360 !== 0 ) {
-                this._offsetForRotation({degrees: this.viewport.getRotation(true)});
-            }
-            if (tiledImage.getRotation(true) % 360 !== 0) {
-                this._offsetForRotation({
-                    degrees: tiledImage.getRotation(true),
-                    point: tiledImage.viewport.pixelFromPointNoRotate(
-                        tiledImage._getRotationPoint(true), true)
-                });
-            }
-            if (tiledImage.viewport.getRotation(true) % 360 === 0 &&
-                tiledImage.getRotation(true) % 360 === 0) {
-                if(tiledImage._drawer.viewer.viewport.getFlip()) {
-                    tiledImage._drawer._flip();
-                }
+            this._setRotations(tiledImage);
+
+            if(flipped){
+                this._flip({point: tile.position.plus(tile.size.divide(2))});
             }
 
             context.strokeRect(
@@ -1138,7 +1164,8 @@
 
             // Rotate the text the right way around.
             context.translate( tileCenterX, tileCenterY );
-            context.rotate( Math.PI / 180 * -this.viewport.getRotation(true) );
+            const angleInDegrees = this.viewport.getRotation(true);
+            context.rotate( Math.PI / 180 * -angleInDegrees );
             context.translate( -tileCenterX, -tileCenterY );
 
             if( tile.x === 0 && tile.y === 0 ){
@@ -1191,13 +1218,6 @@
                 this._restoreRotationChanges();
             }
 
-            if (tiledImage.viewport.getRotation(true) % 360 === 0 &&
-                tiledImage.getRotation(true) % 360 === 0) {
-                if(tiledImage._drawer.viewer.viewport.getFlip()) {
-                    tiledImage._drawer._flip();
-                }
-            }
-
             context.restore();
         }
 
@@ -1225,6 +1245,16 @@
 
         }
 
+        /**
+         * Get the canvas center
+         * @private
+         * @param {Boolean} sketch If set to true return the center point of the sketch canvas
+         * @returns {OpenSeadragon.Point} The center point of the canvas
+         */
+        _getCanvasCenter() {
+            return new $.Point(this.canvas.width / 2, this.canvas.height / 2);
+        }
+
         // private
         _restoreRotationChanges() {
             var context = this._outputContext;

From 7ce5499868415a751d77b4a6de24328782eeb6d0 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Thu, 11 Apr 2024 12:45:11 -0400
Subject: [PATCH 22/27] fix comments

---
 src/webgldrawer.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index f23d4666..25bbda66 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -1071,7 +1071,7 @@
             this._clippingContext.restore();
         }
 
-            /**
+        /**
          * Set rotations for viewport & tiledImage
          * @private
          * @param {OpenSeadragon.TiledImage} tiledImage
@@ -1248,7 +1248,6 @@
         /**
          * Get the canvas center
          * @private
-         * @param {Boolean} sketch If set to true return the center point of the sketch canvas
          * @returns {OpenSeadragon.Point} The center point of the canvas
          */
         _getCanvasCenter() {

From f8ef6818de3fe25f9005b99ce97550452f49fb95 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Fri, 12 Apr 2024 09:24:16 -0700
Subject: [PATCH 23/27] Changelog for #2511

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index a479cd2d..bcc3eca6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,6 +20,7 @@ OPENSEADRAGON CHANGELOG
 * Fixed: placeholderFillStyle didn't work properly when the image was rotated (#2469 @pearcetm)
 * Fixed: Sometimes exponential springs wouldn't ever settle (#2469 @pearcetm)
 * Fixed: The navigator wouldn't update its tracking rectangle when the navigator was resized (#2491 @pearcetm)
+* Fixed: The drawer would improperly crop when the viewport was flipped and a tiled image was rotated (#2511 @pearcetm, @eug-L)
 
 4.1.1:
 

From f2c8db5db0c2e5868437e634d12eae7b3c0df958 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Sat, 27 Apr 2024 16:38:30 -0400
Subject: [PATCH 24/27] fix #2517

---
 src/canvasdrawer.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js
index e755c97b..1ec6a10b 100644
--- a/src/canvasdrawer.js
+++ b/src/canvasdrawer.js
@@ -80,8 +80,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         // Canvas default is "true", so this will only be changed if user specifies "false" in the options or via setImageSmoothinEnabled.
         this._imageSmoothingEnabled = true;
 
-        this._viewportFlipped = false;
-
         // Since the tile-drawn and tile-drawing events are fired by this drawer, make sure handlers can be added for them
         this.viewer.allowEventHandler("tile-drawn");
         this.viewer.allowEventHandler("tile-drawing");
@@ -118,8 +116,8 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         this._prepareNewFrame(); // prepare to draw a new frame
         if(this.viewer.viewport.getFlip() !== this._viewportFlipped){
             this._flip();
-            this._viewportFlipped = !this._viewportFlipped;
         }
+        console.log('draw', this._viewportFlipped);
         for(const tiledImage of tiledImages){
             if (tiledImage.opacity !== 0) {
                 this._drawTiles(tiledImage);
@@ -189,6 +187,10 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.restore();
     }
 
+    get _viewportFlipped(){
+        return this.context.getTransform().a < 0;
+    }
+
     /**
      * Fires the tile-drawing event.
      * @private
@@ -961,6 +963,7 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.translate(point.x, 0);
         context.scale(-1, 1);
         context.translate(-point.x, 0);
+        console.log('flipped');
     }
 
     // private

From 9d6a785aacc8158bb3a1b25391b32b650782db0e Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Sat, 27 Apr 2024 16:41:18 -0400
Subject: [PATCH 25/27] add comment; clean up console.log messages from testing

---
 src/canvasdrawer.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js
index 1ec6a10b..57525e37 100644
--- a/src/canvasdrawer.js
+++ b/src/canvasdrawer.js
@@ -117,7 +117,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         if(this.viewer.viewport.getFlip() !== this._viewportFlipped){
             this._flip();
         }
-        console.log('draw', this._viewportFlipped);
         for(const tiledImage of tiledImages){
             if (tiledImage.opacity !== 0) {
                 this._drawTiles(tiledImage);
@@ -187,6 +186,10 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.restore();
     }
 
+    /**
+     * Test whether the current context is flipped or not
+     * @private
+     */
     get _viewportFlipped(){
         return this.context.getTransform().a < 0;
     }
@@ -963,7 +966,6 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
         context.translate(point.x, 0);
         context.scale(-1, 1);
         context.translate(-point.x, 0);
-        console.log('flipped');
     }
 
     // private

From 8b401e65e355ac2f4308c48e13e23f3b65686d39 Mon Sep 17 00:00:00 2001
From: Tom <tmpearce@gmail.com>
Date: Sun, 28 Apr 2024 08:38:03 -0400
Subject: [PATCH 26/27] fix #2519 by checking minimumOverlapRequired on a
 per-tiled image basis

---
 src/canvasdrawer.js |  6 ++++--
 src/drawerbase.js   |  5 +++--
 src/htmldrawer.js   |  6 ++++--
 src/tiledimage.js   |  2 +-
 src/webgldrawer.js  | 10 ++++++++++
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js
index f6f37708..ad7ea957 100644
--- a/src/canvasdrawer.js
+++ b/src/canvasdrawer.js
@@ -143,10 +143,12 @@ class CanvasDrawer extends OpenSeadragon.DrawerBase{
     }
 
     /**
+     * @param {TiledImage} tiledImage the tiled image that is calling the function
      * @returns {Boolean} Whether this drawer requires enforcing minimum tile overlap to avoid showing seams.
+     * @private
      */
-    minimumOverlapRequired() {
-       return true;
+    minimumOverlapRequired(tiledImage) {
+        return true;
     }
 
 
diff --git a/src/drawerbase.js b/src/drawerbase.js
index 0a0d04ce..083aba79 100644
--- a/src/drawerbase.js
+++ b/src/drawerbase.js
@@ -141,12 +141,13 @@ OpenSeadragon.DrawerBase = class DrawerBase{
     }
 
     /**
+     * @param {TiledImage} tiledImage the tiled image that is calling the function
      * @returns {Boolean} Whether this drawer requires enforcing minimum tile overlap to avoid showing seams.
      * @private
      */
-    minimumOverlapRequired() {
+    minimumOverlapRequired(tiledImage) {
         return false;
-     }
+    }
 
 
     /**
diff --git a/src/htmldrawer.js b/src/htmldrawer.js
index 80f851e4..8b2a9305 100644
--- a/src/htmldrawer.js
+++ b/src/htmldrawer.js
@@ -86,11 +86,13 @@ class HTMLDrawer extends OpenSeadragon.DrawerBase{
     }
 
     /**
+     * @param {TiledImage} tiledImage the tiled image that is calling the function
      * @returns {Boolean} Whether this drawer requires enforcing minimum tile overlap to avoid showing seams.
+     * @private
      */
-    minimumOverlapRequired() {
+    minimumOverlapRequired(tiledImage) {
         return true;
-     }
+    }
 
     /**
      * create the HTML element (e.g. canvas, div) that the image will be drawn into
diff --git a/src/tiledimage.js b/src/tiledimage.js
index 20fa2ebf..0372b8be 100644
--- a/src/tiledimage.js
+++ b/src/tiledimage.js
@@ -1706,7 +1706,7 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
             tileCenter = positionT.plus( sizeT.divide( 2 ) ),
             tileSquaredDistance = viewportCenter.squaredDistanceTo( tileCenter );
 
-        if(this.viewer.drawer.minimumOverlapRequired()){
+        if(this.viewer.drawer.minimumOverlapRequired(this)){
             if ( !overlap ) {
                 sizeC = sizeC.plus( new $.Point(1, 1));
             }
diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index d36a7b74..e9f3633d 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -210,6 +210,16 @@
             return 'webgl';
         }
 
+        /**
+         * @param {TiledImage} tiledImage the tiled image that is calling the function
+         * @returns {Boolean} Whether this drawer requires enforcing minimum tile overlap to avoid showing seams.
+         * @private
+         */
+        minimumOverlapRequired(tiledImage) {
+            // return true if the tiled image is tainted, since the backup canvas drawer will be used.
+            return tiledImage.isTainted();
+        }
+
         /**
         * create the HTML element (canvas in this case) that the image will be drawn into
         * @private

From 3d54f8f6864151be7e717af51ede3cff36574f3e Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 29 Apr 2024 10:41:38 -0700
Subject: [PATCH 27/27] Changelog for #2518

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index bcc3eca6..d49699cb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -21,6 +21,7 @@ OPENSEADRAGON CHANGELOG
 * Fixed: Sometimes exponential springs wouldn't ever settle (#2469 @pearcetm)
 * Fixed: The navigator wouldn't update its tracking rectangle when the navigator was resized (#2491 @pearcetm)
 * Fixed: The drawer would improperly crop when the viewport was flipped and a tiled image was rotated (#2511 @pearcetm, @eug-L)
+* Fixed: Flipped viewport caused image to be flipped again when going fullscreen or resizing (#2518 @pearcetm)
 
 4.1.1: