Merge branch 'dev' of github.com:mapswipe/python-mapswipe-workers into dev

Hagellach37 · Hagellach37 · commit 89a98a8f7f51 · 2019-12-18T14:14:49.000+01:00
diff --git a/manager_dashboard/manager_dashboard/create.html b/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>
diff --git a/manager_dashboard/manager_dashboard/js/forms.js b/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>';
diff --git a/mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_project.py b/mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_project.py
@@ -114,7 +114,13 @@ def validate_geometries(self):
 
             # calculate max area based on zoom level
             # for zoom level 18 this will be 5000 square kilometers
-            max_area = (20 - int(self.zoomLevel)) * (20 - int(self.zoomLevel)) * 1250
+            # max zoom level is 22
+            if self.zoomLevel > 22:
+                raise CustomError(
+                    f"zoom level is to large (max: 22): {self.zoomLevel}."
+                )
+
+            max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
 
             if project_area > max_area:
                 logger.warning(
diff --git a/mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_tutorial.py b/mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_tutorial.py
@@ -52,14 +52,8 @@ def generate_tutorial_data(tutorial):
                 task_y = int(row[0].split("-")[2])
                 grouped_tasks[category][row[3]]["task_x_list"].append(task_x)
                 grouped_tasks[category][row[3]]["task_y_list"].append(task_y)
-                url = t.tile_coords_zoom_and_tileserver_to_URL(
-                    task_x,
-                    task_y,
-                    zoom,
-                    tutorial["tileServer"]["name"],
-                    auth.get_api_key(tutorial["tileServer"]["name"]),
-                    None,
-                    None,
+                url = t.tile_coords_zoom_and_tileserver_to_url(
+                    task_x, task_y, zoom, tutorial["tileServer"]
                 )
                 grouped_tasks[category][row[3]]["url_list"].append(url)
                 grouped_tasks[category][row[3]]["reference_answer_list"].append(row[1])
diff --git a/mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_project.py b/mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_project.py
@@ -117,7 +117,13 @@ def validate_geometries(self):
 
             # calculate max area based on zoom level
             # for zoom level 18 this will be 5000 square kilometers
-            max_area = (20 - int(self.zoomLevel)) * (20 - int(self.zoomLevel)) * 1250
+            # max zoom level is 22
+            if self.zoomLevel > 22:
+                raise CustomError(
+                    f"zoom level is to large (max: 22): {self.zoomLevel}."
+                )
+
+            max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
 
             if project_area > max_area:
                 logger.warning(
diff --git a/mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_tutorial.py b/mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_tutorial.py
@@ -45,23 +45,11 @@ def generate_tutorial_data(tutorial):
             task_y = feature["properties"]["TileY"]
             task_id_real = "{}-{}-{}".format(zoom, task_x, task_y)
 
-            urlA = t.tile_coords_zoom_and_tileserver_to_URL(
-                task_x,
-                task_y,
-                zoom,
-                tutorial["tileServerA"]["name"],
-                tutorial["tileServerA"]["apiKey"],
-                tutorial["tileServerA"]["url"],
-                None,
+            urlA = t.tile_coords_zoom_and_tileserver_to_url(
+                task_x, task_y, zoom, tutorial["tileServerA"]
             )
-            urlB = t.tile_coords_zoom_and_tileserver_to_URL(
-                task_x,
-                task_y,
-                zoom,
-                tutorial["tileServerB"]["name"],
-                tutorial["tileServerB"]["apiKey"],
-                tutorial["tileServerB"]["url"],
-                None,
+            urlB = t.tile_coords_zoom_and_tileserver_to_url(
+                task_x, task_y, zoom, tutorial["tileServerB"]
             )
 
             if group_id not in tasks_dict.keys():
diff --git a/mapswipe_workers/sample_data/change_detection_tutorial_bing.json b/mapswipe_workers/sample_data/change_detection_tutorial_bing.json
@@ -0,0 +1,60 @@
+{
+  "name": "Change Detection Tutorial",
+  "projectType": 3,
+  "projectId": "change_detection_tutorial",
+  "zoomLevel": 16,
+  "lookFor": "CHANGES IN BUILDINGS",
+  "status": "change_detection_tutorial",
+  "projectDetails": "This is a tutorial",
+  "progress": 0,
+  "contributorCount": 0,
+  "tileServerA" : {
+    "apiKey" : "AopsdXjtTu-IwNoCTiZBtgRJ1g7yPkzAi65nXplc-eLJwZHYlAIf2yuSY_Kjg3Wn",
+    "captions" : "",
+    "date" : "",
+    "name" : "bing",
+    "url" : "https://ecn.t0.tiles.virtualearth.net/tiles/a{quad_key}.jpeg?g=7505&mkt=en-US&token={key}",
+    "credits": "© 2019 Microsoft Corporation, Earthstar Geographics SIO"
+  },
+  "tileServerB" : {
+    "apiKey" : "91e57457-aa2d-41ad-a42b-3b63a123f54a",
+    "captions" : "",
+    "date" : "",
+    "name" : "maxar_premium",
+    "url" : "https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe%3AImageryTileService@EPSG%3A3857@jpg/{z}/{x}/{y}.jpg?connectId={key}",
+    "credits": "© 2019 Maxar"
+  },
+  "examplesFile": "sample_data/change_detection_tutorial_tasks_bing.geojson",
+  "categories": {
+    "changes_1": {
+      "pre": "For this project we are looking for new settlements. Compare the upper (before) and lower (after) image and *SWIPE RIGHT* (not tap) to indicate that new settlements have been built.",
+      "post_correct": "Yes, that looks like a new settlement being developed. Plenty of new houses and huts have been built in this area. Swipe left to continue the tutorial.",
+      "post_wrong": "Oh no. Make sure to spot all the new settlements and swipe right. New roads can also function as an indicator sometimes."
+    },
+    "changes_2": {
+      "pre": "And again: If new settlements have been built, *SWIPE* to the right side.",
+      "post_correct": "Correct. We can spot new settlements in the upper right part of the satellite image. Swipe left to go on with some more examples.",
+      "post_wrong": "Take a closer look. There are new settlements here in the upper right part of the satellite image."
+    },
+    "no_changes_1": {
+      "pre": "In this example, there are many buildings but *NO NEW SETTLEMENTS* emerged. *SWIPE* left to indicate no changes.",
+      "post_correct": "Nice. Just watch out for changes referring to settlements. Swipe left to continue.",
+      "post_wrong": "Oh no. Not all changes refer to new settlements, some are just related to agriculture or vegetation."
+    },
+    "no_changes_2": {
+      "pre": "We might spot changes in the vegetation for this imagery pair, but no changes related to settlements. Again, *SWIPE LEFT*.",
+      "post_correct": "Cool. You got it. Just look out for changes concerning settlements.",
+      "post_wrong": "Sorry, try again. Don't be distracted by changes in vegetation, just look out for settlements."
+    },
+    "maybe_1": {
+      "pre": "Sometimes it might be unclear if settlements emerged. Swipe down if you are not sure.",
+      "post_correct": "Great. We cannot really tell if the building at the bottom left is a new settlement. This is a 'maybe'.",
+      "post_wrong": "Are you really sure? Sometimes it's better to mark the imagery as 'not sure'."
+    },
+    "bad_imagery_1": {
+      "pre": "Swipe up to indicate if there is no imagery or if there are clouds.",
+      "post_correct": "That's right, that image was way too cloudy to make a good assessment!",
+      "post_wrong": "It there is no imagery or clouds, we cannot tell the right answer. Make sure to mark this as well by swiping up."
+    }
+  }
+}
diff --git a/mapswipe_workers/sample_data/change_detection_tutorial_tasks_bing.geojson b/mapswipe_workers/sample_data/change_detection_tutorial_tasks_bing.geojson
@@ -0,0 +1,13 @@
+{
+"type": "FeatureCollection",
+"name": "change_detection_tutorial_tasks_18",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 1, "id": 1, "category": "changes_1", "TileX": 146136, "TileY": 126866 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.687255859375, 5.76630318845997 ], [ 20.6886291503906, 5.76630318845997 ], [ 20.6886291503906, 5.76493684469301 ], [ 20.687255859375, 5.76493684469301 ], [ 20.687255859375, 5.76630318845997 ] ] ] ] } },
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 1, "id": 1, "category": "changes_2", "TileX": 146138, "TileY": 126875 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.6900024414062, 5.75400597619731 ], [ 20.6913757324219, 5.75400597619731 ], [ 20.6913757324219, 5.75263960285187 ], [ 20.6900024414062, 5.75263960285187 ], [ 20.6900024414062, 5.75400597619731 ] ] ] ] } },
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 0, "id": 1, "category": "no_changes_1", "TileX": 146116, "TileY": 126871 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.6597900390625, 5.75947143673713 ], [ 20.6611633300781, 5.75947143673713 ], [ 20.6611633300781, 5.75810507652999 ], [ 20.6597900390625, 5.75810507652999 ], [ 20.6597900390625, 5.75947143673713 ] ] ] ] } },
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 0, "id": 1, "category": "no_changes_2", "TileX": 146121, "TileY": 126886 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.6666564941406, 5.73897568897884 ], [ 20.6680297851562, 5.73897568897884 ], [ 20.6680297851562, 5.7376092795666 ], [ 20.6666564941406, 5.7376092795666 ], [ 20.6666564941406, 5.73897568897884 ] ] ] ] } },
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 2, "id": 1, "category": "maybe_1", "TileX": 146127, "TileY": 126886 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.6748962402344, 5.73897568897884 ], [ 20.67626953125, 5.73897568897884 ], [ 20.67626953125, 5.7376092795666 ], [ 20.6748962402344, 5.7376092795666 ], [ 20.6748962402344, 5.73897568897884 ] ] ] ] } },
+{ "type": "Feature", "properties": { "TileZ": 18, "reference": 3, "id": 1, "category": "bad_imagery_1", "TileX": 146127, "TileY": 126888 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 20.6748962402344, 5.73624286688015 ], [ 20.67626953125, 5.73624286688015 ], [ 20.67626953125, 5.73487645092028 ], [ 20.6748962402344, 5.73487645092028 ], [ 20.6748962402344, 5.73624286688015 ] ] ] ] } }
+]
+}
