Commit 34f238ed authored by Pithon Kabiro's avatar Pithon Kabiro
Browse files

Export and use new function in Cesium app

parent 81d4741c
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
formatSTAResponseForLineChart, formatSTAResponseForLineChart,
drawLineChartHC, drawLineChartHC,
getCombinedObservationsFromAllNextLinks, getCombinedObservationsFromAllNextLinks,
getMetadataPlusObservationsForChart,
} from "./appChart.js"; } from "./appChart.js";
// Constants // Constants
...@@ -313,12 +314,34 @@ const activate3DTileFeaturePicking = function () { ...@@ -313,12 +314,34 @@ const activate3DTileFeaturePicking = function () {
); );
// Get "ALL" the Observations that satisfy our query // Get "ALL" the Observations that satisfy our query
getCombinedObservationsFromAllNextLinks( // 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 promiseCombinedObservations = getCombinedObservationsFromAllNextLinks(
axiosGetRequest(URL_OBSERVATIONS, QUERY_PARAMS_COMBINED) axiosGetRequest(URL_OBSERVATIONS, QUERY_PARAMS_COMBINED)
) );
.then((observationArr) => { getMetadataPlusObservationsForChart([
drawHeatMapHC(formatSTAResponseForHeatMap(observationArr)); promiseCombinedObservations,
drawLineChartHC(formatSTAResponseForLineChart(observationArr)); promiseDatastreamMetadata,
])
.then((metadataAndObs) => {
// Extract the metadata and the observations from resulting array
const combinedObs = metadataAndObs[0];
const datastreamMetadata = metadataAndObs[1];
drawHeatMapHC(
formatSTAResponseForHeatMap(combinedObs),
datastreamMetadata
);
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
......
...@@ -393,7 +393,9 @@ export const getCombinedObservationsFromAllNextLinks = function ( ...@@ -393,7 +393,9 @@ export const getCombinedObservationsFromAllNextLinks = function (
}); });
}; };
const getMetadataPlusObservationsForChart = async function (promiseArray) { export const getMetadataPlusObservationsForChart = async function (
promiseArray
) {
const combinedResolvedPromises = []; const combinedResolvedPromises = [];
for (const promise of promiseArray) { for (const promise of promiseArray) {
......
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