diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 13:19:52 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-22 09:21:30 -0700 |
| commit | df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb (patch) | |
| tree | ecac13b203cd45451aeff565cb11b179a5ef84d6 /test | |
| parent | 83d39364f9de987d7840900db2e01673bc1ed6ef (diff) | |
| download | qtlocation-mapboxgl-df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb.tar.gz | |
[core] Rationalize style property classes: <type>{Paint,Layout}Properties
Diffstat (limited to 'test')
| -rw-r--r-- | test/api/annotations.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 0918d78931..907f0446b6 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -48,12 +48,12 @@ TEST(Annotations, LineAnnotation) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }}; - LineProperties lineProperties; + LinePaintProperties lineProperties; lineProperties.color = {{ 255, 0, 0, 1 }}; lineProperties.width = 5; StyleProperties styleProperties; - styleProperties.set<LineProperties>(lineProperties); + styleProperties.set<LinePaintProperties>(lineProperties); map.addShapeAnnotation(ShapeAnnotation(segments, styleProperties)); @@ -70,11 +70,11 @@ TEST(Annotations, FillAnnotation) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; - FillProperties fillProperties; + FillPaintProperties fillProperties; fillProperties.fill_color = {{ 255, 0, 0, 1 }}; StyleProperties styleProperties; - styleProperties.set<FillProperties>(fillProperties); + styleProperties.set<FillPaintProperties>(fillProperties); map.addShapeAnnotation(ShapeAnnotation(segments, styleProperties)); @@ -109,11 +109,11 @@ TEST(Annotations, NonImmediateAdd) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; - FillProperties fillProperties; + FillPaintProperties fillProperties; fillProperties.fill_color = {{ 255, 0, 0, 1 }}; StyleProperties styleProperties; - styleProperties.set<FillProperties>(fillProperties); + styleProperties.set<FillPaintProperties>(fillProperties); map.addShapeAnnotation(ShapeAnnotation(segments, styleProperties)); @@ -143,12 +143,12 @@ TEST(Annotations, RemoveShape) { AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }}; - LineProperties lineProperties; + LinePaintProperties lineProperties; lineProperties.color = {{ 255, 0, 0, 1 }}; lineProperties.width = 5; StyleProperties styleProperties; - styleProperties.set<LineProperties>(lineProperties); + styleProperties.set<LinePaintProperties>(lineProperties); Map map(view, fileSource, MapMode::Still); map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), ""); |