Skip to content

Checking for elevationUnits changes during patch. #1199

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
rma-rripken merged 2 commits into from
Jul 29, 2025
Merged

Checking for elevationUnits changes during patch. #1199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1922f15
Checking for elevationUnits changes during patch.
rma-rripken Jul 28, 2025
56a3c3f
Merge branch 'develop' into feature/1192_location_elevation_units
rma-rripken Jul 29, 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 cwms-data-api/src/main/java/cwms/cda/api/LocationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ private Location getUpdatedLocation(Location existingLocation, Location updatedL
? existingLocation.getVerticalDatum() : updatedLocation.getVerticalDatum();
Double updatedElevation = updatedLocation.getElevation() == null
? existingLocation.getElevation() : updatedLocation.getElevation();
String updatedElevationUnits = updatedLocation.getElevationUnits() == null
? existingLocation.getElevationUnits() : updatedLocation.getElevationUnits();
String updatedMapLabel = updatedLocation.getMapLabel() == null
? existingLocation.getMapLabel() : updatedLocation.getMapLabel();
String updatedBoundingOfficeId = updatedLocation.getBoundingOfficeId() == null
Expand All @@ -521,6 +523,7 @@ private Location getUpdatedLocation(Location existingLocation, Location updatedL
.withPublishedLatitude(updatedPublishedLatitude)
.withVerticalDatum(updatedVerticalDatum)
.withElevation(updatedElevation)
.withElevationUnits(updatedElevationUnits)
.withMapLabel(updatedMapLabel)
.withBoundingOfficeId(updatedBoundingOfficeId)
.build();
Expand Down
Loading