refac: rename variable to reflect its usage

mapswipe · Jan 15, 2024 · 75de897 · 75de897
1 parent 8708f18
commit 75de897
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/project.py b/mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/project.py
@@ -163,7 +163,7 @@ def validate_geometries(self):
         del outDataSource
         del layer
 
-        self.validInputGeometries = valid_input_file
+        self.inputGeometriesFileName = valid_input_file
 
         logger.info(
             f"{self.projectId}"
@@ -175,7 +175,7 @@ def validate_geometries(self):
 
     def create_groups(self):
         self.raw_groups = g.group_input_geometries(
-            self.validInputGeometries, self.groupSize
+            self.inputGeometriesFileName, self.groupSize
         )
 
         for group_id, item in self.raw_groups.items():

diff --git a/mapswipe_workers/mapswipe_workers/project_types/project.py b/mapswipe_workers/mapswipe_workers/project_types/project.py
@@ -112,7 +112,7 @@ def save_project(self):
         project.pop("groups")
         project.pop("tasks")
         project.pop("inputGeometries", None)
-        project.pop("validInputGeometries", None)
+        project.pop("inputGeometriesFileName", None)
 
         # Convert Date object to ISO Datetime:
         # https://www.w3.org/TR/NOTE-datetime

diff --git a/mapswipe_workers/mapswipe_workers/project_types/tile_map_service/project.py b/mapswipe_workers/mapswipe_workers/project_types/tile_map_service/project.py
@@ -49,10 +49,9 @@ def __init__(self, project_draft: dict):
         self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
 
     def validate_geometries(self):
-        # TODO rename attribute validInputGeometries, it is a path to a geojson.
-        self.validInputGeometries = 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.validInputGeometries
+            self.projectId, self.zoomLevel, self.inputGeometriesFileName
         )
         wkt_geometry = multipolygon_to_wkt(multi_polygon)
         return wkt_geometry
@@ -74,7 +73,7 @@ def create_groups(self):
         """Create groups for project extent."""
         # first step get properties of each group from extent
         raw_groups = tile_grouping_functions.extent_to_groups(
-            self.validInputGeometries,
+            self.inputGeometriesFileName,
             self.zoomLevel,
             self.groupSize,
         )