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

attach proj_trans and tr at later stage (to work with vertex_converters interface).

Browse source
This commit is contained in:
Artem Pavlenko 2012-04-03 16:26:18 +01:00
parent cbcb8d6aad
commit 55ed40cbc2
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/mapnik/ctrans.hpp
View file

@ -77,10 +77,25 @@ struct MAPNIK_DECL coord_transform2
coord_transform2(Transform const& t, coord_transform2(Transform const& t,
Geometry & geom, Geometry & geom,
proj_transform const& prj_trans) proj_transform const& prj_trans)
: t_(t), : t_(&t),
geom_(geom), geom_(geom),
prj_trans_(prj_trans) {} prj_trans_(&prj_trans) {}
explicit coord_transform2(Geometry & geom)
: t_(0),
geom_(geom),
prj_trans_(0) {}
void set_proj_trans(proj_transform const& prj_trans)
{
prj_trans_ = &prj_trans;
}
void set_trans(Transform const& t)
{
t_ = &t;
}
unsigned vertex(double *x, double *y) unsigned vertex(double *x, double *y)
{ {
unsigned command = SEG_MOVETO; unsigned command = SEG_MOVETO;
@ -90,7 +105,7 @@ struct MAPNIK_DECL coord_transform2
while (!ok && command != SEG_END) while (!ok && command != SEG_END)
{ {
command = geom_.vertex(x, y); command = geom_.vertex(x, y);
ok = prj_trans_.backward(*x, *y, z); ok = prj_trans_->backward(*x, *y, z);
if (!ok) { if (!ok) {
skipped_points = true; skipped_points = true;
} }
@ -99,7 +114,7 @@ struct MAPNIK_DECL coord_transform2
{ {
command = SEG_MOVETO; command = SEG_MOVETO;
} }
t_.forward(x, y); t_->forward(x, y);
return command; return command;
} }
@ -114,9 +129,9 @@ struct MAPNIK_DECL coord_transform2
} }
private: private:
Transform const& t_; Transform const* t_;
Geometry & geom_; Geometry & geom_;
proj_transform const& prj_trans_; proj_transform const* prj_trans_;
}; };