attach proj_trans and tr at later stage (to work with vertex_converters interface).
This commit is contained in:
parent
cbcb8d6aad
commit
55ed40cbc2
1 changed files with 21 additions and 6 deletions
|
@ -77,9 +77,24 @@ 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)
|
||||||
{
|
{
|
||||||
|
@ -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_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue