Added bilinear functionality for Albedo, DSM, and DEM

wri · Dec 18, 2024 · 7a4012d · 7a4012d
1 parent fbc5a58
commit 7a4012d
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 7 deletions.
diff --git a/city_metrix/layers/albedo.py b/city_metrix/layers/albedo.py
@@ -1,6 +1,6 @@
 import ee
 
-from .layer import Layer, get_image_collection
+from .layer import Layer, get_image_collection, set_bilinear_resampling
 
 class Albedo(Layer):
     """
@@ -115,7 +115,10 @@ def calc_s2_albedo(image):
         ## S2 MOSAIC AND ALBEDO
         dataset = get_masked_s2_collection(ee.Geometry.BBox(*bbox), self.start_date, self.end_date)
         s2_albedo = dataset.map(calc_s2_albedo)
-        albedo_mean = s2_albedo.reduce(ee.Reducer.mean())
+        albedo_mean = (s2_albedo
+                       .map(set_bilinear_resampling)
+                       .reduce(ee.Reducer.mean())
+                       )
 
         albedo_mean_ic = ee.ImageCollection(albedo_mean)
         data = get_image_collection(

diff --git a/city_metrix/layers/alos_dsm.py b/city_metrix/layers/alos_dsm.py
@@ -1,6 +1,6 @@
 import ee
 
-from .layer import Layer, get_image_collection
+from .layer import Layer, get_image_collection, set_bilinear_resampling
 
 
 class AlosDSM(Layer):
@@ -18,6 +18,7 @@ def get_data(self, bbox):
 
         alos_dsm_ic = ee.ImageCollection(alos_dsm
                                          .filterBounds(ee.Geometry.BBox(*bbox))
+                                         .map(set_bilinear_resampling)
                                          .select('DSM')
                                          .mean()
                                          )

diff --git a/city_metrix/layers/layer.py b/city_metrix/layers/layer.py
@@ -323,6 +323,20 @@ def get_stats_funcs(stats_func):
         return [stats_func]
 
 
+def set_bilinear_resampling(data):
+    if isinstance(data, ee.ImageCollection):
+        resampled = data.map(_assign_bilinear_interpolation)
+    else:
+        resampled = data.resample('bilinear')
+
+    return resampled
+
+
+def _assign_bilinear_interpolation(dataset):
+    data = dataset.resample('bilinear')
+    return data
+
+
 def get_image_collection(
         image_collection: ImageCollection,
         bbox: Tuple[float],

diff --git a/city_metrix/layers/nasa_dem.py b/city_metrix/layers/nasa_dem.py
@@ -1,6 +1,6 @@
 import ee
 
-from .layer import Layer, get_image_collection
+from .layer import Layer, get_image_collection, set_bilinear_resampling
 
 
 class NasaDEM(Layer):
@@ -18,6 +18,7 @@ def get_data(self, bbox):
 
         nasa_dem_elev = (ee.ImageCollection(nasa_dem)
                          .filterBounds(ee.Geometry.BBox(*bbox))
+                         .map(set_bilinear_resampling)
                          .select('elevation')
                          .mean()
                          )

diff --git a/tests/resources/bbox_constants.py b/tests/resources/bbox_constants.py
@@ -24,3 +24,7 @@
     -38.39993,-12.93239
 )
 
+BBOX_NLD_AMSTERDAM_TEST = (
+    4.9012,52.3720,
+    4.9083,52.3752
+)
diff --git a/...r_dumps_for_br_lauro_de_freitas/README.md → tests/resources/layer_dumps/README.md b/...r_dumps_for_br_lauro_de_freitas/README.md → tests/resources/layer_dumps/README.md
diff --git a/...dumps_for_br_lauro_de_freitas/__init__.py → tests/resources/layer_dumps/__init__.py b/...dumps_for_br_lauro_de_freitas/__init__.py → tests/resources/layer_dumps/__init__.py
diff --git a/...dumps_for_br_lauro_de_freitas/conftest.py → tests/resources/layer_dumps/conftest.py b/...dumps_for_br_lauro_de_freitas/conftest.py → tests/resources/layer_dumps/conftest.py
@@ -4,7 +4,7 @@
 import shutil
 from collections import namedtuple
 
-from tests.resources.bbox_constants import BBOX_BRA_LAURO_DE_FREITAS_1
+from tests.resources.bbox_constants import BBOX_BRA_LAURO_DE_FREITAS_1, BBOX_NLD_AMSTERDAM_TEST
 from tests.tools.general_tools import create_target_folder, is_valid_path
 
 # RUN_DUMPS is the master control for whether the writes and tests are executed
@@ -18,7 +18,8 @@
 
 # Both the tests and QGIS file are implemented for the same bounding box in Brazil.
 COUNTRY_CODE_FOR_BBOX = 'BRA'
-BBOX = BBOX_BRA_LAURO_DE_FREITAS_1
+# BBOX = BBOX_BRA_LAURO_DE_FREITAS_1
+BBOX = BBOX_NLD_AMSTERDAM_TEST
 
 # Specify None to write to a temporary default folder otherwise specify a valid custom target path.
 CUSTOM_DUMP_DIRECTORY = None

diff --git a/...lauro_de_freitas/test_write_all_layers.py → ...rces/layer_dumps/test_write_all_layers.py b/...lauro_de_freitas/test_write_all_layers.py → ...rces/layer_dumps/test_write_all_layers.py
diff --git a/...uro_de_freitas/test_write_layers_other.py → ...es/layer_dumps/test_write_layers_other.py b/...uro_de_freitas/test_write_layers_other.py → ...es/layer_dumps/test_write_layers_other.py
diff --git a/...st_write_layers_using_fixed_resolution.py → ...st_write_layers_using_fixed_resolution.py b/...st_write_layers_using_fixed_resolution.py → ...st_write_layers_using_fixed_resolution.py
@@ -3,7 +3,7 @@
 import pytest
 
 from city_metrix.layers import *
-from .conftest import RUN_DUMPS, prep_output_path, verify_file_is_populated, get_file_count_in_folder
+from .conftest import RUN_DUMPS, prep_output_path, verify_file_is_populated
 
 TARGET_RESOLUTION = 5