Skip to content

Commit

Permalink
fix: night values
Browse files Browse the repository at this point in the history
  • Loading branch information
desoindx committed Jan 3, 2025
1 parent 60c1228 commit fb3bcfe
Show file tree
Hide file tree
Showing 22 changed files with 221 additions and 28 deletions.
3 changes: 2 additions & 1 deletion npm/react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,5 @@ Liste des équivalents à comparer parmis la liste suivante :
- harry-potter : marathon des films Harry Potter en streaming
- hotel : nuit à l'hotel
- camping : nuit au camping
- location : nuit dans une location
- location : nuit dans une location saisonnière
- residencesecondaire : nuit dans une résidence secondaire
1 change: 1 addition & 0 deletions npm/react/dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ declare module "@incubateur-ademe/impactco2-react" {
"hotel" |
"camping" |
"location"|
"residencesecondaire"|
"boeuf" |
"veau" |
"porc" |
Expand Down
101 changes: 101 additions & 0 deletions public/icons/residencesecondaire.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/camping-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/camping-es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/camping-fr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/hotel-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/hotel-es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/hotel-fr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/location-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/location-es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/location-fr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/residencesecondaire-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/residencesecondaire-es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/meta/residencesecondaire-fr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion src/components/outils/equivalents/detail/Detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useTranslations } from 'next-intl'
import Image from 'next/image'
import React, { Fragment, useState } from 'react'
import { Fragment, useState } from 'react'
import useParamContext from 'src/providers/ParamProvider'
import { Equivalent, EquivalentValue } from 'types/equivalent'
import PlusMinus from 'components/outils/plusMinus/PlusMinus'
Expand Down Expand Up @@ -77,6 +77,10 @@ const ecvs = (type: number, values: EquivalentValue[]): Values[] => {
case 41:
case 42:
case 43:
case 50:
case 51:
case 52:
case 53:
return [
{
label: 'total',
Expand Down
64 changes: 56 additions & 8 deletions src/data/categories/caspratiques.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,35 +96,83 @@ export const casPratiques = [
synonyms: ['voyage'],
slug: 'hotel',
category: 13,
total: 6.9,
ecv: [
{
id: 50,
value: 2.1,
},
{
id: 51,
value: 1.5,
},
{
id: 52,
value: 0.3,
},
{
id: 53,
value: 0.4,
},
],
sources: [
{
label: 'ADEME',
href: 'https://librairie.ademe.fr/changement-climatique/4688-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2018.html',
href: 'https://librairie.ademe.fr/changement-climatique/7637-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2022.html',
},
],
},
{
synonyms: ['voyage', 'tente'],
slug: 'camping',
category: 13,
total: 1.9,
total: 1.4,
},
{
synonyms: ['voyage', 'airbnb'],
slug: 'location',
category: 13,
ecv: [
{
id: 50,
value: 2,
},
{
id: 51,
value: 2.7,
},
{
id: 53,
value: 0.5,
},
],
sources: [
{
label: 'ADEME',
href: 'https://librairie.ademe.fr/changement-climatique/4688-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2018.html',
href: 'https://librairie.ademe.fr/changement-climatique/7637-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2022.html',
},
],
},
{
synonyms: ['voyage', 'airbnb'],
slug: 'location',
slug: 'residencesecondaire',
category: 13,
total: 5.8,
ecv: [
{
id: 50,
value: 2.4,
},
{
id: 51,
value: 1.2,
},
{
id: 53,
value: 3.4,
},
],
sources: [
{
label: 'ADEME',
href: 'https://librairie.ademe.fr/changement-climatique/4688-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2018.html',
href: 'https://librairie.ademe.fr/changement-climatique/7637-bilan-des-emissions-de-gaz-a-effet-de-serre-du-secteur-du-tourisme-en-france-en-2022.html',
},
],
},
Expand Down
16 changes: 16 additions & 0 deletions src/data/ecv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,20 @@ export const ecv = [
publicode: ' . data center',
name: 'Data-centers',
},
{
id: 50,
name: "Consommation d'énergie",
},
{
id: 51,
name: "Services d'entretien",
},
{
id: 52,
name: 'Déplacement du personnel',
},
{
id: 53,
name: 'Construction des infrastructures',
},
]
13 changes: 9 additions & 4 deletions src/providers/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,10 @@
"fromagebleu": "Average of emission factors for various blue cheeses: Roquefort, Bleu d'Auvergne, Gorgonzola, etc.",
"riz": "Average of emission factors for various rice types: white rice, brown rice, red rice, wild rice",
"ble": "Average of emission factors for various wheat types: whole durum wheat, precooked wheat, wheat semolina, soft wheat",
"hotel": "Includes emissions related to energy consumption (heating, electricity, air conditioning, hot water), hotel services (cleaning, laundry), infrastructure (construction, maintenance), and catering (supply, preparation, waste).",
"camping": "Includes the construction and energy consumption of infrastructure (showers, sanitary facilities, and lighting). There are no hotel services or catering.",
"location": "Includes emissions related to energy consumption (heating, electricity, hot water), infrastructure (construction and maintenance). Rentals do not provide hotel services or catering."
"hotel": "Includes emissions related to energy consumption (heating, electricity, air conditioning, hot water), maintenance services (cleaning, laundry), infrastructure (construction, maintenance), and commuting of staff.",
"camping": "Includes the construction and energy consumption of infrastructure (showers, sanitary facilities, and lighting).",
"location": "Includes emissions related to energy consumption (heating, electricity, hot water), infrastructure (construction), and maintenance services.",
"residencesecondaire": "Includes emissions related to energy consumption (heating, electricity, hot water), infrastructure (construction), and maintenance services."
},
"post": {
"ski": "Includes: the carbon impact of transportation (52%), accommodation (4%), food (8%), ski area (3%), infrastructure, equipment, and services (17%), and gear (16%).",
Expand Down Expand Up @@ -474,7 +475,11 @@
"40": "Terminal construction",
"41": "Terminal usage",
"42": "Transmission",
"43": "Data-centers"
"43": "Data-centers",
"50": "Energy consumption",
"51": "Maintenance services",
"52": "Staff commuting",
"53": "Infrastructure construction"
}
},
"category": {
Expand Down
13 changes: 9 additions & 4 deletions src/providers/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,10 @@
"fromagebleu": "Promedio de los factores de emisión de varios quesos azules: Roquefort, Bleu d'Auvergne, Gorgonzola, etc.",
"riz": "Promedio de los factores de emisión de varios arroces: Arroz blanco, integral, rojo, salvaje",
"ble": "Promedio de los factores de emisión de varios trigos: Trigo duro entero, trigo precocido, sémola de trigo, trigo blando",
"hotel": "Incluye las emisiones relacionadas con el consumo de energía (calefacción, electricidad, aire acondicionado, agua caliente), los servicios hoteleros (limpieza, lavandería), la infraestructura (construcción, mantenimiento) y la restauración (suministro, preparación, residuos).",
"camping": "Incluye la construcción y el consumo de energía de la infraestructura (duchas, instalaciones sanitarias e iluminación). No hay servicios hoteleros ni restauración.",
"location": "Incluye las emisiones relacionadas con el consumo de energía (calefacción, electricidad, agua caliente), la infraestructura (construcción y mantenimiento). Los alquileres no proporcionan servicios hoteleros ni restauración."
"hotel": "Incluye las emisiones relacionadas con el consumo de energía (calefacción, electricidad, aire acondicionado, agua caliente), los servicios de mantenimiento (limpieza, lavandería), la infraestructura (construcción, mantenimiento) y los desplazamientos del personal.",
"camping": "Incluye la construcción y el consumo de energía de la infraestructura (duchas, instalaciones sanitarias e iluminación).",
"location": "Incluye las emisiones relacionadas con el consumo de energía (calefacción, electricidad, agua caliente), la infraestructura (construcción) y los servicios de mantenimiento.",
"residencesecondaire": "Incluye las emisiones relacionadas con el consumo de energía (calefacción, electricidad, agua caliente), la infraestructura (construcción) y los servicios de mantenimiento."
},
"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%).",
Expand Down Expand Up @@ -474,7 +475,11 @@
"40": "Construcción de terminales",
"41": "Uso de terminales",
"42": "Transmisión",
"43": "Centros de datos"
"43": "Centros de datos",
"50": "Consumo de energía",
"51": "Servicios de mantenimiento",
"52": "Desplazamiento del personal",
"53": "Construcción de infraestructuras"
}
},
"category": {
Expand Down
13 changes: 9 additions & 4 deletions src/providers/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,10 @@
"fromagebleu": "Moyenne des facteurs d’émission des différents fromages à pâte persillées : Roquefort, bleu d’Auvergne, gorgonzola etc.",
"riz": "Moyenne des facteurs d’émission des différents riz : Riz blanc, complet, rouge; sauvage",
"ble": "Moyenne des facteurs d’émission des différents blés : Blé dur entier, blé précuit, semoule de blé, blé tendre",
"hotel": "Sont inclus les émissions liées à la consommation d’énergie (chauffage, électricité, climatisation, eau chaude), aux services hôteliers (nettoyage, blanchisserie), aux infrastructures (construction, maintenance) et à la restauration (approvisionnement, préparation, déchets).",
"camping": "Sont inclus la construction et la consommation énergétique des infrastructures (les douches, sanitaires et l’éclairage). Il n’y a ni services hôteliers ni restauration.",
"location": "Sont inclus les émissions liées à la consommation énergétique (chauffage, électricité, eau chaude), aux infrastructures (construction et entretien). Les locations ne fournissent ni services hôteliers ni restauration."
"hotel": "Sont inclus les émissions liées à la consommation d’énergie (chauffage, électricité, climatisation, eau chaude), aux services d’entretien (nettoyage, blanchisserie), aux infrastructures (construction, maintenance), au déplacement domicile-travail du personnel.",
"camping": "Sont inclus la construction et la consommation énergétique des infrastructures (les douches, sanitaires et l’éclairage).",
"location": "Sont inclus les émissions liées à la consommation énergétique (chauffage, électricité, eau chaude), aux infrastructures (construction) et au services d’entretien.",
"residencesecondaire": "Sont inclus les émissions liées à la consommation énergétique (chauffage, électricité, eau chaude), aux infrastructures (construction) et services d’entretien. "
},
"post": {
"ski": "Inclus : l’impact carbone du transport (52%), du logement (4%), de l’alimentation (8%), du domaine skiable (3%), des infrastructures, équipements et services du domaine (17%), et de l’équipement (16%).",
Expand Down Expand Up @@ -474,7 +475,11 @@
"40": "Construction des terminaux",
"41": "Usage des terminaux",
"42": "Transmission",
"43": "Data-centers"
"43": "Data-centers",
"50": "Consommation d'énergie",
"51": "Services d'entretien",
"52": "Déplacement du personnel",
"53": "Construction des infrastructures"
}
},
"category": {
Expand Down
19 changes: 13 additions & 6 deletions src/utils/Equivalent/values.json
Original file line number Diff line number Diff line change
Expand Up @@ -1675,23 +1675,30 @@
},
"hotel": {
"category": 13,
"value": 6900,
"value": 4300,
"fr": "nuit[s] dans un hôtel",
"en": "night[s] in a hotel",
"es": "noche[s] en un hotel"
},
"camping": {
"category": 13,
"value": 1900,
"value": 1400,
"fr": "nuit[s] au camping",
"en": "night[s] at the campsite",
"es": "noche[s] en el camping"
},
"location": {
"category": 13,
"value": 5800,
"fr": "nuit[s] dans une location",
"en": "night[s] in a rental",
"es": "noche[s] en un alquiler"
"value": 5300,
"fr": "nuit[s] dans une location saisonnière",
"en": "night[s] in a seasonal rental",
"es": "noche[s] en un alquiler por temporada"
},
"residencesecondaire": {
"category": 13,
"value": 7000,
"fr": "nuit[s] dans une résidence secondaire",
"en": "night[s] in a second home",
"es": "noche[s] en una segunda casa"
}
}

0 comments on commit fb3bcfe

Please sign in to comment.