Spaces:
Runtime error
Runtime error
Update helpers/functional.py
Browse files- helpers/functional.py +7 -4
helpers/functional.py
CHANGED
@@ -66,7 +66,7 @@ def cell2row(grid_string, meta_df, return_row = False):
|
|
66 |
else:
|
67 |
return None
|
68 |
|
69 |
-
def map_to_image(map, return_centre=False, l2a=True):
|
70 |
|
71 |
# 1. get bounds
|
72 |
bbox = map.get_bbox()
|
@@ -81,13 +81,16 @@ def map_to_image(map, return_centre=False, l2a=True):
|
|
81 |
|
82 |
if row is not None:
|
83 |
parquet_url, parquet_row, meta_row = row
|
|
|
84 |
img = row2image(parquet_url, parquet_row)
|
85 |
# 4. acquire image # X. update map
|
86 |
lat, lon = meta_row.centre_lat.item(), meta_row.centre_lon.item()
|
87 |
|
|
|
88 |
if return_centre:
|
89 |
-
|
90 |
-
|
91 |
-
|
|
|
92 |
else:
|
93 |
return None
|
|
|
66 |
else:
|
67 |
return None
|
68 |
|
69 |
+
def map_to_image(map, return_centre=False, return_gridcell=False, l2a=True):
|
70 |
|
71 |
# 1. get bounds
|
72 |
bbox = map.get_bbox()
|
|
|
81 |
|
82 |
if row is not None:
|
83 |
parquet_url, parquet_row, meta_row = row
|
84 |
+
print(meta_row)
|
85 |
img = row2image(parquet_url, parquet_row)
|
86 |
# 4. acquire image # X. update map
|
87 |
lat, lon = meta_row.centre_lat.item(), meta_row.centre_lon.item()
|
88 |
|
89 |
+
ret = [img]
|
90 |
if return_centre:
|
91 |
+
ret.append((lat,lon))
|
92 |
+
if return_gridcell:
|
93 |
+
ret.append(meta_row.grid_cell.item())
|
94 |
+
return ret
|
95 |
else:
|
96 |
return None
|