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

Merge pull request #922 from xificurk/ctrans-cleanup

Browse source 
code cleanup
This commit is contained in:
Artem Pavlenko 2011-10-21 09:55:23 -07:00
commit ba0bdbd07e
1 changed files with 98 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/mapnik/ctrans.hpp
View file

@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* *
*****************************************************************************/ *****************************************************************************/
//$Id$
//$Id: ctrans.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef CTRANS_HPP #ifndef CTRANS_HPP
#define CTRANS_HPP #define CTRANS_HPP
@ -32,9 +31,12 @@
#include <mapnik/coord_array.hpp> #include <mapnik/coord_array.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
namespace mapnik { namespace mapnik
{
typedef coord_array<coord2d> CoordinateArray; typedef coord_array<coord2d> CoordinateArray;
template <typename Transform, typename Geometry> template <typename Transform, typename Geometry>
struct MAPNIK_DECL coord_transform struct MAPNIK_DECL coord_transform
{ {
@ -58,6 +60,7 @@ private:
Geometry& geom_; Geometry& geom_;
}; };
template <typename Transform, typename Geometry> template <typename Transform, typename Geometry>
struct MAPNIK_DECL coord_transform2 struct MAPNIK_DECL coord_transform2
{ {
@ -73,18 +76,17 @@ struct MAPNIK_DECL coord_transform2
unsigned vertex(double *x, double *y) const unsigned vertex(double *x, double *y) const
{ {
unsigned command(SEG_MOVETO); unsigned command = SEG_MOVETO;
bool ok = false; bool ok = false;
bool skipped_points = false; bool skipped_points = false;
while (!ok) double z = 0;
while (!ok && command != SEG_END)
{ {
command = geom_.vertex(x, y); command = geom_.vertex(x, y);
double z=0;
ok = prj_trans_.backward(*x, *y, z); ok = prj_trans_.backward(*x, *y, z);
if (!ok) { if (!ok) {
skipped_points = true; skipped_points = true;
} }
ok = ok || (command == SEG_END);
} }
if (skipped_points && (command == SEG_LINETO)) if (skipped_points && (command == SEG_LINETO))
{ {
@ -94,15 +96,6 @@ struct MAPNIK_DECL coord_transform2
return command; return command;
} }
/*unsigned vertex(double * x , double * y) const
{
unsigned command = geom_.vertex(x,y);
double z=0;
prj_trans_.backward(*x,*y,z);
t_.forward(x,y);
return command;
}*/
void rewind(unsigned pos) void rewind(unsigned pos)
{ {
geom_.rewind(pos); geom_.rewind(pos);
@ -156,6 +149,7 @@ private:
int dy_; int dy_;
}; };
class CoordTransform class CoordTransform
{ {
private: private:
@ -166,13 +160,15 @@ private:
box2d<double> extent_; box2d<double> extent_;
double offset_x_; double offset_x_;
double offset_y_; double offset_y_;
public: public:
CoordTransform(int width, int height, const box2d<double>& extent, CoordTransform(int width, int height, const box2d<double>& extent,
double offset_x = 0, double offset_y = 0) double offset_x = 0, double offset_y = 0)
:width_(width),height_(height),extent_(extent),offset_x_(offset_x),offset_y_(offset_y) : width_(width), height_(height), extent_(extent),
offset_x_(offset_x), offset_y_(offset_y)
{ {
sx_ = (double(width_))/extent_.width(); sx_ = double(width_) / extent_.width();
sy_ = (double(height_))/extent_.height(); sy_ = double(height_) / extent_.height();
} }
inline int width() const inline int width() const
@ -219,7 +215,8 @@ public:
return c; return c;
} }
inline box2d<double> forward(const box2d<double>& e,proj_transform const& prj_trans) const inline box2d<double> forward(const box2d<double>& e,
proj_transform const& prj_trans) const
{ {
double x0 = e.minx(); double x0 = e.minx();
double y0 = e.miny(); double y0 = e.miny();
@ -244,7 +241,8 @@ public:
return box2d<double>(x0, y0, x1, y1); return box2d<double>(x0, y0, x1, y1);
} }
inline box2d<double> backward(const box2d<double>& e,proj_transform const& prj_trans) const inline box2d<double> backward(const box2d<double>& e,
proj_transform const& prj_trans) const
{ {
double x0 = e.minx(); double x0 = e.minx();
double y0 = e.miny(); double y0 = e.miny();
@ -286,6 +284,7 @@ public:
} }
return coords; return coords;
} }
inline box2d<double> const& extent() const inline box2d<double> const& extent() const
{ {
return extent_; return extent_;