From bb6241844a092cf632fe740e6ac79c920117dd4e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 19 Oct 2015 18:30:25 -0700 Subject: [core] Extract PaintPropertiesMap --- src/mbgl/annotation/shape_annotation_impl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mbgl/annotation/shape_annotation_impl.cpp') 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(properties.opacity)); paintProperties.set(PropertyKey::LineWidth, ConstantFunction(properties.width)); paintProperties.set(PropertyKey::LineColor, ConstantFunction(properties.color)); - layer->styles.emplace(ClassID::Default, std::move(paintProperties)); + layer->paints.paints.emplace(ClassID::Default, std::move(paintProperties)); } else if (shape.properties.is()) { layer = createFillLayer(); @@ -47,7 +47,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) { paintProperties.set(PropertyKey::FillOpacity, ConstantFunction(properties.opacity)); paintProperties.set(PropertyKey::FillColor, ConstantFunction(properties.fill_color)); paintProperties.set(PropertyKey::FillOutlineColor, ConstantFunction(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(); @@ -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; } -- cgit v1.2.1