Skip to content

Full soil info isn't returned when FullSoil radius is specified #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ric394 merged 2 commits into from
Sep 12, 2025
Merged

Full soil info isn't returned when FullSoil radius is specified #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ff6cb8
Fix to ensure full soil contents are returned when FullSoil is specif…
hol353 Sep 12, 2025
0c0f06a
Merge branch 'master' of https://github.com/APSIMInitiative/APSoil in…
hol353 Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions API/Services/SoilServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ public static SoilsFromDb Search(SoilDbContext context, string name = null, stri
// the query to be done in SQL (rather than needing a 'Difference' function).
IEnumerable<Models.Soil> soilsInMemory = soils.Include(s => s.Water)
.Include(s => s.Water.SoilCrops)
.Include(s => s.SoilOrganicMatter)
.Include(s => s.SoilWater)
.Include(s => s.Analysis)
.ToList();

if (!double.IsNaN(latitude) && !double.IsNaN(longitude))
Expand Down
8 changes: 6 additions & 2 deletions Tests/UnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,22 @@ public void GetWithLatLongRadius_ShouldReturnSoilsWithinTheRadius()
ResourceFile.FromResourceXML<API.Models.Soil>("Tests.testsoil2.xml")
]);

var soils = API.Services.Soil.Search(context, latitude:-28, longitude: 150, radius: 100)
var soils = API.Services.Soil.Search(context, latitude: -28, longitude: 150, radius: 100)
.ToSoils();

Assert.That(soils.Length, Is.EqualTo(1));
Assert.That(soils[0].Name, Is.EqualTo("Red Chromosol (Billa Billa No066)"));

// Extend the radius to cover the second soil (New Zealand)
soils = API.Services.Soil.Search(context, latitude:-28, longitude: 150, radius: 2500)
soils = API.Services.Soil.Search(context, latitude: -28, longitude: 150, radius: 2500)
.ToSoils();
Assert.That(soils.Length, Is.EqualTo(2));
Assert.That(soils[0].Name, Is.EqualTo("Red Chromosol (Billa Billa No066)"));
Assert.That(soils[1].Name, Is.EqualTo("Clay (Kerikeri No1353)"));
Assert.That(soils[0].SoilOrganicMatter, Is.Not.Null);
Assert.That(soils[0].Analysis, Is.Not.Null);
Assert.That(soils[0].SoilWater, Is.Not.Null);
Assert.That(soils[0].Water, Is.Not.Null);
}

[Test]
Expand Down