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

Merge branch 'master' of github.com:mapnik/mapnik into stats_processor

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-24 10:00:05 -08:00
commit 4273a08e52
2 changed files with 179 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/transform_expression.hpp
View file

@ -71,7 +71,7 @@ struct translate_node
translate_node(expr_node const& tx,
boost::optional<expr_node> const& ty)
: tx_(tx)
, ty_(ty ? *ty : value_null()) {}
, ty_(ty ? expr_node(*ty) : value_null()) {}
};
struct scale_node
@ -82,7 +82,7 @@ struct scale_node
scale_node(expr_node const& sx,
boost::optional<expr_node> const& sy)
: sx_(sx)
, sy_(sy ? *sy : value_null()) {}
, sy_(sy ? expr_node(*sy) : value_null()) {}
};
struct rotate_node
@ -104,8 +104,8 @@ struct rotate_node
boost::optional<expr_node> const& cx,
boost::optional<expr_node> const& cy)
: angle_(angle)
, cx_(cx ? *cx : value_null())
, cy_(cy ? *cy : value_null()) {}
, cx_(cx ? expr_node(*cx) : value_null())
, cy_(cy ? expr_node(*cy) : value_null()) {}
rotate_node(expr_node const& angle,
boost::optional<coords_type> const& center)

175
tests/cpp_tests/geometry_converters_test.cpp Normal file
View file

@ -0,0 +1,175 @@
#include <boost/version.hpp>
#include <mapnik/layer.hpp>
#include <mapnik/feature_type_style.hpp>
#include <mapnik/debug.hpp>
#include <mapnik/ctrans.hpp>
#include <mapnik/vertex_converters.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_factory.hpp>
#if BOOST_VERSION >= 104700
#include <mapnik/util/geometry_to_wkb.hpp>
#include <mapnik/util/geometry_to_wkt.hpp>
#include <mapnik/util/geometry_to_svg.hpp>
#endif
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
struct output_geometry_backend
{
output_geometry_backend(boost::ptr_vector<mapnik::geometry_type> & paths, mapnik::eGeomType type)
: paths_(paths),
type_(type) {}
template <typename T>
void add_path(T & path)
{
mapnik::vertex2d vtx(mapnik::vertex2d::no_init);
path.rewind(0);
std::auto_ptr<mapnik::geometry_type> geom_ptr(new mapnik::geometry_type(type_));
while ((vtx.cmd = path.vertex(&vtx.x, &vtx.y)) != mapnik::SEG_END)
{
//std::cerr << vtx.x << "," << vtx.y << " cmd=" << vtx.cmd << std::endl;
geom_ptr->push_vertex(vtx.x, vtx.y, (mapnik::CommandType)vtx.cmd);
}
paths_.push_back(geom_ptr);
}
boost::ptr_vector<mapnik::geometry_type> & paths_;
mapnik::eGeomType type_;
};
boost::optional<std::string> linestring_bbox_clipping(mapnik::box2d<double> bbox,
std::string wkt_in)
{
using namespace mapnik;
agg::trans_affine tr;
projection src;
projection dst;
proj_transform prj_trans(src,dst);
line_symbolizer sym;
CoordTransform t(bbox.width(),bbox.height(), bbox);
boost::ptr_vector<mapnik::geometry_type> output_paths;
output_geometry_backend backend(output_paths, mapnik::LineString);
typedef boost::mpl::vector<clip_line_tag> conv_types;
vertex_converter<box2d<double>, output_geometry_backend, line_symbolizer,
CoordTransform, proj_transform, agg::trans_affine, conv_types>
converter(bbox, backend, sym, t, prj_trans, tr, 1.0);
converter.set<clip_line_tag>();
boost::ptr_vector<geometry_type> p;
if (!mapnik::from_wkt(wkt_in , p))
{
throw std::runtime_error("Failed to parse WKT");
}
BOOST_FOREACH( geometry_type & geom, p)
{
converter.apply(geom);
}
std::string wkt_out;
if (mapnik::util::to_wkt(wkt_out, output_paths))
{
return boost::optional<std::string>(wkt_out);
}
return boost::optional<std::string>();
}
boost::optional<std::string> polygon_bbox_clipping(mapnik::box2d<double> bbox,
std::string wkt_in)
{
using namespace mapnik;
agg::trans_affine tr;
projection src;
projection dst;
proj_transform prj_trans(src,dst);
polygon_symbolizer sym;
CoordTransform t(bbox.width(),bbox.height(), bbox);
boost::ptr_vector<mapnik::geometry_type> output_paths;
output_geometry_backend backend(output_paths, mapnik::Polygon);
typedef boost::mpl::vector<clip_poly_tag> conv_types;
vertex_converter<box2d<double>, output_geometry_backend, polygon_symbolizer,
CoordTransform, proj_transform, agg::trans_affine, conv_types>
converter(bbox, backend, sym, t, prj_trans, tr, 1.0);
converter.set<clip_poly_tag>();
boost::ptr_vector<geometry_type> p;
if (!mapnik::from_wkt(wkt_in , p))
{
throw std::runtime_error("Failed to parse WKT");
}
BOOST_FOREACH( geometry_type & geom, p)
{
converter.apply(geom);
}
std::string wkt_out;
if (mapnik::util::to_wkt(wkt_out, output_paths))
{
return boost::optional<std::string>(wkt_out);
}
return boost::optional<std::string>();
}
int main( int, char*[] )
{
// LineString/bbox clipping
{
std::string wkt_in("LineString(0 0,200 200)");
boost::optional<std::string> result = linestring_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
BOOST_TEST(result);
BOOST_TEST_EQ(*result,std::string("LineString(50 50,150 150)"));
}
// Polygon/bbox clipping
#if 0
// these tests will fail
{
std::string wkt_in("Polygon((50 50,150 50,150 150,50 150,50 50))");
boost::optional<std::string> result = polygon_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
BOOST_TEST(result);
BOOST_TEST_EQ(*result,std::string("Polygon((50 50,150 50,150 150,50 150,50 50))"));
}
{
std::string wkt_in("Polygon((60 60,140 60,140 160,60 140,60 60))");
boost::optional<std::string> result = polygon_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
BOOST_TEST(result);
BOOST_TEST_EQ(*result,std::string("Polygon((60 60,140 60,140 160,60 140,60 60))"));
}
{
std::string wkt_in("Polygon((0 0,10 0,10 10,0 10,0 0))");
boost::optional<std::string> result = polygon_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
BOOST_TEST(result);
BOOST_TEST_EQ(*result, std::string("GeometryCollection EMPTY"));
}
#endif
{
std::string wkt_in("Polygon((0 0,100 200,200 0,0 0 ))");
boost::optional<std::string> result = polygon_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
BOOST_TEST(result);
BOOST_TEST_EQ(*result,std::string("Polygon((50 50,50 100,75 150,125 150,150 100,150 50,50 50))"));
}
if (!::boost::detail::test_errors())
{
std::clog << "C++ geometry conversions: \x1b[1;32m✓ \x1b[0m\n";
#if BOOST_VERSION >= 104600
::boost::detail::report_errors_remind().called_report_errors_function = true;
#endif
}
else
{
return ::boost::report_errors();
}
}