Commit 11b19fd6 authored by Pithon Kabiro's avatar Pithon Kabiro
Browse files

Change function signature: drawing heatmap

Add parameter for datastream metadata to function that draws heatmap
chart
parent b5ed37e8
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
// Functions // Functions
import { import {
getDatastreamIdFromBuildingNumber, getDatastreamIdFromBuildingNumber,
getDatastreamUrl,
getObservationsUrl, getObservationsUrl,
formatSTAResponseForHeatMap, formatSTAResponseForHeatMap,
axiosGetRequest, axiosGetRequest,
getDatastreamMetadata,
drawHeatMapHC, drawHeatMapHC,
formatSTAResponseForLineChart, formatSTAResponseForLineChart,
drawLineChartHC, drawLineChartHC,
...@@ -300,6 +302,11 @@ const activate3DTileFeaturePicking = function () { ...@@ -300,6 +302,11 @@ const activate3DTileFeaturePicking = function () {
"60min" "60min"
); );
const URL_DATASTREAM = getDatastreamUrl(
BASE_URL,
clickedBuildingDatastreamId
);
const URL_OBSERVATIONS = getObservationsUrl( const URL_OBSERVATIONS = getObservationsUrl(
BASE_URL, BASE_URL,
clickedBuildingDatastreamId clickedBuildingDatastreamId
......
...@@ -81,7 +81,7 @@ export const getDatastreamIdFromBuildingNumber = function ( ...@@ -81,7 +81,7 @@ export const getDatastreamIdFromBuildingNumber = function (
return datastreamIdMatched; return datastreamIdMatched;
}; };
const getDatastreamUrl = function (baseUrl, datastreamID) { export const getDatastreamUrl = function (baseUrl, datastreamID) {
if (!datastreamID) return; if (!datastreamID) return;
const fullDatastreamURL = `${baseUrl}/Datastreams(${datastreamID})`; const fullDatastreamURL = `${baseUrl}/Datastreams(${datastreamID})`;
return fullDatastreamURL; return fullDatastreamURL;
...@@ -138,7 +138,7 @@ export const axiosGetRequest = function (urlObservations, urlParamObj) { ...@@ -138,7 +138,7 @@ export const axiosGetRequest = function (urlObservations, urlParamObj) {
}); });
}; };
const getDatastreamMetadata = async function (urlDatastream) { export const getDatastreamMetadata = async function (urlDatastream) {
try { try {
// Extract properties of interest // Extract properties of interest
const { const {
...@@ -184,7 +184,10 @@ export const formatSTAResponseForHeatMap = function (obsArray) { ...@@ -184,7 +184,10 @@ export const formatSTAResponseForHeatMap = function (obsArray) {
* @param {Array} formattedObsArrayForHeatmap Response from SensorThings API formatted for use in a heatmap * @param {Array} formattedObsArrayForHeatmap Response from SensorThings API formatted for use in a heatmap
* @returns {undefined} undefined * @returns {undefined} undefined
*/ */
export const drawHeatMapHC = function (formattedObsArrayForHeatmap) { export const drawHeatMapHC = function (
formattedObsArrayForHeatmap,
datastreamMetadata
) {
Highcharts.chart("chart-heatmap", { Highcharts.chart("chart-heatmap", {
chart: { chart: {
type: "heatmap", type: "heatmap",
...@@ -196,13 +199,15 @@ export const drawHeatMapHC = function (formattedObsArrayForHeatmap) { ...@@ -196,13 +199,15 @@ export const drawHeatMapHC = function (formattedObsArrayForHeatmap) {
}, },
title: { title: {
text: "Inlet flow (Vorlauf)", // text: "Inlet flow (Vorlauf)",
text: `${datastreamMetadata.description}`,
align: "left", align: "left",
x: 40, x: 40,
}, },
subtitle: { subtitle: {
text: "Temperature variation by day and hour in 2020", // text: "Temperature variation by day and hour in 2020",
text: `${datastreamMetadata.name}`,
align: "left", align: "left",
x: 40, x: 40,
}, },
......
Supports Markdown
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