Just check version in MiradorDownloadDialog, decide on behavior in CanvasDownloadLinks

Author: lutzhelm

__tests__/CanvasDownloadLinks.test.js

@@ -12,7 +12,7 @@ function createWrapper(props) {
       canvasId="abc123"
       canvasLabel="My Canvas Label"
       classes={{}}
-      fullSizeParam="max_full"
+      isVersion3={false}
       infoResponse={{}}
       restrictDownloadOnSizeDefinition={false}
       viewType="single"
@@ -180,15 +180,15 @@ describe('CanvasDownloadLinks', () => {
 
       const link = screen.getByRole('link', { name: /Whole image \(4000 x 1000px\)/i });
       expect(link).toBeInTheDocument();
-      expect(link).toHaveAttribute('href', 'http://example.com/iiif/abc123/full/max_full/0/default.jpg?download=true');
+      expect(link).toHaveAttribute('href', 'http://example.com/iiif/abc123/full/full/0/default.jpg?download=true');
     });
 
     describe('For Images Wider Than 1000px', () => {
       it('renders links for both full-size and 1000px wide versions', () => {
         createWrapper({ canvas });
 
         const link1 = screen.getByRole('link', { name: /Whole image \(4000 x 1000px\)/i });
-        expect(link1).toHaveAttribute('href', 'http://example.com/iiif/abc123/full/max_full/0/default.jpg?download=true');
+        expect(link1).toHaveAttribute('href', 'http://example.com/iiif/abc123/full/full/0/default.jpg?download=true');
 
         const link2 = screen.getByRole('link', { name: /Whole image \(1000 x 250px\)/i });
         expect(link2).toHaveAttribute('href', 'http://example.com/iiif/abc123/full/1000,/0/default.jpg?download=true');

src/CanvasDownloadLinks.js

@@ -34,30 +34,31 @@ export default class CanvasDownloadLinks extends Component {
   }
 
   zoomedImageUrl() {
-    const { canvas, fullSizeParam } = this.props;
+    const { canvas, isVersion3 } = this.props;
     const bounds = this.currentBounds();
     const boundsUrl = canvas
       .getCanonicalImageUri()
       .replace(
         /\/full\/.*\/0\//,
-        `/${bounds.x},${bounds.y},${bounds.width},${bounds.height}/${fullSizeParam}/0/`,
+        `/${bounds.x},${bounds.y},${bounds.width},${bounds.height}/${isVersion3 ? `${bounds.width},${bounds.height}` : 'full'}/0/`,
       );
 
     return `${boundsUrl}?download=true`;
   }
 
   imageUrlForSize(size) {
-    const { canvas } = this.props;
+    const { canvas, isVersion3 } = this.props;
 
-    return `${canvas.getCanonicalImageUri(size.width)}?download=true`;
+    return isVersion3 ? `${canvas.getCanonicalImageUri().replace(/\/full\/.*\/0\//, `/full/${size.width},${size.height}/0/`)}?download=true`
+      : `${canvas.getCanonicalImageUri(size.width)}?download=true`;
   }
 
   fullImageUrl() {
-    const { canvas, fullSizeParam } = this.props;
+    const { canvas, isVersion3 } = this.props;
 
     return `${canvas
       .getCanonicalImageUri()
-      .replace(/\/full\/.*\/0\//, `/full/${fullSizeParam}/0/`)}?download=true`;
+      .replace(/\/full\/.*\/0\//, `/full/${isVersion3 ? 'max' : 'full'}/0/`)}?download=true`;
   }
 
   thousandPixelWideImage() {
@@ -223,7 +224,6 @@ CanvasDownloadLinks.propTypes = {
     getWidth: PropTypes.func.isRequired,
   }).isRequired,
   canvasLabel: PropTypes.string.isRequired, // canvasLabel is passed because we need access to redux
-  fullSizeParam: PropTypes.string.isRequired,
   infoResponse: PropTypes.shape({
     json: PropTypes.shape({
       height: PropTypes.number,
@@ -233,6 +233,7 @@ CanvasDownloadLinks.propTypes = {
       width: PropTypes.number,
     }),
   }).isRequired,
+  isVersion3: PropTypes.bool.isRequired,
   restrictDownloadOnSizeDefinition: PropTypes.bool.isRequired,
   viewType: PropTypes.string.isRequired,
   windowId: PropTypes.string.isRequired,

src/MiradorDownloadDialog.js

@@ -92,14 +92,13 @@ export class MiradorDownloadDialog extends Component {
             } else if (typeof context === 'string') {
               contextArray = [context];
             }
-            const fullSizeParam = contextArray && contextArray.indexOf('http://iiif.io/api/image/3/context.json') > -1
-              ? 'max' : 'full';
+            const isVersion3 = contextArray && contextArray.indexOf('http://iiif.io/api/image/3/context.json') > -1;
 
             return (
               <CanvasDownloadLinks
                 canvas={canvas}
                 canvasLabel={canvasLabel(canvas.id)}
-                fullSizeParam={fullSizeParam}
+                isVersion3={isVersion3}
                 infoResponse={infoResponse(canvas.id)}
                 restrictDownloadOnSizeDefinition={
                     restrictDownloadOnSizeDefinition