Skip to content

Commit d9a573b

Browse files
authored
Revert "Refactor python workers"
1 parent 14cf2fb commit d9a573b

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

mapswipe_workers/mapswipe_workers/project_types/base/project.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ def __init__(self, project_draft):
9191

9292
self.tutorialId = project_draft.get("tutorialId", None)
9393

94-
# currently crowdmap specific attributes todo: discuss in group if empty attributes in mapswipe postgres are ok
95-
self.language = "en-us" if "language" not in project_draft.keys() else project_draft["language"]
96-
self.appId = None if "appId" not in project_draft.keys() else project_draft["appId"]
97-
self.manualUrl = None if "manualUrl" not in project_draft.keys() else project_draft["manualUrl"]
98-
99-
100-
10194
# TODO: Implement resultRequiredCounter as property.
10295
# Does not work because for some reason project['group'] = vars()
10396
# and then del project['group'] will delete also project.group.
@@ -179,11 +172,15 @@ def save_project(self):
179172
raise CustomError(e)
180173

181174
try:
182-
self.save_to_firebase(
175+
self.save_project_to_firebase(project)
176+
self.save_groups_to_firebase(project["projectId"], groups)
177+
self.save_tasks_to_firebase(project["projectId"], groupsOfTasks)
178+
179+
"""self.save_to_firebase(
183180
project,
184181
groups,
185182
groupsOfTasks,
186-
)
183+
)"""
187184
logger.info(
188185
f"{self.projectId}" f" - the project has been saved" f" to firebase"
189186
)

mapswipe_workers/mapswipe_workers/project_types/tile_classification/project.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,13 @@ def __init__(self, project_draft: dict):
1919
self.zoomLevel = int(project_draft.get("zoomLevel", 18))
2020
self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
2121

22-
2322
def validate_geometries(self):
2423
# TODO rename attribute validInputGeometries, it is a path to a geojson.
2524
self.validInputGeometries = save_geojson_to_file(self.projectId, self.geometry)
2625
wkt_geometry = validate_geometries(
2726
self.projectId, self.zoomLevel, self.validInputGeometries
2827
)
2928
return wkt_geometry
30-
31-
def save_to_firebase(self, project, groups, groupsOfTasks):
32-
self.save_project_to_firebase(project)
33-
self.save_groups_to_firebase(project["projectId"], groups)
34-
self.save_tasks_to_firebase(project["projectId"], groupsOfTasks)
3529

3630
def save_project_to_firebase(self, project):
3731
firebase = Firebase()

0 commit comments

Comments
 (0)