Merge pull request #507 from mapswipe/fix-footprint-tutorial

fix order or tutorial screens

Author: Hagellach37

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/grouping_functions.py

@@ -1,7 +1,7 @@
 import json
 
 
-def group_input_geometries(input_geometries_file, group_size):
+def group_input_geometries(input_geometries_file, group_size, tutorial=False):
     """
     The function to create groups of input geometries using the given size (number of
     features) per group
@@ -12,6 +12,8 @@ def group_input_geometries(input_geometries_file, group_size):
         the path to the GeoJSON file containing the input geometries
     group_size : int
         the maximum number of features per group
+    tutorial: boolean
+        if this function is called to create the grouping within a tutorial
 
     Returns
     -------
@@ -44,7 +46,15 @@ def group_input_geometries(input_geometries_file, group_size):
 
         # we use a new id here based on the count
         # since we are not sure that GetFID returns unique values
-        groups[group_id_string]["feature_ids"].append(feature_count)
+        if not tutorial:
+            groups[group_id_string]["feature_ids"].append(feature_count)
+        else:
+            # In the tutorial the feature id is defined by the "screen" attribute.
+            # We do this so that we can sort by the feature id later and
+            # get the screens displayed in the right order on the app.
+            groups[group_id_string]["feature_ids"].append(
+                feature["properties"]["screen"]
+            )
         groups[group_id_string]["features"].append(feature)
 
     return groups

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/tutorial.py

@@ -1,5 +1,7 @@
 import json
 
+import numpy as np
+
 from mapswipe_workers.definitions import DATA_PATH, logger
 from mapswipe_workers.project_types.arbitrary_geometry import grouping_functions as g
 from mapswipe_workers.project_types.arbitrary_geometry.group import Group
@@ -53,11 +55,23 @@ def create_tutorial_tasks(self):
         """Create the tasks dict based on provided examples in geojson file."""
 
         raw_groups = g.group_input_geometries(
-            self.inputGeometries, len(self.tutorial_tasks) + 1
+            self.inputGeometries,
+            len(self.tutorial_tasks["features"]) + 1,
+            tutorial=True,
         )
+
         for group_id, item in raw_groups.items():
             group = Group(self, groupId=101)
-            group.create_tasks(item["feature_ids"], item["features"])
+
+            # Make sure that we sort the tasks.
+            # For the tutorial the feature_id represents the number of the screen.
+            # The group_input_geometries functions doesn't return
+            # the screens in the right order.
+            sorted_idx = np.array(item["feature_ids"]).argsort()
+            sorted_feature_ids = [item["feature_ids"][x] for x in sorted_idx]
+            sorted_features = [item["features"][x] for x in sorted_idx]
+
+            group.create_tasks(sorted_feature_ids, sorted_features)
 
         for task in group.tasks:
             logger.info(task)