Speed up simplifier by specifying distance type as std int64 and remo…

…ving casting
mapbox · Feb 10, 2016 · 8246b6c · 8246b6c
1 parent a5b814c
commit 8246b6c
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/vector_tile_geometry_simplifier.hpp b/src/vector_tile_geometry_simplifier.hpp
@@ -43,28 +43,40 @@ struct geometry_simplifier
     void operator() (mapnik::geometry::line_string<std::int64_t> & geom)
     {
         mapnik::geometry::line_string<std::int64_t> simplified;
-        boost::geometry::simplify(geom, simplified, simplify_distance_);
+        boost::geometry::simplify<
+                mapnik::geometry::line_string<std::int64_t>,
+                std::int64_t>
+                (geom, simplified, simplify_distance_);
         next_(simplified);
     }
 
     void operator() (mapnik::geometry::multi_line_string<std::int64_t> & geom)
     {
         mapnik::geometry::multi_line_string<std::int64_t> simplified;
-        boost::geometry::simplify(geom, simplified, simplify_distance_);
+        boost::geometry::simplify<
+                mapnik::geometry::multi_line_string<std::int64_t>,
+                std::int64_t>
+                (geom, simplified, simplify_distance_);
         next_(simplified);
     }
 
     void operator() (mapnik::geometry::polygon<std::int64_t> & geom)
     {
         mapnik::geometry::polygon<std::int64_t> simplified;
-        boost::geometry::simplify(geom, simplified, simplify_distance_);
+        boost::geometry::simplify<
+                mapnik::geometry::polygon<std::int64_t>,
+                std::int64_t>
+                (geom, simplified, simplify_distance_);
         next_(simplified);
     }
 
     void operator() (mapnik::geometry::multi_polygon<std::int64_t> & geom)
     {
         mapnik::geometry::multi_polygon<std::int64_t> simplified;
-        boost::geometry::simplify(geom, simplified, simplify_distance_);
+        boost::geometry::simplify<
+                mapnik::geometry::multi_polygon<std::int64_t>,
+                std::int64_t>
+                (geom, simplified, simplify_distance_);
         next_(simplified);
     }