Revize 55098dbb

Re #7857

.gitignore

@@ -7 +7 @@
 database/
 dev-dump/
 *.lock
+.env

website/.env

@@ -1 @@
-# In all environments, the following files are loaded if they exist,
-# the latter taking precedence over the former:
-#
-#  * .env                contains default values for the environment variables needed by the app
-#  * .env.local          uncommitted file with local overrides
-#  * .env.$APP_ENV       committed environment-specific defaults
-#  * .env.$APP_ENV.local uncommitted environment-specific overrides
-#
-# Real environment variables win over .env files.
-#
-# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
-#
-# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-
-###> symfony/framework-bundle ###
-APP_ENV=dev
-APP_SECRET=ca5751564bbb9a0d75d412e020790283
-#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-#TRUSTED_HOSTS='^(localhost|example\.com)$'
-###< symfony/framework-bundle ###

website/config/services.yaml

@@ -4 +4 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
+    databaseConnectionString: 'mongodb://root:root@database'
 
 services:
     # default configuration for services in *this* file
     _defaults:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
+        bind:
+            $connectionString: '%databaseConnectionString%'
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
@@ -25 +28 @@
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
+
+    App\OpenData\OpenDataManager: ~      
+    App\OpenData\IOpenDataManager: '@App\OpenData\OpenDataManager'

website/public/js/zcu-heatmap.js

@@ +1 @@
+var mymap;
+
+
+function initMap(x = 49.724, y = 13.352, zoom = 17) {
+
+    mymap = L.map('heatmap').setView([x, y], zoom);
+
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>',
+        maxZoom: 19
+    }).addTo(mymap);
+    
+    
+
+}
+
+function showHeatmap(route) {
+
+    $.ajax({
+        type: "POST",
+        url: route, 
+        success: function(result) {
+            drawHeatmap(result);
+        }
+    });
+
+}
+
+function drawHeatmap(points) {
+        
+    // Flipped x and y
+    points = points.map(function (p) { return [p['y'], p['x'], p['number']]; });
+
+    L.heatLayer(points).addTo(mymap), draw = true;
+
+}
+            
+            
+
+

website/src/Controller/HeatmapController.php

@@ -2 +2 @@
 
 namespace App\Controller;
 
-use App\Entity\OpenData;
-use MongoDB\Driver\Query;
-use MongoDB\Driver\Manager;
+use App\OpenData\IOpenDataManager;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
@@ -13 +11 @@
      * @Route("/heatmap")
      */
     public function index() {
-        $manager = new Manager(
-            'mongodb://root:root@database'
-        );
-
-        $openData = $manager->executeQuery('open-data-db.KOLOBEZKY31102018', new Query([], []));
-        $openData->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        return $this->render('heatmap.html.twig', [
-            'open_data' => $openData->toArray(),
-        ]);
+        return $this->render('heatmap.html.twig');
     }
 
     /**
-     * @Route("heatmap/opendata", name="opendata")
+     * @Route("heatmap/opendata/{collectionName}", name="opendata")
      */
-    public function opendata() {
-        $manager = new Manager(
-            'mongodb://root:root@database'
-        );
-
-        $openData = $manager->executeQuery('open-data-db.KOLOBEZKY31102018', new Query([], []));
-        $openData->setTypeMap([
-            'array' => 'array',
-            'document' => 'array',
-            'root' => 'array',
-        ]);
-
-        return $this->json($openData->toArray());
+    public function opendata(IOpenDataManager $manager, $collectionName) {
+        return $this->json($manager->getCollectionDataByName($collectionName));
     }
 }

website/src/IOpenDataManager.php

@@ +1 @@
+<?php
+
+namespace App\OpenData;
+
+interface IOpenDataManager {
+    public function getCollectionDataByName($name);
+}

website/src/OpenDataManager.php

@@ +1 @@
+<?php
+
+namespace App\OpenData;
+
+use MongoDB\Driver\Query;
+use MongoDB\Driver\Manager;
+
+class OpenDataManager implements IOpenDataManager {
+    private $manager;
+
+    public function __construct() {
+        $this->manager = new Manager(
+            $_ENV['DATABASE_CONNECTION_STRING']
+        );
+    }
+
+    public function getCollectionDataByName($name) {
+        $openData = $this->manager->executeQuery($name, new Query([], []));
+
+        $openData->setTypeMap([
+            'array' => 'array',
+            'document' => 'array',
+            'root' => 'array',
+        ]);
+
+        return $openData->toArray();
+    }
+}

website/templates/heatmap.html.twig

@@ -24 +24 @@
     <script src="https://code.jquery.com/jquery-3.5.0.min.js" integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script>
     <script src="{{ asset('js/leaflet.js') }}"></script>
     <script src="{{ asset('js/leaflet-heat.js') }}"></script>
-
+    <script src="{{ asset('js/zcu-heatmap.js') }}"></script>
     <script>
 
-        $(document).ready(function() {
-            
-            var mymap = L.map('heatmap').setView([49.724, 13.352], 17);
-
-            L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>',
-                maxZoom: 19
-            }).addTo(mymap);
-            
-            $.ajax({
-                type: "POST",
-                url: "{{ path('opendata') }}",
-                success: function(result) {
-                    heatmap(result);
-                }
-            });
-        
-            function heatmap(points) {
-                
-                points = points.map(function (p) { return [p['y'], p['x'], p['number']]; });
-
-                var heat = L.heatLayer(points).addTo(mymap),
-                    draw = true;
-
-            }
-
-        });
-
+       initMap();
+       showHeatmap("{{ path('opendata', {'collectionName':'open-data-db.KOLOBEZKY31102018'}) }}");
 
     </script>