Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Fix style parsing bug for constant expressions #11606

Merged
merged 4 commits into from
Apr 9, 2018
Merged

Fix style parsing bug for constant expressions #11606

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26a461f
Fix style parsing bug for constant expressions
Apr 5, 2018
3c89a5d
Ignore tests for unported GL JS change
Apr 5, 2018
0916a1a
Fuller fix
Apr 6, 2018
455c682
Update mapbox-gl-js
Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions include/mbgl/style/conversion/data_driven_property_value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,17 @@ struct Converter<DataDrivenPropertyValue<T>> {
} else {
// If an expression is neither zoom- nor feature-dependent, it
// should have been reduced to a Literal when it was parsed.
auto literal = dynamic_cast<Literal*>(expression->get());
assert(literal);
optional<T> constant = fromExpressionValue<T>(literal->getValue());
optional<T> constant;
if (auto literal = dynamic_cast<Literal*>(expression->get())) {
// cool, it's pre-folded to a literal
constant = fromExpressionValue<T>(literal->getValue());
} else {
// we didn't manage to fold to a literal during parsing, so evaluate it now
EvaluationContext params(nullptr);
EvaluationResult evaluated((*expression)->evaluate(params));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to check for heatmap-density or other computed properties?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good question -- heatmap-density is used only in heatmap-color, which isn't data-driven and so isn't parsed as a DataDrivenPropertyValue. Rather, it actually has its own wrapper HeatmapColorPropertyValue

assert(evaluated);
constant = fromExpressionValue<T>(*evaluated);
}
if (!constant) {
return {};
}
Expand Down
2 changes: 1 addition & 1 deletion mapbox-gl-js
Open in desktop
Submodule mapbox-gl-js updated 20 files
+1 −0 .eslintrc
+2 −4 docs/components/expression-metadata.js
+2 −2 docs/pages/api.js
+1 −1 docs/pages/style-spec.js
+1 −1 package.json
+6 −1 src/data/feature_index.js
+1 −1 src/shaders/index.js
+1 −1 test/build/browserify-test-fixture.js
+3 −4 test/build/min.test.js
+3 −0 test/build/style-spec.test.js
+4 −10 test/expression.test.js
+1 −0 test/integration/.eslintrc
+24 −50 test/integration/query-tests/edge-cases/box-cutting-antimeridian-z0/expected.json
+2 −35 test/integration/query-tests/edge-cases/null-island/expected.json
+4 −0 test/integration/render-tests/regressions/mapbox-gl-native#10849/style.json
+1 −1 test/query.test.js
+1 −1 test/render.test.js
+1 −1 test/stub_loader.js
+1 −1 test/suite_implementation.js
+1 −1 test/unit/ui/control/geolocate.test.js
2 changes: 2 additions & 0 deletions platform/node/test/ignores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"query-tests/circle-pitch-scale/viewport-inside-align-map": "https://github.com/mapbox/mapbox-gl-native/issues/10615",
"query-tests/circle-pitch-scale/viewport-inside-align-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/10615",
"query-tests/edge-cases/box-cutting-antimeridian-z0": "https://github.com/mapbox/mapbox-gl-native/issues/11607",
"query-tests/edge-cases/null-island": "https://github.com/mapbox/mapbox-gl-native/issues/11607",
"query-tests/geometry/multilinestring": "needs investigation",
"query-tests/geometry/multipolygon": "needs investigation",
"query-tests/geometry/polygon": "needs investigation",
Expand Down