Skip to content

Commit 35dff1d

Browse files
author
Moreno
committed
getSoilAtLocation returns modified to pass tests
1 parent 64b7354 commit 35dff1d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

famodel/project.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,19 +1307,23 @@ def getSoilAtLocation(self, x, y):
13071307

13081308
if self.soil_mode == 'uniform':
13091309
soil_info = self.soilProps[soil_id]
1310-
if not hasattr(self, 'profile_map') or not self.profile_map:
1310+
if not self.profile_map:
13111311
self.convertUniformToLayered(default_layer=50.0)
13121312

13131313
# Replace with a single entry corresponding to this soil_id
13141314
self.profile_map = [
13151315
next(e for e in self.profile_map if e['name'] == str(soil_id))]
13161316
self.profile_map[0]['layers']
13171317

1318+
return soil_id, soil_info
1319+
13181320
elif self.soil_mode == 'layered':
13191321
layers = self.soilProps[soil_id] # list of layer dicts
13201322
profile_entry = {'name': str(soil_id), 'layers': layers}
13211323
self.profile_map.append(profile_entry)
13221324

1325+
return soil_id, layers
1326+
13231327
else:
13241328
raise ValueError(f"Unknown soil_mode: {self.soil_mode}")
13251329

0 commit comments

Comments
 (0)