[algorithms][envelope] update copyright headers to follow latest license-related wording;

rewrite envelope_multi_range and envelope_multi_range_on_spheroid algorithms in a more
clear form;

include/boost/geometry/algorithms/detail/envelope/box.hpp

@@ -9,11 +9,8 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// Distributed under the Boost Software License, Version 1.0.
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+// (See accompanying file LICENSE_1_0.txt or copy at
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_BOX_HPP

include/boost/geometry/algorithms/detail/envelope/implementation.hpp

@@ -12,8 +12,8 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
-// Use, modification and distribution is subject to the Boost Software License,
+// Distributed under the Boost Software License, Version 1.0.
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_IMPLEMENTATION_HPP

include/boost/geometry/algorithms/detail/envelope/initialize.hpp

@@ -4,8 +4,9 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Licensed under the Boost Software License version 1.0.
+// Distributed under the Boost Software License, Version 1.0.
-// http://www.boost.org/users/license.html
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_INITIALIZE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_INITIALIZE_HPP

include/boost/geometry/algorithms/detail/envelope/interface.hpp

@@ -12,8 +12,8 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
-// Use, modification and distribution is subject to the Boost Software License,
+// Distributed under the Boost Software License, Version 1.0.
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_INTERFACE_HPP

include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp

@@ -4,8 +4,9 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Licensed under the Boost Software License version 1.0.
+// Distributed under the Boost Software License, Version 1.0.
-// http://www.boost.org/users/license.html
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_INTERSECTS_ANTIMERIDIAN_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_INTERSECTS_ANTIMERIDIAN_HPP

include/boost/geometry/algorithms/detail/envelope/linear.hpp

@@ -9,15 +9,12 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// Distributed under the Boost Software License, Version 1.0.
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+// (See accompanying file LICENSE_1_0.txt or copy at
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_LINEAR_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_LINEAR _HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_LINEAR_HPP
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/tags.hpp>

include/boost/geometry/algorithms/detail/envelope/multipoint.hpp

@@ -4,8 +4,9 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Licensed under the Boost Software License version 1.0.
+// Distributed under the Boost Software License, Version 1.0.
-// http://www.boost.org/users/license.html
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_MULTIPOINT_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_MULTIPOINT_HPP

include/boost/geometry/algorithms/detail/envelope/point.hpp

@@ -9,11 +9,8 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// Distributed under the Boost Software License, Version 1.0.
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+// (See accompanying file LICENSE_1_0.txt or copy at
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_POINT_HPP

include/boost/geometry/algorithms/detail/envelope/range.hpp

@@ -12,8 +12,8 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
-// Use, modification and distribution is subject to the Boost Software License,
+// Distributed under the Boost Software License, Version 1.0.
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_RANGE_HPP
@@ -93,36 +93,35 @@ struct envelope_multi_range
                 MultiRange const
             >::type iterator_type;
 
-        // initialize MBR
+        bool initialized = false;
-        initialize<Box, 0, dimension<Box>::value>::apply(mbr);
+        for (iterator_type it = boost::begin(multirange);
-
+             it != boost::end(multirange);
-        // skip through empty geometries
+             ++it)
-        iterator_type it = boost::begin(multirange);
-        while (it != boost::end(multirange) && geometry::is_empty(*it))
-        {
-            ++it;
-        }
-
-        // if there are still elements left, apply the envelope policy
-        if (it != boost::end(multirange))
-        {
-            // compute the initial envelope
-            EnvelopePolicy::apply(*it, mbr);
-
-            // for the remaining non-empty geometries just expand the mbr
-            // using the envelope
-            for (++it; it != boost::end(multirange); ++it)
         {
             if (! geometry::is_empty(*it))
+            {
+                if (initialized)
                 {
                     Box helper_mbr;
                     EnvelopePolicy::apply(*it, helper_mbr);
 
                     dispatch::expand<Box, Box>::apply(mbr, helper_mbr);
                 }
+                else
+                {
+                    // compute the initial envelope
+                    EnvelopePolicy::apply(*it, mbr);
+                    initialized = true;
                 }
             }
         }
+
+        if (! initialized)
+        {
+            // if not already initialized, initialize MBR
+            initialize<Box, 0, dimension<Box>::value>::apply(mbr);
+        }
+    }
 };
 
 
@@ -138,9 +137,6 @@ struct envelope_multi_range_on_spheroid
                 MultiRange const
             >::type iterator_type;
 
-        // initialize MBR
-        initialize<Box, 0, dimension<Box>::value>::apply(mbr);
-
         // compute the boxes of the single geometries
         std::vector<Box> boxes;
         for (iterator_type it = boost::begin(multirange);
@@ -155,11 +151,17 @@ struct envelope_multi_range_on_spheroid
             }
         }
 
-        // compute the envelope of the range of boxes
+        // compute the envelope of the range of boxes or initialize if
+        // no boxes have been found
         if (! boxes.empty())
         {
             envelope_range_of_boxes::apply(boxes, mbr);
         }
+        else
+        {
+            initialize<Box, 0, dimension<Box>::value>::apply(mbr);
+        }
+
     }
 };
 

include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp

@@ -4,8 +4,9 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Licensed under the Boost Software License version 1.0.
+// Distributed under the Boost Software License, Version 1.0.
-// http://www.boost.org/users/license.html
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_RANGE_OF_BOXES_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_RANGE_OF_BOXES_HPP

include/boost/geometry/algorithms/detail/envelope/segment.hpp

@@ -9,11 +9,8 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// Distributed under the Boost Software License, Version 1.0.
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+// (See accompanying file LICENSE_1_0.txt or copy at
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_SEGMENT_HPP

include/boost/geometry/algorithms/detail/envelope/transform_units.hpp

@@ -4,8 +4,9 @@
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
-// Licensed under the Boost Software License version 1.0.
+// Distributed under the Boost Software License, Version 1.0.
-// http://www.boost.org/users/license.html
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_TRANSFORM_UNITS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_TRANSFORM_UNITS_HPP

include/boost/geometry/algorithms/dispatch/envelope.hpp

@@ -12,8 +12,8 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
-// Use, modification and distribution is subject to the Boost Software License,
+// Distributed under the Boost Software License, Version 1.0.
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_ENVELOPE_HPP

include/boost/geometry/algorithms/envelope.hpp

@@ -12,8 +12,8 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
-// Use, modification and distribution is subject to the Boost Software License,
+// Distributed under the Boost Software License, Version 1.0.
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_ENVELOPE_HPP