diff --git a/.gitignore b/.gitignore index 67045665db202cf951f839a5f3e73efdcfd45021..f600fad880dc0ab76ec8e7a4cc0fa58271e5c5c6 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 709aae58eefa7a3df531548bdc69df5c18275b04..c32da2298dd25602b5be478336b3f2f39c52886e 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 f4c567fb7928a29c719e94496e0b70d0e88f919d..de1a5cf09344c929bda931cc28306ef5e7b6bd41 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 4c2b8b6621965682ff98d18ef333a9249d401357..93207d279ad262d9653a4d6bab4eca541d680570 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 };