[core] Eliminate use of ClassProperties for layout

2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions
--- a/src/mbgl/annotation/annotation_manager.cpp
+++ b/src/mbgl/annotation/annotation_manager.cpp
@@ -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));
    }