add numpy

wri · Jan 17, 2025 · 11b40cb · 11b40cb
1 parent 4573de1
commit 11b40cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/city_metrix/layers/riparian_areas.py b/city_metrix/layers/riparian_areas.py
@@ -25,8 +25,7 @@ def __init__(self, spatial_resolution=30, river_head=1000, thresh=0, **kwargs):
 
     def get_data(self, bbox):
         # read HAND data to generate drainage paths
-        hand = HeightAboveNearestDrainage(
-            spatial_resolution=self.spatial_resolution, river_head=self.river_head, thresh=self.thresh).get_data(bbox)
+        hand = HeightAboveNearestDrainage(spatial_resolution=self.spatial_resolution, river_head=self.river_head, thresh=self.thresh).get_data(bbox)
 
         # Read surface water occurance
         water = ee.Image('JRC/GSW1_3/GlobalSurfaceWater').select(['occurrence']).gte(50)
@@ -37,7 +36,7 @@ def get_data(self, bbox):
             "water"
         ).occurrence
 
-        combWater = xr.ufuncs.maximum(hand.fillna(0), water_da.fillna(0)) > 0
+        combWater = np.maximum(hand.fillna(0), water_da.fillna(0)) > 0
         combWater = combWater.fillna(False)
 
         # Buffer waterways by riparian zone definitions

diff --git a/environment.yml b/environment.yml
@@ -29,5 +29,6 @@ dependencies:
   - exactextract=0.2.0
   - cfgrib=0.9.15.0
   - scipy=1.13.1
+  - numpy=1.23.0
   - pip:
       - overturemaps==0.6.0
diff --git a/setup.py b/setup.py
@@ -29,6 +29,7 @@
         "scikit-image>=0.24.0",
         "exactextract>=0.2.0",
         "cfgrib",
-        "scipy"
+        "scipy",
+        "numpy"
     ],
 )