diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp index 222f577a9..411db5b42 100644 --- a/src/agg/process_shield_symbolizer.cpp +++ b/src/agg/process_shield_symbolizer.cpp @@ -42,6 +42,8 @@ void agg_renderer::process(shield_symbolizer const& sym, const auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); + if (!mapnik::get(sym, keys::text_placements_)) + return; const text_symbolizer_helper helper(sym, feature, common_.vars_, diff --git a/src/agg/process_text_symbolizer.cpp b/src/agg/process_text_symbolizer.cpp index 54bb45660..758e6c11c 100644 --- a/src/agg/process_text_symbolizer.cpp +++ b/src/agg/process_text_symbolizer.cpp @@ -42,6 +42,8 @@ void agg_renderer::process(text_symbolizer const& sym, const auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); + if (!mapnik::get(sym, keys::text_placements_)) + return; const text_symbolizer_helper helper(sym, feature, common_.vars_, diff --git a/src/cairo/process_text_symbolizer.cpp b/src/cairo/process_text_symbolizer.cpp index fd74360fd..0c00e6f4b 100644 --- a/src/cairo/process_text_symbolizer.cpp +++ b/src/cairo/process_text_symbolizer.cpp @@ -43,6 +43,8 @@ void cairo_renderer::process(shield_symbolizer const& sym, auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); + if (!mapnik::get(sym, keys::text_placements_)) + return; text_symbolizer_helper helper(sym, feature, common_.vars_, @@ -86,6 +88,8 @@ void cairo_renderer::process(text_symbolizer const& sym, auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); + if (!mapnik::get(sym, keys::text_placements_)) + return; text_symbolizer_helper helper(sym, feature, common_.vars_, diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index 0ec93b7f0..0a384b345 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -51,7 +51,8 @@ void grid_renderer::process(shield_symbolizer const& sym, auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); - + if (!mapnik::get(sym, keys::text_placements_)) + return; text_symbolizer_helper helper(sym, feature, common_.vars_, diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp index aa3ab0830..513ccea36 100644 --- a/src/grid/process_text_symbolizer.cpp +++ b/src/grid/process_text_symbolizer.cpp @@ -43,6 +43,8 @@ void grid_renderer::process(text_symbolizer const& sym, auto transform = get_optional(sym, keys::geometry_transform); if (transform) evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_); + if (!mapnik::get(sym, keys::text_placements_)) + return; text_symbolizer_helper helper(sym, feature, common_.vars_, diff --git a/src/renderer_common/render_thunk_extractor.cpp b/src/renderer_common/render_thunk_extractor.cpp index a6756128c..9a5910ed1 100644 --- a/src/renderer_common/render_thunk_extractor.cpp +++ b/src/renderer_common/render_thunk_extractor.cpp @@ -98,6 +98,8 @@ void render_thunk_extractor::operator()(markers_symbolizer const& sym) const void render_thunk_extractor::operator()(text_symbolizer const& sym) const { + if (!mapnik::get(sym, keys::text_placements_)) + return; auto helper = std::make_unique(sym, feature_, vars_, @@ -116,6 +118,8 @@ void render_thunk_extractor::operator()(text_symbolizer const& sym) const void render_thunk_extractor::operator()(shield_symbolizer const& sym) const { + if (!mapnik::get(sym, keys::text_placements_)) + return; auto helper = std::make_unique(sym, feature_, vars_,