diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:08:07 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:09:00 +0900 |
commit | b5c87084afaef42b2d058f68091be31988a6a874 (patch) | |
tree | adef9a65870a41181687e11d57fdf98e7629de3c /boost/geometry/strategies/geographic/side_andoyer.hpp | |
parent | 34bd32e225e2a8a94104489b31c42e5801cc1f4a (diff) | |
download | boost-b5c87084afaef42b2d058f68091be31988a6a874.tar.gz boost-b5c87084afaef42b2d058f68091be31988a6a874.tar.bz2 boost-b5c87084afaef42b2d058f68091be31988a6a874.zip |
Imported Upstream version 1.64.0upstream/1.64.0
Change-Id: Id9212edd016dd55f21172c427aa7894d1d24148b
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/geometry/strategies/geographic/side_andoyer.hpp')
-rw-r--r-- | boost/geometry/strategies/geographic/side_andoyer.hpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/boost/geometry/strategies/geographic/side_andoyer.hpp b/boost/geometry/strategies/geographic/side_andoyer.hpp index c3e71cd1cd..204e45f6e2 100644 --- a/boost/geometry/strategies/geographic/side_andoyer.hpp +++ b/boost/geometry/strategies/geographic/side_andoyer.hpp @@ -2,8 +2,8 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2014, 2015, 2016. -// Modifications copyright (c) 2014-2016 Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2017. +// Modifications copyright (c) 2014-2017 Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle @@ -15,9 +15,7 @@ #define BOOST_GEOMETRY_STRATEGIES_GEOGRAPHIC_SIDE_ANDOYER_HPP -#include <boost/geometry/formulas/andoyer_inverse.hpp> - -#include <boost/geometry/strategies/geographic/side_detail.hpp> +#include <boost/geometry/strategies/geographic/side.hpp> namespace boost { namespace geometry @@ -31,17 +29,24 @@ namespace strategy { namespace side \brief Check at which side of a segment a point lies left of segment (> 0), right of segment (< 0), on segment (0) \ingroup strategies -\tparam Model Reference model of coordinate system. +\tparam Spheroid Reference model of coordinate system. \tparam CalculationType \tparam_calculation */ -template <typename Model, typename CalculationType = void> +template +< + typename Spheroid = srs::spheroid<double>, + typename CalculationType = void +> class andoyer - : public detail::by_azimuth<geometry::formula::andoyer_inverse, Model, CalculationType> + : public side::geographic<strategy::andoyer, Spheroid, CalculationType> { - typedef detail::by_azimuth<geometry::formula::andoyer_inverse, Model, CalculationType> base_t; + typedef side::geographic<strategy::andoyer, Spheroid, CalculationType> base_t; public: - andoyer(Model const& model = Model()) + andoyer() + {} + + explicit andoyer(Spheroid const& model) : base_t(model) {} }; |