merge text and icon buckets/styles

(we're not yet placing together!)
This commit is contained in:
Konstantin Käfer
2014-07-29 18:27:59 +02:00
parent 270c24a9a8
commit fa3a41136c
27 changed files with 909 additions and 1017 deletions

View File

@@ -683,13 +683,9 @@ void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass) {
if (pass == Opaque) return;
if (!layer_desc->getProperties<LineProperties>().isVisible()) return;
break;
case StyleLayerType::Icon:
case StyleLayerType::Symbol:
if (pass == Opaque) return;
if (!layer_desc->getProperties<IconProperties>().isVisible()) return;
break;
case StyleLayerType::Text:
if (pass == Opaque) return;
if (!layer_desc->getProperties<TextProperties>().isVisible()) return;
if (!layer_desc->getProperties<SymbolProperties>().isVisible()) return;
break;
case StyleLayerType::Raster:
if (pass == Translucent) return;