diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/expand/interface.hpp')
-rw-r--r-- | boost/geometry/algorithms/detail/expand/interface.hpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/boost/geometry/algorithms/detail/expand/interface.hpp b/boost/geometry/algorithms/detail/expand/interface.hpp index 5aacd8e72a..28241b379b 100644 --- a/boost/geometry/algorithms/detail/expand/interface.hpp +++ b/boost/geometry/algorithms/detail/expand/interface.hpp @@ -5,11 +5,12 @@ // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. // Copyright (c) 2014-2015 Samuel Debionne, Grenoble, France. -// This file was modified by Oracle on 2015, 2016. -// Modifications copyright (c) 2015-2016, Oracle and/or its affiliates. +// This file was modified by Oracle on 2015, 2016, 2018. +// Modifications copyright (c) 2015-2018, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle +// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -25,16 +26,17 @@ #include <boost/variant/static_visitor.hpp> #include <boost/variant/variant_fwd.hpp> +#include <boost/geometry/core/coordinate_system.hpp> +#include <boost/geometry/core/tag.hpp> +#include <boost/geometry/core/tags.hpp> + #include <boost/geometry/geometries/concepts/check.hpp> #include <boost/geometry/algorithms/dispatch/expand.hpp> #include <boost/geometry/strategies/default_strategy.hpp> +#include <boost/geometry/strategies/expand.hpp> -#include <boost/geometry/strategies/envelope.hpp> -#include <boost/geometry/strategies/cartesian/envelope_segment.hpp> -#include <boost/geometry/strategies/spherical/envelope_segment.hpp> -#include <boost/geometry/strategies/geographic/envelope_segment.hpp> namespace boost { namespace geometry { @@ -58,14 +60,11 @@ struct expand Geometry const& geometry, default_strategy) { - typedef typename point_type<Geometry>::type point_type; - typedef typename coordinate_type<point_type>::type coordinate_type; - - typedef typename strategy::envelope::services::default_strategy - < - typename cs_tag<point_type>::type, - coordinate_type - >::type strategy_type; + typedef typename strategy::expand::services::default_strategy + < + typename tag<Geometry>::type, + typename cs_tag<Geometry>::type + >::type strategy_type; dispatch::expand<Box, Geometry>::apply(box, geometry, strategy_type()); } |