Minor fix for 3386 (provide empty object for lookup) #3414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@lucaswoj can you 🍏 this? 🙏 |
lucaswoj
reviewed
Oct 19, 2016
| @@ -79,7 +79,7 @@ class Bucket { | |||
| let type = options.layer.type; | |||
| if (type === 'fill' && (!options.layer.isPaintValueFeatureConstant('fill-extrude-height') || | |||
| !options.layer.isPaintValueZoomConstant('fill-extrude-height') || | |||
| options.layer.getPaintValue('fill-extrude-height') !== 0)) { | |||
| options.layer.getPaintValue('fill-extrude-height', {}) !== 0)) { | |||
There was a problem hiding this comment.
Would we head off similar bugs if we added this default value further upstream? (such as within StyleLayer#getPaintValue)
There was a problem hiding this comment.
Alternately, perhaps we should be passing a globalProperties object with a zoom here and 👇
jfirebaugh
reviewed
Oct 24, 2016
| @@ -282,7 +282,7 @@ Bucket.create = function(options) { | |||
| let type = options.layer.type; | |||
| if (type === 'fill' && (!options.layer.isPaintValueFeatureConstant('fill-extrude-height') || | |||
| !options.layer.isPaintValueZoomConstant('fill-extrude-height') || | |||
| options.layer.getPaintValue('fill-extrude-height') !== 0)) { | |||
| options.layer.getPaintValue('fill-extrude-height', {zoom: this.zoom}) !== 0)) { | |||
There was a problem hiding this comment.
This doesn't look right -- this here will be Bucket the class/constructor function, not a Bucket instance.
There was a problem hiding this comment.
Oops, good catch @jfirebaugh. Following up in 79dd26a
Merged
lbud
pushed a commit
that referenced
this pull request
Oct 24, 2016
…ntructor's zoom property) (#3448)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is only a small part of the fix for #3386 (more details on that ticket) —
getPaintValuedoes an object lookup onglobalProperties, so without providing an object for lookup this was sometimes throwing.