fix: ingredient doubles (#6419)

* kem lạnh * glace * flødeis * 大豆ベース * chicken broth * saltlake * Fruchtzubereitung * various * various * various * gurke * kalkunkød * it:gambero, gamberi * động vật có vỏ wrong translation? * various * κοκκαλιές wrongly translated * double * parent issue * hoki * various * processing doubles * various * test repair for gurken * ძირა * epices-et-plantes-aromatique * various * various * test repair * test repair * nb:paprika * da:paprika * sl:paprika * ja:唐辛子 * mąka-ziemniaczana wrong synonym * nn:kassavamel * nl:tapioca * maniókaliszt * farine-de-manioc * 大根 * various * test * test * test * test * nn:tørket-hvitløk * various doubles * cabbages * test repair * test repair * test repair * test repair * punajuurimehu * various doubles * test repair * test * test * lemon extract * nb:kål * col * currrant * test * test * doubles * doubles * test * doubles * E412 * doubles * doubles
openfoodfacts · Feb 21, 2022 · 764bbbc · 764bbbc
1 parent 27b7137
commit 764bbbc
Show file tree

Hide file tree

Showing 10 changed files with 472 additions and 740 deletions.
diff --git a/t/expected_test_results/ingredients/fi-do-not-match-myanmar.json b/t/expected_test_results/ingredients/fi-do-not-match-myanmar.json
@@ -22,7 +22,7 @@
                "vegetarian" : "yes"
             },
             {
-               "id" : "en:bell-pepper",
+               "id" : "en:spice-or-bell-pepper",
                "percent_estimate" : 10.4166666666667,
                "percent_max" : 33.3333333333333,
                "percent_min" : 0,
@@ -74,10 +74,12 @@
    ],
    "ingredients_hierarchy" : [
       "en:spice",
+	  "en:condiment",
       "en:turmeric",
       "en:ginger",
-      "en:bell-pepper",
+      "en:spice-or-bell-pepper",
       "en:vegetable",
+	  "en:bell-pepper",
       "en:garlic",
       "en:root-vegetable",
       "en:coriander",
@@ -94,18 +96,20 @@
       "en:spice",
       "en:turmeric",
       "en:ginger",
-      "en:bell-pepper",
+      "en:spice-or-bell-pepper",
       "en:garlic",
       "en:coriander",
       "en:mustard-seed"
    ],
    "ingredients_percent_analysis" : 1,
    "ingredients_tags" : [
       "en:spice",
+	  "en:condiment",
       "en:turmeric",
       "en:ginger",
-      "en:bell-pepper",
+      "en:spice-or-bell-pepper",
       "en:vegetable",
+	  "en:bell-pepper",
       "en:garlic",
       "en:root-vegetable",
       "en:coriander",
@@ -118,7 +122,7 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 6,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "known_ingredients_n" : 11,
+   "known_ingredients_n" : 13,
    "lc" : "fi",
    "nutriments" : {
       "fruits-vegetables-nuts-estimate-from-ingredients_100g" : 0,

diff --git a/t/expected_test_results/ingredients/fr-epices-irradiees.json b/t/expected_test_results/ingredients/fr-epices-irradiees.json
@@ -39,6 +39,7 @@
    ],
    "ingredients_hierarchy" : [
       "en:spice",
+	  "en:condiment",
       "en:sesame",
       "en:seed",
       "en:thyme",
@@ -56,7 +57,8 @@
    ],
    "ingredients_percent_analysis" : 1,
    "ingredients_tags" : [
-      "en:spice",
+       "en:spice",
+	  "en:condiment",
       "en:sesame",
       "en:seed",
       "en:thyme",
@@ -67,7 +69,7 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 3,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "known_ingredients_n" : 5,
+   "known_ingredients_n" : 6,
    "lc" : "fr",
    "nutriments" : {
       "fruits-vegetables-nuts-estimate-from-ingredients_100g" : 0,

diff --git a/t/expected_test_results/ingredients/fr-specific-ingredients.json b/t/expected_test_results/ingredients/fr-specific-ingredients.json
@@ -64,8 +64,8 @@
       "en:apricot",
       "en:fruit",
       "en:concentrated-lemon-juice",
-      "en:citrus-fruit",
-      "en:lemon",
+      "en:fruit-juice",
+      "en:lemon-juice",
       "en:gelling-agent",
       "en:fruit-pectin",
       "en:e440a"
@@ -91,8 +91,8 @@
       "en:apricot",
       "en:fruit",
       "en:concentrated-lemon-juice",
-      "en:citrus-fruit",
-      "en:lemon",
+      "en:fruit-juice",
+      "en:lemon-juice",
       "en:gelling-agent",
       "en:fruit-pectin",
       "en:e440a"

diff --git a/t/expected_test_results/ingredients/fr-truncated-puree.json b/t/expected_test_results/ingredients/fr-truncated-puree.json
@@ -1,7 +1,7 @@
 {
    "ingredients" : [
       {
-         "id" : "en:crushed-tomato",
+         "id" : "en:tomato-puree",
          "percent" : 19,
          "percent_estimate" : 19,
          "text" : "purée de tomate",
@@ -51,10 +51,9 @@
       "en:non-vegetarian"
    ],
    "ingredients_hierarchy" : [
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:vegetable",
       "en:tomato",
-      "en:chopped-tomatoes",
       "en:beef",
       "en:animal",
       "en:fruit-juice",
@@ -67,17 +66,16 @@
       "1-10"
    ],
    "ingredients_original_tags" : [
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:beef",
       "en:fruit-juice",
       "en:oil-and-fat"
    ],
    "ingredients_percent_analysis" : -1,
    "ingredients_tags" : [
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:vegetable",
       "en:tomato",
-      "en:chopped-tomatoes",
       "en:beef",
       "en:animal",
       "en:fruit-juice",
@@ -89,7 +87,7 @@
    "ingredients_with_specified_percent_sum" : 254,
    "ingredients_with_unspecified_percent_n" : 0,
    "ingredients_with_unspecified_percent_sum" : 0,
-   "known_ingredients_n" : 9,
+   "known_ingredients_n" : 8,
    "lc" : "fr",
    "nutriments" : {
       "fruits-vegetables-nuts-estimate-from-ingredients_100g" : 119,

diff --git a/t/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json b/t/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json
@@ -11,7 +11,7 @@
          "vegetarian" : "yes"
       },
       {
-         "id" : "en:crushed-tomato",
+         "id" : "en:tomato-puree",
          "labels" : "en:organic",
          "percent" : 26,
          "percent_estimate" : 26,
@@ -111,10 +111,9 @@
       "en:flour",
       "en:wheat",
       "en:cereal-flour",
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:vegetable",
       "en:tomato",
-      "en:chopped-tomatoes",
       "en:water",
       "en:mozzarella",
       "en:dairy",
@@ -126,7 +125,8 @@
       "en:yeast",
       "en:salt",
       "en:herb",
-      "en:spice"
+      "en:spice",
+	  "en:condiment"
    ],
    "ingredients_n" : 9,
    "ingredients_n_tags" : [
@@ -135,7 +135,7 @@
    ],
    "ingredients_original_tags" : [
       "en:wheat-flour",
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:water",
       "en:mozzarella",
       "en:sunflower-oil",
@@ -151,10 +151,9 @@
       "en:flour",
       "en:wheat",
       "en:cereal-flour",
-      "en:crushed-tomato",
+      "en:tomato-puree",
       "en:vegetable",
       "en:tomato",
-      "en:chopped-tomatoes",
       "en:water",
       "en:mozzarella",
       "en:dairy",
@@ -166,7 +165,8 @@
       "en:yeast",
       "en:salt",
       "en:herb",
-      "en:spice"
+      "en:spice",
+	  "en:condiment"
    ],
    "ingredients_text" : "Farine de blé*, purée de tomates* 26%, eau, mozzarella râpée* 17%, huile de tournesol*, levure, sel, plantes aromatiques*, épices*. Traces de poissons et fruits à coque. * Ingrédients issus de l'agriculture biologique.",
    "ingredients_with_specified_percent_n" : 2,