feat: associated packagings #7756

teolemon · 2022-11-24T18:27:45Z

What

Add associated packagings as comments
Some translated entries for materials
Add more shapes from a Wikipedia review
Add a new "Packaging" label category for FSC and PEFC
Add missing materials

Part of

📦 Packaging (tracker) #6374

teolemon · 2022-11-26T18:16:49Z

Failed test at tests/unit/ecoscore.t line 576.

Structures begin differing at:

$got->{packagings}[0]{material} = 'en:metal,en:aluminium,en:steel'

$expected->{packagings}[0]{material} = 'en:metal'

teolemon · 2022-11-29T14:03:35Z

taxonomies/packaging_materials.txt

@@ -383,6 +397,7 @@ xx:PEmet, 07 PEmet, PEmet 07, 07PEmet, PEmet07, 7 PEmet, PEmet 7, 7PEmet, PEmet7
 <xx:PE
 en:MDPE - Medium-density polyethylene, Medium-density polyethylene
 de:MDPE - Polyethylen mittlerer Dichte, Polyethylen mittlerer Dichte
+fr:MDPE - Polyéthylène moyenne densité, Polyéthylène moyenne densité


Suggested change

fr:MDPE - Polyéthylène moyenne densité, Polyéthylène moyenne densité

fr:07 - MDPE - Polyéthylène moyenne densité, Polyéthylène moyenne densité

@stephanegigandet ok with adding the number as a prefix, as proposed in the Packaging meeting ?

Let's merge the PR as is without adding further changes, I will make a new PR with the numbers. We'll probably keep the acronym first and have the number second, so that suggestions work better. If the number is first, searching for "PET" will result in many PET + something composites etc. being suggested first.

teolemon · 2022-11-29T14:03:58Z

taxonomies/packaging_materials.txt

 xx:LLDPE, 07 LLDPE, LLDPE 07, 07LLDPE, LLDPE07, 7 LLDPE, LLDPE 7, 7LLDPE, LLDPE7, PE-LLD, 07 PE-LLD, PE-LLD 07, 07PE-LLD, PE-LLD07, 7 PE-LLD, PE-LLD 7, 7PE-LLD, PE-LLD7
 wikidata:en:Q1863987

 <en:Multilayer composite
 <xx:PET
 en:PETmet - Metalized polyethylene terephthalate, Metalized polyethylene terephthalate
 de:PETmet - Metallisiertes Polyethylenterephthalat, Metallisiertes Polyethylenterephthalat
+fr:PETmet - Polyéthylène téréphtalate métallisé


Suggested change

fr:PETmet - Polyéthylène téréphtalate métallisé

fr:07 - PETmet - Polyéthylène téréphtalate métallisé, Polyéthylène téréphtalate métallisé

teolemon · 2022-11-29T14:04:12Z

taxonomies/packaging_materials.txt

@@ -363,13 +375,15 @@ wikidata:en:Q413769
 <xx:PE
 en:LLDPE - Linear low-density polyethylene, Linear low-density polyethylene
 de:LLDPE - Lineares Polyethylen niedriger Dichte, Lineares Polyethylen niedriger Dichte
+fr:LLDPE - Polyéthylène basse densité linéaire, Polyéthylène basse densité linéaire


Suggested change

fr:LLDPE - Polyéthylène basse densité linéaire, Polyéthylène basse densité linéaire

fr:07 - LLDPE - Polyéthylène basse densité linéaire, Polyéthylène basse densité linéaire

teolemon · 2022-11-29T14:04:26Z

taxonomies/packaging_materials.txt

@@ -323,6 +333,7 @@ wikidata:en:Q62246
 <en:Other plastics
 en:PA - Polyamide, Polyamide
 de:PA - Polyamide, Polyamide
+fr:PA - Polyamide, Polyamide


Suggested change

fr:PA - Polyamide, Polyamide

fr:07 - PA - Polyamide, Polyamide

teolemon · 2022-11-29T14:04:40Z

taxonomies/packaging_materials.txt

@@ -315,6 +324,7 @@ non_recyclable_and_non_biodegradable:en:yes
 <en:Other plastics
 en:PC - Polycarbonate, Polycarbonate
 de:PC - Polycarbonate, Polycarbonate
+fr:PC - Polycarbonate, Polycarbonate


Suggested change

fr:PC - Polycarbonate, Polycarbonate

fr:07 - PC - Polycarbonate, Polycarbonate

teolemon · 2022-11-29T14:05:17Z

taxonomies/packaging_materials.txt

@@ -124,6 +128,7 @@ non_recyclable_and_non_biodegradable:en:no
 <en:Other plastics
 en:PVDC - Polyvinylidene chloride, Polyvinylidene chloride
 de:PVDC - Polyvinylidenchlorid, Polyvinylidenchlorid
+fr:PVDC - Chlorure de polyvinylidène, Chlorure de polyvinylidène


Suggested change

fr:PVDC - Chlorure de polyvinylidène, Chlorure de polyvinylidène

fr:01 - PVDC - Chlorure de polyvinylidène, Chlorure de polyvinylidène

teolemon · 2022-11-29T14:06:11Z

taxonomies/packaging_materials.txt

@@ -275,11 +281,13 @@ non_recyclable_and_non_biodegradable:en:no
 <xx:PP
 en:CPP - Cast PolyPropylen, Cast PolyPropylen
 de:CPP - Ungerecktes Polypropylen
+fr:CPP - Polypropylène coulé, Polypropylène coulé


Suggested change

fr:CPP - Polypropylène coulé, Polypropylène coulé

fr:05 - CPP - Polypropylène coulé, Polypropylène coulé

teolemon · 2022-11-29T14:06:21Z

taxonomies/packaging_materials.txt

 xx:CPP, PP-C, 05 CPP, CPP 05, 5 CPP, CPP 5, 05CPP, CPP05, 5CPP, CPP5, 05 PP-C, PP-C 05, 5 PP-C, PP-C 5, 05PP-C, PP-C05, 5PP-C, PP-C5

 <xx:PP
 en:OPP - Oriented PolyPropylen, Oriented PolyPropylen
 de:OPP - Orientiertes Polypropylen
+fr:OPP - PolyPropylène Orienté, PolyPropylène Orienté


Suggested change

fr:OPP - PolyPropylène Orienté, PolyPropylène Orienté

fr:05 - OPP - PolyPropylène Orienté, PolyPropylène Orienté

stephanegigandet

Let's merge as is.

stephanegigandet · 2022-12-05T11:55:38Z

Tests are failing, probably need to be updated, I'll look into it.

stephanegigandet · 2022-12-05T12:27:12Z

Tests are failing because the default "packaging_materials:en: en:metal" was removed for en:can, I will add it back.

taxonomies/packaging_shapes.txt

teolemon · 2022-12-05T13:20:07Z

@stephanegigandet I've added the fix so that tests can start running

…s-server into packaging-tgv

sonarcloud · 2022-12-05T14:25:13Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

feat: associated packagings

b311eb0

github-actions bot added 📦 Packaging https://wiki.openfoodfacts.org/Category:Recycling 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies labels Nov 24, 2022

github-actions bot assigned teolemon Nov 24, 2022

teolemon added 2 commits November 25, 2022 09:43

fixes

75c7183

add different kinds of coffee capsules

7bb3bbc

capsules

01d3961

github-actions bot added the categories label Nov 29, 2022

regroup packaging labels

076718a

github-actions bot added the labels label Nov 29, 2022

teolemon added 3 commits November 29, 2022 12:03

add a packaging label category

57c63fb

Update labels.txt

605dfd1

more shapes and materials

88744c9

teolemon commented Nov 29, 2022

View reviewed changes

teolemon requested a review from stephanegigandet November 29, 2022 14:06

Green dot clarification

7a0af76

stephanegigandet approved these changes Dec 5, 2022

View reviewed changes

stephanegigandet marked this pull request as ready for review December 5, 2022 11:54

Merge branch 'main' into packaging-tgv

cf64a9d

teolemon commented Dec 5, 2022

View reviewed changes

taxonomies/packaging_shapes.txt Show resolved Hide resolved

Update taxonomies/packaging_shapes.txt

d326ded

stephanegigandet added 3 commits December 5, 2022 15:04

update taxonomies and tests

8e48332

Merge branch 'packaging-tgv' of github.com:openfoodfacts/openfoodfact…

3510d97

…s-server into packaging-tgv

remove duplicate packaging line

a951762

stephanegigandet requested a review from a team as a code owner December 5, 2022 14:18

github-actions bot added 🥜 Allergens 🧬 Taxonomies - Rebuild Taxonomies are compiled before they can be used. 🧪 tests labels Dec 5, 2022

stephanegigandet approved these changes Dec 5, 2022

View reviewed changes

stephanegigandet merged commit be9391f into main Dec 5, 2022

stephanegigandet deleted the packaging-tgv branch December 5, 2022 16:01

alexgarel mentioned this pull request Dec 5, 2022

chore(main): release 2.5.0 #7781

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: associated packagings #7756

feat: associated packagings #7756

teolemon commented Nov 24, 2022 •

edited

teolemon commented Nov 26, 2022

teolemon Nov 29, 2022

teolemon Dec 3, 2022

stephanegigandet Dec 5, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

teolemon Nov 29, 2022

stephanegigandet left a comment

stephanegigandet commented Dec 5, 2022

stephanegigandet commented Dec 5, 2022

teolemon commented Dec 5, 2022

sonarcloud bot commented Dec 5, 2022

	fr:MDPE - Polyéthylène moyenne densité, Polyéthylène moyenne densité
	fr:07 - MDPE - Polyéthylène moyenne densité, Polyéthylène moyenne densité

	fr:PETmet - Polyéthylène téréphtalate métallisé
	fr:07 - PETmet - Polyéthylène téréphtalate métallisé, Polyéthylène téréphtalate métallisé

	fr:LLDPE - Polyéthylène basse densité linéaire, Polyéthylène basse densité linéaire
	fr:07 - LLDPE - Polyéthylène basse densité linéaire, Polyéthylène basse densité linéaire

	fr:PA - Polyamide, Polyamide
	fr:07 - PA - Polyamide, Polyamide

	fr:PC - Polycarbonate, Polycarbonate
	fr:07 - PC - Polycarbonate, Polycarbonate

	fr:PVDC - Chlorure de polyvinylidène, Chlorure de polyvinylidène
	fr:01 - PVDC - Chlorure de polyvinylidène, Chlorure de polyvinylidène

	fr:CPP - Polypropylène coulé, Polypropylène coulé
	fr:05 - CPP - Polypropylène coulé, Polypropylène coulé

	fr:OPP - PolyPropylène Orienté, PolyPropylène Orienté
	fr:05 - OPP - PolyPropylène Orienté, PolyPropylène Orienté

feat: associated packagings #7756

feat: associated packagings #7756

Conversation

teolemon commented Nov 24, 2022 • edited

What

Part of

teolemon commented Nov 26, 2022

Failed test at tests/unit/ecoscore.t line 576.

Structures begin differing at:

$got->{packagings}[0]{material} = 'en:metal,en:aluminium,en:steel'

$expected->{packagings}[0]{material} = 'en:metal'

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stephanegigandet left a comment

Choose a reason for hiding this comment

stephanegigandet commented Dec 5, 2022

stephanegigandet commented Dec 5, 2022

teolemon commented Dec 5, 2022

sonarcloud bot commented Dec 5, 2022

teolemon commented Nov 24, 2022 •

edited