From 6f13044d0900d63202e06a0941295a04fadc8ee1 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 23 Feb 2015 18:05:50 +0100
Subject: [PATCH] update bounsing box grammar to work with mapnik-geometry

---
 include/mapnik/json/extract_bounding_box_grammar.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_box_grammar.hpp b/include/mapnik/json/extract_bounding_box_grammar.hpp
index e79ed00e1..b16264fe6 100644
--- a/include/mapnik/json/extract_bounding_box_grammar.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/json/generic_json.hpp>
 #include <mapnik/json/error_handler.hpp>
 #include <mapnik/box2d.hpp>
-
+#include <mapnik/geometry_impl.hpp>
 // boost
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -42,7 +42,7 @@
 
 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>>>;
 
 namespace qi = boost::spirit::qi;
@@ -55,8 +55,8 @@ struct calculate_bounding_box_impl
     {
         if (pos)
         {
-            double x = std::get<0>(*pos);
-            double y = std::get<1>(*pos);
+            double x = pos->x;
+            double y = pos->y;
             if (!bbox.valid())
             {
                 bbox.init(x, y, x, y); //TODO: add init(x,y) convinience method