[core] Update unti tests. Remove unnecessary debugging code

2 files changed, 32 insertions, 76 deletions

diff --git a/src/mbgl/util/geometry_within.cpp b/src/mbgl/util/geometry_within.cpp
index 0d60a5622b..bb62047077 100644
--- a/src/mbgl/util/geometry_within.cpp
+++ b/src/mbgl/util/geometry_within.cpp
@@ -8,51 +8,41 @@ bool rayIntersect(const Point<double>& p, const Point<double>& p1, const Point<d
     return ((p1.y > p.y) != (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x);
 }
 
-// a, b are end point for line segment1, c and d are end points for line segment2
-bool lineIntersectLine(const Point<double>& a,
-                       const Point<double>& b,
-                       const Point<double>& c,
-                       const Point<double>& d) {
-    const auto perp = [](const Point<double>& v1, const Point<double>& v2) {
-        return (v1.x * v2.y - v1.y * v2.x);
-    };
-
-    // check if p1 and p2 are in different sides of line segment q1->q2
-    const auto twoSided = [](const Point<double>& p1,
-                             const Point<double>& p2,
-                             const Point<double>& q1,
-                             const Point<double>& q2) {
-        double x1, y1, x2, y2, x3, y3;
-
-        // q1->p1 (x1, y1), q1->p2 (x2, y2), q1->q2 (x3, y3)
-        x1 = p1.x - q1.x;
-        y1 = p1.y - q1.y;
-        x2 = p2.x - q1.x;
-        y2 = p2.y - q1.y;
-        x3 = q2.x - q1.x;
-        y3 = q2.y - q1.y;
-        if ((x1 * y3 - x3 * y1) * (x2 * y3 - x3 * y2) < 0) return true;
-        return false;
-    };
+// a, b are end points for line segment1, c and d are end points for line segment2
+bool lineIntersectLine(const Point<double>& a, const Point<double>& b, const Point<double>& c, const Point<double>& d) {
+    const auto perp = [](const Point<double>& v1, const Point<double>& v2) { return (v1.x * v2.y - v1.y * v2.x); };
 
+    // check if two segments are parallel or not
+    // precondition is end point a, b is inside polygon, if line a->b is
+    // parallel to polygon edge c->d, then a->b won't intersect with c->d
     auto vectorP = Point<double>(b.x - a.x, b.y - a.y);
     auto vectorQ = Point<double>(d.x - c.x, d.y - c.y);
-
-    // check if two segments are parallel or not
-    // precondition is end point a, b is inside polygon, if they line a->b is
-    // parallel to edge c->d, then a->b won't intersect with c->d
     if (perp(vectorQ, vectorP) == 0) return false;
 
-    // check if there are intersecting with each other
-    // a and b lie in separate side of segment c->d
-    // c and d lie in separate side of segment a->b
+    // check if p1 and p2 are in different sides of line segment q1->q2
+    const auto twoSided =
+        [](const Point<double>& p1, const Point<double>& p2, const Point<double>& q1, const Point<double>& q2) {
+            double x1, y1, x2, y2, x3, y3;
+
+            // q1->p1 (x1, y1), q1->p2 (x2, y2), q1->q2 (x3, y3)
+            x1 = p1.x - q1.x;
+            y1 = p1.y - q1.y;
+            x2 = p2.x - q1.x;
+            y2 = p2.y - q1.y;
+            x3 = q2.x - q1.x;
+            y3 = q2.y - q1.y;
+            if ((x1 * y3 - x3 * y1) * (x2 * y3 - x3 * y2) < 0) return true;
+            return false;
+        };
+
+    // If lines are intersecting with each other, the relative location should be:
+    // a and b lie in different sides of segment c->d
+    // c and d lie in different sides of segment a->b
     if (twoSided(a, b, c, d) && twoSided(c, d, a, b)) return true;
     return false;
 }
 
-bool lineIntersectPolygon(const Point<double>& p1,
-                          const Point<double>& p2,
-                          const Polygon<double>& polygon) {
+bool lineIntersectPolygon(const Point<double>& p1, const Point<double>& p2, const Polygon<double>& polygon) {
     for (auto ring : polygon) {
         auto length = ring.size();
         // loop through every edge of the ring
@@ -64,26 +54,7 @@ bool lineIntersectPolygon(const Point<double>& p1,
     }
     return false;
 }
-}
-
-void printPolygon(const Polygon<double>& polygon) {
-    mbgl::Log::Debug(mbgl::Event::General, "-------Print Polygon------");
-    for (auto ring : polygon) {
-        auto length = ring.size();
-        mbgl::Log::Debug(mbgl::Event::General, "-------Print New ring with size: %d ------", length);
-        // loop through every edge of the ring
-        for (std::size_t i = 0; i < length - 1; ++i) {
-            mbgl::Log::Debug(mbgl::Event::General, "point [%.15f, %.15f],", ring[i].x, ring[i].y);
-        }
-    }
-}
-
-void printLine(const LineString<double>& lineString) {
-    mbgl::Log::Debug(mbgl::Event::General, "-------Print LineString------");
-    for (std::size_t i = 0; i < lineString.size(); ++i) {
-        mbgl::Log::Debug(mbgl::Event::General, "point [%.15f, %.15f],", lineString[i].x, lineString[i].y);
-    }
-}
+} // namespace
 
 // ray casting algorithm for detecting if point is in polygon
 bool pointWithinPolygon(const Point<double>& point, const Polygon<double>& polygon) {
@@ -107,14 +78,11 @@ bool pointWithinPolygons(const Point<double>& point, const MultiPolygon<double>&
     return false;
 }
 
-
-bool lineStringWithinPolygon(const LineString<double>& line,
-                             const Polygon<double>& polygon) {
+bool lineStringWithinPolygon(const LineString<double>& line, const Polygon<double>& polygon) {
     const auto length = line.size();
-    // First, check if endpoints of line are all inside polygon
+    // First, check if geometry points of line segments are all inside polygon
     for (std::size_t i = 0; i < length; ++i) {
         if (!pointWithinPolygon(line[i], polygon)) {
-            mbgl::Log::Debug(mbgl::Event::General, "point %.15f, %.15f is not inside polygon", line[i].x, line[i].y);
             return false;
         }
     }
@@ -122,12 +90,6 @@ bool lineStringWithinPolygon(const LineString<double>& line,
     // Second, check if there is line segment intersecting polygon edge
     for (std::size_t i = 0; i < length - 1; ++i) {
         if (lineIntersectPolygon(line[i], line[i + 1], polygon)) {
-            mbgl::Log::Debug(mbgl::Event::General,
-            "---------line [%.15f, %.15f] to [%.15f, %.15f] is not inside polygon",
-            line[i].x,
-            line[i].y,
-            line[i + 1].x,
-            line[i + 1].y);
             return false;
         }
     }
@@ -140,4 +102,4 @@ bool lineStringWithinPolygons(const LineString<double>& line, const MultiPolygon
     }
     return false;
 }
-}
+} // namespace mbgl
diff --git a/src/mbgl/util/geometry_within.hpp b/src/mbgl/util/geometry_within.hpp
index fe9312cd4a..86658ecc83 100644
--- a/src/mbgl/util/geometry_within.hpp
+++ b/src/mbgl/util/geometry_within.hpp
@@ -3,17 +3,11 @@
 
 namespace mbgl {
 
-void printPolygon(const Polygon<double>& polygon);
-
-void printLine(const LineString<double>& lineString);
-
-// ray casting algorithm for detecting if point is in polygon
 bool pointWithinPolygon(const Point<double>& point, const Polygon<double>& polygon);
 
 bool pointWithinPolygons(const Point<double>& point, const MultiPolygon<double>& polygons);
 
-bool lineStringWithinPolygon(const LineString<double>& lineString,
-                             const Polygon<double>& polygon);
+bool lineStringWithinPolygon(const LineString<double>& lineString, const Polygon<double>& polygon);
 
 bool lineStringWithinPolygons(const LineString<double>& line, const MultiPolygon<double>& polygons);
-}
+} // namespace mbgl