diff --git a/xmsgrid/geometry/GmMultiPolyIntersector.cpp b/xmsgrid/geometry/GmMultiPolyIntersector.cpp index 1d05f59a..33520e4f 100644 --- a/xmsgrid/geometry/GmMultiPolyIntersector.cpp +++ b/xmsgrid/geometry/GmMultiPolyIntersector.cpp @@ -2,7 +2,7 @@ /// \file /// \ingroup geometry /// \copyright (C) Copyright Aquaveo 2018. Distributed under FreeBSD License -/// (See accompanying file LICENSE or https://aquaveo.com/bsd/license.txt) +/// (See accompanying file LICENSE or https://aqaveo.com/bsd/license.txt) //------------------------------------------------------------------------------ //----- Included files --------------------------------------------------------- @@ -68,7 +68,6 @@ class GmMultiPolyIntersectorImpl : public GmMultiPolyIntersector int a_startingId = 1); virtual ~GmMultiPolyIntersectorImpl(); - virtual GmMultiPolyIntersectorQueryEnum GetQuery() const override; virtual void SetQuery(GmMultiPolyIntersectorQueryEnum a_query) override; virtual void TraverseLineSegment(double a_x1, double a_y1, @@ -348,14 +347,6 @@ void GmMultiPolyIntersectorImpl::CreateLine() m_line.push_back(m_pt2); } // GmMultiPolyIntersectorImpl::CreateLine //------------------------------------------------------------------------------ -/// \brief Returns the query being used (covered by, intersects...). -/// \return GmMultiPolyIntersectorQueryEnum -//------------------------------------------------------------------------------ -GmMultiPolyIntersectorQueryEnum GmMultiPolyIntersectorImpl::GetQuery() const -{ - return m_query; -} // GmMultiPolyIntersectorImpl::GetQuery -//------------------------------------------------------------------------------ /// \brief Set the query to use (covered by, intersects...). /// \param a_query: GmMultiPolyIntersectorQueryEnum //------------------------------------------------------------------------------ @@ -2347,7 +2338,7 @@ void GmMultiPolyIntersector2IntermediateTests::testPointOnPolygonVertex() {118.66666666666669, 93.33333333333333, 0.0}, {100.0, 100.0, 0.0} }; - + VecInt2d expectedPolyIds = { {167, -1}, {166, -1}, @@ -2421,7 +2412,7 @@ void GmMultiPolyIntersector2IntermediateTests::testPointOnPolygonVertex() {138.66666666666669, 93.33333333333333, 0.0}, {120.0, 100.0, 0.0} }; - + expectedPolyIds = { {}, {13, -1}, @@ -2506,7 +2497,7 @@ void GmMultiPolyIntersector2IntermediateTests::testPointsNearEdgePoints() VecDbl tValues; VecPt3d points; mpi->TraverseLineSegment(segmentPoints[0].x, segmentPoints[0].y, segmentPoints[1].x, segmentPoints[1].y, polyIds, tValues, points); - + VecInt expectedPolyIds = {1836, -1}; VecPt3d expectedPoints = { {958452.39285714, 498553.35714286, 0.0}, @@ -2534,4 +2525,4 @@ void GmMultiPolyIntersector2IntermediateTests::testPointsNearEdgePoints() //} // namespace xms -#endif +#endif \ No newline at end of file