Merge pull request #26 from PnX-SI/dev

Dev > Main / 1.1.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1 (2023-06-06)
+
+- Remplacement de la vue matérialisée `pr_zh.atlas_app` par une vue (utilisée par la route `/api/zones_humides/pbf/complete`) pour corriger et simplifier la mise à jour des données de l'[atlas des zones humides](https://github.com/PnX-SI/GeoNature-ZH-atlas) (#24)
+
 ## 1.1.0 - Taillefer (2023-06-02)
 
 Nécessite la version 2.12.0 (ou plus) de GeoNature.

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

backend/gn_module_zh/blueprint.py

@@ -366,8 +366,7 @@ def get_pbf_complete():
     """
     query = DB.session.execute(sql)
     row = query.first()
-    if row["pbf"]:
-        return Response(bytes(row["pbf"]), mimetype="application/protobuf")
+    return Response(bytes(row["pbf"]) if row["pbf"] else bytes(), mimetype="application/protobuf")
 
 
 @blueprint.route("/geojson", methods=["GET"])

backend/gn_module_zh/migrations/26d6515219fe_add_indexes.py

@@ -0,0 +1,103 @@
+"""add indexes
+
+Revision ID: 26d6515219fe
+Revises: 22b14fc3abe0
+Create Date: 2023-06-05 12:07:39.416188
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "26d6515219fe"
+down_revision = "22b14fc3abe0"
+branch_labels = None
+depends_on = None
+
+SCHEMA = "pr_zh"
+
+
+def upgrade():
+    op.create_index("index_t_zh_id_sdage", table_name="t_zh", columns=["id_sdage"], schema=SCHEMA)
+    op.create_index(
+        "index_t_zh_id_thread", table_name="t_zh", columns=["id_thread"], schema=SCHEMA
+    )
+    op.create_index(
+        "index_t_zh_id_diag_bio", table_name="t_zh", columns=["id_diag_bio"], schema=SCHEMA
+    )
+    op.create_index(
+        "index_t_zh_id_diag_hydro", table_name="t_zh", columns=["id_diag_hydro"], schema=SCHEMA
+    )
+    op.create_index(
+        "index_t_zh_id_lim_list", table_name="t_zh", columns=["id_lim_list"], schema=SCHEMA
+    )
+    op.create_index("index_t_zh_id_zh_uuid", table_name="t_zh", columns=["zh_uuid"], schema=SCHEMA)
+    op.create_index(
+        "index_cor_zh_rb_id_zh", table_name="cor_zh_rb", columns=["id_zh"], schema=SCHEMA
+    )
+    op.create_index(
+        "index_cor_lim_list_id_lim_list",
+        table_name="cor_lim_list",
+        columns=["id_lim_list"],
+        schema=SCHEMA,
+    )
+    op.create_index(
+        "index_cor_zh_area_id_zh", table_name="cor_zh_area", columns=["id_zh"], schema=SCHEMA
+    )
+    op.create_index(
+        "index_cor_zh_area_id_area", table_name="cor_zh_area", columns=["id_area"], schema=SCHEMA
+    )
+
+
+def downgrade():
+    op.drop_index(
+        "index_t_zh_id_sdage",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_t_zh_id_thread",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_t_zh_id_diag_bio",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_t_zh_id_diag_hydro",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_t_zh_id_lim_list",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_t_zh_id_zh_uuid",
+        table_name="t_zh",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_cor_zh_rb_id_zh",
+        table_name="cor_zh_rb",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_cor_lim_list_id_lim_list",
+        table_name="cor_lim_list",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_cor_zh_area_id_zh",
+        table_name="cor_zh_area",
+        schema=SCHEMA,
+    )
+    op.drop_index(
+        "index_cor_zh_area_id_area",
+        table_name="cor_zh_area",
+        schema=SCHEMA,
+    )

backend/gn_module_zh/migrations/643743e807f6_add_atlas_view.py

@@ -0,0 +1,101 @@
+"""add atlas view
+
+Revision ID: 643743e807f6
+Revises: 26d6515219fe
+Create Date: 2023-06-05 12:20:36.897280
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "643743e807f6"
+down_revision = "26d6515219fe"
+branch_labels = None
+depends_on = None
+
+# This revision performs 2 things:
+# - replaces the materialized view by a view
+# - treats better the downgrade part by removing the slugify function
+#   used only for the view (thus this function need to be re-created)
+
+
+def upgrade():
+    # Recreate function here if it is dropped by the
+    op.execute(
+        """
+        CREATE OR REPLACE FUNCTION pr_zh.slugify("value" TEXT)
+        RETURNS TEXT AS $$
+        -- removes accents (diacritic signs) from a given string --
+        WITH "unaccented" AS (
+            SELECT unaccent("value") AS "value"
+        ),
+        -- lowercases the string
+        "lowercase" AS (
+            SELECT lower("value") AS "value"
+            FROM "unaccented"
+        ),
+        -- replaces anything that's not a letter, number, hyphen('-'), or underscore('_') with a hyphen('-')
+        "hyphenated" AS (
+            SELECT regexp_replace("value", '[^a-z0-9\\-_]+', '-', 'gi') AS "value"
+            FROM "lowercase"
+        ),
+        -- trims hyphens('-') if they exist on the head or tail of the string
+        "trimmed" AS (
+            SELECT regexp_replace(regexp_replace("value", '\\-+$', ''), '^\\-', '') AS "value"
+            FROM "hyphenated"
+        )
+        SELECT "value" FROM "trimmed";
+        $$ LANGUAGE SQL STRICT IMMUTABLE;
+    """
+    )
+    op.execute("DROP MATERIALIZED VIEW IF EXISTS pr_zh.atlas_app")
+    op.execute(
+        """
+        CREATE OR REPLACE VIEW pr_zh.atlas_app
+            AS SELECT tzh.id_zh AS id,
+                tzh.main_name AS nom,
+                ( SELECT pr_zh.slugify(tzh.main_name::text) AS slugify) AS slug,
+                tzh.code,
+                tzh.create_date AS date,
+                tzh.geom AS polygon_4326,
+                ( SELECT st_area(st_transform(st_setsrid(tzh.geom, 4326), 2154)) AS st_area) AS superficie,
+                bo.nom_organisme AS operateur,
+                sdage.cd_nomenclature AS type_code,
+                sdage.mnemonique AS type,
+                thread.mnemonique AS menaces,
+                diag_bio.mnemonique AS diagnostic_bio,
+                diag_hydro.mnemonique AS diagnostic_hydro,
+                ( SELECT array_agg(DISTINCT tn.mnemonique) AS array_agg) AS criteres_delim,
+                ( SELECT array_agg(DISTINCT la.area_name) AS array_agg) AS communes,
+                ( SELECT array_agg(DISTINCT trb.name) AS array_agg) AS bassin_versant,
+                ( SELECT COALESCE(json_agg(t.*), '[]'::json) AS "coalesce"
+                    FROM ( SELECT t_medias.title_fr AS label,
+                                t_medias.media_path AS url
+                            FROM gn_commons.t_medias
+                            WHERE t_medias.uuid_attached_row = tzh.zh_uuid) t) AS images
+            FROM pr_zh.t_zh tzh
+                LEFT JOIN pr_zh.cor_lim_list cll ON tzh.id_lim_list = cll.id_lim_list
+                LEFT JOIN ref_nomenclatures.t_nomenclatures tn ON cll.id_lim = tn.id_nomenclature
+                LEFT JOIN pr_zh.cor_zh_area cza ON tzh.id_zh = cza.id_zh
+                LEFT JOIN ref_geo.l_areas la ON cza.id_area = la.id_area
+                LEFT JOIN pr_zh.cor_zh_rb czr ON tzh.id_zh = czr.id_zh
+                LEFT JOIN pr_zh.t_river_basin trb ON czr.id_rb = trb.id_rb
+                LEFT JOIN gn_commons.t_medias med ON med.uuid_attached_row = tzh.zh_uuid
+                LEFT JOIN utilisateurs.t_roles tr ON tr.id_role = tzh.create_author
+                LEFT JOIN utilisateurs.bib_organismes bo ON bo.id_organisme = tr.id_organisme
+                LEFT JOIN ref_nomenclatures.t_nomenclatures sdage ON sdage.id_nomenclature = tzh.id_sdage
+                LEFT JOIN ref_nomenclatures.t_nomenclatures thread ON thread.id_nomenclature = tzh.id_thread
+                LEFT JOIN ref_nomenclatures.t_nomenclatures diag_bio ON diag_bio.id_nomenclature = tzh.id_diag_bio
+                LEFT JOIN ref_nomenclatures.t_nomenclatures diag_hydro ON diag_hydro.id_nomenclature = tzh.id_diag_hydro
+            WHERE cza.cover IS NOT NULL
+            GROUP BY tzh.id_zh, bo.nom_organisme, sdage.cd_nomenclature, sdage.mnemonique, thread.mnemonique, diag_bio.mnemonique, diag_hydro.mnemonique
+            ORDER BY tzh.id_zh;
+        """
+    )
+
+
+def downgrade():
+    op.execute("DROP VIEW pr_zh.atlas_app")
+    op.execute("DROP FUNCTION pr_zh.slugify")