Revize 894e3339

Re #8163 - refactoring

website/public/js/zcu-heatmap.js

@@ -77 +77 @@
   $('.popup-controls').hide()
 }
 
-const areSameCoord = (first, second) => {
+const areCoordsIdentical = (first, second) => {
   return first.lat === second.lat && first.lng === second.lng
 }
 
@@ -175 +175 @@
 
 const genMultipleDatasetsPopUp = (sum, currentPage, countPages, datasetName) => {
   const popupHeader = `<strong id="dataset-name">${datasetName}</strong>`
-  const popupData = `<div id="number-info"><span id="current-number">${sum}</span></div>`
+  const popupData = `<div id="place-intesity"><span id="current-number">${sum}</span></div>`
   const { previousButton, nextButton, pagesList } = getPaginationButtonsInPopup(currentPage, countPages)
 
   return `
@@ -195 +195 @@
     <strong>${datasetName}</strong>
     <div id="place-name">${placeName}</div>`
   const popupData = `
-    <div id="number-info">
+    <div id="place-intesity">
       <span id="current-number">${currentCount}</span>
       <span id="part-info">${(sum && sum !== Number(currentCount)) ? '/' + sum : ''}</span>
     </div>`
@@ -215 +215 @@
     loadCheckboxDatasetNameData()
 
     data.forEach((item, index) => {
-      Object.keys(item).forEach((datasetName) => {
+      Object.keys(item).forEach(datasetName => {
         if (datasetName === $(checkbox).val()) {
           delete data[index][datasetName]
         }
@@ -295 +295 @@
 
 const getCountPagesInPopup = () => {
   const infoKeys = Object.keys(info)
+
   if (infoKeys.length === 1) {
     // return number of records in one dataset (one dataset in area)
     return info[infoKeys[0]].items.length
@@ -303 +304 @@
   return infoKeys.length
 }
 
-const getElFromObjectInfo = (position) => {
+const getPopupDataOnPage = (pageInPopup) => {
   const keys = Object.keys(info)
-  return info[keys[position]]
+  return info[keys[pageInPopup]]
 }
 
-const hasInfoMultipleDatasets = () => {
+const areMultipleDatasetsInRadius = () => {
   return Object.keys(info).length > 1
 }
 
-const setNewPopupDatasetName = (datasetName) => {
+const setPopupDatasetClassName = (datasetName) => {
   const popup = $('.leaflet-popup')
 
   popup.removeClass(function (index, css) {
-    return (css.match (/(^|\s)popup-\S+/g) || []).join(' ');
+    return (css.match(/(^|\s)popup-\S+/g) || []).join(' ');
   })
-  popup.addClass(`popup-${datasetName}`)
+  popup.addClass('popup-' + datasetName)
 }
 
 function showInfo (e) {
@@ -341 +342 @@
     lng: e.latlng.lng,
     lat: e.latlng.lat
   }
-  Object.keys(data[currentTime]).forEach((key) => {
+
+  Object.keys(data[currentTime]).forEach(key => {
     const namedData = data[currentTime][key]
+
     namedData.items.forEach(element => {
       if (e.latlng.distanceTo(new L.LatLng(element.x, element.y)) < radius) {
         lat += element.x
@@ -369 +372 @@
     acc[item.datasetName].number += Number(item.number)
     return acc
   }, {})
-  // There is one dataset
 
-  const numDatasets = Object.keys(datasetsInRadius).length
+  const countDatasets = Object.keys(datasetsInRadius).length
 
-  if (!numDatasets) {
+  if (!countDatasets) {
     if (mymap._popup) {
       $('#part-info').text('')
       $('#current-number').html(0)
@@ -383 +385 @@
     return
   }
 
-  if (numDatasets === 1) {
-    const infoDict = getElFromObjectInfo(0)
-    const info_ = infoDict.items
-    const { place, number } = info_[currentPageInPopup]
+  if (countDatasets === 1) {
+    const markersInRadius = getPopupDataOnPage(0)
+    const popupPagesData = markersInRadius.items
+    const { place, number } = popupPagesData[currentPageInPopup]
 
-    if (!globalPopup._popup || !areSameCoord(globalPopup.coord, eventCoord)) {
-      globalPopup._popup = prepareLayerPopUp(lat, lng, i, `popup-${infoDict.datasetName}`)
+    if (!globalPopup._popup || !areCoordsIdentical(globalPopup.coord, eventCoord)) {
+      globalPopup._popup = prepareLayerPopUp(lat, lng, i, `popup-${markersInRadius.datasetName}`)
       globalPopup.coord = eventCoord
     }
     else {
-      setNewPopupDatasetName(infoDict.datasetName)
+      setPopupDatasetClassName(markersInRadius.datasetName)
     }
 
-    setGlobalPopupContent(getPopupContent(datasetDictNameDisplayName[infoDict.datasetName], place, number, total, 1, info_.length))
+    setGlobalPopupContent(getPopupContent(datasetDictNameDisplayName[markersInRadius.datasetName], place, number, total, 1, popupPagesData.length))
 
-    if (info_.length === 1) {
+    if (popupPagesData.length === 1) {
       disablePopupControls()
     }
   } else {
-    const { datasetName, number } = getElFromObjectInfo(currentPageInPopup)
+    const { datasetName, number } = getPopupDataOnPage(currentPageInPopup)
 
-    if (!globalPopup._popup || !areSameCoord(globalPopup.coord, eventCoord)) {
+    if (!globalPopup._popup || !areCoordsIdentical(globalPopup.coord, eventCoord)) {
       globalPopup._popup = prepareLayerPopUp(lat, lng, i, `popup-${datasetName}`)
       globalPopup.coord = eventCoord
     }
     else {
-      setNewPopupDatasetName(datasetName)
+      setPopupDatasetClassName(datasetName)
     }
 
     setGlobalPopupContent(genMultipleDatasetsPopUp(number, 1, getCountPagesInPopup(), datasetDictNameDisplayName[datasetName]))
@@ -435 +437 @@
 }
 
 function setPageContentInPopup (page) {
-  const previousPageData = hasInfoMultipleDatasets() ? getElFromObjectInfo(page) : getElFromObjectInfo(0).items[page]
-  const currentPageData = hasInfoMultipleDatasets() ? getElFromObjectInfo(currentPageInPopup) : getElFromObjectInfo(0).items[currentPageInPopup]
+  const previousPageData = areMultipleDatasetsInRadius() ? getPopupDataOnPage(page) : getPopupDataOnPage(0).items[page]
+  const currentPageData = areMultipleDatasetsInRadius() ? getPopupDataOnPage(currentPageInPopup) : getPopupDataOnPage(0).items[currentPageInPopup]
   const datasetName = $('#dataset-name')
 
   if (datasetName) {