Merge pull request #250 from mapswipe/dev

v2.1.7

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

manager_dashboard/manager_dashboard/create.html

@@ -173,7 +173,7 @@ <h3>Project Type Specific Information</h3>
                           <ul>
                           <li>
                               <label for="zoomLevel">Zoom Level</label>
-                              <input type="number" name="zoomLevel" id="zoomLevel" value="18" min="14" max="24">
+                              <input type="number" name="zoomLevel" id="zoomLevel" value="18" min="14" max="22">
                               <span>We use the Tile Map Service zoom levels. Please check for your area which zoom level is available. For example, Bing imagery is available at zoomlevel 18 for most regions. If you use a custom tile server you may be able to use even higher zoom levels.</span>
                           </li>
                           <li>
@@ -276,7 +276,7 @@ <h3>Project Type Specific Information</h3>
                           <ul>
                           <li>
                               <label for="zoomLevelChangeDetection">Zoom Level</label>
-                              <input type="number" name="zoomLevelChangeDetection" id="zoomLevelChangeDetection" value="18" min="16" max="24">
+                              <input type="number" name="zoomLevelChangeDetection" id="zoomLevelChangeDetection" value="18" min="16" max="22">
                               <span>We use the Tile Map Service zoom levels. Please check for your area which zoom level is available. For example, Bing imagery is available at zoomlevel 18 for most regions. If you use a custom tile server you may be able to use even higher zoom levels.</span>
                           </li>
                           <li>

manager_dashboard/manager_dashboard/js/forms.js

@@ -148,9 +148,9 @@ function openFile(event) {
               // check project size
 
               area = turf.area(feature)/1000000 // area in square kilometers
-              maxArea = (20 - zoomLevel) * (20 - zoomLevel) * 1250
+              maxArea = (23 - zoomLevel) * (23 - zoomLevel) * 200
               console.log('project size: ' + area + ' sqkm')
-              if (area > 5000) {
+              if (area > maxArea) {
                 throw 'project is to large: ' + area + ' sqkm; ' + 'max allowed size for this zoom level: ' + maxArea + ' sqkm'
               }
               info_output.innerHTML += 'Project Size: ' + area + ' sqkm<br>';

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/config/logging.cfg

@@ -8,24 +8,24 @@ keys=consoleHandler,fileHandler
 keys=mapswipeFormatter
 
 [logger_root]
-level=DEBUG
+level=INFO
 handlers=consoleHandler
 
 [logger_mapswipeLogger]
-level=DEBUG
+level=INFO
 handlers=consoleHandler,fileHandler
 qualname=mapswipeLogger
 propagate=0
 
 [handler_consoleHandler]
 class=StreamHandler
-level=DEBUG
+level=INFO
 formatter=mapswipeFormatter
 args=(sys.stdout,)
 
 [handler_fileHandler]
 class=handlers.TimedRotatingFileHandler
-level=DEBUG
+level=INFO
 formatter=mapswipeFormatter
 args=('/var/log/mapswipe_workers/mapswipe_workers.log','D', 1, 14,)
 

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):
@@ -238,7 +241,7 @@ def calc_count(row) -> List[int]:
     total_count = no_count + yes_count + maybe_count + bad_count
     assert total_count > 0, "Total count for result must be bigger than zero."
 
-    return [total_count, no_count, yes_count, maybe_count, no_count]
+    return [total_count, no_count, yes_count, maybe_count, bad_count]
 
 
 def get_agg_results_by_task_id(
@@ -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],