tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Use PropertyValue<T> for Annotation line/fill

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2016-07-12 16:16:21 +03:00
parent a73c81cc55
commit c670b08ecb
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/api/annotations.cpp
View File

@@ -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);