Commit 459aa539 authored by Pithon Kabiro's avatar Pithon Kabiro
Browse files

Edit building to datastream mapping object

Deactivate datastreams that do not have observations
parent c160bef4
...@@ -340,7 +340,7 @@ const activate3DTileFeaturePicking = function () { ...@@ -340,7 +340,7 @@ const activate3DTileFeaturePicking = function () {
); );
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.error(err);
}); });
}, Cesium.ScreenSpaceEventType.LEFT_CLICK); }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
}; };
......
...@@ -22,43 +22,58 @@ export const getDatastreamIdFromBuildingNumber = function ( ...@@ -22,43 +22,58 @@ export const getDatastreamIdFromBuildingNumber = function (
101: { 101: {
vl: { "15min": "69", "60min": "75" }, vl: { "15min": "69", "60min": "75" },
rl: { "15min": "81", "60min": "87" }, rl: { "15min": "81", "60min": "87" },
flow: { "15min": "93", "60min": "99" },
power: { "15min": "105", "60min": "111" }, // These Datastreams do not yet have Observations
energy: { "15min": "117", "60min": "123" }, // flow: { "15min": "93", "60min": "99" },
energy_verb: { "15min": "129", "60min": "135" }, // power: { "15min": "105", "60min": "111" },
// energy: { "15min": "117", "60min": "123" },
// energy_verb: { "15min": "129", "60min": "135" },
}, },
102: { 102: {
vl: { "15min": "70", "60min": "76" }, vl: { "15min": "70", "60min": "76" },
rl: { "15min": "82", "60min": "88" }, rl: { "15min": "82", "60min": "88" },
flow: { "15min": "94", "60min": "100" },
power: { "15min": "106", "60min": "112" }, // These Datastreams do not yet have Observations
energy: { "15min": "118", "60min": "124" }, // flow: { "15min": "94", "60min": "100" },
energy_verb: { "15min": "130", "60min": "136" }, // power: { "15min": "106", "60min": "112" },
// energy: { "15min": "118", "60min": "124" },
// energy_verb: { "15min": "130", "60min": "136" },
}, },
107: { 107: {
vl: { "15min": "71", "60min": "77" }, vl: { "15min": "71", "60min": "77" },
rl: { "15min": "83", "60min": "89" }, rl: { "15min": "83", "60min": "89" },
flow: { "15min": "95", "60min": "101" },
power: { "15min": "107", "60min": "113" }, // These Datastreams do not yet have Observations
energy: { "15min": "119", "60min": "125" }, // flow: { "15min": "95", "60min": "101" },
energy_verb: { "15min": "131", "60min": "137" }, // power: { "15min": "107", "60min": "113" },
// energy: { "15min": "119", "60min": "125" },
// energy_verb: { "15min": "131", "60min": "137" },
}, },
"112, 118": { "112, 118": {
vl: { "15min": "72", "60min": "78" }, vl: { "15min": "72", "60min": "78" },
rl: { "15min": "84", "60min": "90" }, rl: { "15min": "84", "60min": "90" },
flow: { "15min": "96", "60min": "102" },
power: { "15min": "108", "60min": "114" }, // These Datastreams do not yet have Observations
energy: { "15min": "120", "60min": "126" }, // flow: { "15min": "96", "60min": "102" },
energy_verb: { "15min": "132", "60min": "138" }, // power: { "15min": "108", "60min": "114" },
// energy: { "15min": "120", "60min": "126" },
// energy_verb: { "15min": "132", "60min": "138" },
}, },
125: { 125: {
vl: { "15min": "73", "60min": "79" }, vl: { "15min": "73", "60min": "79" },
rl: { "15min": "85", "60min": "91" }, rl: { "15min": "85", "60min": "91" },
flow: { "15min": "97", "60min": "103" },
power: { "15min": "109", "60min": "115" }, // These Datastreams do not yet have Observations
energy: { "15min": "121", "60min": "127" }, // flow: { "15min": "97", "60min": "103" },
energy_verb: { "15min": "133", "60min": "139" }, // power: { "15min": "109", "60min": "115" },
// energy: { "15min": "121", "60min": "127" },
// energy_verb: { "15min": "133", "60min": "139" },
}, },
225: { 225: {
vl: { "15min": "74", "60min": "80" }, vl: { "15min": "74", "60min": "80" },
rl: { "15min": "86", "60min": "92" }, rl: { "15min": "86", "60min": "92" },
...@@ -69,10 +84,12 @@ export const getDatastreamIdFromBuildingNumber = function ( ...@@ -69,10 +84,12 @@ export const getDatastreamIdFromBuildingNumber = function (
}, },
}; };
if (!buildingNumber) return; if (
buildingToDatastreamMapping?.[buildingNumber]?.[phenomenon]?.[
// check if building is contained in mapping object samplingRate
if (!(buildingNumber in buildingToDatastreamMapping)) return; ] === undefined
)
return;
const datastreamIdMatched = Number( const datastreamIdMatched = Number(
buildingToDatastreamMapping[buildingNumber][phenomenon][samplingRate] buildingToDatastreamMapping[buildingNumber][phenomenon][samplingRate]
...@@ -159,7 +176,7 @@ export const getDatastreamMetadata = async function (urlDatastream) { ...@@ -159,7 +176,7 @@ export const getDatastreamMetadata = async function (urlDatastream) {
return { description, name, unitOfMeasurement }; return { description, name, unitOfMeasurement };
} catch (err) { } catch (err) {
console.log(err); console.error(err);
} }
}; };
...@@ -427,7 +444,7 @@ const followNextLink = function (responsePromise) { ...@@ -427,7 +444,7 @@ const followNextLink = function (responsePromise) {
} }
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.error(err);
}); });
}; };
...@@ -456,7 +473,7 @@ export const getCombinedObservationsFromAllNextLinks = function ( ...@@ -456,7 +473,7 @@ export const getCombinedObservationsFromAllNextLinks = function (
}); });
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.error(err);
}); });
}; };
...@@ -479,7 +496,7 @@ export const getMetadataPlusObservationsForChart = async function ( ...@@ -479,7 +496,7 @@ export const getMetadataPlusObservationsForChart = async function (
const resolvedPromise = await promise; const resolvedPromise = await promise;
combinedResolvedPromises.push(resolvedPromise); combinedResolvedPromises.push(resolvedPromise);
} catch (err) { } catch (err) {
console.log(err); console.error(err);
} }
} }
return combinedResolvedPromises; return combinedResolvedPromises;
...@@ -504,7 +521,7 @@ const getObservationsFromMultipleDatastreams = async function ( ...@@ -504,7 +521,7 @@ const getObservationsFromMultipleDatastreams = async function (
const observations = await observationPromise; const observations = await observationPromise;
observationsAllDatastreamsArr.push(observations); observationsAllDatastreamsArr.push(observations);
} catch (err) { } catch (err) {
console.log(err); console.error(err);
} }
} }
return observationsAllDatastreamsArr; return observationsAllDatastreamsArr;
......
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