test(LAB-2654): allow intersected geojson polygons if with order (#1638)

Author: BlueGrizzliBear

src/kili/utils/labels/geojson/polygon.py

@@ -7,72 +7,9 @@
 )
 
 
-def has_intersection(vertices):
-    """Returns a boolean to indicate if the vertices intersect each other."""
-    n = len(vertices)
-
-    for i in range(n):
-        x1, y1 = vertices[i]["x"], vertices[i]["y"]
-        x2, y2 = vertices[(i + 1) % n]["x"], vertices[(i + 1) % n]["y"]
-
-        for j in range(i + 2, n):
-            x3, y3 = vertices[j]["x"], vertices[j]["y"]
-            x4, y4 = vertices[(j + 1) % n]["x"], vertices[(j + 1) % n]["y"]
-
-            if x1 == x4 and y1 == y4:
-                continue
-
-            if do_edges_intersect(x1, y1, x2, y2, x3, y3, x4, y4):
-                return True
-
-    return False
-
-
-def orientation(px, py, qx, qy, rx, ry):
-    """Returns a number to identify the orientation of the pair of edges.
-
-    0 is colinear, 1 is clockwise, -1 is counterclock.
-    """
-    val = (qy - py) * (rx - qx) - (qx - px) * (ry - qy)
-    if val == 0:
-        return 0
-    return 1 if val > 0 else -1
-
-
-def do_edges_intersect(x1, y1, x2, y2, x3, y3, x4, y4):
-    """Returns a boolean to indicate if the vertices identified 1 and 2 intersect with 3 and 4."""
-    o1 = orientation(x1, y1, x2, y2, x3, y3)
-    o2 = orientation(x1, y1, x2, y2, x4, y4)
-    o3 = orientation(x3, y3, x4, y4, x1, y1)
-    o4 = orientation(x3, y3, x4, y4, x2, y2)
-
-    # General case
-    if o1 != o2 and o3 != o4:
-        return True
-
-    # Special cases
-    if o1 == 0 and on_segment(x1, y1, x3, y3, x2, y2):
-        return True
-    if o2 == 0 and on_segment(x1, y1, x4, y4, x2, y2):
-        return True
-    if o3 == 0 and on_segment(x3, y3, x1, y1, x4, y4):
-        return True
-    if o4 == 0 and on_segment(x3, y3, x2, y2, x4, y4):
-        return True
-
-    return False
-
-
-def on_segment(px, py, qx, qy, rx, ry):
-    """Returns a boolean to indicate if the first vertex (q) is on the segment (pr)."""
-    qy_not_on_segment = min(py, ry) <= qy <= max(py, ry)
-    qx_not_on_segment = min(px, rx) <= qx <= max(px, rx)
-
-    return qy_not_on_segment and qx_not_on_segment
-
-
-def is_clockwise(vertices):
-    """Returns a boolean to indicate if the vertices are stored clockwise in the array.
+def get_oriented_area(vertices):
+    """Returns the area value which gives an indication on the vertices order.
+    Positive if counter-clockwise, negative if clockwise.
 
     This function uses the Shoelace formula :
     see also : https://en.wikipedia.org/wiki/Shoelace_formula
@@ -83,9 +20,9 @@ def is_clockwise(vertices):
     for i in range(n):
         x1, y1 = vertices[i]["x"], vertices[i]["y"]
         x2, y2 = vertices[(i + 1) % n]["x"], vertices[(i + 1) % n]["y"]
-        sum_product += (x2 - x1) * (y2 + y1)
+        sum_product += (x1 - x2) * (y2 + y1)
 
-    return sum_product > 0
+    return sum_product
 
 
 def order_counter_clockwise(vertices):
@@ -95,15 +32,15 @@ def order_counter_clockwise(vertices):
     For more information on the order expected for GeoJson :
     https://datatracker.ietf.org/doc/html/rfc7946#section-3.1.6
     """
-    if has_intersection(vertices):
+    order = get_oriented_area(vertices)
+    if order < 0:
+        vertices.reverse()
+    elif order == 0:
         raise ConversionError(
-            f"Polygon has edges intersection when looking at {vertices} and cannot be exported to \
-            GeoJson format."
+            f"Polygon order could not be identified as clockwise nor counter-clockwise because of \
+                edges intersection in {vertices} and thus cannot be exported to GeoJson format."
         )
 
-    if is_clockwise(vertices):
-        vertices.reverse()
-
     return vertices
 
 

tests/unit/utils/labels/test_data/has_intersection_test_cases.py

@@ -1,6 +1,129 @@
 test_cases = [
     (
         "test_case_1",
+        [
+            {"x": 0, "y": 0},
+            {"x": 1, "y": 0},
+            {"x": 1, "y": 1},
+            {"x": 0, "y": 1},
+        ],
+        {
+            "coordinates": [[[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_2",
+        [
+            {"x": 0, "y": 0},
+            {"x": 0, "y": 1},
+            {"x": 1, "y": 1},
+            {"x": 1, "y": 0},
+        ],
+        {
+            "coordinates": [[[1, 0], [1, 1], [0, 1], [0, 0], [1, 0]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_3",
+        [
+            {"x": 0, "y": 0},
+            {"x": 0, "y": 2},
+            {"x": 1, "y": 1},
+            {"x": 2, "y": 2},
+            {"x": 2, "y": 0},
+        ],
+        {
+            "coordinates": [[[2, 0], [2, 2], [1, 1], [0, 2], [0, 0], [2, 0]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_4",
+        [
+            {"x": 0, "y": 0},
+            {"x": 0, "y": 2},
+            {"x": 2, "y": 2},
+            {"x": 1, "y": 0},
+            {"x": 0, "y": 1},
+        ],
+        {
+            "coordinates": [[[0, 1], [1, 0], [2, 2], [0, 2], [0, 0], [0, 1]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_5",
+        [
+            {"x": 0, "y": 1},
+            {"x": 1, "y": 0},
+            {"x": 2, "y": 2},
+            {"x": 0, "y": 2},
+            {"x": 0, "y": 0},
+        ],
+        {
+            "coordinates": [[[0, 1], [1, 0], [2, 2], [0, 2], [0, 0], [0, 1]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_6",
+        [
+            {"x": 0, "y": 0},
+            {"x": 2, "y": 2},
+            {"x": 2, "y": 0},
+            {"x": 1, "y": 0},
+            {"x": 0, "y": 2},
+        ],
+        {
+            "coordinates": [[[0, 2], [1, 0], [2, 0], [2, 2], [0, 0], [0, 2]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_7",
+        [
+            {"x": 0, "y": 0},
+            {"x": 2, "y": 0},
+            {"x": 2, "y": 2},
+            {"x": 0, "y": 1},
+            {"x": 0, "y": 2},
+        ],
+        {
+            "coordinates": [[[0, 0], [2, 0], [2, 2], [0, 1], [0, 2], [0, 0]]],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_8",
+        [
+            {"x": -68.40459303313284, "y": -23.5274667659679},
+            {"x": -68.40651350514116, "y": -23.52735316457091},
+            {"x": -68.40645155443121, "y": -23.52536512424942},
+            {"x": -68.40527449094223, "y": -23.52536512424942},
+            {"x": -68.40477888526267, "y": -23.52536512424942},
+            {"x": -68.40446913171293, "y": -23.52536512424942},
+            {"x": -68.40459303313284, "y": -23.525308322656073},
+        ],
+        {
+            "coordinates": [
+                [
+                    [-68.40459303313284, -23.525308322656073],
+                    [-68.40446913171293, -23.52536512424942],
+                    [-68.40477888526267, -23.52536512424942],
+                    [-68.40527449094223, -23.52536512424942],
+                    [-68.40645155443121, -23.52536512424942],
+                    [-68.40651350514116, -23.52735316457091],
+                    [-68.40459303313284, -23.5274667659679],
+                    [-68.40459303313284, -23.525308322656073],
+                ]
+            ],
+            "type": "Polygon",
+        },
+    ),
+    (
+        "test_case_9",
         [
             {"x": 4.4310542897769665, "y": 52.19847958268726},
             {"x": 4.424421731366076, "y": 52.202545578240006},
@@ -37,5 +160,5 @@
             ],
             "type": "Polygon",
         },
-    )
+    ),
 ]

tests/unit/utils/labels/test_data/kili_polygon_to_geojson_polygon_test_cases.py

@@ -27,20 +27,18 @@
         "Cross segments #3",
         [
             {"x": 0, "y": 0},
-            {"x": 2, "y": 2},
-            {"x": 2, "y": 0},
+            {"x": 0, "y": 1},
             {"x": 1, "y": 0},
-            {"x": 0, "y": 2},
+            {"x": 1, "y": 1},
         ],
         ConversionError,
     ),
     (
         "Cross segments #4",
         [
             {"x": 0, "y": 0},
-            {"x": 2, "y": 0},
             {"x": 2, "y": 2},
-            {"x": 0, "y": 1},
+            {"x": 2, "y": 0},
             {"x": 0, "y": 2},
         ],
         ConversionError,
@@ -49,10 +47,19 @@
         "Cross segments #5",
         [
             {"x": 0, "y": 0},
+            {"x": 2, "y": 0},
             {"x": 0, "y": 2},
             {"x": 2, "y": 2},
-            {"x": 1, "y": 0},
-            {"x": 0, "y": 1},
+        ],
+        ConversionError,
+    ),
+    (
+        "Cross segments #6",
+        [
+            {"x": 0, "y": 0},
+            {"x": 0, "y": 2},
+            {"x": 2, "y": 0},
+            {"x": 2, "y": 2},
         ],
         ConversionError,
     ),