From eaabdb8b6d8ba3251cf837598b31a5b309906bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Wed, 16 Aug 2023 10:15:33 +0200
Subject: [PATCH] fix: simplify vegan/vegetarian ingredients analysis and merge
 'ignore' and 'maybe' (#8849)

---
 lib/ProductOpener/Ingredients.pm              |  7 ++--
 taxonomies/ingredients.txt                    | 42 ++++++++++---------
 .../ingredients/ca-middle-dot.json            |  1 -
 .../ingredients/ja-parenthesis.json           | 16 +++----
 ...rgherita-pizza-2-compound-ingredients.json |  4 +-
 5 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/lib/ProductOpener/Ingredients.pm b/lib/ProductOpener/Ingredients.pm
index 29879f6a83e79..3bb1071b902c1 100644
--- a/lib/ProductOpener/Ingredients.pm
+++ b/lib/ProductOpener/Ingredients.pm
@@ -3181,9 +3181,10 @@ sub analyze_ingredients ($product_ref) {
 					}
 				}
 
-				# Vegetable oil (rapeseed oil, ...) : ignore "from_palm_oil:en:maybe" if the ingredient has sub-ingredients
-				if (    ($property eq "from_palm_oil")
-					and (defined $value)
+				# if the property value is "maybe" and the ingredient has sub-ingredients,
+				# we ignore the ingredient and only look at its sub-ingredients (already added)
+				# e.g. "Vegetable oil (rapeseed oil, ...)""
+				if (    (defined $value)
 					and ($value eq "maybe")
 					and (defined $ingredient_ref->{ingredients}))
 				{
diff --git a/taxonomies/ingredients.txt b/taxonomies/ingredients.txt
index 1492a148f5014..e4eba15a3cdcd 100644
--- a/taxonomies/ingredients.txt
+++ b/taxonomies/ingredients.txt
@@ -1,3 +1,5 @@
+# properties vegan:en, vegetarian:en and from_palm_oil:en can have values yes, no, maybe
+# in the case of maybe, if the ingredient has sub-ingredients, then only its sub-ingredients are considered
 
 #comment:en:These are synonyms of ingredients
 
@@ -35431,8 +35433,8 @@ pl:sok, soki, soku, soków
 pt:Sumo
 ru:Сок
 # ingredient/fr:jus has 156 products in 4 languages @2019-02-02
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:juice
 en:concentrated juice
@@ -60192,8 +60194,8 @@ zh:食品添加剂
 wikidata:en:Q2596997
 wikipedia:en:https://en.wikipedia.org/wiki/Condiment
 # ingredient/fr:condiment has 360 products in 6 languages @2019-03-09
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:condiment
 en:powdered condiment
@@ -81768,8 +81770,8 @@ wikidata:en:Q636056
 wikipedia:en:https://en.wikipedia.org/wiki/Purée
 # ingredient/fr:purée has 151 products @2018-10-05
 # used only to qualify another ingredient, ignore for ingredient analysis
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:purée
 en:concentrated purée
@@ -82255,8 +82257,8 @@ wikidata:en:Q745361
 wikipedia:en:https://en.wikipedia.org/wiki/Stuffing
 # ingredient/fr:garniture has 1531 products in 9 languages @2018-12-01
 # ingredient/fr:farce has 884 products in 6 languages @2019-05-18
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:filling
 en:apricot filling
@@ -82639,8 +82641,8 @@ ciqual_proxy_food_code:en:9810
 ciqual_proxy_food_name:fr:Pâtes sèches standard, crues
 # ingredient/fr:pâtes-alimentaires has 115 products 2019-05-20
 # ingredient/paste has 1809 products @2018-12-10
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:pasta
 en:durum wheat semolina pasta
@@ -83039,8 +83041,8 @@ ta:நூடுல்ஸ்
 wikidata:en:q192874
 wikipedia:en:https://en.wikipedia.org/wiki/Noodle
 # ingredient/fr:nouilles has 241 products in 7 languages @2019-05-08
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 carbon_footprint_fr_foodges_ingredient:fr:Pâte à tarte
 carbon_footprint_fr_foodges_value:fr:7.3
 
@@ -84190,8 +84192,8 @@ tr:kaplama
 # usage:fr:Enrobage:farines (blé, seigle, et riz) (contient gluten) eau, amidon modifié, amidon et protéines de blé (contient gluten ), sel
 # ingredient/fr:enrobant has 79 products in 4 languages @2019-02-21
 # coating (water, wheat flour, modified corn starch, gluten of wheat, corn flour, corn starch, salt, potato starch)
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 <en:coating
 en:cocoa coating
@@ -85727,8 +85729,8 @@ nl:korst
 # usage:fr: croûte: herbes aromatiques bio
 # usage:fr: conservateur (croûte) : natamycine (contient lait)
 # usage/de: Kruste (mit Farbstoff [E 160b])
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 # description:en:The outer layer of cheese. Mostly for cheeses that have a distinctive layer different from the cheese itself.
 
@@ -86078,8 +86080,8 @@ en:jam
 de:Marmelade de:Konfitüre
 pl:dżem
 ru:джем, повидло, варенье
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 
 ###################################################################################################
 #
@@ -86213,8 +86215,8 @@ zh:醬
 wikidata:en:Q178359
 wikipedia:en:https://en.wikipedia.org/wiki/Sauce
 # ingredient/sauce has 5701 products in 15 languages @2019-05-02
-vegan:en:ignore
-vegetarian:en:ignore
+vegan:en:maybe
+vegetarian:en:maybe
 nova:en:3
 
 <en:sauce
diff --git a/tests/unit/expected_test_results/ingredients/ca-middle-dot.json b/tests/unit/expected_test_results/ingredients/ca-middle-dot.json
index e7e47785feaa2..05e34533f70e3 100644
--- a/tests/unit/expected_test_results/ingredients/ca-middle-dot.json
+++ b/tests/unit/expected_test_results/ingredients/ca-middle-dot.json
@@ -69,7 +69,6 @@
    ],
    "ingredients_analysis" : {
       "en:maybe-vegetarian" : [
-         "en:mozzarella",
          "en:rennet"
       ],
       "en:non-vegan" : [
diff --git a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
index 51995fc58deb8..12cfe0a1ad647 100644
--- a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
+++ b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
@@ -10,16 +10,16 @@
                "percent_max" : 100,
                "percent_min" : 10,
                "text" : "本醸造",
-               "vegan" : "ignore",
-               "vegetarian" : "ignore"
+               "vegan" : "maybe",
+               "vegetarian" : "maybe"
             }
          ],
          "percent_estimate" : 55,
          "percent_max" : 100,
          "percent_min" : 10,
          "text" : "しょうゆ",
-         "vegan" : "ignore",
-         "vegetarian" : "ignore"
+         "vegan" : "maybe",
+         "vegetarian" : "maybe"
       },
       {
          "id" : "ja:糖類",
@@ -64,8 +64,8 @@
          "percent_max" : 33.3333333333333,
          "percent_min" : 0,
          "text" : "みりん",
-         "vegan" : "ignore",
-         "vegetarian" : "ignore"
+         "vegan" : "maybe",
+         "vegetarian" : "maybe"
       },
       {
          "ciqual_food_code" : "11058",
@@ -126,8 +126,8 @@
          "percent_max" : 11.1111111111111,
          "percent_min" : 0,
          "text" : "調味料",
-         "vegan" : "ignore",
-         "vegetarian" : "ignore"
+         "vegan" : "maybe",
+         "vegetarian" : "maybe"
       },
       {
          "ciqual_food_code" : "1014",
diff --git a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json
index edeb2b9b3c63b..22eacf6c447c9 100644
--- a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json
+++ b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-2-compound-ingredients.json
@@ -39,8 +39,8 @@
          "percent_max" : 70,
          "percent_min" : 70,
          "text" : "Garniture",
-         "vegan" : "ignore",
-         "vegetarian" : "ignore"
+         "vegan" : "maybe",
+         "vegetarian" : "maybe"
       },
       {
          "id" : "en:pizza-dough",