Skip to content
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.

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

[13pt] PR: Modifying OSM bridge scripts #1298

Merged
merged 14 commits into from
Oct 11, 2024
Merged

[13pt] PR: Modifying OSM bridge scripts #1298

merged 14 commits into from
Oct 11, 2024

Conversation

ZahraGhahremani
Copy link
Contributor

@ZahraGhahremani ZahraGhahremani commented Sep 19, 2024

This PR addresses three issues regarding OSM bridges. It dissolves touching bridge lines so each bridge has a single linestring. It also removes abandoned bridge from the dataset and it adds bridge type field to bridge centroids. As part of this PR, max_hand_ft and max_discharge_cfs columns are added to osm_bridge_centroids.gkpg.
The pre-clip and osm bridges were updated following changes in this PR.

Changes

  • data/bridges/pull_osm_bridges.py
  • src/heal_bridges_osm.py
  • src/bash_variables.env

Deployment Plan (For developer use)

How does the changes affect the product?

  • Code only?
  • If applicable, has a deployment plan be created with the deployment person/team?
  • Require new or adjusted data inputs? Does it have start, end and duration code (in UTC)?
  • If new or updated data sets, has the FIM code been updated and tested with the new/adjusted data (subset is fine, but must be a subset of the new data)?
  • Require new pre-clip set?
  • Has new or updated python packages?

Update: Oct 7th:

  • Zahra has already run new pre-clips for CONUS and will run pre-clips for Alaska as part of her testing.
  • When she is done, she will tell me (Rob) so I can copy it to the 4 other environments before merging.
    (S3, ESIP, Dev1, UCS2)

Issuer Checklist (For developer use)

You may update this checklist before and/or after creating the PR. If you're unsure about any of them, please ask, we're here to help! These items are what we are going to look for before merging your code.

  • Informative and human-readable title, using the format: [_pt] PR: <description>
  • Links are provided if this PR resolves an issue, or depends on another other PR
  • If submitting a PR to the dev branch (the default branch), you have a descriptive Feature Branch name using the format: dev-<description-of-change> (e.g. dev-revise-levee-masking)
  • Changes are limited to a single goal (no scope creep)
  • The feature branch you're submitting as a PR is up to date (merged) with the latest dev branch
  • pre-commit hooks were run locally
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • CHANGELOG updated with template version number, e.g. 4.x.x.x
  • Add yourself as an assignee in the PR as well as the FIM Technical Lead

Merge Checklist (For Technical Lead use only)

  • Update CHANGELOG with latest version number and merge date
  • Update the Citation.cff file to reflect the latest version number in the CHANGELOG
  • If applicable, update README with major alterations

ZahraGhahremani added 2 commits September 26, 2024 21:37
Merge remote-tracking branch 'origin/dev' into dev-osm-bridge
@ZahraGhahremani ZahraGhahremani changed the title modified osm bridge scripts [13pt] PR: Modifying OSM bridge scripts Sep 26, 2024
@ZahraGhahremani ZahraGhahremani marked this pull request as ready for review September 26, 2024 22:00
@ZahraGhahremani ZahraGhahremani added the enhancement New feature or request label Sep 26, 2024
@ZahraGhahremani
Copy link
Contributor Author

Using dissolve function to merge touching lines works well for addressing #1147, however, it also combines some bridges that should not be considered as a single bridge based on the current dev version and simplify technique.

HUC 05030101 (Lat 40.5126 N, long: 80.1354 W):
image

@ZahraGhahremani
Copy link
Contributor Author

Example of abandoned bridges that is dropped in this feature branch:

Churchville, NY in HUC 04130003:
image

image

@CarsonPruitt-NOAA
Copy link
Collaborator

Awesome work, Zahra. Can you add to the description that you fixed several HUCs that had no bridges because of the duplicate columns?

@ZahraGhahremani
Copy link
Contributor Author

Thanks, Carson! I also added a line to convert polygon outputs into linestrings to be consistent with the previous version.

ZahraGhahremani and others added 2 commits October 3, 2024 20:44
@RobHanna-NOAA
Copy link
Contributor

New pre-clips loaded into Dev1, UCS2, FIM S3. I will do ESIP later this week.

RobHanna-NOAA
RobHanna-NOAA previously approved these changes Oct 11, 2024
@CarsonPruitt-NOAA CarsonPruitt-NOAA merged commit 42b75d2 into dev Oct 11, 2024
1 check passed
@CarsonPruitt-NOAA CarsonPruitt-NOAA deleted the dev-osm-bridge branch October 11, 2024 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
4 participants