diff options
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/annotation/shape_annotation_impl.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index b8e9f973f2..374d770a29 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -115,7 +115,6 @@ void AnnotationManager::updateStyle(Style& style) { std::unique_ptr<SymbolLayer> layer = std::make_unique<SymbolLayer>(); layer->id = PointLayerID; layer->type = StyleLayerType::Symbol; - layer->styles.emplace(ClassID::Default, ClassProperties()); layer->bucket = std::make_shared<StyleBucket>(layer->type); layer->bucket->name = layer->id; 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; } |