From b6cd3b37eff98d9128398095ff145fcea72e29f2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 16 Jan 2015 16:24:31 +0100
Subject: [PATCH] store {bbox, offset} to match boost.geometry rtree
 instantiation

---
 include/mapnik/json/extract_bounding_box_grammar.hpp      | 5 ++---
 include/mapnik/json/extract_bounding_box_grammar_impl.hpp | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_box_grammar.hpp b/include/mapnik/json/extract_bounding_box_grammar.hpp
index 2e33cee38..83d32c7eb 100644
--- a/include/mapnik/json/extract_bounding_box_grammar.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar.hpp
@@ -42,9 +42,8 @@
 
 namespace mapnik { namespace json {
 
-struct empty {};
 using position = std::tuple<double,double>;
-using boxes = std::vector<std::tuple<std::size_t,box2d<double>>>;
+using boxes = std::vector<std::tuple<box2d<double>, std::size_t>>;
 
 namespace qi = boost::spirit::qi;
 namespace standard_wide =  boost::spirit::standard_wide;
@@ -78,7 +77,7 @@ struct push_box_impl
     template <typename T>
     result_type operator() (T & boxes, std::size_t offset, box2d<double> const& box) const
     {
-        boxes.emplace_back(offset, box);
+        boxes.emplace_back(box, offset);
     }
 };
 
diff --git a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
index 4b0c63b36..6c6a54b7a 100644
--- a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
@@ -55,13 +55,13 @@ extract_bounding_box_grammar<Iterator, ErrorHandler>::extract_bounding_box_gramm
     qi::_r3_type _r3;
     qi::_a_type _a;
     qi::_b_type _b;
+    qi::skip_type skip;
+    qi::lexeme_type lexeme;
+    boost::spirit::repository::qi::seek_type seek;
+    boost::spirit::repository::qi::iter_pos_type iter_pos;
     using qi::fail;
     using qi::on_error;
-    using qi::skip;
-    using qi::lexeme;
     using boost::phoenix::push_back;
-    using boost::spirit::repository::qi::seek;
-    using boost::spirit::repository::qi::iter_pos;
 
     start = features(_r1)
         ;