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

remove Feature alias of feature_impl

Browse source
This commit is contained in:
Jiri Drbalek 2015-10-01 14:16:11 +00:00
parent dc554eb920
commit a03081c367
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@ Released: YYYY XX, 2015
- Visual tests: new command line arguments `--agg`, `--cairo`, `--svg`, `--grid` for selecting renderers (https://github.com/mapnik/mapnik/pull/3074) - Visual tests: new command line arguments `--agg`, `--cairo`, `--svg`, `--grid` for selecting renderers (https://github.com/mapnik/mapnik/pull/3074)
- Visual tests: new command line argument `--scale-factor` or abbreviated `-s` for setting scale factor (https://github.com/mapnik/mapnik/pull/3074) - Visual tests: new command line argument `--scale-factor` or abbreviated `-s` for setting scale factor (https://github.com/mapnik/mapnik/pull/3074)
- Fixed parsing colors in hexadecimal notation (https://github.com/mapnik/mapnik/pull/3075) - Fixed parsing colors in hexadecimal notation (https://github.com/mapnik/mapnik/pull/3075)
- Removed mapnik::Feature type alias of mapnik::feature_impl (https://github.com/mapnik/mapnik/pull/3099)
## 3.0.5 ## 3.0.5

3
include/mapnik/feature.hpp
View file

@ -273,9 +273,6 @@ inline std::ostream& operator<< (std::ostream & out,feature_impl const& f)
return out; return out;
} }
// TODO - remove at Mapnik 3.x
using Feature = feature_impl;
using feature_ptr = std::shared_ptr<feature_impl>; using feature_ptr = std::shared_ptr<feature_impl>;
} }

4
include/mapnik/renderer_common/process_group_symbolizer.hpp
View file

@ -329,7 +329,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
// get the layout for this set of properties // get the layout for this set of properties
for (auto const& rule : props->get_rules()) for (auto const& rule : props->get_rules())
{ {
if (util::apply_visitor(evaluate<Feature,value_type,attributes>(*sub_feature,common.vars_), if (util::apply_visitor(evaluate<feature_impl,value_type,attributes>(*sub_feature,common.vars_),
*(rule->get_filter())).to_bool()) *(rule->get_filter())).to_bool())
{ {
// add matched rule and feature to the list of things to draw // add matched rule and feature to the list of things to draw
@ -380,7 +380,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
// evaluate the repeat key with the matched sub feature if we have one // evaluate the repeat key with the matched sub feature if we have one
if (rpt_key_expr) if (rpt_key_expr)
{ {
rpt_key_value = util::apply_visitor(evaluate<Feature,value_type,attributes>(*match_feature,common.vars_), rpt_key_value = util::apply_visitor(evaluate<feature_impl,value_type,attributes>(*match_feature,common.vars_),
*rpt_key_expr).to_unicode(); *rpt_key_expr).to_unicode();
} }
helper.add_box_element(layout_manager.offset_box_at(i), rpt_key_value); helper.add_box_element(layout_manager.offset_box_at(i), rpt_key_value);

2
utils/pgsql2sqlite/pgsql2sqlite.hpp
View file

@ -388,7 +388,7 @@ void pgsql2sqlite(Connection conn,
{ {
if (oid == geometry_oid) if (oid == geometry_oid)
{ {
mapnik::Feature feat(ctx,pkid); mapnik::feature_impl feat(ctx,pkid);
mapnik::geometry::geometry<double> geom = geometry_utils::from_wkb(buf, size, wkbGeneric); mapnik::geometry::geometry<double> geom = geometry_utils::from_wkb(buf, size, wkbGeneric);
if (!mapnik::geometry::is_empty(geom)) if (!mapnik::geometry::is_empty(geom))
{ {