Commit 09fdaff6 authored by Pithon Kabiro's avatar Pithon Kabiro
Browse files

Change function signature: drawing line chart

Add parameter for datastream metadata to function that draws line chart
parent 34f238ed
...@@ -313,22 +313,12 @@ const activate3DTileFeaturePicking = function () { ...@@ -313,22 +313,12 @@ const activate3DTileFeaturePicking = function () {
clickedBuildingDatastreamId clickedBuildingDatastreamId
); );
// Get "ALL" the Observations that satisfy our query // Create promises
// getCombinedObservationsFromAllNextLinks(
// axiosGetRequest(URL_OBSERVATIONS, QUERY_PARAMS_COMBINED)
// )
// .then((observationArr) => {
// drawHeatMapHC(formatSTAResponseForHeatMap(observationArr));
// drawLineChartHC(formatSTAResponseForLineChart(observationArr));
// })
// .catch((err) => {
// console.log(err);
// });
const promiseDatastreamMetadata = getDatastreamMetadata(URL_DATASTREAM); const promiseDatastreamMetadata = getDatastreamMetadata(URL_DATASTREAM);
const promiseCombinedObservations = getCombinedObservationsFromAllNextLinks( const promiseCombinedObservations = getCombinedObservationsFromAllNextLinks(
axiosGetRequest(URL_OBSERVATIONS, QUERY_PARAMS_COMBINED) axiosGetRequest(URL_OBSERVATIONS, QUERY_PARAMS_COMBINED)
); );
// Pass promises to our async function
getMetadataPlusObservationsForChart([ getMetadataPlusObservationsForChart([
promiseCombinedObservations, promiseCombinedObservations,
promiseDatastreamMetadata, promiseDatastreamMetadata,
...@@ -338,6 +328,11 @@ const activate3DTileFeaturePicking = function () { ...@@ -338,6 +328,11 @@ const activate3DTileFeaturePicking = function () {
const combinedObs = metadataAndObs[0]; const combinedObs = metadataAndObs[0];
const datastreamMetadata = metadataAndObs[1]; const datastreamMetadata = metadataAndObs[1];
drawLineChartHC(
formatSTAResponseForLineChart(combinedObs),
datastreamMetadata
);
drawHeatMapHC( drawHeatMapHC(
formatSTAResponseForHeatMap(combinedObs), formatSTAResponseForHeatMap(combinedObs),
datastreamMetadata datastreamMetadata
......
...@@ -301,7 +301,10 @@ export const formatSTAResponseForLineChart = function (obsArray) { ...@@ -301,7 +301,10 @@ export const formatSTAResponseForLineChart = function (obsArray) {
* @param {Array} formattedObsArrayForLineChart Response from SensorThings API formatted for use in a line chart * @param {Array} formattedObsArrayForLineChart Response from SensorThings API formatted for use in a line chart
* @returns {undefined} undefined * @returns {undefined} undefined
*/ */
export const drawLineChartHC = function (formattedObsArrayForLineChart) { export const drawLineChartHC = function (
formattedObsArrayForLineChart,
datastreamMetadata
) {
// Create the chart // Create the chart
Highcharts.stockChart("chart-line", { Highcharts.stockChart("chart-line", {
chart: { chart: {
...@@ -314,11 +317,13 @@ export const drawLineChartHC = function (formattedObsArrayForLineChart) { ...@@ -314,11 +317,13 @@ export const drawLineChartHC = function (formattedObsArrayForLineChart) {
title: { title: {
text: "Inlet flow (Vorlauf)", text: "Inlet flow (Vorlauf)",
text: `${datastreamMetadata.description}`,
"align": "left", "align": "left",
}, },
subtitle: { subtitle: {
text: "Temperature variation by hour in 2020", text: "Temperature variation by hour in 2020",
text: `${datastreamMetadata.name}`,
align: "left", align: "left",
}, },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment