Revize ab904bf5

refactoring

website/public/js/index.js

@@ -17 +17 @@
 let positionsSourceRoute
 
 let currentTime
-
 let currentDate
 
 var timer
@@ -40 +39 @@
 const datasetDictNameDisplayName = {}
 var datasetSelected = []
 
-// data only for one day
+// animate data only in one day
 let lockedDay = false
 
 // loading information for async operations
@@ -49 +48 @@
 // default loader showup delay
 const defaultLoaderDelay = 1000
 
-// marks for all datasets
-const dataSourceMarks = {}
+// map markers for all datasets
+const dataMapMarkers = {}
 
 const globalMarkersHolder = {}
 // all marker from which popup was removed
@@ -85 +84 @@
 
 
 /* ------------ DATA FETCHERS ------------ */
+
 const genericFetch = async (route, method) => {
   const headers = new Headers()
-  const myRequest = new Request(route, {
+  const request = new Request(route, {
     method: method,
     headers: headers
   })
-  const beforeJson = await fetch(myRequest)
+  const beforeJson = await fetch(request)
 
   return beforeJson.json()
 }
-const fetchByNameDate = async (baseRoute, name, date, currentTime) => {
-  return await genericFetch(baseRoute + '/' + name + '/' + date + '/' + currentTime, 'GET')
+
+const fetchDatasetDataByDatetime = async (route, datasetName, date, time) => {
+  return await genericFetch(route + '/' + datasetName + '/' + date + '/' + time, 'GET')
 }
 
-const fetchDataSourceMarks = async (positionRoute, datasetName) => {
-    return await genericFetch(positionRoute + '/' + datasetName, 'GET')
+const fetchDatasetMapMarkers = async (route, datasetName) => {
+  return await genericFetch(route + '/' + datasetName, 'GET')
 }
 
-preload = async (time, change, date) => {
+preload = async (time, timeShift, date) => {
   loadingY()
 
-  for (let nTime = time + change; nTime >= 0 && nTime <= 23; nTime = nTime + change) {
+  for (let nTime = time + timeShift; nTime >= 0 && nTime <= 23; nTime = nTime + timeShift) {
     if (!data[nTime]) {
       data[nTime] = {}
     }
 
     datasetSelected.forEach(async (datasetName) => {
       if (!data[nTime][datasetName]) {
-        data[nTime][datasetName] = await fetchByNameDate(dataSourceRoute, datasetName, date, nTime)
+        data[nTime][datasetName] = await fetchDatasetDataByDatetime(dataSourceRoute, datasetName, date, nTime)
       }
     })
   }
@@ -125 +126 @@
  * Load and display heatmap layer for current data
  * 
  * @param {string} opendataRoute route to dataset source
- * @param {string} positionsRoute  route to dataset postitions source
+ * @param {string} positionsRoute  route to dataset positions source
  */
 const loadCurrentTimeHeatmap = async (opendataRoute, positionsRoute, loaderDelay = defaultLoaderDelay) => {
   loadCheckboxDatasetNameData()
@@ -136 +137 @@
   data[currentTime] = {}
 
   const dataSelectedHandler = async (datasetName) => {
-    if (!(datasetName in dataSourceMarks)) {
-      dataSourceMarks[datasetName] = await fetchDataSourceMarks(positionsRoute, datasetName)
+    if (!(datasetName in dataMapMarkers)) {
+      dataMapMarkers[datasetName] = await fetchDatasetMapMarkers(positionsRoute, datasetName)
     }
 
-    const datasetData = await fetchByNameDate(dataSourceRoute, datasetName, currentDateToString(), currentTime)
+    const datasetData = await fetchDatasetDataByDatetime(dataSourceRoute, datasetName, currentDateToString(), currentTime)
     data[currentTime][datasetName] = datasetData
   }
+
   datasetSelected.forEach((datasetName) => {
     allPromises.push(dataSelectedHandler(datasetName))
   })
@@ -152 +154 @@
   await Promise.all(allPromises).then(
     () => {
       loadingN(0)
-      drawMapMarkers(dataSourceMarks)
+      drawMapMarkers(dataMapMarkers)
       drawHeatmap(data[currentTime])
 
       preload(currentTime, 1, currentDateToString())
@@ -190 +192 @@
     maxZoom: 19
   }).addTo(mymap)
 
-  mymap.on('click', function (e) { showInfo(e) })
+  mymap.on('click', function (e) { showPopup(e) })
 }
 
 const setMapView = (latitude, longitude, zoom) => {
@@ -308 +310 @@
 
 
 
-/* ------------ POPUPs ------------ */
+/* ------------ POPUPS ------------ */
 
 const setGlobalPopupContent = (content) => {
   globalPopup._popup.setContent(content)
@@ -411 +413 @@
   popup.addClass('popup-' + datasetName)
 }
 
-const showInfo = (e) => {
+const showPopup = (e) => {
   info = []
   currentPageInPopup = 0
 
@@ -527 +529 @@
   const { _popup } = mymap
 
   if (_popup) {
-    showInfo({
+    showPopup({
       latlng: _popup.getLatLng()
     })
   }
@@ -715 +717 @@
 }
 
 const initDatepicker = async (availableDatesSource) => {
-  var availableDates = ''
   const result = await genericFetch(availableDatesSource, 'GET')
-  availableDates = String(result).split(',')
+  const datesContainData = String(result).split(',')
+
   $('#date').datepicker({
     format: 'yyyy-mm-dd',
     language: 'cs',
     beforeShowDay: function (date) {
-      if (availableDates.indexOf(formatDate(date)) < 0) {
+      if (datesContainData.indexOf(formatDate(date)) < 0) {
         return { enabled: false, tooltip: 'Žádná data' }
       } else {
         return { enabled: true }
@@ -865 +867 @@
   $('#player-time > .spinner-border').addClass('d-none')
   setTimeline()
 }
+
 module.exports = {
   initDatepicker,
   initLocationsMenu,