Skip to content

Commit d8d71d3

Browse files
committed
better typing for arbitrary geometry tutorial
1 parent fcf6a3b commit d8d71d3

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/grouping_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def group_input_geometries(input_geometries_file, group_size):
7979
center_y = feature.GetFieldAsDouble("center_y")
8080
groups[group_id_string]["center_points"].append([center_x, center_y])
8181
except: # noqa
82-
groups[group_id_string]["center_points"].append([])
82+
groups[group_id_string]["center_points"].append(None)
8383

8484
# this is relevant for the tutorial
8585
try:

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/task.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Dict, List
1+
from typing import Any, Dict, List, Optional
22

33
from osgeo import ogr
44

@@ -9,11 +9,11 @@ class Task(BaseTask):
99
def __init__(
1010
self,
1111
group: object,
12-
featureId: int,
12+
featureId: Any[int, str],
1313
featureGeometry: Dict,
14-
center: List,
15-
reference: int,
16-
screen: int,
14+
center: Optional[List[float, float]],
15+
reference: Optional[int],
16+
screen: Optional[int],
1717
):
1818
"""
1919
Parameters
@@ -28,10 +28,12 @@ def __init__(
2828
super().__init__(group, taskId=task_id)
2929
self.geojson = featureGeometry
3030

31-
if center is not None:
31+
# only tasks that use Google tile map service need this
32+
if center:
3233
self.center = center
3334

34-
if screen is not None:
35+
# only tasks that are part of a tutorial need this
36+
if screen:
3537
self.screen = screen
3638
self.reference = reference
3739

@@ -41,6 +43,7 @@ def __init__(
4143

4244
# create wkt geometry from geojson
4345
# this geometry will be stored in postgres
46+
# it will be remove before storing the data in firebase
4447
poly = ogr.CreateGeometryFromJson(str(featureGeometry))
4548
wkt_geometry = poly.ExportToWkt()
4649
self.geometry = wkt_geometry

0 commit comments

Comments
 (0)