From 015ec0df3ef402f40d25e2e199943fdb60179232 Mon Sep 17 00:00:00 2001
From: Pithon Kabiro <pithon.kabiro@hft-stuttgart.de>
Date: Thu, 28 Oct 2021 10:11:02 +0200
Subject: [PATCH] Create a configuration module file
... that conatains information about the SensorThings API server url
and Cesium access token
---
.gitignore | 3 +++
public/js/appCesium.js | 5 +++--
public/js/appChart.js | 11 +++++------
public/js/src_modules/baseUrlPlusQueryParams.mjs | 6 +-----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6704566..f600fad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Our custom config file
+config.mjs
+
# Logs
logs
*.log
diff --git a/public/js/appCesium.js b/public/js/appCesium.js
index 709aae5..c32da22 100644
--- a/public/js/appCesium.js
+++ b/public/js/appCesium.js
@@ -1,7 +1,8 @@
"use strict";
-Cesium.Ion.defaultAccessToken =
- "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyODgxYzJlNi1kNDZiLTQ3ZmQtYmUxYy0yMWI0OGM3NDA5MzAiLCJpZCI6NDczOSwic2NvcGVzIjpbImFzciIsImdjIl0sImlhdCI6MTU0MTUyMzU0MX0.shj2hM3pvsvcmE_wMb2aBDuk_cKWmFmbolltInGImwU";
+import { CESIUM_ION_ACCESS_TOKEN } from "./config.mjs";
+
+Cesium.Ion.defaultAccessToken = CESIUM_ION_ACCESS_TOKEN;
// Flag to determine models that will be loaded
// Set to `true` or `false`
diff --git a/public/js/appChart.js b/public/js/appChart.js
index f4c567f..de1a5cf 100644
--- a/public/js/appChart.js
+++ b/public/js/appChart.js
@@ -1,9 +1,8 @@
"use strict";
-import {
- BASE_URL,
- QUERY_PARAMS_COMBINED,
-} from "./src_modules/baseUrlPlusQueryParams.mjs";
+import { SENSORTHINGS_API_BASE_URL } from "./config.mjs";
+
+import { QUERY_PARAMS_COMBINED } from "./src_modules/baseUrlPlusQueryParams.mjs";
import { calculateVorlaufMinusRuecklaufTemperature } from "./src_modules/calculateTemperatureDiff.mjs";
@@ -146,7 +145,7 @@ const drawChartUsingSelectedOptions = async function () {
selectedBuildingsDataPointsSamplingRateAbbrevRawObsArr.length === 0
? [[], []]
: await getMetadataPlusObservationsFromSingleOrMultipleDatastreams(
- BASE_URL,
+ SENSORTHINGS_API_BASE_URL,
QUERY_PARAMS_COMBINED,
selectedBuildingsDataPointsSamplingRateAbbrevRawObsArr
);
@@ -156,7 +155,7 @@ const drawChartUsingSelectedOptions = async function () {
selectedBuildingsDataPointsSamplingRateAbbrevTempDiffArr.length === 0
? [[], []]
: await calculateVorlaufMinusRuecklaufTemperature(
- BASE_URL,
+ SENSORTHINGS_API_BASE_URL,
QUERY_PARAMS_COMBINED,
extractBuildingPlusSamplingRate(
selectedBuildingsDataPointsSamplingRateAbbrevTempDiffArr
diff --git a/public/js/src_modules/baseUrlPlusQueryParams.mjs b/public/js/src_modules/baseUrlPlusQueryParams.mjs
index 4c2b8b6..93207d2 100644
--- a/public/js/src_modules/baseUrlPlusQueryParams.mjs
+++ b/public/js/src_modules/baseUrlPlusQueryParams.mjs
@@ -1,7 +1,5 @@
"use strict";
-const BASE_URL = "http://193.196.39.91:8080/frost-icity-tp31/v1.1";
-
/**
* Create a temporal filter string for the fetched Observations
* @param {String} dateStart Start date in YYYY-MM-DD format
@@ -33,9 +31,7 @@ const createUrlParametersForGetRequest = function (dateStart, dateStop) {
};
};
-const QUERY_PARAMS_COMBINED = createUrlParametersForGetRequest(
+export const QUERY_PARAMS_COMBINED = createUrlParametersForGetRequest(
"2020-01-01",
"2021-01-01"
);
-
-export { BASE_URL, QUERY_PARAMS_COMBINED };
--
GitLab