Merge branch 'add_home_territory_pnx' into recette

Author: juggler31

atlas/modeles/repositories/vmObservationsMaillesRepository.py

@@ -75,34 +75,38 @@ def getObservationsMaillesChilds(session, cd_ref, year_min=None, year_max=None):
 
 def territoryObservationsMailles(connection):
     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
+)
 SELECT
-    obs.id_maille,
-    obs.nbr AS obs_nbr,
-    obs.type_code,
-    area.area_geojson,
-    MAX(extract(YEAR FROM o.dateobs)) AS last_observation
-FROM atlas.vm_observations_mailles obs
-        JOIN atlas.vm_l_areas area ON area.id_area=obs.id_maille
-        JOIN atlas.vm_observations AS o ON o.id_observation = ANY(obs.id_observations)
-GROUP BY obs.id_maille, obs.nbr, obs.type_code, area.area_geojson
+    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,
+             MAX(obs_in_area.annee)
+         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
   """
 
-    observations = connection.execute(text(sql))
-    return FeatureCollection(
-        [
-            Feature(
-                id=o.id_maille,
-                geometry=json.loads(o.area_geojson),
-                properties={
-                    "id_maille": o.id_maille,
-                    "type_code": o.type_code,
-                    "nb_observations": int(o.obs_nbr),
-                    "last_observation": o.last_observation,
-                },
-            )
-            for o in observations
-        ]
-    )
+    query = connection.execute(text(sql))
+    return dict(query.all()[0])
 
 
 # last observation for index.html

atlas/static/mapAreas.js

@@ -156,31 +156,29 @@ function displayObsTaxonMaille(areaCode, cd_ref) {
     });
 }
 
-function refreshObsArea() {
-    $("#taxonList ul").on("click", "#taxonListItem", function () {
+function refreshObsArea(elem) {
+    $(this)
+        .siblings()
+        .removeClass("current");
+    $(this).addClass("current");
+    if (configuration.AFFICHAGE_MAILLE) {
+        displayObsTaxonMaille(elem.currentTarget.getAttribute("area-code"), elem.currentTarget.getAttribute("cdref"));
+    } else {
+        displayObsTaxon(elem.currentTarget.getAttribute("area-code"), elem.currentTarget.getAttribute("cdref"));
+    }
+    const name = elem.currentTarget.querySelector("#name").innerHTML;
+    $("#titleMap").fadeOut(500, function () {
         $(this)
-            .siblings()
-            .removeClass("current");
-        $(this).addClass("current");
-        if (configuration.AFFICHAGE_MAILLE) {
-            displayObsTaxonMaille(this.getAttribute("area-code"), this.getAttribute("cdref"));
-        } else {
-            displayObsTaxon(this.getAttribute("area-code"), this.getAttribute("cdref"));
-        }
-        var name = $(this)
-            .find("#name")
-            .html();
-        $("#titleMap").fadeOut(500, function () {
-            $(this)
-                .html("Observations du taxon : " + name)
-                .fadeIn(500);
-        });
+            .html("Observations du taxon : " + name)
+            .fadeIn(500);
     });
 }
 
 $(document).ready(function () {
     $("#loaderSpinner").hide();
     if (configuration.INTERACTIVE_MAP_LIST) {
-        refreshObsArea();
+        $("#taxonList ul").on("click", "#taxonListItem", elem => {
+            refreshObsArea(elem);
+        });
     }
 });

atlas/static/mapHome.js

@@ -25,12 +25,11 @@ $(function(){
         // display maille layer
         fetch(`/api/observationsMailleTerritory`)
             .then(response => response.json())
-            .then(data => {
-                observations = data
-                displayMailleLayer(observations);
+            .then(observations => {
+                displayMailleLayer(observations.observations_features);
             })
             .catch(error => {
-                console.log('Error fetching data: ', error);
+                console.log('Error fetching observations: ', error);
             });