Merge pull request #252 from mapswipe/feature-tasking-manager-geometries

Feature tasking manager geometries

Author: Hagellach37

docker-compose.yaml

@@ -53,7 +53,7 @@ services:
             context: mapswipe_workers/
         depends_on:
             - postgres
-        command: mapswipe_workers --verbose run --schedule m --only_new_results
+        command: mapswipe_workers --verbose run --schedule m
         volumes:
             - ./api-data:/var/lib/mapswipe_workers/api-data/:rw
             - ./api-data/agg_results:/var/lib/mapswipe_workers/api-data/agg_results:rw
@@ -62,6 +62,8 @@ services:
             - ./api-data/projects:/var/lib/mapswipe_workers/api-data/projects:rw
             - ./api-data/results:/var/lib/mapswipe_workers/api-data/results:rw
             - ./api-data/tasks:/var/lib/mapswipe_workers/api-data/tasks:rw
+            - ./api-data/yes_maybe:/var/lib/mapswipe_workers/api-data/yes_maybe:rw
+            - ./api-data/hot_tm:/var/lib/mapswipe_workers/api-data/hot_tm:rw
         restart: "no"
         networks:
             - mapswipe_workers

mapswipe_workers/Dockerfile

@@ -23,6 +23,8 @@ RUN mkdir -p $data_dir"api-data/history/"
 RUN mkdir -p $data_dir"api-data/projects/"
 RUN mkdir -p $data_dir"api-data/results/"
 RUN mkdir -p $data_dir"api-data/tasks/"
+RUN mkdir -p $data_dir"api-data/yes_maybe/"
+RUN mkdir -p $data_dir"api-data/hot_tm/"
 
 # copy mapswipe workers repo from local repo
 WORKDIR $repo_dir

mapswipe_workers/mapswipe_workers/generate_stats/generate_stats.py

@@ -62,8 +62,6 @@ def generate_stats(project_id_list: list):
                 projects_info_dynamic_filename, index_label="idx"
             )
 
-            # TODO: for build area projects generate tasking manager geometries
-
     if len(project_id_list) > 0:
         # merge static info and dynamic info and save
         projects_filename = f"{DATA_PATH}/api-data/projects/projects.csv"

mapswipe_workers/mapswipe_workers/generate_stats/project_stats.py

@@ -6,7 +6,10 @@
 from mapswipe_workers import auth
 from mapswipe_workers.definitions import logger, DATA_PATH
 from mapswipe_workers.utils import geojson_functions
-from mapswipe_workers.generate_stats import project_stats_by_date
+from mapswipe_workers.generate_stats import (
+    project_stats_by_date,
+    tasking_manager_geometries,
+)
 
 
 def add_metadata_to_csv(filename: str):
@@ -353,6 +356,10 @@ def get_per_project_statistics(project_id: str, project_info: pd.Series) -> dict
             f"saved project stats by date for {project_id}: {project_stats_by_date_filename}"
         )
 
+        # generate geometries for HOT Tasking Manager
+        tasking_manager_geometries.generate_tasking_manager_geometries(project_id)
+
+        # prepare output of function
         project_stats_dict = {
             "project_id": project_id,
             "progress": project_stats_by_date_df["cum_progress"].iloc[-1],