fix: data from deleted depth intervals should not be sent to the soil id algorithm #2912
+655
−290
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knipec
force-pushed
the
fix/delete-depth
branch
from
6a29b93 to
fff92c8
Compare
Co-authored-by: Paul Schreiber <[email protected]>
shrouxm
approved these changes
Feb 26, 2025
| @@ -0,0 +1,257 @@ | |||
| /* | |||
Comment on lines
+335
to
342
| const getSoilDataForSite = ( | ||
| siteId: string, | ||
| soilData: Record<string, SoilData | undefined>, | ||
| ) => soilData[siteId] ?? DEFAULT_SOIL_DATA; | ||
|
|
||
| export const selectSoilData = (siteId: string) => (state: AppState) => | ||
| getSoilDataForSite(siteId, state.soilData.soilData); | ||
|
|
There was a problem hiding this comment.
question: is there any situation where we want to use the naive getSoilData/selectSoilData? if not, would it make more sense to instead name these getRawSoilData or something similar, and name the getVisible ones just get if they're the default that we always want to be using everywhere? recognizing this is probably a pain in the butt to refactor 🙃
Comment on lines
+373
to
+408
| ...projectOrPresetIntervals.map(interval => { | ||
| const existingInterval = effectiveSoilData.depthIntervals.find( | ||
| sameDepth(interval), | ||
| ); | ||
| const enabledInputs = fromEntries( | ||
| soilPitMethods.map(method => [ | ||
| methodEnabled(method), | ||
| effectiveProjectSettings?.[methodRequired(method)] || | ||
| (existingInterval?.[methodEnabled(method)] ?? | ||
| (!effectiveProjectSettings && | ||
| DEFAULT_ENABLED_SOIL_PIT_METHODS.includes(method))), | ||
| ]), | ||
| ); | ||
| return { | ||
| isFromPreset: true, | ||
| interval: { | ||
| ...enabledInputs, | ||
| ...interval, | ||
| }, | ||
| }; | ||
| }), | ||
| ...effectiveSoilData.depthIntervals | ||
| .filter(interval => !projectOrPresetIntervals.some(overlaps(interval))) | ||
| .map(interval => ({ | ||
| isFromPreset: false, | ||
| interval: { | ||
| ...interval, | ||
| ...fromEntries( | ||
| soilPitMethods.map(method => [ | ||
| methodEnabled(method), | ||
| interval?.[methodEnabled(method)] ?? | ||
| DEFAULT_ENABLED_SOIL_PIT_METHODS.includes(method), | ||
| ]), | ||
| ), | ||
| }, | ||
| })), |
There was a problem hiding this comment.
comment: recognizing that i'm the one who created this monstrosity... wow this is hard to parse!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Product code:
selectNextDataBasedInputs, which is what creates the input data sent to the soil id algorithm, would send all depthDependentData as input data.getVisibleDepthIntervalsAfterNormalizingis. Taking suggestions for better names and if there are ways to make this cleaner.Tests:
getVisibleSoilDataForSiteselectNextDataBasedInputsRelated Issues
Fixes #2875
There will also be a backend change for editing depth intervals
Verification steps
In dev environment:
sudo tcpdump -i lo0 port 8000 -Ato see what inputs get sent when we push soil data, and what we use to query for soil id matches