Merge pull request #88 from Financial-Times/image-type

Be explicit about which image types we expect from largeImage
Financial-Times · Dec 9, 2014 · 47f5ff8 · 47f5ff8
2 parents ff10e2c + 2e02fe6
commit 47f5ff8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/models/article.js b/models/article.js
@@ -444,10 +444,12 @@ Object.defineProperty(Article.prototype, 'body', {
 Object.defineProperty(Article.prototype, 'largestImage', {
     get: function () {
         if (this.raw.item.images) {
-            var sortedImages = this.raw.item.images.sort(function (a, b) {
-                return a.width < b.width;
+            var images = {};
+
+            this.raw.item.images.forEach(function(img) {
+                images[img.type] = img;
             });
-            return sortedImages[0];
+            return images['wide-format'] || images['article'] || images['primary'];
         }
     }
 });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ft-api-client",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/Financial-Times/ft-api-client.git"

diff --git a/test/fixtures/03b49444-16c9-11e3-bced-00144feabdc0 b/test/fixtures/03b49444-16c9-11e3-bced-00144feabdc0
@@ -517,6 +517,15 @@
                 "width": 272,
                 "mediaType": "image/jpeg"
             },
+            {
+                "url": "http://im.ft-static.com/content/images/alternative.img",
+                "type": "primary",
+                "source": "AFP/Getty Images",
+                "alt": "RUSSIA-G20-SUMMIT",
+                "height": 2000,
+                "width": 2000,
+                "mediaType": "image/jpeg"
+            },
             {
                 "url": "http://im.ft-static.com/content/images/9ba9fc53-8af1-4145-9109-bd6f0ccff3bd.img",
                 "type": "secondary",