sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if text_symbolizer has 'placement finder'(keys::text_placements) before any text processing

Browse source
This commit is contained in:
Artem Pavlenko 2024-06-04 12:15:10 +01:00
parent d7a8f1d04a
commit 61cb187dbb
6 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/agg/process_shield_symbolizer.cpp
View file

@ -42,6 +42,8 @@ void agg_renderer<T0, T1>::process(shield_symbolizer const& sym,
const auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
const text_symbolizer_helper helper(sym,
feature,
common_.vars_,

2
src/agg/process_text_symbolizer.cpp
View file

@ -42,6 +42,8 @@ void agg_renderer<T0, T1>::process(text_symbolizer const& sym,
const auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
const text_symbolizer_helper helper(sym,
feature,
common_.vars_,

4
src/cairo/process_text_symbolizer.cpp
View file

@ -43,6 +43,8 @@ void cairo_renderer<T>::process(shield_symbolizer const& sym,
auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
text_symbolizer_helper helper(sym,
feature,
common_.vars_,
@ -86,6 +88,8 @@ void cairo_renderer<T>::process(text_symbolizer const& sym,
auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
text_symbolizer_helper helper(sym,
feature,
common_.vars_,

3
src/grid/process_shield_symbolizer.cpp
View file

@ -51,7 +51,8 @@ void grid_renderer<T>::process(shield_symbolizer const& sym,
auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
text_symbolizer_helper helper(sym,
feature,
common_.vars_,

2
src/grid/process_text_symbolizer.cpp
View file

@ -43,6 +43,8 @@ void grid_renderer<T>::process(text_symbolizer const& sym,
auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
if (transform)
evaluate_transform(tr, feature, common_.vars_, *transform, common_.scale_factor_);
if (!mapnik::get<text_placements_ptr>(sym, keys::text_placements_))
return;
text_symbolizer_helper helper(sym,
feature,
common_.vars_,

4
src/renderer_common/render_thunk_extractor.cpp
View file

@ -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<text_placements_ptr>(sym, keys::text_placements_))
return;
auto helper = std::make_unique<text_symbolizer_helper>(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<text_placements_ptr>(sym, keys::text_placements_))
return;
auto helper = std::make_unique<text_symbolizer_helper>(sym,
feature_,
vars_,