compute all transports everywhere

Author: desoindx

src/components/comparateur/overscreens/ComparisonOverscreen.tsx

@@ -1,47 +1,19 @@
 'use client'
-
 import { useTranslations } from 'next-intl'
-import React, { useMemo, useState } from 'react'
+import { useState } from 'react'
 import useParamContext from 'src/providers/ParamProvider'
 import { useSearchEquivalent } from 'src/providers/useSearchEquivalent'
-import { deplacements } from 'data/categories/deplacement'
 import Button from 'components/base/buttons/Button'
 import HiddenLabel from 'components/form/HiddenLabel'
 import Input from 'components/form/Input'
 import ComparisonEquivalents from './ComparisonEquivalents'
 import styles from './EquivalentsOverscreen.module.css'
 
-const allEquivalents = deplacements
-  .filter((equivalent) => equivalent.category === 4)
-  .flatMap((deplacement) =>
-    deplacement.withCarpool
-      ? [
-          ...Array.from({ length: 4 }).map((_, index) => ({
-            ...deplacement,
-            carpool: index + 1,
-            slug: `${deplacement.slug}+${index + 1}`,
-          })),
-          deplacement,
-        ]
-      : [deplacement]
-  )
-
 const ComparisonOverscreen = ({ index }: { index: 0 | 1 }) => {
-  const {
-    setOverscreen,
-    transport: { modes },
-  } = useParamContext()
+  const { setOverscreen } = useParamContext()
   const [search, setSearch] = useState('')
   const results = useSearchEquivalent(search, true, 4)
 
-  const equivalents = useMemo(
-    () =>
-      allEquivalents.filter((equivalent) => {
-        const [slug, carpool] = equivalent.slug.split('+')
-        return carpool ? modes.includes(`${slug}+1`) : modes.includes(slug)
-      }),
-    [modes]
-  )
   const tSearch = useTranslations('comparateur.overscreen')
   const t = useTranslations('overscreen.transport')
   const tModal = useTranslations('modal')
@@ -87,7 +59,7 @@ const ComparisonOverscreen = ({ index }: { index: 0 | 1 }) => {
             </div>
           )
         ) : (
-          <ComparisonEquivalents onClose={onClose} equivalents={equivalents} index={index} />
+          <ComparisonEquivalents onClose={onClose} equivalents={results} index={index} />
         )}
       </ul>
       <div className={styles.footerCenter}>

src/components/outils/CategorySimulator.tsx

@@ -132,7 +132,10 @@ const CategorySimulator = ({
 
   const ref = useRef<HTMLUListElement>(null)
   const firstElementRef = useRef<HTMLAnchorElement>(null)
-  const max = Math.max.apply(null, equivalents?.map((equivalent) => equivalent.value) || [])
+  const max = Math.max.apply(
+    null,
+    equivalents?.filter((equivalent) => !equivalent.ignore).map((equivalent) => equivalent.value) || []
+  )
   const legends = useMemo(() => computeLegends(equivalents), [equivalents])
   const [basePercent, setBasePercent] = useState(80)
   const [legendRelative, setLegendRelative] = useState(false)

src/components/outils/transport/TransportComparisonEquivalent.tsx

@@ -19,36 +19,19 @@ import styles from './TransportComparisonEquivalent.module.css'
 const allEquivalents = computedEquivalents.flatMap(getEquivalentWithCarpool)
 
 const getEquivalent = (language: string, equivalents: ComputedEquivalent[], slug: string) => {
-  const [name, carpool] = slug.split('+')
-  const equivalent = equivalents.find(
-    (equivalent) => isEquivalentInMode(equivalent, name) && (carpool ? equivalent.carpool : !equivalent.carpool)
-  ) as (ComputedEquivalent & { found?: boolean }) | undefined
+  let equivalent = equivalents.find((equivalent) => isEquivalentInMode(equivalent, slug)) as
+    | (ComputedEquivalent & { found?: boolean })
+    | undefined
+
   if (!equivalent) {
-    return allEquivalents.find((equivalent) => isEquivalentInMode(equivalent, slug)) as
+    equivalent = allEquivalents.find((equivalent) => isEquivalentInMode(equivalent, slug)) as
       | (ComputedEquivalent & { found?: boolean })
       | undefined
   }
 
-  if (carpool) {
-    if (!equivalent) {
-      return undefined
-    }
-
-    return {
-      ...equivalent,
-      name: getName(
-        language,
-        { ...equivalent, slug: carpool ? `${equivalent.slug}+${carpool}` : equivalent.slug, carpool: Number(carpool) },
-        false,
-        1,
-        false,
-        true
-      ),
-      found: true,
-    }
-  }
-
-  return equivalent ? { ...equivalent, found: true } : undefined
+  return equivalent
+    ? { ...equivalent, name: getName(language, equivalent, false, 1, false, true), found: true }
+    : undefined
 }
 
 const TransportComparisonEquivalent = ({
@@ -94,7 +77,7 @@ const TransportComparisonEquivalent = ({
           </Link>
           <div className={styles.top}>
             <EquivalentIcon equivalent={equivalent} height={4} />
-            <p>{equivalent.found ? equivalent.name : getName(language, equivalent)}</p>
+            <p>{equivalent.found ? equivalent.name : getName(language, equivalent, false, 1, false, true)}</p>
           </div>
           {equivalent.found ? (
             <div>

src/components/shareable/overScreens/TransportComparison.tsx

@@ -43,11 +43,18 @@ const TransportComparison = ({
     () =>
       equivalents
         .filter((equivalent) => {
-          if (equivalent.carpool) {
-            const [slug] = equivalent.slug.split('+')
-            return modes.includes(`${slug}+1`)
+          const infos = equivalent.slug.split('+')
+          let slug = infos[0]
+          if (equivalent.slug.startsWith('voiture-')) {
+            if (equivalent.slug.includes('hybride')) {
+              slug = `voiturehybride`
+            } else if (equivalent.slug.includes('electrique')) {
+              slug = `voitureelectrique`
+            } else {
+              slug = 'voiturethermique'
+            }
           }
-          return modes.includes(equivalent.slug)
+          return infos[1] ? modes.includes(`${slug}+1`) : modes.includes(slug)
         })
         .sort((a, b) => a.slug.localeCompare(b.slug)),
     [modes]

src/data/categories/deplacement.ts

@@ -997,11 +997,11 @@ export const deplacements = [
     ecv: [
       {
         id: 6,
-        value: 0.0931681350556303,
+        value: 0.1134194350556303,
       },
       {
         id: 5,
-        value: 0.04073222826086956,
+        value: 0.03315991847826087,
       },
     ],
     default: false,

src/hooks/useTransportations.tsx

@@ -28,8 +28,6 @@ export default function useTransportations(
     const allEquivalents =
       values || km
         ? deplacements
-            // Carpool is managed after expansion, avion needs to be managed here
-            .filter((equivalent) => equivalent.withCarpool || params.transport.modes.includes(equivalent.slug))
             .filter((equivalent) => (values && equivalent.type ? values[equivalent.type as DeplacementType] : km))
             .map((equivalent) => {
               if ('ecvs' in equivalent && equivalent.ecvs) {
@@ -75,15 +73,14 @@ export default function useTransportations(
                   equivalents.find((eq) => eq.slug === `voiture-${carpoolCarInfo.size}-${carpoolCarInfo.engine}`)) ||
                 equivalent
 
-              const carpoolValue = equivalent.withCarpool && carpool[equivalent.slug] ? carpool[equivalent.slug] : 1
-              return carpoolEquivalent.withCarpool &&
-                params.transport.modes.find((mode) => mode.startsWith(`${equivalent.slug}+`))
+              return carpoolEquivalent.withCarpool
                 ? [
-                    {
+                    ...Array.from({ length: 4 }, (_, i) => i + 1).map((carpoolValue) => ({
                       ...carpoolEquivalent,
+                      id: carpoolEquivalent.id + carpoolValue,
                       default: equivalent.default,
-                      ignore: equivalent.ignore,
-                      slug: equivalent.slug,
+                      ignore: equivalent.ignore || carpoolValue !== 1,
+                      slug: `${equivalent.slug}+${carpoolValue}`,
                       carpool: carpoolValue,
                       name:
                         getNameWithoutSuffix(params.language, { ...equivalent, carpool: carpoolValue }) +
@@ -92,8 +89,8 @@ export default function useTransportations(
                       value: carpoolEquivalent.value / (carpoolValue + 1),
                       ecv: carpoolEquivalent.ecv.map((ecv) => ({ ...ecv, value: ecv.value / (carpoolValue + 1) })),
                       usage: carpoolEquivalent.usage / (carpoolValue + 1),
-                      link: `${carpoolEquivalent.link}+${carpoolValue}`,
-                    },
+                      link: `${realEquivalent.link}+${carpoolValue}`,
+                    })),
                     {
                       ...realEquivalent,
                       default: equivalent.default,
@@ -115,17 +112,23 @@ export default function useTransportations(
                   ]
             })
             .filter((equivalent) => {
-              if (equivalent.withCarpool) {
-                // Carpool case, check slug+1
-                if ('carpool' in equivalent && equivalent.carpool) {
-                  const [slug] = equivalent.slug.split('+')
-                  return params.transport.modes.includes(`${slug}+1`)
+              // Carpool case, check slug+1
+              const infos = equivalent.slug.split('+')
+              let slug = infos[0]
+              if (equivalent.slug.startsWith('voiture-')) {
+                if (equivalent.slug.includes('hybride')) {
+                  slug = `voiturehybride`
+                } else if (equivalent.slug.includes('electrique')) {
+                  slug = `voitureelectrique`
+                } else {
+                  slug = 'voiturethermique'
                 }
-                // Without carpool, check slug
-                return params.transport.modes.includes(equivalent.slug)
               }
-              // Manage on top
-              return true
+              if ('carpool' in equivalent && equivalent.carpool) {
+                return params.transport.modes.includes(`${slug}+1`)
+              }
+              // Without carpool, check slug
+              return params.transport.modes.includes(slug)
             })
         : []
 

src/providers/ParamProvider.tsx

@@ -443,12 +443,6 @@ export function ParamProvider({ children }: { children: ReactNode }) {
     if (searchParams.get('modes')) {
       const modes = (searchParams.get('modes') as string).replace(/ /g, '+').split(',')
       if (modes.length > 0) {
-        if (modes.includes('voiturethermique') && modes.includes('voitureelectrique')) {
-          modes.push('voiturehybride')
-        }
-        if (modes.includes('voiturethermique+1') && modes.includes('voitureelectrique+1')) {
-          modes.push('voiturehybride+1')
-        }
         setModes(modes)
         if (!searchParams.get('comparison')) {
           if (modes.length === 2) {

src/providers/locales/en.json

@@ -444,10 +444,10 @@
         "avion-pny": "Travel by plane, very long journey. Total distance traveled: 11,600 km.",
         "tgv-paris-berlin": "Total distance traveled: 2,478 km.",
         "tgv-paris-marseille": "Total distance traveled: 1,504 km.",
-        "voiture-lille-nimes": "Total distance traveled: 1,882 km.",
+        "voiture-lille-nimes": "Journey made alone, in an average car running on diesel over a total distance of 1,882 km.",
         "ski": "Average value. Study conducted for a day of skiing in La Clusaz, Le Grand Bornand, and Tignes.",
         "piscine": "Average size of a private pool: 8 x 4m with a depth ranging from 1.5m to 2.1m.",
-        "terre-voiture": "Total distance traveled: 40,000 km.",
+        "terre-voiture": "Journey made alone, in a sedan running on gasoline over a total distance of 40,000 km.",
         "harry-potter": "All Harry Potter films last an average of 1,176 minutes = 19.6 hours. The data is calculated based on one hour of HD streaming on a television using Wi-Fi.",
         "avion-courtcourrier": "Average occupancy rate: 101-220 passengers.",
         "avion-moyencourrier": "Average occupancy rate: 101-220 passengers.",
@@ -530,32 +530,32 @@
         "maisonneuve": "Construction of a new conventional house of 130 m² living space - case of housing in Saint-Pierre and Miquelon.",
         "voiture-citadine-essence": "Small - Gasoline",
         "voiture-citadine-diesel": "Small - Diesel",
-        "voiture-citadine-electrique": "Small - Electric",
+        "voiture-citadine-electrique": "Small",
         "voiture-citadine-hybride": "Small - Non rechargeable",
         "voiture-citadine-hybriderechargeable": "Small - Plug-in",
         "voiture-compact-essence": "Medium - Gasoline",
         "voiture-compact-diesel": "Medium - Diesel",
-        "voiture-compact-electrique": "Medium - Electric",
+        "voiture-compact-electrique": "Medium",
         "voiture-compact-hybride": "Medium - Non rechargeable",
         "voiture-compact-hybriderechargeable": "Medium - Plug-in",
         "voiture-berline-essence": "Sedan - Gasoline",
         "voiture-berline-diesel": "Sedan - Diesel",
-        "voiture-berline-electrique": "Sedan - Electric",
+        "voiture-berline-electrique": "Sedan",
         "voiture-berline-hybride": "Sedan - Non rechargeable",
         "voiture-berline-hybriderechargeable": "Sedan - Plug-in",
         "voiture-grandeberline-essence": "SUV - Gasoline",
         "voiture-grandeberline-diesel": "SUV - Diesel",
-        "voiture-grandeberline-electrique": "SUV - Electric",
+        "voiture-grandeberline-electrique": "SUV",
         "voiture-grandeberline-hybride": "SUV - Non rechargeable",
         "voiture-grandeberline-hybriderechargeable": "SUV - Plug-in",
         "voiturethermique": "Medium - Diesel",
-        "voitureelectrique": "Medium - Electric",
+        "voitureelectrique": "Medium",
         "voiturehybride": "Medium - Non rechargeable"
       },
       "post": {
         "ski": "Includes: the carbon impact of transportation (52%), accommodation (4%), food (8%), ski area (3%), infrastructure, equipment, and services (17%), and gear (16%).",
         "piscine": "58,000 liters of tap water to fill it.",
-        "terre-voiture": "Includes: the carbon impact of a trip in a gasoline car.",
+        "terre-voiture": "Included are direct emissions, the construction of vehicles (manufacturing, maintenance, and end-of-life), and the production and distribution of fuel and electricity. The construction of infrastructure (roads, railways, airports...) is not included.",
         "avion-courtcourrier": "Per person in France. We account for the carbon impact of contrail formation. Included are direct emissions, the construction of vehicles (manufacturing, maintenance, and end-of-life), and the production and distribution of fuel and electricity. The construction of infrastructure (roads, railways, airports...) is not included.",
         "avion-moyencourrier": "Per person in France. We account for the carbon impact of contrail formation. Included are direct emissions, the construction of vehicles (manufacturing, maintenance, and end-of-life), and the production and distribution of fuel and electricity. The construction of infrastructure (roads, railways, airports...) is not included.",
         "avion-moyenlongcourrier": "Per person in France. We account for the carbon impact of contrail formation. Included are direct emissions, the construction of vehicles (manufacturing, maintenance, and end-of-life), and the production and distribution of fuel and electricity. The construction of infrastructure (roads, railways, airports...) is not included.",

src/providers/locales/es.json

@@ -444,10 +444,10 @@
         "avion-pny": "Viaje en avión, un trayecto muy largo. Distancia total recorrida: 11.600 km.",
         "tgv-paris-berlin": "Distancia total recorrida: 2,478 km.",
         "tgv-paris-marseille": "Distancia total recorrida: 1,504 km.",
-        "voiture-lille-nimes": "Distancia total recorrida: 1,882 km.",
+        "voiture-lille-nimes": "Trayecto realizado solo, en un coche promedio que funciona con diésel, en una distancia total de 1,882 km.",
         "ski": "Valor promedio. Estudio realizado para un día de esquí en La Clusaz, Le Grand Bornand y Tignes.",
         "piscine": "Tamaño promedio de una piscina privada: 8 x 4m con una profundidad que varía entre 1,5m y 2,1m.",
-        "terre-voiture": "Distancia total recorrida: 40,000 km.",
+        "terre-voiture": "Viaje realizado solo, en un coche tipo berlina que funciona con gasolina, en una distancia total de 40 000 km.",
         "harry-potter": "El total de las películas de Harry Potter dura un promedio de 1,176 minutos = 19,6 horas. El dato se calcula en base a una hora de transmisión en alta definición en un televisor usando Wi-Fi.",
         "avion-courtcourrier": "Tasa de ocupación promedio: 101-220 pasajeros.",
         "avion-moyencourrier": "Tasa de ocupación promedio: 101-220 pasajeros.",
@@ -530,32 +530,32 @@
         "maisonneuve": "Construcción de una casa nueva convencional de 130 m² habitables - caso de viviendas en San Pedro y Miquelón",
         "voiture-citadine-essence": "Pequeña - Gasolina",
         "voiture-citadine-diesel": "Pequeña - Diésel",
-        "voiture-citadine-electrique": "Pequeña - Eléctrico",
+        "voiture-citadine-electrique": "Pequeña",
         "voiture-citadine-hybride": "Pequeña - No recargable",
         "voiture-citadine-hybriderechargeable": "Pequeña - Enchufable",
         "voiture-compact-essence": "Mediana - Gasolina",
         "voiture-compact-diesel": "Mediana - Diésel",
-        "voiture-compact-electrique": "Mediana - Eléctrico",
+        "voiture-compact-electrique": "Mediana",
         "voiture-compact-hybride": "Mediana - No recargable",
         "voiture-compact-hybriderechargeable": "Mediana - Enchufable",
         "voiture-berline-essence": "Berlina - Gasolina",
         "voiture-berline-diesel": "Berlina - Diésel",
-        "voiture-berline-electrique": "Berlina - Eléctrico",
+        "voiture-berline-electrique": "Berlina",
         "voiture-berline-hybride": "Berlina - No recargable",
         "voiture-berline-hybriderechargeable": "Berlina - Enchufable",
         "voiture-grandeberline-essence": "SUV - Gasolina",
         "voiture-grandeberline-diesel": "SUV - Diésel",
-        "voiture-grandeberline-electrique": "SUV - Eléctrico",
+        "voiture-grandeberline-electrique": "SUV",
         "voiture-grandeberline-hybride": "SUV - No recargable",
         "voiture-grandeberline-hybriderechargeable": "SUV - Enchufable",
         "voiturethermique": "Mediana - Diésel",
-        "voitureelectrique": "Mediana - Eléctrico",
+        "voitureelectrique": "Mediana",
         "voiturehybride": "Mediana - No recargable"
       },
       "post": {
         "ski": "Incluye: el impacto de carbono del transporte (52%), alojamiento (4%), alimentos (8%), la estación de esquí (3%), infraestructura, equipo y servicios (17%), y equipo (16%).",
         "piscine": "58,000 litros de agua del grifo para llenarla.",
-        "terre-voiture": "Incluye: el impacto de carbono de un viaje en coche con motor de combustión.",
+        "terre-voiture": "Se incluyen las emisiones directas, la construcción de vehículos (fabricación, mantenimiento y fin de vida) y la producción y distribución de combustible y electricidad. La construcción de infraestructuras (carreteras, vías férreas, aeropuertos...) no está incluida.",
         "avion-courtcourrier": "Por persona en Francia. Se tiene en cuenta el impacto del carbono debido a la formación de estelas. Se incluyen las emisiones directas, la construcción de vehículos (fabricación, mantenimiento y fin de vida), y la producción y distribución de combustible y electricidad. La construcción de infraestructuras (carreteras, vías férreas, aeropuertos...) no está incluida.",
         "avion-moyencourrier": "Por persona en Francia. Se tiene en cuenta el impacto del carbono debido a la formación de estelas. Se incluyen las emisiones directas, la construcción de vehículos (fabricación, mantenimiento y fin de vida), y la producción y distribución de combustible y electricidad. La construcción de infraestructuras (carreteras, vías férreas, aeropuertos...) no está incluida.",
         "avion-moyenlongcourrier": "Por persona en Francia. Se tiene en cuenta el impacto del carbono debido a la formación de estelas. Se incluyen las emisiones directas, la construcción de vehículos (fabricación, mantenimiento y fin de vida), y la producción y distribución de combustible y electricidad. La construcción de infraestructuras (carreteras, vías férreas, aeropuertos...) no está incluida.",