editoast, front: filter psl signs by speed limit and speed limit tags in maps

editoast/map_layers.yml

@@ -101,7 +101,14 @@ layers:
     views:
       geo:
         on_field: geographic
-        data_expr: layer.data || jsonb_build_object('angle', layer.angle_geo)
+        data_expr: >
+          layer.data || jsonb_build_object(
+            'angle', layer.angle_geo,
+            'speed_limit_by_tag', speed_section.data->'speed_limit_by_tag',
+            'speed_limit', speed_section.data->'speed_limit'
+          )
+        joins:
+          - inner join infra_object_speed_section speed_section on speed_section.obj_id = layer.obj_id and speed_section.infra_id = layer.infra_id
 
   neutral_signs:
     table_name: infra_layer_neutral_sign

front/src/common/Map/Layers/InfraObjectLayers/GeoJSONs.tsx

@@ -287,16 +287,19 @@ function getDetectorsLayers(context: LayerContext, prefix: string): LayerProps[]
 }
 
 function getPSLSignsLayers(context: LayerContext, prefix: string): LayerProps[] {
+  const filter = getFilterBySpeedSectionsTag(context.layersSettings);
   return [
     {
       ...getPSLSignsLayerProps(context),
       id: `${prefix}geo/psl-signs`,
       minzoom: POINT_ENTITIES_MIN_ZOOM,
+      filter,
     },
     {
       ...getMastLayerProps(context),
       id: `${prefix}geo/psl-signs-mast`,
       minzoom: 13,
+      filter,
     },
     {
       ...getKPLabelLayerProps({
@@ -305,6 +308,7 @@ function getPSLSignsLayers(context: LayerContext, prefix: string): LayerProps[]
         isSignalisation: true,
       }),
       id: `${prefix}geo/psl-signs-kp`,
+      filter,
     },
   ];
 }

front/src/common/Map/Layers/InfraObjectLayers/extensions/SNCF/PSL.tsx

@@ -211,7 +211,7 @@ const SNCF_PSL = ({ colors, layerOrder, infraID }: SNCF_PSLProps) => {
           layerOrder={layerOrder}
         />
       </Source>
-      <SNCF_PSL_Signs colors={colors} layerOrder={layerOrder} />
+      <SNCF_PSL_Signs colors={colors} layerOrder={layerOrder} filter={speedSectionFilter} />
     </>
   );
 };

front/src/common/Map/Layers/InfraObjectLayers/extensions/SNCF/PSLSigns.tsx

@@ -1,4 +1,5 @@
 import { isNil } from 'lodash';
+import type { FilterSpecification } from 'maplibre-gl';
 import type { LayerProps, SymbolLayer } from 'react-map-gl/maplibre';
 import { Source } from 'react-map-gl/maplibre';
 
@@ -13,6 +14,7 @@ import type { Theme } from 'types';
 type SNCF_PSL_SignsProps = {
   colors: Theme;
   layerOrder?: number;
+  filter: FilterSpecification;
 };
 
 export function getPSLSignsLayerProps({
@@ -61,7 +63,7 @@ export function getPSLSignsLayerProps({
 
 export default function SNCF_PSL_Signs(props: SNCF_PSL_SignsProps) {
   const infraID = useInfraID();
-  const { colors, layerOrder } = props;
+  const { colors, layerOrder, filter } = props;
 
   const signsParams: LayerProps = getPSLSignsLayerProps({
     sourceTable: 'psl_signs',
@@ -85,12 +87,13 @@ export default function SNCF_PSL_Signs(props: SNCF_PSL_SignsProps) {
       type="vector"
       url={`${MAP_URL}/layer/psl_signs/mvt/geo/?infra=${infraID}`}
     >
-      <OrderedLayer {...mastsParams} layerOrder={layerOrder} />
-      <OrderedLayer {...signsParams} layerOrder={layerOrder} />
+      <OrderedLayer {...mastsParams} layerOrder={layerOrder} filter={filter} />
+      <OrderedLayer {...signsParams} layerOrder={layerOrder} filter={filter} />
       <OrderedLayer
         {...KPLabelsParams}
         id="chartis/osrd_psl_signs_kp/geo"
         layerOrder={layerOrder}
+        filter={filter}
       />
     </Source>
   );