Repository navigation
Keep layer names clear of the pump label in the borewell drawing - #66
Merged
Merged
Conversation
A pump lowered to the middle of a layer had its label drawn over the layer's name. Layer names now step around the pump label the same way they do the water label, on screen and for the thin-layer names written beside the drawing in print.
# Conflicts: # app/src/components/geology/BorewellProfile.tsx
This file contains hidden or 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
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.
Problem
In the on-screen borewell drawing, a pump lowered to the middle of a layer had its "Pump … ft" label drawn on top of that layer's name, so neither could be read. Example: Sand 135–175 ft, water at 108 ft, pump lowered to 158 ft.
Layer names already stepped above or below the "Water … ft" label, but nothing knew about the pump label.
Change
BorewellProfile.tsx: layer names now step around both fixed labels (water and pump) with the same rule that was used for water alone. The pump and water labels stay where they are, next to their markers.Print/PDF variant: names written on the layers were never affected (they sit inside the layer column). Only the names of layers too thin to write on, which go beside the drawing, could land on the pump label; those now move below it, as they already did for the water label.
Check
One new end-to-end check: a borewell with Sand 135–175, water 108, pump 158 is opened and no two labels beside the drawing may be closer than a line of text.
covered: ["Sand 135–175 / Pump 158 ft"]Typecheck and lint pass.