update to main

wri · Jun 3, 2024 · 1bac7af · 1bac7af
2 parents d053023 + 5217fc0
commit 1bac7af
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 3 deletions.
diff --git a/city_metrix/layers/__init__.py b/city_metrix/layers/__init__.py
@@ -15,3 +15,4 @@
 from .average_net_building_height import AverageNetBuildingHeight
 from .open_buildings import OpenBuildings
 from .tree_canopy_height import TreeCanopyHeight
+from .alos_dsm import AlosDSM
diff --git a/city_metrix/layers/alos_dsm.py b/city_metrix/layers/alos_dsm.py
@@ -0,0 +1,21 @@
+import ee
+import xee
+import xarray as xr
+
+from .layer import Layer, get_image_collection
+
+
+class AlosDSM(Layer):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+    def get_data(self, bbox):
+        dataset = ee.ImageCollection("JAXA/ALOS/AW3D30/V3_2")
+        alos_dsm = ee.ImageCollection(dataset
+                                      .filterBounds(ee.Geometry.BBox(*bbox))
+                                      .select('DSM')
+                                      .mean()
+                                      )
+        data = get_image_collection(alos_dsm, bbox, 30, "ALOS DSM").DSM
+
+        return data
diff --git a/notebooks/tutorial/get layers.ipynb b/notebooks/tutorial/get layers.ipynb
diff --git a/tests/layers.py b/tests/layers.py
@@ -1,6 +1,6 @@
 import ee
 
-from city_metrix.layers import LandsatCollection2, Albedo, LandSurfaceTemperature, EsaWorldCover, EsaWorldCoverClass, TreeCover, AverageNetBuildingHeight, OpenStreetMap, OpenStreetMapClass, UrbanLandUse, OpenBuildings, TreeCanopyHeight, SmartSurfaceLULC
+from city_metrix.layers import LandsatCollection2, Albedo, LandSurfaceTemperature, EsaWorldCover, EsaWorldCoverClass, TreeCover, AverageNetBuildingHeight, OpenStreetMap, OpenStreetMapClass, UrbanLandUse, OpenBuildings, TreeCanopyHeight, AlosDSM, SmartSurfaceLULC
 from city_metrix.layers.layer import get_image_collection
 from .conftest import MockLayer, MockMaskLayer, ZONES, LARGE_ZONES, MockLargeLayer, MockGroupByLayer, \
     MockLargeGroupByLayer
@@ -104,6 +104,11 @@ def test_openbuildings():
 def test_tree_canopy_hight():
     count = TreeCanopyHeight().get_data(SAMPLE_BBOX).count()
     assert count
+
+def test_AlosDSM():
+    mean = AlosDSM().get_data(SAMPLE_BBOX).mean()
+    assert mean
+
 
 def test_smart_surface_lulc():
     count = SmartSurfaceLULC().get_data(SAMPLE_BBOX).count()