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.

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

RnR Domain Hotfix #596

Merged
merged 2 commits into from
Dec 12, 2023
Merged

RnR Domain Hotfix #596

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
2b8cfe7
Fixes viz issue with RnR threshold association
shawncrawley Nov 30, 2023
bdacf1d
Converts RnR back to stage to get status if needed
shawncrawley Dec 1, 2023
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
4 changes: 2 additions & 2 deletions Core/LAMBDA/rnr_functions/rnr_domain_generator/sql/domain.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ flow_fcsts_from_rating_curve AS (
JOIN rnr.staggered_curves curve
ON curve.rating_id = rating.rating_id
AND (curve.stage = f.value
OR (curve.stage > f.value
AND curve.next_higher_point_stage < f.value))
OR (curve.stage < f.value
AND curve.next_higher_point_stage > f.value))
),

all_flow_forecasts AS (
Expand Down
91 changes: 67 additions & 24 deletions ...functions/viz_db_postprocess_sql/products/replace_route/rfc_based_5day_max_streamflow.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ max_flows_station_xwalk AS (
SELECT
mf.feature_id,
xwalk.nws_station_id,
xwalk.gage_id,
station.rfc_defined_fcst_point,
mf.reference_time,
mf.time_of_max,
Expand All @@ -30,45 +31,77 @@ max_flows_station_xwalk AS (
ON station.nws_station_id = xwalk.nws_station_id
),

usgs_threshold AS (
max_flows_station_xwalk_with_rc_stage AS (
SELECT
main.*,
ROUND((curve.stage + ((curve.next_higher_point_stage - curve.stage) / (curve.next_higher_point_flow - curve.flow) * (main.streamflow - curve.flow)))::numeric, 2) as stage_from_curve
FROM max_flows_station_xwalk main
LEFT JOIN external.rating rating
ON rating.location_id = main.gage_id
LEFT JOIN rnr.staggered_curves curve
ON curve.rating_id = rating.rating_id
AND (curve.flow = main.streamflow
OR (curve.flow < main.streamflow
AND curve.next_higher_point_flow > main.streamflow))
),

native_threshold AS (
SELECT DISTINCT ON (location_id)
location_id as nws_station_id,
rating_source,
action_stage,
minor_stage,
moderate_stage,
major_stage,
record_stage,
action_flow,
minor_flow,
moderate_flow,
major_flow,
record_flow
FROM external.threshold
WHERE rating_source = 'NONE'
), usgs_threshold AS (
SELECT DISTINCT ON (location_id)
location_id as nws_station_id,
rating_source,
action_stage,
minor_stage,
moderate_stage,
major_stage,
record_stage,
action_flow_calc as action_flow,
minor_flow_calc as minor_flow,
moderate_flow_calc as moderate_flow,
major_flow_calc as major_flow
major_flow_calc as major_flow,
record_flow_calc as record_flow
FROM external.threshold
WHERE rating_source = 'USGS Rating Depot' AND location_id IN (SELECT nws_station_id FROM max_flows_station_xwalk)
WHERE rating_source = 'USGS Rating Depot' AND location_id NOT IN (SELECT nws_station_id FROM native_threshold)
), nrldb_threshold AS (
SELECT DISTINCT ON (location_id)
location_id as nws_station_id,
rating_source,
action_stage,
minor_stage,
moderate_stage,
major_stage,
record_stage,
action_flow_calc as action_flow,
minor_flow_calc as minor_flow,
moderate_flow_calc as moderate_flow,
major_flow_calc as major_flow
FROM external.threshold
WHERE rating_source = 'NRLDB' AND location_id IN (SELECT nws_station_id FROM max_flows_station_xwalk) AND location_id NOT IN (SELECT nws_station_id FROM usgs_threshold)
), native_threshold AS (
SELECT DISTINCT ON (location_id)
location_id as nws_station_id,
rating_source,
action_flow,
minor_flow,
moderate_flow,
major_flow
major_flow_calc as major_flow,
record_flow_calc as record_flow
FROM external.threshold
WHERE rating_source = 'NONE' AND location_id IN (SELECT nws_station_id FROM max_flows_station_xwalk) AND location_id NOT IN (SELECT nws_station_id FROM usgs_threshold UNION SELECT nws_station_id FROM nrldb_threshold)
WHERE rating_source = 'NRLDB' AND location_id NOT IN (SELECT nws_station_id FROM native_threshold UNION SELECT nws_station_id FROM usgs_threshold)
), threshold AS (
SELECT * FROM native_threshold
UNION
SELECT * FROM usgs_threshold
UNION
SELECT * FROM nrldb_threshold
UNION
SELECT * FROM native_threshold
),

fcst AS (
fcst_meta AS (
SELECT DISTINCT ON (lid, product_time)
lid,
product_time as issue_time
Expand All @@ -84,28 +117,38 @@ root_status_trace_reaches AS (
stream_order,
stream_length,
is_waterbody,
issue_time,
fcst_meta.issue_time,
rating_source,
CASE
WHEN rfc_defined_fcst_point AND issue_time IS NULL
WHEN rfc_defined_fcst_point AND fcst_meta.issue_time IS NULL
THEN 'No Forecast'
WHEN major_flow IS NOT NULL AND streamflow > major_flow
THEN 'Major'
WHEN major_stage IS NOT NULL AND stage_from_curve > major_stage
THEN 'Major'
WHEN moderate_flow IS NOT NULL AND streamflow > moderate_flow
THEN 'Moderate'
WHEN moderate_stage IS NOT NULL AND stage_from_curve > moderate_stage
THEN 'Moderate'
WHEN minor_flow IS NOT NULL AND streamflow > minor_flow
THEN 'Minor'
WHEN minor_stage IS NOT NULL AND stage_from_curve > minor_stage
THEN 'Minor'
WHEN action_flow IS NOT NULL AND streamflow > action_flow
THEN 'Action'
WHEN issue_time IS NOT NULL AND action_flow IS NULL AND minor_flow IS NULL AND moderate_flow IS NULL AND major_flow IS NULL
WHEN action_stage IS NOT NULL AND stage_from_curve > action_stage
THEN 'Action'
WHEN issue_time IS NOT NULL
AND action_flow IS NULL AND minor_flow IS NULL AND moderate_flow IS NULL AND major_flow IS NULL
AND action_stage IS NULL AND minor_stage IS NULL AND moderate_stage IS NULL AND major_stage IS NULL
THEN 'All Thresholds Undefined'
WHEN mf.nws_station_id IS NOT NULL
THEN 'No Flooding'
ELSE ''
END as max_status
FROM max_flows_station_xwalk mf
LEFT JOIN fcst
ON fcst.lid = mf.nws_station_id
FROM max_flows_station_xwalk_with_rc_stage mf
LEFT JOIN fcst_meta
ON fcst_meta.lid = mf.nws_station_id
LEFT JOIN threshold
ON threshold.nws_station_id = mf.nws_station_id
WHERE rfc_defined_fcst_point IS TRUE OR issue_time IS NOT NULL
Expand Down
16 changes: 9 additions & 7 deletions ...z_functions/viz_db_postprocess_sql/summaries/rfc_based_5day_max_streamflow/rfc_points.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
DROP TABLE IF EXISTS publish.rfc_based_5day_max_streamflow_rfc_points;
SELECT DISTINCT ON (ahps.nws_lid)
ahps.nws_lid,
usgs_sitecode,
nws_name,

SELECT DISTINCT ON (main.nws_station_id)
main.nws_station_id as nws_lid,
main.gage_id as usgs_sitecode,
station.name as nws_name,
to_char('1900-01-01 00:00:00'::timestamp without time zone, 'YYYY-MM-DD HH24:MI:SS UTC') AS reference_time,
ST_TRANSFORM(ST_SetSRID(ST_MakePoint(longitude, latitude),4326),3857) as geom
ST_TRANSFORM(station.geo_point, 3857) as geom
INTO publish.rfc_based_5day_max_streamflow_rfc_points
FROM ingest.ahps_metadata ahps
INNER JOIN publish.rfc_based_5day_max_streamflow rfc ON ahps.nws_lid = rfc.nws_station_id
FROM rnr.domain_crosswalk as main
LEFT JOIN external.nws_station as station on station.nws_station_id = main.nws_station_id
WHERE main.nws_station_id IS NOT NULL;