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

[core] Eliminate use of ClassProperties for layout

Browse Source
This commit is contained in:
John Firebaugh
2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/annotation/annotation_manager.cpp
View File

@@ -120,8 +120,8 @@ void AnnotationManager::updateStyle(Style& style) {
layer->source = SourceID;
layer->sourceLayer = PointLayerID;
layer->layout.set(PropertyKey::IconImage, Function<std::string>("{sprite}"));
layer->layout.set(PropertyKey::IconAllowOverlap, Function<bool>(true));
layer->layout.icon.image = std::string("{sprite}");
layer->layout.icon.allowOverlap = true;
style.addLayer(std::move(layer));
}

3
src/mbgl/annotation/shape_annotation_impl.cpp
View File

@@ -31,8 +31,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) {
std::unique_ptr<LineLayer> layer = std::make_unique<LineLayer>();
layer->type = StyleLayerType::Line;
layer->layout.set(PropertyKey::LineJoin, Function<JoinType>(JoinType::Round));
layer->layout.join = JoinType::Round;
const LinePaintProperties& properties = shape.properties.get<LinePaintProperties>();
ClassProperties paintProperties;