From eeaf906ffee6e20ca8271b430ab81b08c9528e86 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Fri, 13 Jun 2014 14:56:09 +0300 Subject: [PATCH] [algorithms][is_valid] merged code in linestring.hpp and multi_linestring.hpp into linear.hpp --- .../is_valid/{linestring.hpp => linear.hpp} | 0 .../detail/is_valid/multi_linestring.hpp | 60 ------------------- 2 files changed, 60 deletions(-) rename include/boost/geometry/algorithms/detail/is_valid/{linestring.hpp => linear.hpp} (100%) delete mode 100644 include/boost/geometry/algorithms/detail/is_valid/multi_linestring.hpp diff --git a/include/boost/geometry/algorithms/detail/is_valid/linestring.hpp b/include/boost/geometry/algorithms/detail/is_valid/linear.hpp similarity index 100% rename from include/boost/geometry/algorithms/detail/is_valid/linestring.hpp rename to include/boost/geometry/algorithms/detail/is_valid/linear.hpp diff --git a/include/boost/geometry/algorithms/detail/is_valid/multi_linestring.hpp b/include/boost/geometry/algorithms/detail/is_valid/multi_linestring.hpp deleted file mode 100644 index 18adbd481..000000000 --- a/include/boost/geometry/algorithms/detail/is_valid/multi_linestring.hpp +++ /dev/null @@ -1,60 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) - -// Copyright (c) 2014, Oracle and/or its affiliates. - -// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle - -// Licensed under the Boost Software License version 1.0. -// http://www.boost.org/users/license.html - -#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_MULTI_LINESTRING_HPP -#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_MULTI_LINESTRING_HPP - -#include - -#include - -#include -#include - - -namespace boost { namespace geometry -{ - - -#ifndef DOXYGEN_NO_DISPATCH -namespace dispatch -{ - - -// A MultiLinestring is a MultiCurve -// A MultiCurve is simple if all of its elements are simple and the -// only intersections between any two elements occur at Points that -// are on the boundaries of both elements. -// -// Reference: OGC 06-103r4 (ยง6.1.8.1; Fig. 9) -template -struct is_valid -{ - static inline bool apply(MultiLinestring const& multilinestring) - { - return detail::check_iterator_range - < - dispatch::is_valid - < - typename boost::range_value::type - > - >::apply(boost::begin(multilinestring), - boost::end(multilinestring)); - } -}; - - -} // namespace dispatch -#endif // DOXYGEN_NO_DISPATCH - - -}} // namespace boost::geometry - - -#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_MULTI_LINESTRING_HPP