territories-dashboard-lib 0.1.39b2__py3-none-any.whl → 1.1.1.dev10__py3-none-any.whl

territories_dashboard_lib/geo_lib/admin.py

@@ -30,6 +30,8 @@ class GeoFeatureForm(forms.ModelForm):
             "show_on_fr_level",
             "point_icon_svg",
             "svg_file",
+            "color_column",
+            "size_column",
         ]
 
     def clean(self):

territories_dashboard_lib/geo_lib/migrations/0003_geofeature_color_column_geofeature_size_column.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.9 on 2026-01-06 16:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('geo_lib', '0002_geoelement_linked_to_indicator'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='geofeature',
+            name='color_column',
+            field=models.TextField(blank=True, help_text="Optionnel. Nom de la colonne qui définit une couleur par point. Les valeurs de la colonne doivent être sous le format #ffffff (hexadecimale). Si renseigné, le champ 'color' ne sera pas utilisé. Seulement pour les points.", null=True, verbose_name='Colonne de la couleur'),
+        ),
+        migrations.AddField(
+            model_name='geofeature',
+            name='size_column',
+            field=models.TextField(blank=True, help_text="Optionnel. Nom de la colonne qui définit une taille par point. Les valeurs de la colonne doivent être 'sm' (small) ou 'md' (medium). Seulement pour les points.", null=True, verbose_name='Colonne de la taille'),
+        ),
+    ]

territories_dashboard_lib/geo_lib/models.py

@@ -40,6 +40,18 @@ class GeoFeature(CommonModel):
         verbose_name="Afficher au niveau France entière",
         help_text="Décochez si la quantité de données est trop importante pour le niveau France entière.",
     )
+    color_column = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name="Colonne de la couleur",
+        help_text="Optionnel. Nom de la colonne qui définit une couleur par point. Les valeurs de la colonne doivent être sous le format #ffffff (hexadecimale). Si renseigné, le champ 'color' ne sera pas utilisé. Seulement pour les points.",
+    )
+    size_column = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name="Colonne de la taille",
+        help_text="Optionnel. Nom de la colonne qui définit une taille par point. Les valeurs de la colonne doivent être 'sm' (small) ou 'md' (medium). Seulement pour les points.",
+    )
 
     def __str__(self):
         return self.name

territories_dashboard_lib/geo_lib/payloads.py

@@ -3,29 +3,18 @@ from typing import List, Optional
 from pydantic import BaseModel, field_validator
 
 from territories_dashboard_lib.commons.types import TerritoryCode
-from territories_dashboard_lib.indicators_lib.enums import (
-    GeoLevel,
-    MeshLevel,
-)
+from territories_dashboard_lib.indicators_lib.enums import MeshLevel
+from territories_dashboard_lib.indicators_lib.payloads import SubMeshPayload
 
 
-class GeoFeaturesParams(BaseModel):
-    mesh: MeshLevel
-    geo_level: GeoLevel
-    main_territories: List[TerritoryCode]
+class GeoFeaturesPayload(SubMeshPayload):
     last: Optional[int] = None
     limit: Optional[int] = 1000
     feature: int
 
-    @field_validator("main_territories", mode="before")
-    def split_main_territories(cls, v):
-        if isinstance(v, str):
-            return v.split(",")
-        return v
-
 
 class MainTerritoryParams(BaseModel):
-    geo_level: GeoLevel
+    geo_level: MeshLevel
     geo_id: List[TerritoryCode]
 
     @field_validator("geo_id", mode="before")
@@ -46,14 +35,11 @@ class TerritoriesParams(BaseModel):
         return v
 
 
-class TerritoryFeatureParams(BaseModel):
-    mesh: MeshLevel
-    geo_level: GeoLevel | None = None
-    main_territories: List[TerritoryCode] | None = None
+class TerritoryFeaturePayload(SubMeshPayload):
     codes: List[TerritoryCode] | None = None
 
-    @field_validator("main_territories", "codes", mode="before")
-    def split_main_territories(cls, v):
+    @field_validator("codes", mode="before")
+    def split_codes(cls, v):
         if isinstance(v, str):
             return v.split(",")
         return v

territories_dashboard_lib/geo_lib/views.py

@@ -7,22 +7,26 @@ from django.http import HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404
 from django.views.decorators.cache import cache_control
 from django.views.decorators.http import require_GET
-from psycopg2.sql import SQL, Identifier, Literal
+from psycopg2.sql import SQL
 
 from territories_dashboard_lib.geo_lib.payloads import (
-    GeoFeaturesParams,
+    GeoFeaturesPayload,
     MainTerritoryParams,
     SearchTerritoriesParams,
     TerritoriesParams,
-    TerritoryFeatureParams,
+    TerritoryFeaturePayload,
 )
 from territories_dashboard_lib.indicators_lib.enums import (
     FRANCE_GEOLEVEL_TITLES,
-    MESH_DB,
     MeshLevel,
 )
-from territories_dashboard_lib.indicators_lib.query.commons import get_territories_ids
-from territories_dashboard_lib.indicators_lib.query.utils import run_custom_query
+from territories_dashboard_lib.indicators_lib.query.commons import (
+    get_sub_territories,
+)
+from territories_dashboard_lib.indicators_lib.query.utils import (
+    format_sql_codes,
+    run_custom_query,
+)
 
 from .enums import GeoFeatureType
 from .models import GeoFeature
@@ -42,14 +46,11 @@ class DateTimeEncoder(json.JSONEncoder):
 @require_GET
 @cache_control(max_age=3600)
 def geo_features_view(request):
-    params = GeoFeaturesParams(**request.GET.dict())
+    payload = GeoFeaturesPayload(**request.GET.dict())
 
-    geo_feature = get_object_or_404(GeoFeature, id=params.feature)
-    geo_level = params.geo_level
-    mesh = params.mesh
-    main_territory_codes = params.main_territories
-    last = params.last
-    limit = params.limit
+    geo_feature = get_object_or_404(GeoFeature, id=payload.feature)
+    last = payload.last
+    limit = payload.limit
 
     last_year_query = (
         f"SELECT DISTINCT annee FROM {geo_feature.name} ORDER BY annee DESC"
@@ -57,10 +58,16 @@ def geo_features_view(request):
     years = run_custom_query(last_year_query)
     last_year = years[0].get("annee")
 
-    territories_ids = get_territories_ids(main_territory_codes, geo_level, mesh)
-
-    col_id_name = f"code_{mesh}"
+    territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.territory
+    )
+    territories_ids = [t["code"] for t in territories]
+    col_id_name = f"code_{payload.submesh}"
     columns = [el.name for el in geo_feature.items.all()]
+    if geo_feature.color_column:
+        columns.append(geo_feature.color_column)
+    if geo_feature.size_column:
+        columns.append(geo_feature.size_column)
 
     coma = ", " if columns else ""
     select_geo_code = (
@@ -73,8 +80,8 @@ def geo_features_view(request):
         where_clause = f"WHERE geo.{col_id_name} IN ('{"', '".join(territories_ids)}')"
     else:
         where_clause = (
-            f"JOIN contours_simplified_{geo_level} contours ON ST_intersects(geo.geometry, contours.geometry)\n"
-            f"WHERE contours.code IN ('{"', '".join(main_territory_codes)}')"
+            f"JOIN contours_simplified_{payload.territory.mesh} contours ON ST_intersects(geo.geometry, contours.geometry)\n"
+            f"WHERE contours.code IN {payload.territory.sql_codes}"
         )
     where_clause += f" AND annee = {last_year}"
 
@@ -91,16 +98,22 @@ def geo_features_view(request):
     results = run_custom_query(query)
 
     items = geo_feature.items.all()
-    # Transform results
-    data = [
-        {
+    data = []
+    for r in results:
+        properties = {el.label: r.get(el.name) for el in items}
+        if geo_feature.color_column or geo_feature.size_column:
+            properties["display"] = {}
+        if geo_feature.color_column:
+            properties["display"]["color"] = r.get(geo_feature.color_column)
+        if geo_feature.size_column:
+            properties["display"]["size"] = r.get(geo_feature.size_column)
+        d = {
             "type": "Feature",
             "id": r.get("geo_code"),
-            "properties": {el.label: r.get(el.name) for el in items},
+            "properties": properties,
             "geometry": json.loads(r.get("geojson")),
         }
-        for r in results
-    ]
+        data.append(d)
 
     last_queried_order_id = results[-1]["order_id"] if results else None
 
@@ -146,12 +159,10 @@ def precise_view(request):
     if not mesh_level:
         return JsonResponse({"error": "Missing 'mesh' parameter"}, status=400)
 
-    mapped_mesh_level = "DEPCOM" if mesh_level == "com" else mesh_level.upper()
-
     query = f"""
-        SELECT "{mapped_mesh_level}" AS id, ST_asgeojson(geometry) AS polygon
+        SELECT code AS id, ST_asgeojson(geometry) AS polygon
         FROM contours_geo_ign_{mesh_level}
-        WHERE "{mapped_mesh_level}" IN ('{"', '".join(territories_ids)}')
+        WHERE code IN ('{"', '".join(territories_ids)}')
         """
 
     results = run_custom_query(query)
@@ -164,20 +175,20 @@ def precise_view(request):
 @require_GET
 @cache_control(max_age=3600)
 def territories_view(request):
-    params = TerritoryFeatureParams(**request.GET.dict())
-    geo_level = params.geo_level
-    mesh = params.mesh
+    payload = TerritoryFeaturePayload(**request.GET.dict())
 
-    if params.codes:
-        territories_ids = params.codes
+    if payload.codes:
+        territories_ids = payload.codes
     else:
-        main_territory_codes = params.main_territories
-        territories_ids = get_territories_ids(main_territory_codes, geo_level, mesh)
+        territories = get_sub_territories(
+            submesh=payload.submesh, territory=payload.territory
+        )
+        territories_ids = [t["code"] for t in territories]
 
     query = f"""
         SELECT code AS id, ST_asgeojson(geometry) AS polygon
-        FROM contours_simplified_{params.mesh}
-        WHERE code IN ('{"', '".join(territories_ids)}')
+        FROM contours_simplified_{payload.submesh}
+        WHERE code IN {format_sql_codes(territories_ids)}
         """
 
     results = run_custom_query(query)
@@ -190,7 +201,7 @@ def territories_view(request):
 
 
 def _fill_territory_li(code, name, mesh):
-    label = name if mesh == MeshLevel.National else f"{name} - {code}"
+    label = name if mesh == MeshLevel.fr else f"{name} - {code}"
     return f"""<li data-code="{code}" data-name="{name}" onclick="chooseTerritory(this)"><button aria-label="Choisir {label}">{label}</button></li>"""
 
 
@@ -201,27 +212,21 @@ def search_territories_view(request):
     mesh = params.mesh
     search = params.search
     offset = params.offset
-    if mesh == MeshLevel.National:
+    if mesh == MeshLevel.fr:
         lis = []
         for code, name in FRANCE_GEOLEVEL_TITLES.items():
             li = _fill_territory_li(code, name, mesh)
             lis.append(li)
         return HttpResponse("\n".join(lis))
-    mesh_db = MESH_DB[mesh]
+    table_name = f"arbo_{mesh}"
     pagination = 20
-    query = SQL("""
-    SELECT DISTINCT {code} as code, {name} as name FROM arborescence_geo
-    WHERE unaccent({name}) || {code} ILIKE unaccent(%s)
-    AND "FR" <> 'ETR'
-    ORDER BY {name}, {code}
-    LIMIT {limit} OFFSET {offset};
-    ;
-    """).format(
-        code=Identifier(mesh_db),
-        name=Identifier(f"NOM_{mesh_db}"),
-        offset=Literal(offset * pagination),
-        limit=Literal(pagination),
-    )
+    query = SQL(f"""
+    SELECT DISTINCT code, name FROM {table_name}
+    WHERE unaccent(name) || code ILIKE unaccent(%s)
+    AND code !~ '^[A-Z]{{3}}$'
+    ORDER BY name, code
+    LIMIT {pagination} OFFSET {offset * pagination};
+    """)
     territories = run_custom_query(query, [f"%{search}%"])
     lis = []
     for territory in territories:

territories_dashboard_lib/indicators_lib/enums.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from django.conf import settings
 from django.db import models
 
@@ -8,19 +10,48 @@ class AggregationFunctions(models.TextChoices):
 
 
 class MeshLevel(models.TextChoices):
-    National = "fr"
-    Region = "reg"
-    Department = "dep"
-    Epci = "epci"
-    Town = "com"
-
-
-class GeoLevel(models.TextChoices):
-    France = "fr"
-    Region = "reg"
-    Department = "dep"
-    Epci = "epci"
-    Town = "com"
+    fr = "fr"
+    reg = "reg"
+    dep = "dep"
+    epci = "epci"
+    com = "com"
+    aom = "aom"
+
+
+STANDARD_MESHES = [
+    MeshLevel.fr,
+    MeshLevel.reg,
+    MeshLevel.dep,
+    MeshLevel.epci,
+    MeshLevel.com,
+]
+
+ALL_MESHES_ABSOLUTE = [
+    MeshLevel.fr,
+    MeshLevel.reg,
+    MeshLevel.dep,
+    MeshLevel.aom,
+    MeshLevel.epci,
+    MeshLevel.com,
+]
+
+
+MESHES_ORDERED_FOR_PRESENTATION = [
+    MeshLevel.fr,
+    MeshLevel.reg,
+    MeshLevel.dep,
+    MeshLevel.epci,
+    MeshLevel.com,
+    MeshLevel.aom,
+]
+
+
+def order_meshes_for_presentation(meshes: List[MeshLevel]) -> List[MeshLevel]:
+    """
+    Orders a list of MeshLevel values according to MESHES_ORDERED_FOR_PRESENTATION.
+    """
+    order_index = {mesh: i for i, mesh in enumerate(MESHES_ORDERED_FOR_PRESENTATION)}
+    return sorted(meshes, key=lambda mesh: order_index[mesh])
 
 
 class FranceGeoLevel(models.TextChoices):
@@ -42,30 +73,33 @@ FRANCE_DB_VALUES = {
 }
 
 
-DEFAULT_MESH = MeshLevel.Region
+DEFAULT_MESH = MeshLevel.reg
 
-MESH_TITLES = {
-    MeshLevel.National: "France entière",
-    MeshLevel.Region: "Région",
-    MeshLevel.Department: "Département",
-    MeshLevel.Epci: "Intercommunalité",
-    MeshLevel.Town: "Commune",
+MESHES_SHORT_TITLES = {
+    MeshLevel.fr: "France",
+    MeshLevel.reg: "Région",
+    MeshLevel.dep: "Département",
+    MeshLevel.epci: "Intercommunalité",
+    MeshLevel.com: "Commune",
+    MeshLevel.aom: "AOM",
 }
 
-MESH_DB = {
-    MeshLevel.Region: "REG",
-    MeshLevel.Department: "DEP",
-    MeshLevel.Epci: "EPCI",
-    MeshLevel.Town: "DEPCOM",
+MESHES_LONG_TITLES = {
+    MeshLevel.fr: "France",
+    MeshLevel.reg: "Région",
+    MeshLevel.dep: "Département",
+    MeshLevel.epci: "Intercommunalité",
+    MeshLevel.com: "Commune",
+    MeshLevel.aom: "Autorité Organisatrice de la Mobilité",
 }
 
 
 def get_miminum_mesh():
     try:
         town_mesh_is_disabled = settings.DISABLE_TOWN_MESH
-        return MeshLevel.Epci if town_mesh_is_disabled else MeshLevel.Town
+        return MeshLevel.epci if town_mesh_is_disabled else MeshLevel.com
     except AttributeError:
-        return MeshLevel.Town
+        return MeshLevel.com
 
 
 def get_allow_same_mesh():
@@ -73,13 +107,3 @@ def get_allow_same_mesh():
         return bool(settings.ALLOW_SAME_MESH)
     except AttributeError:
         return False
-
-
-def get_all_meshes():
-    min_mesh = get_miminum_mesh()
-    meshes = []
-    for m in MeshLevel:
-        meshes.append(m)
-        if m == min_mesh:
-            break
-    return meshes

territories_dashboard_lib/indicators_lib/migrations/0004_alter_indicator_min_mesh.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.8 on 2025-12-03 13:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('indicators_lib', '0003_indicator_short_title'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='indicator',
+            name='min_mesh',
+            field=models.TextField(choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')], default='com'),
+        ),
+    ]

territories_dashboard_lib/indicators_lib/migrations/0005_auto_20251203_1621.py

@@ -115,8 +115,8 @@ def reset_indicators_methodo_pdf(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("indicators_lib", "0003_indicator_short_title"),
-        ("website_lib", "0004_mainconf_description_mainconf_social_image_url"),
+        ("indicators_lib", "0004_alter_indicator_min_mesh"),
+        ("website_lib", "0005_mainconf_meshes"),
     ]
 
     operations = [

territories_dashboard_lib/indicators_lib/models.py

@@ -10,18 +10,15 @@ from territories_dashboard_lib.indicators_lib.refresh_filters import refresh_fil
 
 
 class Theme(CommonModel):
-    # TODO: make it primary key
-    # django.db.utils.OperationalError: foreign key mismatch -
-    # "tdbmd_indicators_indicatorsubtheme" referencing "tdbmd_indicators_indicatortheme"
     ordering = models.IntegerField(default=0)
     ordering.verbose_name = "Ordre dans la sidebar"
     name = models.CharField(max_length=64, unique=True)
     name.verbose_name = "Nom (~id, URL)"
     title = models.CharField(max_length=128)
     title.verbose_name = "Titre (affiché)"
-    objectif_theme = models.TextField(blank=True, null=True)
+    objectif_theme = models.TextField(blank=True)
     objectif_theme.verbose_name = "Objectif"
-    action_theme = models.TextField(blank=True, null=True)
+    action_theme = models.TextField(blank=True)
     action_theme.verbose_name = "Actions"
 
     def is_displayed_on_app(self):
@@ -106,7 +103,7 @@ class Indicator(CommonModel):
     # Indicator's DB attributes
     db_table_prefix = models.CharField(max_length=128)
     db_table_prefix.verbose_name = "Préfixe dans la DB"
-    min_mesh = models.TextField(choices=MeshLevel.choices, default=MeshLevel.Town)
+    min_mesh = models.TextField(choices=MeshLevel.choices, default=MeshLevel.com)
     is_composite = models.BooleanField(default=False)
     is_composite.verbose_name = "Indicateur composite"
     show_alternative = models.BooleanField(
@@ -180,6 +177,12 @@ class Indicator(CommonModel):
 
     get_theme_title.short_description = "Thème"
 
+    def table_name(indicator, mesh: MeshLevel, *, flows: bool = False):
+        table_prefix = (
+            indicator.flows_db_table_prefix if flows else indicator.db_table_prefix
+        )
+        return f"{table_prefix}_{mesh}"
+
     class Meta:
         ordering = ("sub_theme", "index_in_theme")
         verbose_name = "3 - Indicateur"

territories_dashboard_lib/indicators_lib/payloads.py

@@ -1,8 +1,9 @@
 from typing import Annotated, Optional
 
-from pydantic import BaseModel, BeforeValidator, Field
+from pydantic import BaseModel, BeforeValidator, Field, model_validator
 
 from territories_dashboard_lib.commons.types import MutualisedTerritoryCode, SQlName
+from territories_dashboard_lib.indicators_lib.query.utils import format_sql_codes
 
 from .enums import MeshLevel
 
@@ -11,6 +12,10 @@ class Territory(BaseModel):
     id: MutualisedTerritoryCode
     mesh: MeshLevel
 
+    @property
+    def sql_codes(territory) -> str:
+        return format_sql_codes(territory.id.split(","))
+
 
 def validate_territory(value):
     if value and "-" in value:
@@ -25,6 +30,14 @@ class SubMeshPayload(BasePayload):
     submesh: MeshLevel
 
 
+class SubMeshOnlyPayload(SubMeshPayload):
+    @model_validator(mode="after")
+    def check_not_same_mesh(self):
+        if self.submesh == self.territory.mesh:
+            raise ValueError("submesh and territory mesh should not be equal")
+        return self
+
+
 class FlowsPayload(SubMeshPayload):
     prefix: SQlName
     dimension: SQlName | None = None