refac: black and flake8

Author: ElJocho

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/project.py

@@ -16,7 +16,8 @@
 from mapswipe_workers.utils import tile_functions, tile_grouping_functions
 from mapswipe_workers.utils.validate_input import (
     save_geojson_to_file,
-    validate_and_collect_geometries_to_multipolyon, multipolygon_to_wkt,
+    validate_and_collect_geometries_to_multipolyon,
+    multipolygon_to_wkt,
 )
 
 
@@ -49,7 +50,9 @@ def __init__(self, project_draft: dict):
         self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
 
     def validate_geometries(self):
-        self.inputGeometriesFileName = save_geojson_to_file(self.projectId, self.geometry)
+        self.inputGeometriesFileName = save_geojson_to_file(
+            self.projectId, self.geometry
+        )
         multi_polygon = validate_and_collect_geometries_to_multipolyon(
             self.projectId, self.zoomLevel, self.inputGeometriesFileName
         )

mapswipe_workers/mapswipe_workers/utils/validate_input.py

@@ -82,7 +82,7 @@ def check_if_geom_is_valid(projectId, feat_geom):
             f"Probably self-intersections."
         )
 
-        raise CustomError(f"Geometry is not valid. ")
+        raise CustomError("Geometry is not valid.")
 
 
 def check_if_project_area_is_too_big(projectId, project_area, zoomLevel):
@@ -189,15 +189,19 @@ def build_multipolygon_from_layer_geometries(projectId, layer):
     return multi_polygon, project_area
 
 
-def validate_and_collect_geometries_to_multipolyon(projectId, zoomLevel, input_file_path):
+def validate_and_collect_geometries_to_multipolyon(
+    projectId, zoomLevel, input_file_path
+):
     """Validate all geometries contained in input file and collect them to a single multi polygon."""
     layer, datasource = load_geojson_to_ogr(projectId, input_file_path)
 
     # check if inputs fit constraints
     check_if_layer_is_empty(projectId, layer)
     check_if_zoom_level_is_too_high(zoomLevel)
 
-    multi_polygon, project_area = build_multipolygon_from_layer_geometries(projectId, layer)
+    multi_polygon, project_area = build_multipolygon_from_layer_geometries(
+        projectId, layer
+    )
 
     check_if_layer_has_too_many_geometries(projectId, multi_polygon)
     check_if_project_area_is_too_big(projectId, project_area, zoomLevel)

mapswipe_workers/tests/unittests/test_utils_validate_input.py

@@ -7,7 +7,8 @@
 from mapswipe_workers.definitions import CustomError
 from mapswipe_workers.utils.validate_input import (
     save_geojson_to_file,
-    validate_and_collect_geometries_to_multipolyon, multipolygon_to_wkt,
+    validate_and_collect_geometries_to_multipolyon,
+    multipolygon_to_wkt,
 )
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -31,7 +32,13 @@ def test_area_is_too_large(self):
             "fixtures/tile_map_service_grid/projects/projectDraft_area_too_large.json"
         )
         project_draft, path_to_geometries = get_project_draft(path)
-        self.assertRaises(CustomError, validate_and_collect_geometries_to_multipolyon, 1, 18, path_to_geometries)
+        self.assertRaises(
+            CustomError,
+            validate_and_collect_geometries_to_multipolyon,
+            1,
+            18,
+            path_to_geometries,
+        )
 
     def test_broken_geojson_string(self):
         """Test if validate_geometries throws an error
@@ -42,7 +49,13 @@ def test_broken_geojson_string(self):
             "fixtures/tile_map_service_grid/projects/projectDraft_broken_geojson.json"
         )
         project_draft, path_to_geometries = get_project_draft(path)
-        self.assertRaises(CustomError, validate_and_collect_geometries_to_multipolyon, 1, 18, path_to_geometries)
+        self.assertRaises(
+            CustomError,
+            validate_and_collect_geometries_to_multipolyon,
+            1,
+            18,
+            path_to_geometries,
+        )
 
     def test_feature_is_none(self):
         """Test if validate_geometries throws an error
@@ -52,15 +65,27 @@ def test_feature_is_none(self):
             "fixtures/tile_map_service_grid/projects/projectDraft_feature_is_none.json"
         )
         project_draft, path_to_geometries = get_project_draft(path)
-        self.assertRaises(CustomError, validate_and_collect_geometries_to_multipolyon, 1, 18, path_to_geometries)
+        self.assertRaises(
+            CustomError,
+            validate_and_collect_geometries_to_multipolyon,
+            1,
+            18,
+            path_to_geometries,
+        )
 
     def test_no_features(self):
         """Test if validate_geometries throws an error
         if the provided geojson contains no features."""
 
         path = "fixtures/tile_map_service_grid/projects/projectDraft_no_features.json"
         project_draft, path_to_geometries = get_project_draft(path)
-        self.assertRaises(CustomError, validate_and_collect_geometries_to_multipolyon, 1, 18, path_to_geometries)
+        self.assertRaises(
+            CustomError,
+            validate_and_collect_geometries_to_multipolyon,
+            1,
+            18,
+            path_to_geometries,
+        )
 
     def test_single_geom_validation(self):
         path = "fixtures/completeness/projectDraft_single.json"