skip image if validation fails

mapbox · Nov 27, 2019 · 40e86d3 · 40e86d3 · ahk · Nov 27, 2019
1 parent bfb1dbe
commit 40e86d3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/render/image_manager.js b/src/render/image_manager.js
@@ -86,21 +86,26 @@ class ImageManager extends Evented {
     }
 
     addImage(id: string, image: StyleImage) {
-        this._validate(id, image);
         assert(!this.images[id]);
-        this.images[id] = image;
+        if (this._validate(id, image)) {
+            this.images[id] = image;
+        }
     }
 
     _validate(id: string, image: StyleImage) {
         if (!this._validateStretch(image.stretchX, image.data && image.data.width)) {
             this.fire(new ErrorEvent(new Error(`Image "${id}" has invalid "stretchX" value`)));
+            return false;
         }
         if (!this._validateStretch(image.stretchY, image.data && image.data.height)) {
             this.fire(new ErrorEvent(new Error(`Image "${id}" has invalid "stretchY" value`)));
+            return false;
         }
         if (!this._validateContent(image.content, image)) {
             this.fire(new ErrorEvent(new Error(`Image "${id}" has invalid "content" value`)));
+            return false;
         }
+        return true;
     }
 
     _validateStretch(stretch: ?Array<[number, number]> | void, size: number) {