Release 1.4 (#15)

* ref point & cor_linear & cor_areas

* Changelog 1.4.0 - Review

* prepa release

---------

Co-authored-by: joel.clement <joelclems@gmail.com>
Co-authored-by: Camille Monchicourt <camille.monchicourt@ecrins-parcnational.fr>

Author: 3 people

CHANGELOG.md

@@ -1,6 +1,27 @@
 CHANGELOG
 =========
 
+1.4.0 (2023-09-14)
+------------------
+
+**🚀 Nouveautés**
+
+* Ajout d'un référentiel de couches de *points* (table des types de points et table de géometries + modèles) (#12)
+* Ajout de tables de correspondance entre les linéaires et les zonages (+ relations associées dans les modèles) (#12)
+
+**⚠️ Notes de version**
+ 
+* Les nouvelles tables de correspondances `ref_geo.cor_areas` et `ref_geo.cor_linear_area` ne sont pas remplies par défaut pour ne pas alourdir la base de données et ses calculs, alors qu'elles ne sont pas utilisées actuellement par GeoNature
+* Exemple de requête pour remplir la table `ref_geo.cor_area_linear` pour les régions, départements et communes :
+  ```
+  INSERT INTO ref_geo.cor_linear_area (id_linear, id_area)
+  SELECT  id_linear, id_area
+    FROM ref_geo.l_areas la
+    JOIN ref_geo.l_linears ll ON la.geom && ll.geom
+    JOIN ref_geo.bib_areas_types bat ON bat.id_type =la.id_type
+    WHERE bat.type_code IN ('DEP', 'REG', 'COM')
+  ```
+
 1.3.0 (2023-03-03)
 ------------------
 

VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

src/ref_geo/migrations/data/ref_geo_cor.sql

@@ -0,0 +1,51 @@
+-- cor_areas
+-- - table de correspondance entre un groupe de zonage et ses éléments
+--     par exemple une régions et ses départements ou ses communes.
+
+CREATE TABLE ref_geo.cor_areas (
+    id_area_group integer,
+    id_area integer
+);
+
+COMMENT ON TABLE ref_geo.cor_areas IS 'Table de correspondance des intersections des zonages. Non remplie par défaut.';
+
+ALTER TABLE ref_geo.cor_areas
+    ADD CONSTRAINT fk_ref_geo_cor_areas_id_area_group FOREIGN KEY (id_area_group)
+    REFERENCES ref_geo.l_areas(id_area)
+    ON UPDATE CASCADE ON DELETE CASCADE;
+
+ALTER TABLE ref_geo.cor_areas
+    ADD CONSTRAINT fk_ref_geo_cor_areas_id_area FOREIGN KEY (id_area)
+    REFERENCES ref_geo.l_areas(id_area)
+    ON UPDATE CASCADE ON DELETE CASCADE;
+
+CREATE INDEX ref_geo_cor_areas_id_area ON ref_geo.cor_areas USING btree(id_area);
+CREATE INDEX ref_geo_cor_areas_id_area_group ON ref_geo.cor_areas USING btree(id_area_group);
+
+
+-- cor_linear_area
+-- - Table de correspondance entre les éléments lineaires et les éléments de zonage
+--     par exemple pour trouver rapidement les routes d'une communes
+--     ou inversement les communes traversée par un linéaire
+
+
+CREATE TABLE ref_geo.cor_linear_area (
+    id_linear integer,
+    id_area integer
+);
+
+COMMENT ON TABLE ref_geo.cor_areas IS 'Table de correspondance entre les éléments lineaires et les éléments de zonage. Non remplie par défaut';
+
+
+ALTER TABLE ref_geo.cor_linear_area
+    ADD CONSTRAINT fk_ref_geo_cor_linear_id_area_group FOREIGN KEY (id_area)
+    REFERENCES ref_geo.l_areas(id_area)
+    ON UPDATE CASCADE ON DELETE CASCADE;
+
+ALTER TABLE ref_geo.cor_linear_area
+    ADD CONSTRAINT fk_ref_geo_cor_linear_id_lineair_group FOREIGN KEY (id_linear)
+    REFERENCES ref_geo.l_linears(id_linear)
+    ON UPDATE CASCADE ON DELETE CASCADE;
+
+CREATE INDEX ref_geo_cor_linear_area_id_area ON ref_geo.cor_linear_area USING btree(id_area);
+CREATE INDEX ref_geo_cor_linear_area_id_linear ON ref_geo.cor_linear_area USING btree(id_linear);

src/ref_geo/migrations/data/ref_geo_point.sql

@@ -0,0 +1,43 @@
+-- tables pour gérer les référentiels géographiques points (PK/PR, ..)
+
+
+-- table des type de points
+
+CREATE TABLE ref_geo.bib_points_types (
+    id_type SERIAL NOT NULL,
+    type_name character varying(200) NOT NULL,
+    type_code character varying(25) NOT NULL,
+    type_desc text,
+    ref_name character varying(200),
+    ref_version integer,
+    num_version character varying(50),
+    meta_create_date timestamp without time zone,
+    meta_update_date timestamp without time zone,
+    CONSTRAINT pk_ref_geo_bib_points_types_id_type PRIMARY KEY (id_type),
+    UNIQUE(type_code)
+);
+
+
+-- table des points (PK/PR, ...)
+
+CREATE TABLE ref_geo.l_points (
+    id_point SERIAL NOT NULL,
+    id_type INTEGER NOT NULL,
+    point_name character varying(250) NOT NULL,
+    point_code character varying(25) NOT NULL,
+    enable BOOLEAN NOT NULL DEFAULT (TRUE),
+    geom GEOMETRY(GEOMETRY, :local_srid),
+    geojson_4326 VARCHAR,
+    source character varying(250),
+    additional_data jsonb NULL,
+    meta_create_date timestamp without time zone,
+    meta_update_date timestamp without time zone,
+
+    UNIQUE (id_type, point_code),
+
+    CONSTRAINT pk_ref_geo_l_points_id_point PRIMARY KEY (id_point),
+    CONSTRAINT fk_ref_geo_l_points_id_type FOREIGN KEY (id_type)
+        REFERENCES ref_geo.bib_points_types(id_type)
+        ON UPDATE CASCADE ON DELETE NO ACTION
+);
+

src/ref_geo/migrations/versions/795f6ea8ec45_cor_linear_area.py

@@ -0,0 +1,36 @@
+"""cor_areas & cor_linear_areas
+
+Revision ID: 795f6ea8ec45
+Revises: dea1645de8c0
+Create Date: 2023-08-02 11:48:06.329936
+
+"""
+
+import sqlalchemy as sa
+import importlib
+
+from alembic import op
+from sqlalchemy.sql import text
+
+
+# revision identifiers, used by Alembic.
+revision = "795f6ea8ec45"
+down_revision = "dea1645de8c0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    stmt = text(importlib.resources.read_text("ref_geo.migrations.data", "ref_geo_cor.sql"))
+    op.get_bind().execute(stmt)
+
+
+def downgrade():
+    op.get_bind().execute(
+        """
+        DROP TABLE ref_geo.cor_linear_area;
+        DROP TABLE ref_geo.cor_areas;
+    """
+    )
+
+    pass

src/ref_geo/migrations/versions/dea1645de8c0_ref_geo_point.py

@@ -0,0 +1,38 @@
+""" Référentiel point, cor (area, linear, point)
+
+Revision ID: dea1645de8c0
+Revises: f7374cd6e38d
+Create Date: 2023-07-27 12:13:01.748452
+
+"""
+import importlib
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.sql import text
+from ref_geo.utils import (
+    get_local_srid,
+)
+
+# revision identifiers, used by Alembic.
+revision = "dea1645de8c0"
+down_revision = "f7374cd6e38d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    stmt = text(importlib.resources.read_text("ref_geo.migrations.data", "ref_geo_point.sql"))
+    op.get_bind().execute(stmt, {"local_srid": get_local_srid(op.get_bind())})
+
+    pass
+
+
+def downgrade():
+    op.get_bind().execute(
+        """
+        DROP TABLE ref_geo.l_points;
+        DROP TABLE ref_geo.bib_points_types;
+    """
+    )
+    pass

src/ref_geo/models.py

@@ -2,7 +2,9 @@
 
 from geoalchemy2 import Geometry
 from sqlalchemy import ForeignKey
-from sqlalchemy.orm import deferred
+from sqlalchemy.orm import deferred, column_property
+from sqlalchemy.sql import func
+
 from sqlalchemy.dialects.postgresql import JSONB
 
 from utils_flask_sqla.serializers import serializable
@@ -26,6 +28,24 @@ class BibAreasTypes(db.Model):
     num_version = db.Column(db.Unicode)
 
 
+cor_areas = db.Table(
+    "cor_areas",
+    db.Column(
+        "id_area_group",
+        db.Integer,
+        ForeignKey("ref_geo.l_areas.id_area"),
+        primary_key=True,
+    ),
+    db.Column(
+        "id_area",
+        db.Integer,
+        ForeignKey("ref_geo.l_areas.id_area"),
+        primary_key=True,
+    ),
+    schema="ref_geo",
+)
+
+
 @geoserializable
 class LAreas(db.Model):
     __tablename__ = "l_areas"
@@ -42,6 +62,14 @@ class LAreas(db.Model):
     meta_create_date = db.Column(db.DateTime, default=datetime.now)
     meta_update_date = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now)
     area_type = db.relationship("BibAreasTypes", lazy="select")
+    parent_areas = db.relationship(
+        "LAreas",
+        secondary=cor_areas,
+        primaryjoin=id_area == cor_areas.c.id_area,
+        secondaryjoin=cor_areas.c.id_area_group == id_area,
+        backref="child_areas",
+        lazy="raise",
+    )
 
 
 @serializable
@@ -57,19 +85,40 @@ class BibLinearsTypes(db.Model):
     num_version = db.Column(db.Unicode(length=50))
 
 
-class CorLinearGroup(db.Model):
-    __table_name__ = "cor_linear_group"
-    __table_args__ = {"schema": "ref_geo"}
-    id_group = db.Column(
+cor_linear_group = db.Table(
+    "cor_linear_group",
+    db.Column(
+        "id_group",
         db.Integer,
         ForeignKey("ref_geo.t_linear_groups.id_group"),
         primary_key=True,
-    )
-    id_linear = db.Column(
+    ),
+    db.Column(
+        "id_linear",
         db.Integer,
         ForeignKey("ref_geo.l_linears.id_linear"),
         primary_key=True,
-    )
+    ),
+    schema="ref_geo",
+)
+
+
+cor_linear_area = db.Table(
+    "cor_linear_area",
+    db.Column(
+        "id_area",
+        db.Integer,
+        ForeignKey("ref_geo.l_areas.id_area"),
+        primary_key=True,
+    ),
+    db.Column(
+        "id_linear",
+        db.Integer,
+        ForeignKey("ref_geo.l_linears.id_linear"),
+        primary_key=True,
+    ),
+    schema="ref_geo",
+)
 
 
 @geoserializable
@@ -90,8 +139,9 @@ class LLinears(db.Model):
     meta_update_date = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now)
     type = db.relationship("BibLinearsTypes")
     groups = db.relationship(
-        "TLinearGroups", secondary=CorLinearGroup.__table__, backref="linears"
+        "TLinearGroups", secondary=cor_linear_group, backref="linears", lazy="raise"
     )
+    areas = db.relationship("LAreas", secondary=cor_linear_area, backref="linears", lazy="raise")
 
 
 @serializable
@@ -103,6 +153,41 @@ class TLinearGroups(db.Model):
     code = db.Column(db.Unicode(length=25), unique=True)
 
 
+@serializable
+class BibPointsTypes(db.Model):
+    __tablename__ = "bib_points_types"
+    __table_args__ = {"schema": "ref_geo"}
+    id_type = db.Column(db.Integer, primary_key=True)
+    type_name = db.Column(db.Unicode(length=200), nullable=False)
+    type_code = db.Column(db.Unicode(length=25), nullable=False)
+    type_desc = db.Column(db.Unicode)
+    ref_name = db.Column(db.Unicode(length=200))
+    ref_version = db.Column(db.Integer)
+    num_version = db.Column(db.Unicode(length=50))
+
+
+@geoserializable
+class LPoints(db.Model):
+    __tablename__ = "l_points"
+    __table_args__ = {"schema": "ref_geo"}
+    id_point = db.Column(db.Integer, primary_key=True)
+    id_type = db.Column(db.Integer, ForeignKey("ref_geo.bib_points_types.id_type"), nullable=False)
+    point_name = db.Column(db.Unicode(length=250))
+    point_code = db.Column(db.Unicode(length=25))
+    geom = db.Column(Geometry("GEOMETRY"))
+    source = db.Column(db.Unicode(length=250))
+    enable = db.Column(db.Boolean, nullable=False, default=True)
+    additional_data = db.Column(JSONB)
+    meta_create_date = db.Column(db.DateTime, default=datetime.now)
+    meta_update_date = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now)
+    type = db.relationship("BibPointsTypes")
+
+    geom_4326 = column_property(
+        func.ST_TRANSFORM(geom, 4326),
+        deferred=True,
+    )
+
+
 @serializable
 class LiMunicipalities(db.Model):
     __tablename__ = "li_municipalities"