front: fix layers order on map

Author: SharglutDev

front/src/applications/editor/Map.tsx

@@ -206,7 +206,11 @@ const MapUnplugged: FC<PropsWithChildren<MapProps>> = ({
           attributionControl={false}
           touchZoomRotate
           maxPitch={85}
-          terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }}
+          terrain={
+            terrain3DExaggeration
+              ? { source: 'terrain', exaggeration: terrain3DExaggeration }
+              : undefined
+          }
           doubleClickZoom={false}
           interactive
           cursor={cursor}

front/src/applications/referenceMap/Map.tsx

@@ -123,7 +123,11 @@ function Map() {
         interactiveLayerIds={defineInteractiveLayers()}
         touchZoomRotate
         maxPitch={85}
-        terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }}
+        terrain={
+          terrain3DExaggeration
+            ? { source: 'terrain', exaggeration: terrain3DExaggeration }
+            : undefined
+        }
       >
         <VirtualLayers />
         <AttributionControl customAttribution={CUSTOM_ATTRIBUTION} />
@@ -149,6 +153,7 @@ function Map() {
             />
           </>
         )}
+
         <Platforms
           colors={colors[mapStyle]}
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.PLATFORMS.GROUP]}

front/src/assets/mapstyles/OSMStyle.json

@@ -1047,10 +1047,10 @@
     "type": "fill-extrusion",
     "minzoom": 0,
     "paint": {
-        "fill-extrusion-color": "#aaa",
-        "fill-extrusion-height": ["get", "render_height"],
-        "fill-extrusion-base": ["get", "render_min_height"],
-        "fill-extrusion-opacity": 0.6
+      "fill-extrusion-color": "#aaa",
+      "fill-extrusion-height": ["get", "render_height"],
+      "fill-extrusion-base": ["get", "render_min_height"],
+      "fill-extrusion-opacity": 0.6
     }
   },
   {

front/src/common/Map/Consts/colors.ts

@@ -56,7 +56,7 @@ const colors: Record<string, Theme> = {
       halo: '#eee',
     },
     platform: {
-      fill: '#e05206',
+      fill: '#e9b996',
     },
     pn: {
       text: '#712b2b',

front/src/common/Map/Layers/Platforms.tsx

@@ -16,7 +16,7 @@ function Platforms(props: PlatformsProps) {
 
   const platformsParams: LayerProps = {
     id: 'osm/platforms',
-    type: 'fill-extrusion',
+    type: 'fill',
     source: 'openmaptiles',
     'source-layer': 'transportation',
     filter: [
@@ -26,10 +26,7 @@ function Platforms(props: PlatformsProps) {
       ['==', 'subclass', 'platform'],
     ],
     paint: {
-      'fill-extrusion-color': colors.platform.fill,
-      'fill-extrusion-height': 2,
-      'fill-extrusion-base': 1,
-      'fill-extrusion-opacity': 0.4,
+      'fill-color': colors.platform.fill,
     },
   };
 

front/src/modules/simulationResult/components/SimulationResultsMap.tsx

@@ -247,7 +247,11 @@ const Map: FC<MapProps> = ({ setExtViewport }) => {
         interactiveLayerIds={interactiveLayerIds}
         touchZoomRotate
         maxPitch={85}
-        terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }}
+        terrain={
+          terrain3DExaggeration
+            ? { source: 'terrain', exaggeration: terrain3DExaggeration }
+            : undefined
+        }
         onLoad={handleLoadFinished}
       >
         <VirtualLayers />

front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx

@@ -171,7 +171,11 @@ function Map() {
         interactiveLayerIds={defineInteractiveLayers()}
         touchZoomRotate
         maxPitch={85}
-        terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }}
+        terrain={
+          terrain3DExaggeration
+            ? { source: 'terrain', exaggeration: terrain3DExaggeration }
+            : undefined
+        }
       >
         <VirtualLayers />
         <AttributionControl position="bottom-right" customAttribution={CUSTOM_ATTRIBUTION} />