summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-10-30 10:21:17 +0200
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-11-11 18:20:01 +0200
commitc6f3cc8b60e0cff032020a780d4fd3de1cb2a112 (patch)
tree155fe444f21ae88dda664e81cfc8378e28297b0e /test/fixtures
parente1556fc539607db626b978040895716c1564c9b9 (diff)
downloadqtlocation-mapboxgl-c6f3cc8b60e0cff032020a780d4fd3de1cb2a112.tar.gz
[core] Implement image expression (#15877)
* [core] Bump gl-js version * [core] Implement image expression * [core] Use new image expression * [core] Coerce image expression to / from string * [core] Serialize evaluated image * [core] Pass available images to layout * [core] Pass images to evaluation context * [core] Set available flag value based on image availability * [core] Allow image coercion to boolean to indicate image availability * [core] Coalesce image expression * [core] Add image expression to next build system * [core] Align serialization format and evaluated type with gl-js * [core] Add images to expression evaluation method * [core] Add support for Image expression to expression test runner * [core] Unskip image expression tests * [core] Update unit tests * [core] Use image expression in annotation manager * [core] Add string to ImageExpression conversion * [core] Add image expression to expression dsl * [core] Convert tokens for implicitly created Image literal * [core] Fix clang format * [core] Split generated style code lines that are over 120 characters * [core] Add unit test for image expression equality * [core] Add image property expression evaluation unit test * [core] Unskip image expression render test * [core] Skip 'in' expression tests * [core] Ignore fill-pattern/update-feature-state render test * [core] Rename Image::serialize to Image::toValue
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/expression_equality/image.a.json4
-rw-r--r--test/fixtures/expression_equality/image.b.json4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/fixtures/expression_equality/image.a.json b/test/fixtures/expression_equality/image.a.json
new file mode 100644
index 0000000000..930b21dd0e
--- /dev/null
+++ b/test/fixtures/expression_equality/image.a.json
@@ -0,0 +1,4 @@
+[
+ "image",
+ "maki-11"
+] \ No newline at end of file
diff --git a/test/fixtures/expression_equality/image.b.json b/test/fixtures/expression_equality/image.b.json
new file mode 100644
index 0000000000..edec7d0497
--- /dev/null
+++ b/test/fixtures/expression_equality/image.b.json
@@ -0,0 +1,4 @@
+[
+ "image",
+ "bicycle-15"
+] \ No newline at end of file