From 4bea8b638b9129e90806cfd01f3695045d96fb0f Mon Sep 17 00:00:00 2001 From: Lucas Wojciechowski Date: Wed, 24 Aug 2016 14:20:48 -0700 Subject: [PATCH] Unignore fill-opacity property-function test --- js/style/style_layer.js | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/style/style_layer.js b/js/style/style_layer.js index a9c68560c47..e1f0d92ac95 100644 --- a/js/style/style_layer.js +++ b/js/style/style_layer.js @@ -218,7 +218,9 @@ StyleLayer.prototype = util.inherit(Evented, { if (this.minzoom && zoom < this.minzoom) return true; if (this.maxzoom && zoom >= this.maxzoom) return true; if (this.layout['visibility'] === 'none') return true; - if (this.paint[this.type + '-opacity'] === 0) return true; + if (this.isPaintValueFeatureConstant(this.type + '-opacity') && this.paint[this.type + '-opacity'] === 0) return true; + if (this.isPaintValueFeatureConstant(this.type + '-color') && this.paint[this.type + '-color'][3] === 0) return true; + return false; }, diff --git a/package.json b/package.json index 4bc6094db0f..f4cd41cf1f5 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "istanbul": "^0.4.2", "json-loader": "^0.5.4", "lodash": "^4.13.1", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#3e36b193a0c442a3fd863119f101afa6db97b32d", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#35efbce663a0f13d37d34afac799e33178ee610a", "memory-fs": "^0.3.0", "minifyify": "^7.0.1", "npm-run-all": "^3.0.0",