chartos: add condition in config

Author: Tguisnet

chartos/chartos.yml

@@ -25,14 +25,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: signal.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_signalmodel signal on signal.obj_id = layer.obj_id and signal.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: signal.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_signalmodel signal on signal.obj_id = layer.obj_id and signal.infra_id = layer.infra_id
 
@@ -44,16 +42,39 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: speed_section.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_speedsectionmodel speed_section on speed_section.obj_id = layer.obj_id and speed_section.infra_id = layer.infra_id
+      where:
+        - not (speed_section.data @? '$.extensions.lpv_sncf.z')
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: speed_section.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_speedsectionmodel speed_section on speed_section.obj_id = layer.obj_id and speed_section.infra_id = layer.infra_id
+      where:
+        - not (speed_section.data @? '$.extensions.lpv_sncf.z')
+
+- name: lpv
+  table_name: osrd_infra_speedsectionlayer
+  id_field: id
+  views:
+    - name: geo
+      on_field: geographic
+      cache_duration: 3600
+      data_expr: speed_section.data
+      joins:
+        - inner join osrd_infra_speedsectionmodel speed_section on speed_section.obj_id = layer.obj_id and speed_section.infra_id = layer.infra_id
+      where:
+        - speed_section.data @? '$.extensions.lpv_sncf.z'
+    - name: sch
+      on_field: schematic
+      cache_duration: 3600
+      data_expr: speed_section.data
+      joins:
+        - inner join osrd_infra_speedsectionmodel speed_section on speed_section.obj_id = layer.obj_id and speed_section.infra_id = layer.infra_id
+      where:
+        - speed_section.data @? '$.extensions.lpv_sncf.z'
 
 - name: track_section_links
   table_name: osrd_infra_tracksectionlinklayer
@@ -63,14 +84,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: track_section_link.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_tracksectionlinkmodel track_section_link on track_section_link.obj_id = layer.obj_id and track_section_link.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: track_section_link.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_tracksectionlinkmodel track_section_link on track_section_link.obj_id = layer.obj_id and track_section_link.infra_id = layer.infra_id
 
@@ -82,14 +101,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: switch.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_switchmodel switch on switch.obj_id = layer.obj_id and switch.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: switch.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_switchmodel switch on switch.obj_id = layer.obj_id and switch.infra_id = layer.infra_id
 
@@ -101,14 +118,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: detector.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_detectormodel detector on detector.obj_id = layer.obj_id and detector.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: detector.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_detectormodel detector on detector.obj_id = layer.obj_id and detector.infra_id = layer.infra_id
 
@@ -120,14 +135,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: buffer_stop.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_bufferstopmodel buffer_stop on buffer_stop.obj_id = layer.obj_id and buffer_stop.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: buffer_stop.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_bufferstopmodel buffer_stop on buffer_stop.obj_id = layer.obj_id and buffer_stop.infra_id = layer.infra_id
 
@@ -139,14 +152,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: route.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_routemodel route on route.obj_id = layer.obj_id and route.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: route.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_routemodel route on route.obj_id = layer.obj_id and route.infra_id = layer.infra_id
 
@@ -158,14 +169,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: operational_point.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_operationalpointmodel operational_point on operational_point.obj_id = layer.obj_id and operational_point.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: operational_point.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_operationalpointmodel operational_point on operational_point.obj_id = layer.obj_id and operational_point.infra_id = layer.infra_id
 
@@ -177,14 +186,12 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: catenary.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_catenarymodel catenary on catenary.obj_id = layer.obj_id and catenary.infra_id = layer.infra_id
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: catenary.data
-      exclude_fields: [geo, sch]
       joins:
         - inner join osrd_infra_catenarymodel catenary on catenary.obj_id = layer.obj_id and catenary.infra_id = layer.infra_id
 
@@ -196,9 +203,7 @@
       on_field: geographic
       cache_duration: 3600
       data_expr: layer.information
-      exclude_fields: [geo, sch]
     - name: sch
       on_field: schematic
       cache_duration: 3600
       data_expr: layer.information
-      exclude_fields: [geo, sch]

chartos/chartos/config.py

@@ -27,6 +27,7 @@ class View:
     exclude_fields: List[str] = field(compare=False)
     joins: List[JoinExpr] = field(compare=False)
     cache_duration: int = field(compare=False)
+    where: List[str] = field(compare=False)
 
     @staticmethod
     def parse(data):
@@ -37,6 +38,7 @@ def parse(data):
             data.get("exclude_fields", []),
             data.get("joins", []),
             data["cache_duration"],
+            data.get("where", []),
         )
 
     def todict(self):

chartos/chartos/views.py

@@ -1,5 +1,6 @@
 import json
 from collections import defaultdict
+from functools import reduce
 from typing import Any, Dict, List, Mapping, NewType, Tuple
 
 from asyncpg import Connection
@@ -141,6 +142,8 @@ async def mvt_query(psql, layer, infra, view: View, z: int, x: int, y: int) -> b
         f"{' '.join(view.joins)} "
         # filter by infra
         f"WHERE layer.infra_id = $4 "
+        # Where view conditions
+        f"{reduce(lambda base, cond: f'{base} AND ({cond}) ', view.where, '')}"
         # we only want objects which are inside the tile BBox
         f"AND {view.on_field} && bbox.geom "
         # exclude geometry collections
@@ -287,6 +290,8 @@ async def get_objects_in_bbox(
         f"{' '.join(view.joins)} "
         # Filter by infra
         "WHERE layer.infra_id = $1 "
+        # Where view conditions
+        f"{reduce(lambda base, cond: f'{base} AND ({cond}) ', view.where, '')}"
         # Filter by objects inside the bounding box
         f"AND layer.{view.on_field} && ST_Transform(ST_MakeEnvelope($2, $3, $4, $5, 4326), 3857)"
     )