Use backup sensor values #22
Conversation
|
Text looks fine for now; we'll address it with design in a separate card. |
usgs-details.html
Outdated
| function renderHeader(metric, isFallback, isBackupSensor) { | ||
| if (isFallback) { | ||
| return 'Typical ' + metric.display + ' in the Schuylkill River:'; | ||
| } else if (isBackupSensor) { |
There was a problem hiding this comment.
Since the body of the if is a simple return, prefer an independent if to an else if.
if (isFallback) {
return ...;
}
if (isBackupSensor) {
return ...;
}
return ...;
usgs-details.html
Outdated
| function renderSubtext(isFallback, isBackupSensor) { | ||
| if (isFallback) { | ||
| return 'A common sensor reading for this month.'; | ||
| } else if (isBackupSensor) { |
| function renderHeader(metric, isFallback) { | ||
| var firstWord = isFallback ? 'Typical ' : 'Current '; | ||
| return firstWord + metric.display + ' in the Schuylkill River:'; | ||
| function renderHeader(metric, isFallback, isBackupSensor) { |
There was a problem hiding this comment.
It's starting to feel like we're passing too many parameters too often. Since isFallback and isBackupSensor are essentially global state values, consider making them so, setting them once, and using them directly, instead of passing in each call.
There was a problem hiding this comment.
Hm. I can see the logic in this but I think I'm inclined to leave these arguments lists as is for now. Aside from string constants and the metrics object, I don't think we've set any other global variables. If we end up doing #23, we should consider creating some app state there.
- make primary & backup sensor url constants & adjust urlForMetric fn - adjust renderHeader & renderSubtext methods to return backup-sensor-specific values for the Delaware gage - update fetchDataForMetric fn to try the backup sensor if the primary sensor request fails
kellyi
force-pushed
the
ki/use-backup-sensor-values
branch
from
dc1e67f to
864fa1a
Compare
|
Rebased on |
Overview
This PR adapts the
fetchDataForMetricfunction to try getting data from a backup sensor on the Delaware River if the primary sensor's url is unavailable. If both requests fail, we then use the fallback values.This works by giving the xhr object a different error listener depending on whether the url is the primary or backup sensor: if it fails for the primary url, we call the same function again for the backup url. If it fails there, we call the error handler implemented in #21.
I made a few related adjustments here, too: the change updates the
renderHeader&renderSubtextmethods in order to return text for the Delaware gauge if necessary, and reducing the logic of theurlForMetricmethod while turning the base urls for the primary and backup sensors into longer string constants.Connects #18
Screenshot
Notes
I slimmed down the text here from what was suggested in Fallback values: use different gauge #18 so that it would roughly match the length of the other headers & subscripts. Tagging @ajrobbins for feedback on that.
Only the last commit is part of this PR. Once the others have gone in I can rebase this on
develop.Testing
server.usgsfrom thePRIMARY_SENSOR_URLconstant, then refresh the app. visit the spokes and verify that you see the values, headers, and subscripts from the Delaware River..usgsfrom theBACKUP_SENSOR_URLconst, refresh the app, then visit the spokes again. Verify that you see the fallback values and text.