refactor: remove centroid extraction and request type

Author: matthiasschaub

sketch_map_tool/definitions.py

@@ -16,7 +16,6 @@
     "sketch-map",
     "raster-results",
     "vector-results",
-    "centroid-results",
 ]
 # Colors to be detected
 COLORS = {

sketch_map_tool/helpers.py

@@ -7,10 +7,9 @@
 import numpy as np
 from billiard.exceptions import TimeLimitExceeded
 from celery.result import AsyncResult, GroupResult
-from geojson import Feature, FeatureCollection, Point
+from geojson import Feature, FeatureCollection
 from numpy.typing import NDArray
 from reportlab.graphics.shapes import Drawing
-from shapely.geometry import shape
 
 from sketch_map_tool.exceptions import TimeLimitExceededError, TranslatableError
 
@@ -110,16 +109,3 @@ def extract_errors(
                 if len(errors_) > 0:
                     errors = errors + [e.translate() for e in errors_]
     return errors
-
-
-def extract_centroids(feature_collection: FeatureCollection) -> FeatureCollection:
-    centroids = []
-
-    for feature in feature_collection.features:
-        geom = shape(feature.geometry)
-        centroid_point = Point((geom.centroid.x, geom.centroid.y))
-        centroids.append(
-            Feature(geometry=centroid_point, properties=feature.properties)
-        )
-
-    return FeatureCollection(centroids)

sketch_map_tool/routes.py

@@ -30,7 +30,6 @@
 )
 from sketch_map_tool.helpers import (
     N_,
-    extract_centroids,
     extract_errors,
     merge,
     to_array,
@@ -220,7 +219,7 @@ def get_async_result(uuid: str, type_: REQUEST_TYPES) -> AsyncResult | GroupResu
     """Get Celery `AsyncResult` or restore `GroupResult` for given Celery UUID."""
     if type_ == "sketch-map":
         async_result = celery_app.AsyncResult(uuid)
-    elif type_ in ("vector-results", "centroid-results", "raster-results"):
+    elif type_ in ("vector-results", "raster-results"):
         async_result = celery_app.GroupResult.restore(uuid)
     else:
         raise TypeError()
@@ -326,16 +325,13 @@ def download(uuid: str, type_: REQUEST_TYPES, lang="en") -> Response:
             else:
                 # support legacy results
                 file: BytesIO = async_result.get()
-        case "vector-results" | "centroid-results":
+        case "vector-results":
             db_client_flask.update_files_download_vector(uuid)
             mimetype = "application/geo+json"
             download_name = type_ + ".geojson"
             if isinstance(async_result, GroupResult):
                 results = async_result.get(propagate=False)
-                if type_ == "centroid-results":
-                    vector_results = [extract_centroids(r[-2]) for r in results]
-                else:
-                    vector_results = [r[-2] for r in results]
+                vector_results = [r[-2] for r in results]
                 raw = geojson.dumps(merge(vector_results))
                 file: BytesIO = BytesIO(raw.encode("utf-8"))
             else:

tests/integration/test_routes.py

@@ -233,7 +233,6 @@ def test_api_status_uuid_sketch_map(uuid_create, flask_client):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_api_status_uuid_digitize(uuid_digitize, type_, flask_client):
@@ -306,7 +305,6 @@ def test_api_download_uuid_sketch_map(uuid_create, flask_client):
     "type_",
     [
         "vector-results",
-        "centroid-results",
         "raster-results",
     ],
 )

tests/unit/test_helpers.py

@@ -49,16 +49,3 @@ def test_zip_(sketch_map_frame_markings_detected):
     assert zip_info[1].file_size == 5407584
     assert zip_info[2].filename == "attributions.txt"
     assert zip_info[2].file_size == 11
-
-
-def test_extract_centroids(detected_markings_cleaned):
-    result_centroids = helpers.extract_centroids(detected_markings_cleaned)
-    assert isinstance(result_centroids, FeatureCollection)
-    assert len(result_centroids.features)
-    assert len(result_centroids) == len(detected_markings_cleaned.features)
-    for i, feature in enumerate(result_centroids.features):
-        assert feature.geometry.type == "Point"
-        assert (
-            result_centroids.features[i].properties
-            == detected_markings_cleaned.features[i].properties
-        )

tests/unit/test_routes_api_download.py

@@ -28,18 +28,13 @@ def test_download_failure(client, uuid):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_download_success(client, uuid, type_, monkeypatch):
     monkeypatch.setattr(
         "sketch_map_tool.routes.merge",
         lambda *_: {"type": "FeatureCollection", "features": []},
     )
-    monkeypatch.setattr(
-        "sketch_map_tool.routes.extract_centroids",
-        lambda *_: {"type": "FeatureCollection", "features": []},
-    )
     monkeypatch.setattr(
         "sketch_map_tool.routes.zip_",
         lambda *_: BytesIO(),
@@ -55,7 +50,6 @@ def test_group_download_success(client, uuid, type_, monkeypatch):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_started(client, uuid, type_):
@@ -69,7 +63,6 @@ def test_group_started(client, uuid, type_):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_failure(client, uuid, type_):
@@ -83,14 +76,9 @@ def test_group_failure(client, uuid, type_):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_started_success_failure(client, uuid, type_, monkeypatch):
-    monkeypatch.setattr(
-        "sketch_map_tool.routes.extract_centroids",
-        lambda *_: {"type": "FeatureCollection", "features": []},
-    )
     resp = client.get("/api/download/{0}/{1}".format(uuid, type_))
     assert resp.status_code == 500
 
@@ -100,7 +88,6 @@ def test_group_started_success_failure(client, uuid, type_, monkeypatch):
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_success_failure(
@@ -114,10 +101,6 @@ def test_group_success_failure(
         "sketch_map_tool.routes.merge",
         lambda *_: {"type": "FeatureCollection", "features": []},
     )
-    monkeypatch.setattr(
-        "sketch_map_tool.routes.extract_centroids",
-        lambda *_: {"type": "FeatureCollection", "features": []},
-    )
     monkeypatch.setattr(
         "sketch_map_tool.routes.zip_",
         lambda *_: BytesIO(),

tests/unit/test_routes_api_status.py

@@ -91,7 +91,6 @@ def test_status_failure_hard(
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_status_success(
@@ -114,7 +113,6 @@ def test_group_status_success(
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_status_started(
@@ -137,7 +135,6 @@ def test_group_status_started(
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 @pytest.mark.parametrize(
@@ -163,7 +160,6 @@ def test_group_status_failure(client, uuid, type_, mock_group_result_failure, la
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_status_failure_hard(
@@ -189,7 +185,6 @@ def test_group_status_failure_hard(
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_status_started_success_failure(
@@ -222,7 +217,6 @@ def test_group_status_started_success_failure(
     (
         "raster-results",
         "vector-results",
-        "centroid-results",
     ),
 )
 def test_group_status_success_failure(