diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-12 16:16:21 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-13 11:57:09 +0300 |
| commit | c670b08ecb431b1bfd02da748de3d9fa16a757ec (patch) | |
| tree | b1c19eab6e4b895018df67da4cd5a61e75b431f2 /test | |
| parent | a73c81cc55671c8f3f5916c310353a22d6a6f231 (diff) | |
| download | qtlocation-mapboxgl-c670b08ecb431b1bfd02da748de3d9fa16a757ec.tar.gz | |
[core] Use PropertyValue<T> for Annotation line/fill
Diffstat (limited to 'test')
| -rw-r--r-- | test/api/annotations.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 05d1f28fc7..253e6995f3 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -53,8 +53,8 @@ TEST(Annotations, LineAnnotation) { LineString<double> line = {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }}; LineAnnotation annotation { line }; - annotation.color = { 255, 0, 0, 1 }; - annotation.width = 5; + annotation.color = { { 255, 0, 0, 1 } }; + annotation.width = { 5 }; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); test.map.addAnnotation(annotation); @@ -69,7 +69,7 @@ TEST(Annotations, FillAnnotation) { Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; FillAnnotation annotation { polygon }; - annotation.color = { 255, 0, 0, 1 }; + annotation.color = { { 255, 0, 0, 1 } }; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); test.map.addAnnotation(annotation); @@ -110,7 +110,7 @@ TEST(Annotations, NonImmediateAdd) { Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; FillAnnotation annotation { polygon }; - annotation.color = { 255, 0, 0, 1 }; + annotation.color = { { 255, 0, 0, 1 } }; test.map.addAnnotation(annotation); test.checkRendering("non_immediate_add"); @@ -162,8 +162,8 @@ TEST(Annotations, RemoveShape) { LineString<double> line = {{ { 0, 0 }, { 45, 45 } }}; LineAnnotation annotation { line }; - annotation.color = { 255, 0, 0, 1 }; - annotation.width = 5; + annotation.color = { { 255, 0, 0, 1 } }; + annotation.width = { 5 }; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); AnnotationID shape = test.map.addAnnotation(annotation); |