From b1b46119c311383d8c28e9242afca3df71aecb75 Mon Sep 17 00:00:00 2001
From: vincent <vincent@caboulot.org>
Date: Tue, 30 Jul 2024 18:37:55 +0200
Subject: [PATCH] ajoute quelques bricoles

---
 .env                                                 | 1 +
 assets/controllers/map_controller.js                 | 6 +++++-
 config/services.yaml                                 | 3 ++-
 src/Kernel.php                                       | 6 ++++++
 templates/partials/_overpass-element-popup.html.twig | 6 ++++++
 templates/task/show.html.twig                        | 2 +-
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 9e81e18..33dbbd6 100644
--- a/.env
+++ b/.env
@@ -29,5 +29,6 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
+APP_TIMEZONE=
 OSM_CLIENT_ID=
 OSM_CLIENT_SECRET=
diff --git a/assets/controllers/map_controller.js b/assets/controllers/map_controller.js
index 2214b14..4d53d9b 100644
--- a/assets/controllers/map_controller.js
+++ b/assets/controllers/map_controller.js
@@ -55,6 +55,10 @@ export default class extends Controller {
                 layer2.on('popupopen', function (event) {
                     var element = event.popup.options.overpassElement;
                     delete element.members;
+                    element['map'] = {
+                        'center': map.getCenter(),
+                        'zoom': map.getZoom(),
+                    };
                     fetch(_this.popupUrlValue + '?' + (new URLSearchParams({
                         'element': JSON.stringify(element),
                     })))
@@ -111,6 +115,6 @@ export default class extends Controller {
             }).addTo(map);
         }
 
-        map.fitBounds(layer.getBounds());
+        map.fitBounds(layer1.getBounds());
     }
 }
diff --git a/config/services.yaml b/config/services.yaml
index 2d6a76f..4904dd1 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -4,7 +4,8 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
-
+    timezone: '%env(APP_TIMEZONE)%'
+ 
 services:
     # default configuration for services in *this* file
     _defaults:
diff --git a/src/Kernel.php b/src/Kernel.php
index 779cd1f..6e55a84 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -8,4 +8,10 @@ use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
+
+    public function boot(): void
+    {
+        parent::boot();
+        date_default_timezone_set($this->getContainer()->getParameter('timezone'));
+    }
 }
diff --git a/templates/partials/_overpass-element-popup.html.twig b/templates/partials/_overpass-element-popup.html.twig
index b8697cf..8533226 100644
--- a/templates/partials/_overpass-element-popup.html.twig
+++ b/templates/partials/_overpass-element-popup.html.twig
@@ -1,6 +1,12 @@
 <h6>{{ element.type|capitalize }} {{ element.id }}</h6>
 <p>Voir sur <a href="https://www.openstreetmap.org/{{ element.type }}/{{ element.id }}" target="_blank">OSM</a>
+<br/>sur <a href="https://api.panoramax.xyz/#focus=map&map={{ element.map.zoom }}/{{ element.map.center.lat }}/{{ element.map.center.lng }}" target="_blank">Panoramax<a>
 {% if element.type == 'relation' and element.tags and element.tags.route and element.tags.route == 'hiking' %}
 <br/>sur <a href="https://hiking.waymarkedtrails.org/#route?id={{ element.id }}&type=relation" target="_blank">WayMarkedTrails</a>
 {% endif %}
+<table><tbody>
+    {% for key, value in element.tags %}
+    <tr><th>{{ key }}</th><td>{{ value }}</td></tr>
+    {% endfor %}
+</tbody></table>
 </p>
diff --git a/templates/task/show.html.twig b/templates/task/show.html.twig
index f1a2d5d..14703f1 100644
--- a/templates/task/show.html.twig
+++ b/templates/task/show.html.twig
@@ -82,7 +82,7 @@
 <h2 class="mb-3">Carte</h2>
 <div class="row">
     <div class="col mb-3">
-        {{ macro.map(task) }}
+        {{ macro.map(task, task.project.overpassResult) }}
     </div>
 </div>