Revize bf634c97

fixed

website/public/js/index.js

@@ -69 +69 @@
 
 
 
-function onDocumentReady() {
+const onDocumentReady = () => {
   $('#dropdown-dataset').on('click', function (e) {
     e.stopPropagation()
   })
@@ -85 +85 @@
 
 
 /* ------------ DATA FETCHERS ------------ */
-
-const fetchByNameDate = async (baseRoute, name, date, currentTime) => {
+const genericFetch = async (route, method) => {
   const headers = new Headers()
-  const myRequest = new Request(baseRoute + '/' + name + '/' + date + '/' + currentTime, {
-    method: 'GET',
+  const myRequest = new Request(route, {
+    method: method,
     headers: headers
   })
   const beforeJson = await fetch(myRequest)
 
   return beforeJson.json()
 }
+const fetchByNameDate = async (baseRoute, name, date, currentTime) => {
+  return await genericFetch(baseRoute + '/' + name + '/' + date + '/' + currentTime, 'GET')
+}
 
 const fetchDataSourceMarks = async (positionRoute, datasetName) => {
-  const headers = new Headers()
-  const myRequest = new Request(positionRoute + '/' + datasetName, {
-    method: 'GET',
-    headers: headers
-  })
-  const beforeJson = await fetch(myRequest)
-
-  return beforeJson.json()
+    return await genericFetch(positionRoute + '/' + datasetName, 'GET')
 }
 
-async function preload(time, change, date) {
+preload = async (time, change, date) => {
   loadingY()
 
   for (let nTime = time + change; nTime >= 0 && nTime <= 23; nTime = nTime + change) {
@@ -170 +165 @@
  * Checks dataset availibility
  * @param {string} route authority for datasets availibility checks
  */
-const checkDataSetsAvailability = (route) => {
-  $.ajax({
-    type: 'POST',
-    // Todo it might be good idea to change db collections format
-    url: route + '/' + currentDateToString(),
-    success: function (result) {
-      updateAvailableDataSets(result)
-    }
-  })
+const checkDataSetsAvailability = async (route) => {
+  const result = await genericFetch(route + '/' + currentDateToString(), 'POST')
+  updateAvailableDataSets(result)
 }
 
 
@@ -204 +193 @@
   mymap.on('click', function (e) { showInfo(e) })
 }
 
-function setMapView(latitude, longitude, zoom) {
+const setMapView = (latitude, longitude, zoom) => {
   localStorage.setItem('lat', latitude)
   localStorage.setItem('lng', longitude)
   localStorage.setItem('zoom', zoom)
@@ -725 +714 @@
   $('#dropdownMenuButtonTime').html(formatTime(currentTime, true))
 }
 
-const initDatepicker = (availableDatesSource) => {
+const initDatepicker = async (availableDatesSource) => {
   var availableDates = ''
-
-  $.ajax({
-    type: 'GET',
-    url: availableDatesSource,
-    success: function (result) {
-      availableDates = String(result).split(',')
-    }
-  }).then(function () {
-    $('#date').datepicker({
-      format: 'yyyy-mm-dd',
-      language: 'cs',
-      beforeShowDay: function (date) {
-        if (availableDates.indexOf(formatDate(date)) < 0) {
-          return { enabled: false, tooltip: 'Žádná data' }
-        } else {
-          return { enabled: true }
-        }
-      },
-      autoclose: true
-    })
+  const result = await genericFetch(availableDatesSource, 'GET')
+  availableDates = String(result).split(',')
+  $('#date').datepicker({
+    format: 'yyyy-mm-dd',
+    language: 'cs',
+    beforeShowDay: function (date) {
+      if (availableDates.indexOf(formatDate(date)) < 0) {
+        return { enabled: false, tooltip: 'Žádná data' }
+      } else {
+        return { enabled: true }
+      }
+    },
+    autoclose: true
   })
 }