Revize 64bc2934

+ funkcionalita zobrazení jednotlivých datasetů - zatím bez animace

website/public/js/zcu-heatmap.js

@@ -1 @@
-var map;
+var mymap;
 var heatmapLayer = null;
 
 var startX = 49.7248;
@@ -9 +9 @@
 
 
 function initMap() {
-  map = L.map('heatmap').setView([startX, startY], startZoom);
+  mymap = L.map('heatmap').setView([startX, startY], startZoom);
 
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     attribution: '',
     maxZoom: 19
-  }).addTo(map);
+  }).addTo(mymap);
 }
 
 
 function setMapView(latitude = startX, longitude = startY, zoom = startZoom) {
-  map.setView([latitude, longitude], zoom);
+  mymap.setView([latitude, longitude], zoom);
 }
 
 
@@ -59 +59 @@
     }, 400);
 }
 
-function showHeatmap(route, date) {
+function showHeatmap(route) {
+
+  var name = $('#type').children("option:selected").text();
+  var parts = $('#date').val().split('-');
+  var date = parts[2] + parts[1] + parts[0];
+  var time = $('#time').children("option:selected").val();
 
   $.ajax({
     type: "POST",
-    url: route + date,
+    url: route + '/' +  name + '/' + date + '/' + time,
     success: function(result) {
       drawHeatmap(result);
     }
@@ -78 +83 @@
   if (heatmapLayer != null) {
     mymap.removeLayer(heatmapLayer);
   }
-  heatmapLayer = L.heatLayer(points).addTo(map), draw = true; 
+  heatmapLayer = L.heatLayer(points, {opacity: 0.5}).addTo(mymap);
+  heatmapLayer.options = {opacity: 1};
   // var heat_01 = ...
   // on background map.addLayer(heat_01) -> map.removeLayer(heat_01);
+  // $(.leaflet-heatmap-layer).css('opacity', 'value');
 }
 
 function checkDataSetsAvailability(route) {
@@ -105 +112 @@
     options += '<option value="' + value + '">' + key + '</option>\n'; 
   });
 
-  $('#types').empty().append(options);
+  $('#type').empty().append(options);
   
 }

website/src/Controller/HeatmapController.php

@@ -24 +24 @@
         $dataSet = $form->getData();
         if ($form->isSubmitted()) {
             $dataSet = $form->getData();
-            // Todo do something
         }
 
         return $this->render(
             'heatmap.html.twig',
             [
                 'form' => $form->createView(),
+                'data_to_display' => $dataSet,
             ]
         );
     }
 
     /**
-     * @Route("heatmap/opendata/{collectionName}", name="opendata")
+     * @Route("heatmap/opendata/{name}/{date}/{time}", name="opendata")
      */
-    public function opendata(IOpenDataManager $manager, $collectionName) {
-        return $this->json($manager->getCollectionDataByName($collectionName));
+    public function opendata(IOpenDataManager $manager, $name = 'NONE', $date = '01012020', $time = '1') {
+        return $this->json($manager->getCollectionDataByName($name, $date, $time));
     }
 
     /**

website/src/IOpenDataManager.php

@@ -3 +3 @@
 namespace App\OpenData;
 
 interface IOpenDataManager {
-    public function getCollectionDataByName($name);
+    public function getCollectionDataByName($name, $date, $hour);
 
     public function getAvailableCollections();
 

website/src/OpenDataManager.php

@@ -14 +14 @@
         );
     }
 
-    public function getCollectionDataByName($name) {
-        $openData = $this->manager->executeQuery($name, new Query([], []));
+    public function getCollectionDataByName($name, $date, $hour) {
+        $openData = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query(['date' => $date.$hour], []));
 
         $openData->setTypeMap([
             'array' => 'array',

website/templates/heatmap.html.twig

@@ -44 +44 @@
               {{ form_label(form.date, 'Vyberte čas') }}
               {{
                 form_widget(form.time, {
+                  'id' : 'time',
                   'attr' : {
                     'class' : "custom-select"
                   }
@@ -55 +56 @@
               {{ form_label(form.date, 'Vybrané datové sady') }}
               {{
                 form_widget(form.type, {
-                  'id' : 'types',
+                  'id' : 'type',
                   'attr' : {
                     'class' : "custom-select"                 
                   }
@@ -164 +165 @@
     <script src="{{ asset('js/zcu-heatmap.js') }}"></script>
     <script>
        initMap();
-       showHeatmap("{{ path('opendata', {'collectionName':'open-data-db.'}) }}", 'KOLOBEZKY31102018');
+        {% if data_to_display is defined %}
+          showHeatmap("{{ path('opendata') }}");
+        {% endif %}
     </script>