territories-dashboard-lib 0.1.33b1__py3-none-any.whl → 1.1.1.dev7__py3-none-any.whl

territories_dashboard_lib/indicators_lib/views.py

@@ -9,7 +9,7 @@ from territories_dashboard_lib.commons.decorators import use_payload
 from territories_dashboard_lib.tracking_lib.enums import EventType, GraphType
 from territories_dashboard_lib.tracking_lib.logic import track_event
 
-from .enums import MESH_TITLES
+from .enums import MESHES_SHORT_TITLES
 from .export import export_to_csv
 from .format import format_data, format_indicator_value
 from .models import Indicator
@@ -19,9 +19,11 @@ from .payloads import (
     FlowsPayload,
     IndicatorTablePayload,
     OptionalComparisonQueryPayload,
+    SubMeshOnlyPayload,
     SubMeshPayload,
 )
 from .query.commons import (
+    get_mesh_column_name,
     get_sub_territories,
     get_territory_name,
     get_values_for_territory,
@@ -62,6 +64,11 @@ def download_indicator_methodo_view(request, name):
 @cache_control(max_age=3600)
 @use_payload(SubMeshPayload)
 def indicator_statistics_view(request, name, payload):
+    if payload.submesh == payload.territory.mesh:
+        return HttpResponse(
+            "les statiques ne sont pas disponibles si la maille est du même niveau que le territoire.",
+            status=400,
+        )
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
     query = get_geography_statistics_values_for_indicator(
@@ -193,7 +200,7 @@ def indicator_proportions_export_view(request, name, payload):
 
 
 @cache_control(max_age=3600)
-@use_payload(SubMeshPayload)
+@use_payload(SubMeshOnlyPayload)
 def indicator_histogram_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
@@ -207,7 +214,7 @@ def indicator_histogram_view(request, name, payload):
 
 
 @cache_control(max_age=3600)
-@use_payload(SubMeshPayload)
+@use_payload(SubMeshOnlyPayload)
 def indicator_histogram_export_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
@@ -237,7 +244,7 @@ def indicator_histogram_export_view(request, name, payload):
 
 
 @cache_control(max_age=3600)
-@use_payload(SubMeshPayload)
+@use_payload(SubMeshOnlyPayload)
 def indicator_top_10_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
@@ -251,7 +258,7 @@ def indicator_top_10_view(request, name, payload):
 
 
 @require_GET
-@use_payload(SubMeshPayload)
+@use_payload(SubMeshOnlyPayload)
 def indicator_top_10_export_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
@@ -274,28 +281,10 @@ def flows_view(request, payload):
     last_year_query = f"SELECT DISTINCT annee FROM {flows_table} ORDER BY annee DESC"
     last_year = run_custom_query(last_year_query)[0]["annee"]
 
-    mapped_geo_level = (
-        "DEPCOM" if payload.territory.mesh == "com" else payload.territory.mesh.upper()
-    )
-    mapped_mesh_level = (
-        "DEPCOM" if payload.submesh == "com" else payload.submesh.upper()
+    territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.territory, with_center=True
     )
-
-    codes = ", ".join(f"'{code.strip()}'" for code in payload.territory.id.split(","))
-
-    # Geo query
-    geo_query = f"""
-        SELECT DISTINCT
-            arbo."{mapped_mesh_level}" as territory_id,
-            arbo."NOM_{mapped_mesh_level}" as territory_name,
-            ST_ASGEOJSON(ST_CENTROID(contours.geometry)) as center
-        FROM arborescence_geo AS arbo
-        JOIN contours_simplified_{payload.submesh} as contours
-        ON arbo."{mapped_mesh_level}" = contours.code
-        WHERE arbo."{mapped_geo_level}" IN ({codes})
-    """
-    territories = run_custom_query(geo_query)
-    territories_ids = ", ".join(f"'{t['territory_id'].strip()}'" for t in territories)
+    territories_ids = ", ".join(f"'{t['code'].strip()}'" for t in territories)
 
     dimension_value = (
         f"{payload.dimension} as dimension"
@@ -303,25 +292,28 @@ def flows_view(request, payload):
         else "'all' as dimension"
     )
 
+    mesh_col = get_mesh_column_name(payload.submesh)
     # Values query
     values_query = f"""
         SELECT
-            code_{payload.submesh}_1 as territory_1_id,
-            code_{payload.submesh}_2 as territory_2_id,
+            {mesh_col}_1 as territory_1_id,
+            {mesh_col}_2 as territory_2_id,
             CAST(valeur AS int) as value,
             {dimension_value}
         FROM {flows_table} flows
         WHERE annee = {last_year}
         AND (
-            code_{payload.submesh}_1 IN ({territories_ids})
-            OR code_{payload.submesh}_2 IN ({territories_ids})
+            {mesh_col}_1 IN ({territories_ids})
+            OR {mesh_col}_2 IN ({territories_ids})
         )
+        AND {mesh_col}_1 IS NOT NULL
+        AND {mesh_col}_2 IS NOT NULL
     """
     row_values = run_custom_query(values_query)
     territories_dict = {
-        t["territory_id"]: {
-            "name": t["territory_name"],
-            "code": t["territory_id"],
+        t["code"]: {
+            "name": t["name"],
+            "code": t["code"],
             "center": json.loads(t["center"]),
         }
         for t in territories
@@ -333,26 +325,16 @@ def flows_view(request, payload):
             external_territories_ids.add(row["territory_1_id"])
         if row["territory_2_id"] not in territories_dict:
             external_territories_ids.add(row["territory_2_id"])
-    external_territories_ids
 
     external_territories = []
     if external_territories_ids:
-        codes = ", ".join([f"'{tid}'" for tid in external_territories_ids])
-        geo_query = f"""
-            SELECT DISTINCT
-                arbo."{mapped_mesh_level}" as territory_id,
-                arbo."NOM_{mapped_mesh_level}" as territory_name,
-                ST_ASGEOJSON(ST_CENTROID(contours.geometry)) as center
-            FROM arborescence_geo AS arbo
-            JOIN contours_simplified_{payload.submesh} as contours
-            ON arbo."{mapped_mesh_level}" = contours.code
-            WHERE arbo."{mapped_mesh_level}" IN ({codes})
-        """
-        external_territories = run_custom_query(geo_query)
+        external_territories = get_sub_territories(
+            submesh=payload.submesh, codes=external_territories_ids, with_center=True
+        )
     for t in external_territories:
-        territories_dict[t["territory_id"]] = {
-            "name": f"{t['territory_name']} (externe)",
-            "code": t["territory_id"],
+        territories_dict[t["code"]] = {
+            "name": f"{t['name']} (externe)",
+            "code": t["code"],
             "center": json.loads(t["center"]),
         }
 
@@ -367,8 +349,12 @@ def flows_view(request, payload):
 def comparison_histogram_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
-    territories = get_sub_territories(payload.territory, payload.submesh)
-    cmp_territories = get_sub_territories(payload.cmp_territory, payload.submesh)
+    territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.territory
+    )
+    cmp_territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.cmp_territory
+    )
     values, cmp_values, buckets = get_comparison_values_and_buckets(
         indicator, payload.submesh, territories, cmp_territories, filters
     )
@@ -386,8 +372,12 @@ def comparison_histogram_view(request, name, payload):
 def comparison_histogram_export_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
-    territories = get_sub_territories(payload.territory, payload.submesh)
-    cmp_territories = get_sub_territories(payload.cmp_territory, payload.submesh)
+    territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.territory
+    )
+    cmp_territories = get_sub_territories(
+        submesh=payload.submesh, territory=payload.cmp_territory
+    )
     values, cmp_values, buckets = get_comparison_values_and_buckets(
         indicator, payload.submesh, territories, cmp_territories, filters
     )
@@ -399,12 +389,12 @@ def comparison_histogram_export_view(request, name, payload):
         row["Décile"] = (
             f"{format_indicator_value(bucket[0])} - {format_indicator_value(bucket[1])}"
         )
-        row[f"{territory_name} - Nombre de {MESH_TITLES[payload.submesh]}s"] = len(
-            values[index + 1]
-        )
-        row[f"{cmp_territory_name} - Nombre de {MESH_TITLES[payload.submesh]}s"] = len(
-            cmp_values[index + 1]
+        row[f"{territory_name} - Nombre de {MESHES_SHORT_TITLES[payload.submesh]}s"] = (
+            len(values[index + 1])
         )
+        row[
+            f"{cmp_territory_name} - Nombre de {MESHES_SHORT_TITLES[payload.submesh]}s"
+        ] = len(cmp_values[index + 1])
         row[f"{territory_name} - échantillon de dix territoires"] = " | ".join(
             values[index + 1][:10]
         )
@@ -418,7 +408,7 @@ def comparison_histogram_export_view(request, name, payload):
 def get_label(props, indicator, key):
     labels = {
         "annee": "Année",
-        "lieu": "Lieu",
+        "name": "Lieu",
         "territory_1": "Origine",
         "territory_2": "Destination",
         "valeur": "flux" if props.flows else indicator.unite,

territories_dashboard_lib/superset_lib/logic.py

@@ -9,46 +9,45 @@ def get_territory_meshes(territory_id: str, territory_mesh: MeshLevel):
     current_dep = None
     current_epci = None
     current_com = None
-    if territory_mesh != MeshLevel.National:
-        mapped_mesh = "DEPCOM" if territory_mesh == "com" else territory_mesh.upper()
+    if territory_mesh != MeshLevel.fr:
         query = f"""
         SELECT
-            "NOM_REG" as reg_name,
-            "NOM_DEP" as dep_name,
-            "NOM_EPCI" as epci_name,
-            "NOM_DEPCOM" as com_name
+            name_reg,
+            name_dep,
+            name_epci,
+            name_com
         FROM arborescence_geo
-        WHERE "{mapped_mesh}" = '{territory_id}'
+        WHERE code_{territory_mesh} = '{territory_id}'
         LIMIT 1
         """
         row = run_custom_query(query)[0]
         if territory_mesh in [
-            MeshLevel.Region,
-            MeshLevel.Department,
-            MeshLevel.Epci,
-            MeshLevel.Town,
+            MeshLevel.reg,
+            MeshLevel.dep,
+            MeshLevel.epci,
+            MeshLevel.com,
         ]:
-            current_reg = row["reg_name"]
+            current_reg = row["name_reg"]
         if territory_mesh in [
-            MeshLevel.Department,
-            MeshLevel.Epci,
-            MeshLevel.Town,
+            MeshLevel.dep,
+            MeshLevel.epci,
+            MeshLevel.com,
         ]:
-            current_dep = row["dep_name"]
+            current_dep = row["name_dep"]
         if territory_mesh in [
-            MeshLevel.Epci,
-            MeshLevel.Town,
+            MeshLevel.epci,
+            MeshLevel.com,
         ]:
-            current_epci = row["epci_name"]
+            current_epci = row["name_epci"]
         if territory_mesh in [
-            MeshLevel.Town,
+            MeshLevel.com,
         ]:
-            current_com = row["com_name"]
+            current_com = row["name_com"]
     territory_meshes = {
-        MeshLevel.Region: current_reg,
-        MeshLevel.Department: current_dep,
-        MeshLevel.Epci: current_epci,
-        MeshLevel.Town: current_com,
+        MeshLevel.reg: current_reg,
+        MeshLevel.dep: current_dep,
+        MeshLevel.epci: current_epci,
+        MeshLevel.com: current_com,
     }
     return territory_meshes
 

territories_dashboard_lib/superset_lib/migrations/0002_alter_filter_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 = [
+        ('superset_lib', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='filter',
+            name='mesh',
+            field=models.TextField(blank=True, choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')], help_text="Maille du territoire sur lequel s'effectue le filtre.", null=True),
+        ),
+    ]

territories_dashboard_lib/tracking_lib/enums.py

@@ -5,6 +5,7 @@ TRACKING_COOKIE_NAME = "omnibus"
 
 class EventType(models.TextChoices):
     download = "download"
+    view_indicator_card = "vue-resume-indicateur"
 
 
 class GraphType(models.TextChoices):

territories_dashboard_lib/tracking_lib/migrations/0005_alter_page_cmp_territory_mesh_alter_page_submesh_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.8 on 2025-12-03 13:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking_lib', '0004_cookieinfo_ip_address'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='page',
+            name='cmp_territory_mesh',
+            field=models.TextField(blank=True, choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')], help_text="Maille du territoire de comparaison, null s'il ne s'agit pas de la page comparaison.", null=True),
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='submesh',
+            field=models.TextField(blank=True, choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')], help_text="Maille d'analyse sélectionnée.", null=True),
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='territory_mesh',
+            field=models.TextField(blank=True, choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')], help_text='Maille du territoire principal sélectionné.', null=True),
+        ),
+    ]

territories_dashboard_lib/tracking_lib/migrations/0006_alter_event_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2026-01-06 16:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking_lib', '0005_alter_page_cmp_territory_mesh_alter_page_submesh_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='name',
+            field=models.TextField(choices=[('download', 'Download'), ('vue-resume-indicateur', 'View Indicator Card')]),
+        ),
+    ]

territories_dashboard_lib/tracking_lib/payloads.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from pydantic import BaseModel
 
 from territories_dashboard_lib.tracking_lib.enums import EventType
@@ -6,5 +8,5 @@ from territories_dashboard_lib.tracking_lib.enums import EventType
 class EventPayload(BaseModel):
     indicator: str
     event: EventType
-    objet: str
-    type: str
+    objet: Optional[str] = None
+    type: Optional[str] = None

territories_dashboard_lib/tracking_lib/views.py

@@ -26,18 +26,19 @@ def track_event_view(request):
         return JsonResponse({"error": e.errors()}, status=422)
     if (
         Event.objects.filter(created_at__gte=timezone.now() - timedelta(days=1)).count()
-        > 1000
+        > 100_000
     ):
         return HttpResponse(status=429)
     response = HttpResponse()
+    data = {"indicator": payload.indicator}
+    if payload.objet:
+        data["objet"] = payload.objet
+    if payload.type:
+        data["type"] = payload.type
     track_event(
         request=request,
         response=response,
         event_name=payload.event,
-        data={
-            "indicator": payload.indicator,
-            "objet": payload.objet,
-            "type": payload.type,
-        },
+        data=data,
     )
     return HttpResponse()

territories_dashboard_lib/website_lib/conf.py

@@ -0,0 +1,28 @@
+from territories_dashboard_lib.indicators_lib.enums import (
+    ALL_MESHES_ABSOLUTE,
+    MESHES_ORDERED_FOR_PRESENTATION,
+)
+from territories_dashboard_lib.website_lib.models import MainConf
+
+
+class MissingMainConf(Exception):
+    def __init__(self):
+        super().__init__()
+        self.message = "Configuration principale du site (MainConf) manquante, veuillez la créer via le backoffice ou le shell."
+
+
+def get_meshes_for_current_project():
+    main_conf = get_main_conf()
+    return [m for m in ALL_MESHES_ABSOLUTE if m in main_conf.meshes]
+
+
+def get_ordered_meshes_for_current_project():
+    main_conf = get_main_conf()
+    return [m for m in MESHES_ORDERED_FOR_PRESENTATION if m in main_conf.meshes]
+
+
+def get_main_conf():
+    main_conf = MainConf.objects.first()
+    if main_conf is None:
+        raise MissingMainConf
+    return main_conf

territories_dashboard_lib/website_lib/context_processors.py

@@ -2,20 +2,19 @@ from django.conf import settings
 
 from territories_dashboard_lib.superset_lib.models import Dashboard
 from territories_dashboard_lib.superset_lib.serializers import serialize_dashboard
-from territories_dashboard_lib.website_lib.models import (
-    MainConf,
-    NoticeBanner,
-)
+from territories_dashboard_lib.website_lib.conf import get_main_conf
+from territories_dashboard_lib.website_lib.models import NoticeBanner
 
 
 def default(request):
-    main_conf = MainConf.objects.first()
+    main_conf = get_main_conf()
     notice = NoticeBanner.objects.first()
+    view_name = request.resolver_match.view_name if request.resolver_match else None
     context = {
         "ENABLE_SUPERSET": settings.ENABLE_SUPERSET,
         "ANALYTICS_ID": settings.ANALYTICS_ID,
         "ENVIRONMENT": settings.ENVIRONMENT,
-        "view_name": request.resolver_match.view_name,
+        "view_name": view_name,
         "absolute_uri": request.build_absolute_uri(),
         "main_conf": main_conf,
         "notice": notice,

territories_dashboard_lib/website_lib/migrations/0005_mainconf_meshes.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2.8 on 2025-12-03 13:42
+
+import django.contrib.postgres.fields
+import territories_dashboard_lib.website_lib.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website_lib', '0004_mainconf_description_mainconf_social_image_url'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mainconf',
+            name='meshes',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(choices=[('fr', 'Fr'), ('reg', 'Reg'), ('dep', 'Dep'), ('epci', 'Epci'), ('com', 'Com'), ('aom', 'Aom')]), default=territories_dashboard_lib.website_lib.models.get_default_meshes, help_text="Liste des mailles territoriales activées sur la plateforme, la liste des mailles disponible est : ['fr', 'reg', 'dep', 'epci', 'com', 'aom'].<br/>L'ajout de nouvelles mailles demande une modification de la base de données des indicateurs ainsi que du code.", size=None, verbose_name='Mailles'),
+        ),
+    ]

territories_dashboard_lib/website_lib/models.py

@@ -1,7 +1,9 @@
+from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from martor.models import MartorField
 
 from territories_dashboard_lib.commons.models import CommonModel
+from territories_dashboard_lib.indicators_lib.enums import STANDARD_MESHES, MeshLevel
 from territories_dashboard_lib.website_lib.navigation import (
     parse_footer_navigation,
     parse_header_navigation,
@@ -12,6 +14,10 @@ from territories_dashboard_lib.website_lib.static_content import (
 )
 
 
+def get_default_meshes():
+    return STANDARD_MESHES
+
+
 class MainConf(CommonModel):
     title = models.TextField(
         verbose_name="Titre principal du site", default="Tableau de bord"
@@ -74,6 +80,12 @@ class MainConf(CommonModel):
         verbose_name="Image de description",
         help_text="Lien d'une image (idéalement 1200x630px). Elle sera utilisée lors du partage sur les réseaux sociaux.",
     )
+    meshes = ArrayField(
+        models.TextField(choices=MeshLevel),
+        default=get_default_meshes,
+        verbose_name="Mailles",
+        help_text=f"Liste des mailles territoriales activées sur la plateforme, la liste des mailles disponible est : {[m.value for m in MeshLevel]}.<br/>L'ajout de nouvelles mailles demande une modification de la base de données des indicateurs ainsi que du code.",
+    )
 
     @property
     def entity_breaklines(self):

territories_dashboard_lib/website_lib/params.py

@@ -2,23 +2,29 @@ from functools import wraps
 
 from territories_dashboard_lib.indicators_lib.enums import (
     FRANCE_GEOLEVEL_TITLES,
-    MESH_TITLES,
+    MESHES_LONG_TITLES,
+    MESHES_SHORT_TITLES,
+    STANDARD_MESHES,
     FranceGeoLevel,
     MeshLevel,
-    get_all_meshes,
     get_allow_same_mesh,
+    order_meshes_for_presentation,
 )
 from territories_dashboard_lib.indicators_lib.query.utils import run_custom_query
+from territories_dashboard_lib.website_lib.conf import (
+    get_meshes_for_current_project,
+    get_ordered_meshes_for_current_project,
+)
 
 TERRITORY_DEFAULT = {
     "id": FranceGeoLevel.METRO,
-    "mesh": MeshLevel.National,
+    "mesh": MeshLevel.fr,
     "name": FRANCE_GEOLEVEL_TITLES[FranceGeoLevel.METRO],
 }
 
 CMP_TERRITORY_DEFAULT = {
     "id": FranceGeoLevel.All,
-    "mesh": MeshLevel.National,
+    "mesh": MeshLevel.fr,
     "name": FRANCE_GEOLEVEL_TITLES[FranceGeoLevel.All],
 }
 
@@ -32,9 +38,6 @@ class BadParam(Exception):
     pass
 
 
-# TODO coverage
-# appeler la page détail d'un indicateur (page html, pas api) avec plus de combinaisons de paramètres GET
-# tester les valeurs du context du template
 class ParamsHandler:
     def __init__(self, request):
         self.request = request
@@ -47,6 +50,7 @@ class ParamsHandler:
         self.mesh = None
         self.meshes = []
         self.comparison = request.resolver_match.view_name == "website:comparison"
+        self.all_meshes = get_meshes_for_current_project()
 
     ######################## Territory
 
@@ -66,12 +70,12 @@ class ParamsHandler:
         return parts[0], parts[1]
 
     def get_territory_name(self, territory_id, territory_mesh):
-        if territory_mesh == MeshLevel.National:
+        # TODO use common -> get_territory_name, need Territory
+        if territory_mesh == MeshLevel.fr:
             return FRANCE_GEOLEVEL_TITLES[territory_id]
-        mesh = "DEPCOM" if territory_mesh == "com" else territory_mesh.upper()
         query = f"""
-        SELECT DISTINCT "NOM_{mesh}" AS name FROM arborescence_geo
-        WHERE "{mesh}" = '{territory_id}'
+        SELECT DISTINCT name FROM arbo_{territory_mesh}
+        WHERE code = '{territory_id}'
         """
         try:
             results = run_custom_query(query)
@@ -144,29 +148,34 @@ class ParamsHandler:
     ######################## Mesh
 
     def get_max_territory_mesh(self):
-        meshes = get_all_meshes()
         if self.comparison is False:
             return self.territory_mesh
-        if meshes.index(self.cmp_territory_mesh) > meshes.index(self.territory_mesh):
+        if self.all_meshes.index(self.cmp_territory_mesh) > self.all_meshes.index(
+            self.territory_mesh
+        ):
             return self.cmp_territory_mesh
         return self.territory_mesh
 
     def is_not_valid_mesh(self, mesh):
         if mesh is None:
             return True
-        meshes = get_all_meshes()
         max_territory_mesh = self.get_max_territory_mesh()
         allow_same_mesh = get_allow_same_mesh()
         is_not_valid = (
-            meshes.index(max_territory_mesh) > meshes.index(mesh)
+            self.all_meshes.index(max_territory_mesh) > self.all_meshes.index(mesh)
             if allow_same_mesh
-            else meshes.index(max_territory_mesh) >= meshes.index(mesh)
+            else self.all_meshes.index(max_territory_mesh)
+            >= self.all_meshes.index(mesh)
         )
         return is_not_valid
 
     def get_default_mesh(self):
         max_territory_mesh = self.get_max_territory_mesh()
-        meshes = get_all_meshes()
+        meshes = (
+            STANDARD_MESHES
+            if max_territory_mesh in STANDARD_MESHES
+            else self.all_meshes
+        )
         if meshes.index(max_territory_mesh) == len(meshes) - 1:
             default_mesh = meshes[-1]
         else:
@@ -201,13 +210,15 @@ class ParamsHandler:
         max_territory_mesh = self.get_max_territory_mesh()
         meshes = [
             m
-            for m in get_all_meshes()
-            if not (m == MeshLevel.Town and max_territory_mesh == MeshLevel.National)
+            for m in self.all_meshes
+            if not (m == MeshLevel.com and max_territory_mesh == MeshLevel.fr)
         ]
         min_mesh_index = meshes.index(max_territory_mesh)
         if get_allow_same_mesh() is False:
             min_mesh_index += 1
-        self.meshes = meshes[min(min_mesh_index, len(meshes) - 1) :]
+        self.meshes = order_meshes_for_presentation(
+            meshes[min(min_mesh_index, len(meshes) - 1) :]
+        )
 
     ######################## Commons
 
@@ -258,8 +269,9 @@ class ParamsHandler:
             "cmp_territory_name": self.cmp_territory_name,
             "mesh": self.mesh,
             "meshes": self.meshes,
-            "meshes_titles": MESH_TITLES,
-            "all_meshes": get_all_meshes(),
+            "meshes_short_titles": MESHES_SHORT_TITLES,
+            "meshes_long_titles": MESHES_LONG_TITLES,
+            "ordered_meshes": get_ordered_meshes_for_current_project(),
             "url_params": "&".join(url_params),
         }