Revize d5a88af0

done

website/public/js/zcu-heatmap.js

@@ -22 +22 @@
 var datasetSelected = []
 
 const globalMarkersHolder = {}
-const datasetColorDict = {}
+// all marker from which popup was removed
+// contains: {key:[L.circle,L.pupup]}
+// key: x and y, x + '' + y string
+let globalMarkersChanged = {}
 
-/* const genColor = (datasetNames) => {
-  datasetNames.forEach((name) => {
-    datasetColorDict[name] =
-  })
-} */
 const fetchByNameDate = async (baseRoute, name, date, currentTime) => {
   const headers = new Headers()
   const myRequest = new Request(baseRoute + '/' + name + '/' + date + '/' + currentTime, {
@@ -47 +45 @@
   const beforeJson = await fetch(myRequest)
   return beforeJson.json()
 }
-// all marker from which popup was removed
-// contains: {key:[L.circle,L.pupup]}
-// key: x and y, x + '' + y string
-let globalMarkersChanged = {}
 
 const genPopUpControlButtons = (currentPage, numPages, onNextClick, onPreviousClick) => ({
   previousButton: '<button id="previous-info-btn" class="circle-button" onclick="previousInfo()"></button>',
@@ -172 +166 @@
 
   const numDatasets = Object.keys(datasetsInRadius).length
 
-  if (!numDatasets) { return }
+  if (!numDatasets) {
+    return
+  }
 
   if (numDatasets === 1) {
     const infoDict = getElFromObjectInfo(0)
@@ -361 +357 @@
   const dataDict = dataRaw
   const mergedPoints = []
   let max = 0
+  if (Object.keys(globalMarkersChanged).length) {
+    Object.keys(globalMarkersChanged).forEach(function (key) {
+      globalMarkersChanged[key][0].bindPopup(globalMarkersChanged[key][1])
+    })
+    globalMarkersChanged = {}
+  }
   Object.keys(dataDict).forEach((key) => {
     const data = dataDict[key]
     max = Math.max(max, data.max)
     if (data != null) {
     // Bind back popups for markers (we dont know if there is any data for this marker or not)
-      if (Object.keys(globalMarkersChanged).length) {
-        Object.keys(globalMarkersChanged).forEach(function (key) {
-          globalMarkersChanged[key][0].bindPopup(globalMarkersChanged[key][1])
-        })
-        globalMarkersChanged = {}
-      }
       const points = data.items.map((point) => {
         const { x, y, number } = point
         const key = x + '' + y

website/templates/index.html.twig

@@ -18 +18 @@
     </div>
 
     <nav class="navbar navbar-expand-lg">
-      <a href="/heatmap/?data_set[date]=2019-04-11&amp;data_set[time]=9&amp;data_set[type]=JIS" class="navbar-brand shifted">
+      <a href="/heatmap/?date=2019-04-11&amp;time=9&amp;type[]=JIS" class="navbar-brand shifted">
         <h1>Heatmap.ZČU</h1>
       </a>
 
@@ -92 +92 @@
             <h3>Hledání anomálií</h3>
             <hr>
             <p>Heatmapa vám také dává možnost prozkoumávat data vlastním způsobem &ndash; stačí jen zvolit konkrétní datum a&nbsp;čas, pro které chcete data zobrazit. Můžete tak objevit i&nbsp;různé anomálie, například narazit na noční návštěvníky kampusu nebo odhalit návraty na studentské koleje v&nbsp;brzkých ranních hodinách&hellip;</p>
-            <a href="/heatmap/?data_set[date]=2019-04-11&amp;data_set[time]=9&amp;data_set[type]=JIS" class="btn btn-primary" role="button">Vyzkoušet heatmapu</a>
+            <a href="/heatmap/?date=2019-04-11&amp;time=9&amp;type[]=JIS" class="btn btn-primary" role="button">Vyzkoušet heatmapu</a>
           </div>
         </div>