[core] More complete fix for composite function interpolation edge case

b5b4549 / #8613 handled the edge case for layout properties, but not paint properties. Move the check for a degenerate range to interpolationFactor in order to handle both correctly.
This commit is contained in:
John Firebaugh
2017-04-20 15:28:28 -07:00
parent c6be40b71b
commit 3c23faf65a
3 changed files with 4 additions and 5 deletions

View File

@@ -100,9 +100,6 @@ public:
T evaluate(float zoom, const GeometryTileFeature& feature, T finalDefaultValue) const {
std::tuple<Range<float>, Range<InnerStops>> ranges = coveringRanges(zoom);
Range<T> resultRange = evaluate(std::get<1>(ranges), feature, finalDefaultValue);
// If the covering stop range is constant, just return the output value directly.
if (resultRange.min == resultRange.max) return resultRange.min;
// Otherwise, interpolate between the two stops.
return util::interpolate(
resultRange.min,
resultRange.max,