mikonvergence commited on
Commit
d54265f
·
verified ·
1 Parent(s): 8cc8f31

Update helpers/functional.py

Browse files
Files changed (1) hide show
  1. helpers/functional.py +13 -5
helpers/functional.py CHANGED
@@ -8,14 +8,21 @@ import os
8
  from PIL import Image
9
 
10
  # GLOBAL VARIABLES
11
- if os.path.isfile('metadata.parquet'):
12
- meta_path = 'metadata.parquet'
13
  else:
14
  DATASET_NAME = 'Major-TOM/Core-S2L2A'
15
- meta_path = 'https://huggingface.co/datasets/{}/resolve/main/metadata.parquet'.format(DATASET_NAME)
 
 
 
 
 
 
16
 
17
  grid = Grid(10, latitude_range=(-90,90), longitude_range=(-180,180))
18
- df = pd.read_parquet(meta_path)
 
19
 
20
  # HELPER FUNCTIONS
21
  def gridcell2ints(grid_string):
@@ -59,7 +66,7 @@ def cell2row(grid_string, meta_df, return_row = False):
59
  else:
60
  return None
61
 
62
- def map_to_image(map, return_centre=False):
63
 
64
  # 1. get bounds
65
  bbox = map.get_bbox()
@@ -69,6 +76,7 @@ def map_to_image(map, return_centre=False):
69
  rows, cols = grid.latlon2rowcol([center[0]], [center[1]])
70
 
71
  # 3. translate major-tom cell to row in parquet
 
72
  row = cell2row("{}_{}".format(rows[0],cols[0]), df, return_row = True)
73
 
74
  if row is not None:
 
8
  from PIL import Image
9
 
10
  # GLOBAL VARIABLES
11
+ if os.path.isfile('helpers/s2l2a_metadata.parquet'):
12
+ l2a_meta_path = 'helpers/s2l2a_metadata.parquet'
13
  else:
14
  DATASET_NAME = 'Major-TOM/Core-S2L2A'
15
+ l2a_meta_path = 'https://huggingface.co/datasets/{}/resolve/main/metadata.parquet'.format(DATASET_NAME)
16
+
17
+ if os.path.isfile('helpers/s2l1c_metadata.parquet'):
18
+ l1c_meta_path = 'helpers/s2l1c_metadata.parquet'
19
+ else:
20
+ DATASET_NAME = 'Major-TOM/Core-S2L1C'
21
+ l1c_meta_path = 'https://huggingface.co/datasets/{}/resolve/main/metadata.parquet'.format(DATASET_NAME)
22
 
23
  grid = Grid(10, latitude_range=(-90,90), longitude_range=(-180,180))
24
+ l2a_df = pd.read_parquet(l2a_meta_path)
25
+ l1c_df = pd.read_parquet(l1c_meta_path)
26
 
27
  # HELPER FUNCTIONS
28
  def gridcell2ints(grid_string):
 
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()
 
76
  rows, cols = grid.latlon2rowcol([center[0]], [center[1]])
77
 
78
  # 3. translate major-tom cell to row in parquet
79
+ df = l2a_df if l2a else l1c_df
80
  row = cell2row("{}_{}".format(rows[0],cols[0]), df, return_row = True)
81
 
82
  if row is not None: