add performance methode to get observations on territory sheet

juggler31 · juggler31 · commit 840a78ef0e01 · 2025-03-27T16:40:07.000+01:00
diff --git a/atlas/atlasAPI.py b/atlas/atlasAPI.py
@@ -1,4 +1,5 @@
 # -*- coding:utf-8 -*-
+import json
 
 from flask import jsonify, Blueprint, request, current_app
 
@@ -131,6 +132,23 @@ def getObservationsAreaTaxonMailleAPI(id_area, cd_ref):
     return jsonify(observations)
 
 
+@api.route("/area/<int(signed=True):id_area>", methods=["GET"])
+def get_observations_area_api(id_area):
+    connection = db.engine.connect()
+
+    if current_app.config["AFFICHAGE_MAILLE"]:
+        observations = vmObservationsMaillesRepository.lastObservationsAreaMaille(
+            connection, current_app.config["NB_LAST_OBS"], str(id_area)
+        )
+    else:
+        observations = vmObservationsRepository.lastObservationsArea(
+            connection, current_app.config["NB_LAST_OBS"], id_area
+        )
+
+    connection.close()
+    return jsonify(observations)
+
+
 @api.route("/photoGroup/<group>", methods=["GET"])
 def getPhotosGroup(group):
     connection = db.engine.connect()
diff --git a/atlas/atlasRoutes.py b/atlas/atlasRoutes.py
@@ -314,15 +314,6 @@ def ficheArea(id_area):
     session = db.session
     connection = db.engine.connect()
 
-    if current_app.config["AFFICHAGE_MAILLE"]:
-        observations = vmObservationsMaillesRepository.lastObservationsAreaMaille(
-            connection, current_app.config["NB_LAST_OBS"], str(id_area)
-        )
-    else:
-        observations = vmObservationsRepository.lastObservationsArea(
-            connection, current_app.config["NB_LAST_OBS"], id_area
-        )
-
     listTaxons = vmTaxonsRepository.getTaxonsAreas(connection, id_area)
     area = vmAreasRepository.getAreaFromIdArea(connection, id_area)
     stats_area = vmAreasRepository.getStatsByArea(connection, id_area)
@@ -335,7 +326,6 @@ def ficheArea(id_area):
         listTaxons=listTaxons,
         stats_area=stats_area,
         areaInfos=area,
-        observations=observations,
         DISPLAY_EYE_ON_LIST=True,
         id_area=id_area,
     )
diff --git a/atlas/modeles/repositories/vmObservationsMaillesRepository.py b/atlas/modeles/repositories/vmObservationsMaillesRepository.py
@@ -118,43 +118,38 @@ def lastObservationsMailles(connection, mylimit, idPhoto):
 
 def lastObservationsAreaMaille(connection, obs_limit, id_area):
     sql = """
-    WITH obs_in_area AS (
-        SELECT
-            obs.id_observation,
-            obs.cd_ref,
-            date_part('year', obs.dateobs) AS annee
-        FROM atlas.vm_observations obs
-        JOIN atlas.vm_cor_area_synthese AS cas  ON cas.id_synthese = obs.id_observation
-        WHERE cas.id_area = :idAreaCode
-    )
+WITH obs_in_area AS (
     SELECT
-        obs_in_area.id_observation,
-        obs_in_area.cd_ref,
-        COALESCE(t.nom_vern || ' | ', '') || t.lb_nom  AS display_name,
-        obs_in_area.annee,
-        obs.type_code,
-        obs.id_maille,
-        vla.area_geojson AS geojson_4326
-    FROM obs_in_area
-            JOIN atlas.vm_observations_mailles obs ON obs_in_area.id_observation = ANY(obs.id_observations)
-            JOIN atlas.vm_l_areas vla ON vla.id_area=obs.id_maille
-            JOIN atlas.vm_taxons AS t ON t.cd_ref = obs_in_area.cd_ref
-    ORDER BY annee DESC
-    LIMIT :obsLimit;
+        obs.id_observation,
+        obs.cd_ref,
+        date_part('year', obs.dateobs) AS annee
+    FROM atlas.vm_observations obs
+             JOIN atlas.vm_cor_area_synthese AS cas  ON cas.id_synthese = obs.id_observation
+    WHERE cas.id_area = :idAreaCode
+)
+SELECT
+    json_build_object(
+            'type', 'FeatureCollection',
+            'features', json_agg(ST_AsGeoJSON(features.*)::json)
+    ) AS observations_features
+     FROM (
+SELECT
+    COUNT(obs_in_area.id_observation) AS nb_observations,
+    COUNT(DISTINCT obs_in_area.cd_ref) AS nb_cd_ref,
+    json_agg(DISTINCT jsonb_build_object(
+            'name', (COALESCE(t.nom_vern || ' | ', '') || t.lb_nom),
+            'cdRef', t.cd_ref)) AS taxons,
+    obs.type_code,
+    obs.id_maille,
+    vla.the_geom
+FROM obs_in_area
+         JOIN atlas.vm_observations_mailles obs ON obs_in_area.id_observation = ANY(obs.id_observations)
+         JOIN atlas.vm_l_areas vla ON vla.id_area=obs.id_maille
+         JOIN atlas.vm_taxons AS t ON t.cd_ref = obs_in_area.cd_ref
+GROUP BY obs.type_code, obs.id_maille, vla.the_geom) AS features
     """
-    results = connection.execute(text(sql), idAreaCode=id_area, obsLimit=obs_limit)
-    observations = list()
-    for r in results:
-        infos = {
-            "cd_ref": r.cd_ref,
-            "taxon": r.display_name,
-            "geojson_maille": json.loads(r.geojson_4326),
-            "id_maille": r.id_maille,
-            "id_observation": r.id_observation,
-            "type_code": r.type_code,
-        }
-        observations.append(infos)
-    return observations
+    query = connection.execute(text(sql), idAreaCode=id_area, obsLimit=obs_limit)
+    return dict(query.all()[0])
 
 
 # Use for API
diff --git a/atlas/modeles/repositories/vmObservationsRepository.py b/atlas/modeles/repositories/vmObservationsRepository.py
@@ -76,7 +76,6 @@ def lastObservations(connection, mylimit, idPhoto):
         temp.pop("the_geom_point", None)
         temp["geojson_point"] = json.loads(o.geojson_point or "{}")
         temp["dateobs"] = o.dateobs
-        temp["type_code"] = o.type_code
         temp["group2_inpn"] = utils.deleteAccent(o.group2_inpn)
         temp["pathImg"] = utils.findPath(o)
         obsList.append(temp)
diff --git a/atlas/static/mapAreas.js b/atlas/static/mapAreas.js
@@ -9,6 +9,10 @@ var currentLayer;
 // Current observation geoJson:  type object
 var myGeoJson;
 
+const id_area = document.location.pathname.split("/")[2]
+displayObs(id_area)
+
+
 // Display limit of the territory
 var areaLayer = L.geoJson(areaInfos.areaGeoJson, {
     style: function () {
@@ -30,12 +34,8 @@ bounds.extend(layerBounds);
 map.fitBounds(bounds);
 map.zoom = map.getZoom();
 // Display the 'x' last observations
-// MAILLE
-if (configuration.AFFICHAGE_MAILLE) {
-    displayMailleLayerLastObs(observations);
-}
 // POINT
-else {
+if (!configuration.AFFICHAGE_MAILLE) {
     displayMarkerLayerPointLastObs(observations);
 }
 
@@ -75,34 +75,53 @@ function displayObsGridBaseUrl() {
 
 // display observation on click
 function displayObsTaxon(id_area, cd_ref) {
-  $.ajax({
-    url:
-      configuration.URL_APPLICATION +
-      "/api/observations/" +
-      id_area +
-      "/" +
-      cd_ref,
-    dataType: "json",
-    beforeSend: function() {
-      $("#loadingGif").show();
-      $("#loadingGif").attr(
-        "src",
-        configuration.URL_APPLICATION + "/static/images/loading.svg"
-      );
-    }
-  }).done(function(observations) {    
-    $("#loadingGif").hide();
-    map.removeLayer(currentLayer);
-    if (configuration.AFFICHAGE_MAILLE) {
-        displayMailleLayerLastObs(observations);
-        clearOverlays()
-    } else {
+    $.ajax({
+        url:
+            configuration.URL_APPLICATION +
+            "/api/observations/" +
+            id_area +
+            "/" +
+            cd_ref,
+        dataType: "json",
+        beforeSend: function() {
+            $("#loadingGif").show();
+            $("#loadingGif").attr(
+                "src",
+                configuration.URL_APPLICATION + "/static/images/loading.svg"
+            );
+        }
+    }).done(function(observations) {
+        $("#loadingGif").hide();
         map.removeLayer(currentLayer);
-        displayMarkerLayerPointArea(observations);
-    }
-  });
+        if (configuration.AFFICHAGE_MAILLE) {
+            displayMailleLayerLastObs(observations);
+            clearOverlays()
+        } else {
+            map.removeLayer(currentLayer);
+            displayMarkerLayerPointArea(observations);
+        }
+    });
 }
 
+function displayObs(areaCode) {
+    $("#loaderSpinner").show();
+    fetch(`/api/area/${areaCode}`)
+        .then(data => {
+            return data.json()
+        })
+        .then(observations => {
+            if (configuration.AFFICHAGE_MAILLE) {
+                displayMailleLayer(observations.observations_features);
+            } else {
+                displayMarkerLayerPointLastObs(observations)
+            }
+            $("#loaderSpinner").hide();
+        })
+        .catch(err => {
+            console.error(err)
+            $("#loaderSpinner").hide();
+        })
+}
 
 function displayObsTaxonMaille(areaCode, cd_ref) {
     $.ajax({
diff --git a/atlas/static/mapGenerator.js b/atlas/static/mapGenerator.js
@@ -451,8 +451,7 @@ function generateGeojsonGridArea(observations) {
 }
 
 function displayGridLayerArea(observations) {
-    myGeoJson = generateGeojsonGridArea(observations);
-    currentLayer = L.geoJson(myGeoJson, {
+    currentLayer = L.geoJson(observations, {
         onEachFeature: onEachFeatureMaille,
         style: styleMaille,
     });
@@ -645,12 +644,17 @@ function buildSpeciesEntries(taxons) {
     return rows.join('\n');
 }
 
-function onEachFeatureMailleLastObs(feature, layer) {
-    title = `${feature.properties.taxons.length} espèces observées dans la maille &nbsp;: `;
-    rows = buildSpeciesEntries(feature.properties.taxons);
-    popupContent = `<b>${title}</b><ul>${rows}</ul>`;
+function createPopUp(feature, layer) {
+    const title = `${feature.properties.taxons.length} espèces observées dans la maille &nbsp;: `;
+    const rows = buildSpeciesEntries(feature.properties.taxons);
+    const popupContent = `<b>${title}</b><ul>${rows}</ul>`;
 
     layer.bindPopup(popupContent, { maxHeight: 300 });
+}
+
+function onEachFeatureMailleLastObs(feature, layer) {
+    createPopUp(feature, layer);
+
 
     addInFeatureGroup(feature, layer);
 
@@ -808,6 +812,22 @@ function generateGeoJsonMailleLastObs(observations, isRefresh=false) {
     };
 }
 
+function displayMailleLayer(observationsMaille) {
+    // myGeoJson = observationsMaille;
+    // Get all different type code
+    Object.values(observationsMaille.features).forEach(elem => {
+            if (!current_type_code.includes(elem.properties.type_code)) {
+                current_type_code.push(elem.properties.type_code)
+            }
+    })
+    createMailleSelector()
+    currentLayer = L.geoJson(observationsMaille, {
+        onEachFeature: onEachFeatureMailleLastObs,
+    });
+
+    // ajout de la légende
+    generateLegendMaille();
+}
 
 function displayMailleLayerLastObs(observations, isRefresh=false) {
     const geojsonMaille = generateGeoJsonMailleLastObs(observations, isRefresh);
diff --git a/atlas/templates/areaSheet/_main.html b/atlas/templates/areaSheet/_main.html
@@ -29,7 +29,6 @@
     {# Ajoutez ici les assets complémentaires qui seront en bas de page #}
     <script type="text/javascript">
         var configuration = {{configuration|tojson}};
-        var observations = {{observations|tojson}};
         var areaInfos = {{ areaInfos | tojson }};
         var url_limit_territory = "{{url_for('static', filename='custom/territoire.json') }}";
         const translations = {
@@ -66,8 +65,13 @@
             </div>
             <div class="col-12 col-xl-8 col-lg-7 col-md-6 d-flex flex-column m-0 p-0" style="min-height: 80vh;">
                 <div class="bg-light p-2">
-                    <h5 id="titleMap"><i class="fa fa-map"></i> <i>{{ areaInfos.areaName }}</i> : {{ configuration.NB_LAST_OBS }} {{ _('last.obs.area') }}
-                    </h5>
+                    {% if configuration.AFFICHAGE_MAILLE %}
+                        <h5 id="titleMap"><i class="fa fa-map"></i> <i>{{ areaInfos.areaName }}</i> 
+                        </h5>
+                    {% else %}
+                        <h5 id="titleMap"><i class="fa fa-map"></i> <i>{{ areaInfos.areaName }}</i> : {{ configuration.NB_LAST_OBS }} {{ _('last.obs.area') }}
+                        </h5>
+                    {% endif %}
                 </div>
                 <div class="d-flex align-content-stretch bg-warning flex-grow-1">
                     <div class="d-flex flex-grow-1">
