front: lpv: wip with panels

Author: nicolaswurtz

front/src/assets/mapstyles/OSMStyle.json

@@ -1054,19 +1054,11 @@
     "source": "openmaptiles",
     "source-layer": "building",
     "type": "fill-extrusion",
-    "minzoom": 15,
+    "minzoom": 0,
     "paint": {
         "fill-extrusion-color": "#aaa",
-        "fill-extrusion-height": [
-            "interpolate", ["linear"], ["zoom"],
-            15, 0,
-            15.05, ["get", "render_height"]
-        ],
-        "fill-extrusion-base": [
-            "interpolate", ["linear"], ["zoom"],
-            15, 0,
-            15.05, ["get", "render_min_height"]
-        ],
+        "fill-extrusion-height": ["get", "render_height"],
+        "fill-extrusion-base": ["get", "render_min_height"],
         "fill-extrusion-opacity": 0.6
     }
   },

front/src/common/Map/Layers/SignalingType.js

@@ -27,17 +27,15 @@ export default function SignalingType(props) {
     },
   };
 
-  return (
-    layersSettings.signalingtype && (
-      <Source
-        id={`osrd_signaling_type_${geomType}`}
-        type="vector"
-        url={`${MAP_URL}/layer/signaling_sections/mvt/${geomType}/?infra=${infraID}`}
-      >
-        <Layer {...layerdef} id={`chartis/osrd_signaling_type/${geomType}`} />
-      </Source>
-    )
-  );
+  return layersSettings.signalingtype ? (
+    <Source
+      id={`osrd_signaling_type_${geomType}`}
+      type="vector"
+      url={`${MAP_URL}/layer/signaling_sections/mvt/${geomType}/?infra=${infraID}`}
+    >
+      <Layer {...layerdef} id={`chartis/osrd_signaling_type/${geomType}`} />
+    </Source>
+  ) : null;
 }
 
 SignalingType.propTypes = {

front/src/common/Map/Layers/extensions/SNCF/SNCF_LPV.tsx

@@ -8,7 +8,7 @@ import { MAP_URL } from 'common/Map/const';
 import { Theme } from 'types';
 
 // REMOVE BEFORE PROD
-import Panel from './SNCF_LPV_PANELS';
+import Panels from './SNCF_LPV_PANELS';
 
 interface SNCF_LPVProps {
   geomType: string;
@@ -94,7 +94,7 @@ export default function SNCF_LPV(props: SNCF_LPVProps) {
     filter: speedSectionFilter,
     layout: {
       visibility: 'visible',
-      'line-cap': 'square',
+      'line-cap': ['step', ['zoom'], 'round', 15, 'square'],
     },
     paint: {
       'line-color': '#747678',
@@ -113,7 +113,7 @@ export default function SNCF_LPV(props: SNCF_LPVProps) {
     filter: speedSectionFilter,
     layout: {
       visibility: 'visible',
-      'line-cap': 'square',
+      'line-cap': ['step', ['zoom'], 'round', 15, 'square'],
     },
     paint: {
       'line-color': [
@@ -168,7 +168,7 @@ export default function SNCF_LPV(props: SNCF_LPVProps) {
             beforeId={`chartis/osrd_sncf_lpv_points/${geomType}`}
           />
         </Source>
-        <Panel />
+        <Panels />
       </>
     );
   }

front/src/common/Map/Layers/extensions/SNCF/SNCF_LPV_PANELS.js

@@ -1,77 +1,20 @@
 import React from 'react';
 import { Source, Layer } from 'react-map-gl';
 
-function Panel() {
-  const MAP_URL = 'https://tiles.carto.graou.info';
+function Panels() {
   const blueprintPrefix = '';
+  const filter = [
+    'all',
+    ['in', 'type_if', 'CHEVRON', 'R', 'TIV D FIXE', 'TIVD C FIX', 'TIVD B FIX', 'Z'],
+  ];
 
   const panelParams = {
     id: 'panelParams',
     type: 'symbol',
     source: 'signalisation',
     'source-layer': 'signalisation_angles',
-    minzoom: 12,
-    filter: [
-      'all',
-      [
-        'in',
-        'type_if',
-        'APPROETSA',
-        'ARRET VOY',
-        'ARRET',
-        'ARRET A',
-        'ATC',
-        'BP DIS',
-        'BP EXE',
-        'BP FIN',
-        'CAB E',
-        'CAB S',
-        'CAB R',
-        'CC FIN',
-        'CC EXE',
-        'CHEVRON',
-        'DD',
-        'DIVERS',
-        'DEPOT',
-        'DESTI',
-        'FIN CAT',
-        'G',
-        'GABARIT',
-        'GARE',
-        'HEURT...',
-        'IDD',
-        'IDP',
-        'IMP',
-        'JAL MAN',
-        'JAL ARRET',
-        'L',
-        'LGR',
-        'LIMITETS',
-        'LM',
-        'MIBLAN VER',
-        'P',
-        'PN',
-        'PN...',
-        'R',
-        'REP TGV',
-        'REV',
-        'SECT',
-        'SIFFLER',
-        'STOP',
-        'STOP A',
-        'TECS',
-        'TIV D FIXE',
-        'TIV R MOB',
-        'TIV D MOB',
-        'TIV PENDIS',
-        'TIV PENEXE',
-        'TIV PENREP',
-        'TIVD C FIX',
-        'TIVD B FIX',
-        'TSCS',
-        'Z',
-      ],
-    ],
+    minzoom: 10,
+    filter,
     layout: {
       'text-font': ['Open Sans Regular'],
       'text-size': 9,
@@ -137,7 +80,7 @@ function Panel() {
         'PN...',
         ['concat', blueprintPrefix, ['get', 'type_if']],
       ],
-      'icon-size': ['step', ['zoom'], 0.2, 15, 0.4],
+      'icon-size': ['step', ['zoom'], 0.3, 15, 0.4],
       'text-offset': [
         'step',
         ['zoom'],
@@ -192,16 +135,46 @@ function Panel() {
     },
   };
 
+  const mastParams = {
+    id: 'mast2',
+    type: 'symbol',
+    source: 'signalisation',
+    'source-layer': 'signalisation_angles',
+    minzoom: 15,
+    filter,
+    layout: {
+      'text-font': ['Open Sans Regular'],
+      'text-size': 8,
+      'text-field': '',
+      'text-allow-overlap': true,
+      'text-ignore-placement': true,
+      'icon-image': [
+        'case',
+        ['==', ['get', 'position'], 'D'],
+        'MATD',
+        ['==', ['get', 'position'], 'G'],
+        'MATG',
+        '',
+      ],
+      'icon-size': 1,
+      'icon-rotation-alignment': 'map',
+      'icon-rotate': ['get', 'angle'],
+      'icon-allow-overlap': true,
+      'icon-ignore-placement': true,
+    },
+  };
+
   return (
     <Source
       id="panel"
       type="vector"
-      url={`${MAP_URL}/data/signalisation.json`}
+      url="https://osm.osrd.fr/data/signalisation.json"
       source-layer="signalisation_angles"
     >
+      <Layer {...mastParams} />
       <Layer {...panelParams} />
     </Source>
   );
 }
 
-export default Panel;
+export default Panels;