Merge pull request #750 from MTES-MCT/fix-gpu

Remplace les cartes statiques par leurs équivalents dynamiques

assets/scripts/map_libre/index.js

@@ -17,6 +17,7 @@ export default class MapLibre
     this.mapCenter = _options.mapCenter
     this.defaultZoom = _options.defaultZoom
     this.data = _options.data
+    this.bounds = _options.bounds
 
     if (!this.targetElement)
     {
@@ -87,6 +88,20 @@ export default class MapLibre
 
       // Set controls
       this.map.addControl(new maplibregl.NavigationControl(), 'top-left')
+      const fullScreenControl = new maplibregl.FullscreenControl()
+      this.map.addControl(fullScreenControl, 'bottom-right')
+      this.map.addControl(this.tabs, 'top-right')
+      this.map.scrollZoom.disable()
+
+      fullScreenControl.on('fullscreenstart', () => this.map.scrollZoom.enable())
+      fullScreenControl.on('fullscreenend', () => this.map.scrollZoom.disable())
+
+      if (this.bounds)
+      {
+        this.map.fitBounds(this.bounds, {
+          padding: 50,
+        })
+      }
     })
   }
 
@@ -122,9 +137,7 @@ export default class MapLibre
       )
     }
 
-    this.tabs = new Tabs({
-      tabList,
-    })
+    this.tabs = new Tabs({ tabList })
   }
 
   setSources()

assets/scripts/map_libre/tabs.js

@@ -16,6 +16,9 @@ export default class Tabs
 
     this.buttonsNode = document.createElement('div')
     this.buttonsNode.classList.add('tablist')
+    this.buttonsNode.style.pointerEvents = 'auto'
+    this.buttonsNode.style.height = '100vh'
+    this.buttonsNode.style.width = '50px'
     this.buttonsNode.setAttribute('role', 'tablist')
     this.buttonsNode.setAttribute('aria-label', 'Paramètres de la carte')
 
@@ -46,6 +49,10 @@ export default class Tabs
 
     // Create tab
     const tabNode = document.createElement('div')
+    tabNode.style.width = '50vw'
+    tabNode.style.height = '100vh'
+    tabNode.style.right = '50px'
+    tabNode.style.pointerEvents = 'auto'
     tabNode.id = `${_tab.id}-tab`
     tabNode.classList.add('tab')
     tabNode.setAttribute('role', 'tabpanel')
@@ -97,4 +104,9 @@ export default class Tabs
   {
     return this.tabsNode.querySelector(`[aria-labelledby="${_id}"]`)
   }
+
+  onAdd()
+  {
+    return this.tabsNode
+  }
 }

carto/templates/carto/map_libre.html

@@ -8,6 +8,13 @@
 {% load highcharts_tags %}
 {% load sri %}
 
+{% block top_navigation %}
+{% endblock top_navigation %}
+
+{% block title %}
+{{ map_name }}
+{% endblock title %}
+
 {% block pagetitle %}
 {{ map_name }}
 {% endblock pagetitle %}
@@ -40,13 +47,15 @@
 {{ data|json_script:"data" }}
 
 <script language="javascript" nonce="[NONCE_PLACEHOLDER]">
-new MapLibre ({
+new MapLibre({
     targetElement: document.getElementById('map__container'),
     debug: {{ debug|yesno:"true,false" }},
     mapCenter: [{{ center_lng }}, {{ center_lat }}],
     defaultZoom: {{ default_zoom }},
+    bounds: {{ bounds|default:'null' }},
     data: JSON.parse(document.getElementById('data').textContent)
 })
+
 </script>
 {% endlocalize %}
 {% endblock bodyend %}

config/settings.py

@@ -660,3 +660,7 @@ def show_toolbar(request):
 # CRISP
 
 CRISP_WEBHOOK_SECRET_KEY = env.str("CRISP_WEBHOOK_SECRET_KEY")
+
+X_FRAME_OPTIONS = "SAMEORIGIN"
+
+XS_SHARING_ALLOWED_METHODS = ["POST", "GET", "OPTIONS", "PUT", "DELETE"]

project/admin.py

@@ -74,11 +74,6 @@ def response_change(self, request, obj):
             messages.add_message(request, messages.INFO, msg)
             return HttpResponseRedirect(".")
 
-        elif "_generate-gpu" in request.POST:
-            tasks.generate_theme_map_gpu.delay(obj.id)
-            messages.add_message(request, messages.INFO, "Génération de l'image des zonages d'urbanismes en cours")
-            return HttpResponseRedirect(".")
-
         elif "_generate-fill-gpu" in request.POST:
             tasks.generate_theme_map_fill_gpu.delay(obj.id)
             messages.add_message(

project/apps.py

@@ -4,8 +4,7 @@
 
 def pre_create_historical_record_callback(sender, **kwargs):
     project_history = kwargs["history_instance"]
-    if project_history.async_theme_map_gpu_done is None:
-        project_history.async_theme_map_gpu_done = False
+    if project_history.async_theme_map_fill_gpu_done is None:
         project_history.generate_theme_map_fill_gpu = False
 
 

project/migrations/0102_remove_historicalproject_async_theme_map_gpu_done_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.13 on 2024-11-21 10:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("public_data", "0191_landconso_landconsocomparison_landconsostats_landpop_and_more"),
+        ("project", "0101_remove_projectcommune_commune_insee"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="historicalproject",
+            name="async_theme_map_gpu_done",
+        ),
+        migrations.RemoveField(
+            model_name="historicalproject",
+            name="theme_map_gpu",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="async_theme_map_gpu_done",
+        ),
+        migrations.RemoveField(
+            model_name="project",
+            name="theme_map_gpu",
+        ),
+    ]

project/migrations/0103_merge_20241128_1446.py

@@ -0,0 +1,12 @@
+# Generated by Django 4.2.13 on 2024-11-28 13:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("project", "0102_alter_projectcommune_commune"),
+        ("project", "0102_remove_historicalproject_async_theme_map_gpu_done_and_more"),
+    ]
+
+    operations = []

project/models/create.py

@@ -39,8 +39,6 @@ def map_tasks(project_id: str) -> List[celery.Task]:  # noqa: C901
             map_tasks.append(tasks.generate_theme_map_understand_artif.si(project.id))
 
     if project.has_complete_uniform_ocsge_coverage and project.has_zonage_urbanisme:
-        if not project.async_theme_map_gpu_done:
-            map_tasks.append(tasks.generate_theme_map_gpu.si(project.id))
         if not project.async_theme_map_fill_gpu_done:
             map_tasks.append(tasks.generate_theme_map_fill_gpu.si(project.id))
 

project/models/project_base.py

@@ -278,13 +278,6 @@ def get_public_key(self) -> str:
         storage=PublicMediaStorage(),
     )
 
-    theme_map_gpu = models.ImageField(
-        upload_to=upload_in_project_folder,
-        blank=True,
-        null=True,
-        storage=PublicMediaStorage(),
-    )
-
     theme_map_fill_gpu = models.ImageField(
         upload_to=upload_in_project_folder,
         blank=True,
@@ -307,7 +300,6 @@ def get_public_key(self) -> str:
     async_generate_theme_map_conso_done = models.BooleanField(default=False)
     async_generate_theme_map_artif_done = models.BooleanField(default=False)
     async_theme_map_understand_artif_done = models.BooleanField(default=False)
-    async_theme_map_gpu_done = models.BooleanField(default=False)
     async_theme_map_fill_gpu_done = models.BooleanField(default=False)
     async_ocsge_coverage_status_done = models.BooleanField(default=False)
 
@@ -348,9 +340,7 @@ def async_complete(self) -> bool:
             static_maps_ready = static_maps_ready and self.async_theme_map_understand_artif_done
 
         if self.has_zonage_urbanisme and self.has_complete_uniform_ocsge_coverage:
-            static_maps_ready = (
-                static_maps_ready and self.async_theme_map_gpu_done and self.async_theme_map_fill_gpu_done
-            )
+            static_maps_ready = static_maps_ready and self.async_theme_map_fill_gpu_done
 
         return calculations_and_extend_ready and static_maps_ready
 

project/tasks/project.py

@@ -695,65 +695,6 @@ def generate_theme_map_understand_artif(self, project_id) -> None:
         logger.info("End generate_theme_map_understand_artif, project_id=%d", project_id)
 
 
-@shared_task(bind=True, max_retries=5)
-def generate_theme_map_gpu(self, project_id) -> None:
-    logger.info("Start generate_theme_map_gpu, project_id=%d", project_id)
-    try:
-        diagnostic = Project.objects.get(id=int(project_id))
-
-        geom = diagnostic.combined_emprise.transform("3857", clone=True)
-        srid, wkt = geom.ewkt.split(";")
-        polygons = shapely.wkt.loads(wkt)
-        gdf_emprise = geopandas.GeoDataFrame({"geometry": [polygons]}, crs="EPSG:3857")
-
-        data = {"color": [], "geometry": []}
-
-        for zone_urba in ZoneUrba.objects.intersect(diagnostic.combined_emprise):
-            srid, wkt = zone_urba.intersection.ewkt.split(";")
-            polygons = shapely.wkt.loads(wkt)
-            data["geometry"].append(polygons)
-            data["color"].append((*[_ / 255 for _ in zone_urba.get_color()], 0.9))
-
-        zone_urba_gdf = geopandas.GeoDataFrame(data, crs="EPSG:4326").to_crs(epsg=3857)
-
-        fig, ax = plt.subplots(figsize=(15, 10))
-        plt.axis("off")
-        fig.set_dpi(150)
-
-        zone_urba_gdf.plot(ax=ax, color=zone_urba_gdf["color"])
-        gdf_emprise.plot(ax=ax, facecolor="none", edgecolor="black")
-        ax.add_artist(ScaleBar(1))
-        ax.set_title(
-            f"Les zones d'urbanisme du territoire «{diagnostic.territory_name}» en {diagnostic.analyse_end_date}"
-        )
-        cx.add_basemap(ax, source=settings.OPENSTREETMAP_URL)
-        cx.add_attribution(ax, text=settings.OPENSTREETMAP_ATTRIBUTION)
-
-        img_data = io.BytesIO()
-        plt.savefig(img_data, bbox_inches="tight", format="jpg")
-        plt.close()
-        img_data.seek(0)
-
-        race_protection_save_map(
-            diagnostic.pk,
-            "async_theme_map_gpu_done",
-            "theme_map_gpu",
-            f"theme_map_gpu_{project_id}.jpg",
-            img_data,
-        )
-
-    except Project.DoesNotExist:
-        logger.error(f"project_id={project_id} does not exist")
-
-    except Exception as exc:
-        logger.error(exc)
-        logger.exception(exc)
-        self.retry(exc=exc, countdown=300)
-
-    finally:
-        logger.info("End generate_theme_map_gpu, project_id=%d", project_id)
-
-
 @shared_task(bind=True, max_retries=5)
 def generate_theme_map_fill_gpu(self, project_id) -> None:
     logger.info("Start generate_theme_map_fill_gpu, project_id=%d", project_id)

project/templates/project/components/charts/artif_zone_urba.html

@@ -1,5 +1,5 @@
 <div>
-    <h1 class="mb-3">Détail de la zone urbaine</h1>
+    <h4 class="mb-3">Détail de la zone urbaine</h1>
     <ul class="fr-tags-group">
         <li>
             <p class="fr-tag fr-tag--sm">Surface de la zone:&nbsp;<strong>{{ surface|floatformat:1 }} ha</strong></p>

project/templates/project/components/dashboard/artificialisation.html

@@ -147,17 +147,19 @@ <h2>Aperçu de l'artificialisation</h2>
     <h3>Evolution de l'artificialisation entre {{ first_millesime }} et {{ last_millesime }}</h3>
 
     <div class="fr-grid-row fr-grid-row--gutters">
-        <div class="fr-col-12 fr-col-lg-8">
+        <div class="fr-col-12">
             <div class="bg-white fr-p-2w h-100">
                 <div class="d-flex justify-content-end align-items-center fr-mb-2w">
                     {% include "project/components/widgets/chart_buttons.html" with chart="chart_waterfall" %}
                 </div>
                 <div id="chart_waterfall"></div>
             </div>
         </div>
-        <div class="fr-col-12 fr-col-lg-4">
-            {% url 'project:theme-my-artif' project.pk as dynamic_map_url %}
-            {% include "project/components/widgets/static_map.html" with dynamic_map_url=dynamic_map_url static_map=project.theme_map_understand_artif title="Carte comprendre l'artificialisation de son territoire" %}
+    </div>
+    <div class="fr-grid-row fr-grid-row--gutters">
+        <div class="fr-col-12">
+            {% url 'project:theme-my-artif' project.pk as map_url %}
+            {% include "project/components/map/iframe_map.html" with src=map_url title="Carte comprendre l'artificialisation" %}
         </div>
     </div>
 

project/templates/project/components/dashboard/consommation.html

@@ -13,7 +13,7 @@
     <h3 id="conso-annuelle">Consommation d'espace annuelle sur le territoire</h3>
 
     <div class="fr-grid-row fr-grid-row--gutters">
-        <div class="fr-col-12{% if not is_commune %} fr-col-lg-8{% endif %}">
+        <div class="fr-col-12">
             <div class="bg-white fr-p-2w h-100">
                 <div class="d-flex justify-content-end align-items-center fr-mb-2w">
                     {% include "project/components/widgets/chart_buttons.html" with chart="annual_total_conso_chart" %}
@@ -22,13 +22,15 @@ <h3 id="conso-annuelle">Consommation d'espace annuelle sur le territoire</h3>
                 <div id="annual_total_conso_chart"></div>
             </div>
         </div>
-        {% if not is_commune %}
-        <div class="fr-col-12 fr-col-lg-4">
-            {% url 'project:theme-city-conso' project.pk as dynamic_map_url %}
-            {% include "project/components/widgets/static_map.html" with dynamic_map_url=dynamic_map_url static_map=project.theme_map_conso title="Carte consommation d'espaces des communes du territoire sur la période (en ha)" %}
+    </div>
+    {% if not is_commune %}
+    <div class="fr-grid-row fr-grid-row--gutters">
+        <div class="fr-col-12">
+            {% url 'project:theme-city-conso' project.pk as map_url %}
+            {% include "project/components/map/iframe_map.html" with src=map_url title="ECarte consommation d'espaces des communes du territoire sur la période (en ha)" %}
         </div>
-        {% endif %}
     </div>
+    {% endif %}
 
     <div class="fr-notice bg-white fr-mt-2w">
         <div class="fr-px-2w">