Revize 72a438f3

+ location persistence
+ last available collections
+ available collections code rework

website/public/js/zcu-heatmap.js

@@ -52 +52 @@
 }
 // eslint-disable-next-line no-unused-vars
 function initMap () {
+
+  startX = localStorage.getItem('lat') || startX;
+  startY = localStorage.getItem('lng') || startY;
+  startZoom = localStorage.getItem('zoom') || startZoom;
+
   mymap = L.map('heatmap').setView([startX, startY], startZoom)
 
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
@@ -125 +130 @@
 }
 
 // eslint-disable-next-line no-unused-vars
-function setMapView (latitude = startX, longitude = startY, zoom = startZoom) {
+function setMapView (latitude, longitude, zoom) {
+  localStorage.setItem('lat', latitude);
+  localStorage.setItem('lng', longitude);
+  localStorage.setItem('zoom', zoom);
   mymap.setView([latitude, longitude], zoom)
 }
 

website/src/Controller/HeatmapController.php

@@ -68 +68 @@
     public function dataSourcePoistions(IOpenDataManager $manager, $name = 'NONE') {
         return $this->json($manager->getDataSourcePositions($name));
     }
+
+    /**
+     * @Route("heatmap/last", name="last")
+     */
+    public function lastAvailableCollections(IOpenDataManager $manager) {
+        return $this->json($manager->getLastAvailableCollections());
+    }
 }

website/src/IOpenDataManager.php

@@ -16 +16 @@
     public function getMaxCollectionNumberAtDay($name, $date);
 
     public function getDataSourcePositions($name);
+
+    public function getLastAvailableCollections();
 }

website/src/OpenDataManager.php

@@ -3 +3 @@
 namespace App\OpenData;
 
 use MongoDB\Driver\Query;
-use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 
 class OpenDataManager implements IOpenDataManager {
@@ -54 +53 @@
     }
 
     public function isCollectionAvailable($name, $date) {
-        $command = new Command(['listCollections' => 1, 'filter' => ['name' => $name.$date]]);
-        $result = $this->manager->executeCommand('open-data-db', $command)->toArray();
+        $result = $this->manager->executeQuery('open-data-db.'.$name, new Query(['date' => $date], []));
 
-        return !empty($result);
+        return !empty($result->toArray());
     }
 
     public function getDatesWithAvailableCollection() {
-        $command = new Command(['listCollections' => 1]);
-        $result = $this->manager->executeCommand('open-data-db', $command)->toArray();
+        $available = $this->getAvailableCollections();
+        $result = [];
+
+        foreach ($available as $key => $value) {
+            $dates = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['projection' => ['date' => true, '_id' => false]]));
+            $dates->setTypeMap(['root' => 'array']);
+            $result = array_merge($result, array_map(function ($item) {return $item['date']; }, $dates->toArray()));
+        }
+
+        return array_values(array_unique($result));
+    }
+
+    public function getLastAvailableCollections() {
+        $available = $this->getAvailableCollections();
+        $result = [];
+
+        foreach ($available as $key => $value) {
+            $date = $this->manager->executeQuery('open-data-db.'.$value['key-name'], new Query([], ['sort' => ['date' => -1], 'limit' => 1, 'projection' => ['date' => true, '_id' => false]]));
+            $date->setTypeMap(['root' => 'array']);
 
-        $dates = [];
-        foreach ($result as $value) {
-            if (preg_match('/\\d{4}-\\d{2}-\\d{2}/', $value->name)) {
-                array_push($dates, substr($value->name, -10));
+            $date_array = $date->toArray();
+            if (!empty($date_array)) {
+                $result[$value['key-name']] = $date_array[0]['date'];
             }
         }
 
-        return array_values(array_unique($dates));
+        return $result;
     }
 
     public function getMaxCollectionNumberAtDay($name, $date) {

website/templates/heatmap.html.twig

@@ -95 +95 @@
     </a>
     <div class="locations collapse show" id="mapLocations">
       <ul>
-        <li onclick="setMapView()">Kampus ZČU</li>
+        <li onclick="setMapView(49.7248, 13.3521, 17)">Kampus ZČU</li>
         <li onclick="setMapView(49.7367263, 13.3709177, 18)">FPE &ndash; Pedagogická fakulta</li>
         <li onclick="setMapView(49.7474950, 13.3748308, 18)">FPR &ndash; Právnická fakulta</li>
         <li onclick="setMapView(49.7450169, 13.3702668, 18)">FZS &ndash; Fakulta zdravotnických studií</li>