diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 18:30:25 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 12:00:11 -0700 |
commit | bb6241844a092cf632fe740e6ac79c920117dd4e (patch) | |
tree | 6d2540fde2c2a3fbe3d1f8bfce32c57e192894d9 /src/mbgl/annotation/shape_annotation_impl.cpp | |
parent | e257ad284bf02f658949f3f2ddb7becbbcf1f820 (diff) | |
download | qtlocation-mapboxgl-bb6241844a092cf632fe740e6ac79c920117dd4e.tar.gz |
[core] Extract PaintPropertiesMap
Diffstat (limited to 'src/mbgl/annotation/shape_annotation_impl.cpp')
-rw-r--r-- | src/mbgl/annotation/shape_annotation_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index 45b25f45e5..b70b3423ba 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -37,7 +37,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) { paintProperties.set(PropertyKey::LineOpacity, ConstantFunction<float>(properties.opacity)); paintProperties.set(PropertyKey::LineWidth, ConstantFunction<float>(properties.width)); paintProperties.set(PropertyKey::LineColor, ConstantFunction<Color>(properties.color)); - layer->styles.emplace(ClassID::Default, std::move(paintProperties)); + layer->paints.paints.emplace(ClassID::Default, std::move(paintProperties)); } else if (shape.properties.is<FillPaintProperties>()) { layer = createFillLayer(); @@ -47,7 +47,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) { paintProperties.set(PropertyKey::FillOpacity, ConstantFunction<float>(properties.opacity)); paintProperties.set(PropertyKey::FillColor, ConstantFunction<Color>(properties.fill_color)); paintProperties.set(PropertyKey::FillOutlineColor, ConstantFunction<Color>(properties.stroke_color)); - layer->styles.emplace(ClassID::Default, std::move(paintProperties)); + layer->paints.paints.emplace(ClassID::Default, std::move(paintProperties)); } else { beforeLayerID = shape.properties.get<std::string>(); @@ -68,7 +68,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) { return; } - layer->styles = sourceLayer->styles; + layer->paints.paints = sourceLayer->paints.paints; layer->bucket->layout = sourceLayer->bucket->layout; } |