import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / strategies / geographic / side.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/geographic/side.hpp b/ceph/src/boost/boost/geometry/strategies/geographic/side.hpp
index 1201dc2f6dba407e618954e54e93738bc606c603..bbcf64f8253dc199c90bc5a194e00fb1448c4d1f 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/geographic/side.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/geographic/side.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2014-2018.
-// Modifications copyright (c) 2014-2018 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2020.
+// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -27,10 +27,12 @@
 #include <boost/geometry/util/promote_floating_point.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
 
+#include <boost/geometry/strategy/geographic/envelope.hpp>
+
 #include <boost/geometry/strategies/geographic/disjoint_segment_box.hpp>
-#include <boost/geometry/strategies/geographic/envelope_segment.hpp>
 #include <boost/geometry/strategies/geographic/parameters.hpp>
 #include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/strategies/spherical/point_in_point.hpp>
 //#include <boost/geometry/strategies/concepts/side_concept.hpp>
 
 
@@ -64,7 +66,9 @@ template
 class geographic
 {
 public:
-    typedef strategy::envelope::geographic_segment
+    typedef geographic_tag cs_tag;
+
+    typedef strategy::envelope::geographic
         <
             FormulaPolicy,
             Spheroid,
@@ -88,6 +92,12 @@ public:
         return disjoint_strategy_type(m_model);
     }
 
+    typedef strategy::within::spherical_point_point equals_point_point_strategy_type;
+    static inline equals_point_point_strategy_type get_equals_point_point_strategy()
+    {
+        return equals_point_point_strategy_type();
+    }
+
     geographic()
     {}
 
@@ -116,6 +126,11 @@ public:
         return formula::azimuth_side_value(a1p, a12);
     }
 
+    Spheroid const& model() const
+    {
+        return m_model;
+    }
+
 private:
     template <typename ResultType,
               typename InverseFormulaType,