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

Chart updates #45

Merged
merged 3 commits into from
May 16, 2024
Merged

Chart updates #45

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a298772
tidying up look of the chart
PhillipsOwen May 16, 2024
e9094be
fixing display of line parts when there is no data value
PhillipsOwen May 16, 2024
4df1b4b
fixing display of line parts when there is no data value
PhillipsOwen May 16, 2024
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
43 changes: 30 additions & 13 deletions src/components/dialog/observation-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Fragment} from 'react';
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend } from 'recharts';
import React from 'react';
import axios from 'axios';
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Legend, ResponsiveContainer, Tooltip } from 'recharts';
import { useQuery, QueryClient, QueryClientProvider } from '@tanstack/react-query';

const queryClient = new QueryClient();
Expand Down Expand Up @@ -57,16 +57,16 @@ function CreateObsChart(url) {

// render the chart
return (
<Fragment>
<ResponsiveContainer width="100%" height="100%">
{ status === 'pending' ? (
'Loading...'
<div>Loading...</div>
) : status === 'error' ? (
<span>Error: {error.message}</span>
<div>Error: {error.message}</div>
) : (
<LineChart width={590} height={300} data={data} margin={{ top: 0, right: 0, left: 0, bottom: 0 }}>
<LineChart width={590} height={300} data={data} margin={{ top: 10, right: 0, left: -10, bottom: 0 }}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey="time" />
<YAxis domain={['dataMin', 'dataMax']} />
<XAxis dataKey="time" allowDuplicatedCategory={false} />
<YAxis domain={['auto', 'auto']}/>
<Tooltip />
<Legend verticalAlign="bottom" height={30} />
<Line type="monotone" dataKey="Observations" stroke="gray" strokeWidth={2} dot={false} isAnimationActive={false} />
Expand All @@ -75,7 +75,7 @@ function CreateObsChart(url) {
<Line type="monotone" dataKey="Difference (APS-OBS)" stroke="red" strokeWidth={2} dot={false} isAnimationActive={false} />
</LineChart>
)}
</Fragment>
</ResponsiveContainer>
);
}

Expand Down Expand Up @@ -118,10 +118,27 @@ function csvToJSON(csvData) {
// remove the timezone from the time value
ret_val.map(function (e){
e.time = e.time.substring(0, e.time.split(':', 2).join(':').length);
if (e["APS Nowcast"]) e["APS Nowcast"] = +parseFloat(e["APS Nowcast"]).toFixed(4);
if (e["Observations"]) e["Observations"] = +parseFloat(e["Observations"]).toFixed(4);
if (e["NOAA Tidal Predictions"]) e["NOAA Tidal Predictions"] = +parseFloat(e["NOAA Tidal Predictions"]).toFixed(3);
if (e["Difference (APS-OBS)"]) e["Difference (APS-OBS)"] = +parseFloat(e["Difference (APS-OBS)"]).toFixed(3);

// data that is missing a value will not result in plotting
if (e["APS Nowcast"])
e["APS Nowcast"] = +parseFloat(e["APS Nowcast"]).toFixed(4);
else
e["APS Nowcast"] = null;

if (e["Observations"])
e["Observations"] = +parseFloat(e["Observations"]).toFixed(4);
else
e["Observations"] = null;

if (e["NOAA Tidal Predictions"])
e["NOAA Tidal Predictions"] = +parseFloat(e["NOAA Tidal Predictions"]).toFixed(3);
else
e["NOAA Tidal Predictions"] = null;

if (e["Difference (APS-OBS)"])
e["Difference (APS-OBS)"] = +parseFloat(e["Difference (APS-OBS)"]).toFixed(3);
else
e["Difference (APS-OBS)"] = null;
});

// return the json data representation
Expand Down