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

update bounsing box grammar to work with mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-02-23 18:05:50 +01:00
parent 07ab1fea66
commit 6f13044d09
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/json/extract_bounding_box_grammar.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/json/generic_json.hpp> #include <mapnik/json/generic_json.hpp>
#include <mapnik/json/error_handler.hpp> #include <mapnik/json/error_handler.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/geometry_impl.hpp>
// boost // boost
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
@ -42,7 +42,7 @@
namespace mapnik { namespace json { namespace mapnik { namespace json {
using position = std::tuple<double,double>; using position = mapnik::new_geometry::point;
using boxes = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>; using boxes = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>;
namespace qi = boost::spirit::qi; namespace qi = boost::spirit::qi;
@ -55,8 +55,8 @@ struct calculate_bounding_box_impl
{ {
if (pos) if (pos)
{ {
double x = std::get<0>(*pos); double x = pos->x;
double y = std::get<1>(*pos); double y = pos->y;
if (!bbox.valid()) if (!bbox.valid())
{ {
bbox.init(x, y, x, y); //TODO: add init(x,y) convinience method bbox.init(x, y, x, y); //TODO: add init(x,y) convinience method