diff --git a/1_clean_json.py b/1_clean_json.py index 0bc7240..a557d97 100644 --- a/1_clean_json.py +++ b/1_clean_json.py @@ -16,6 +16,12 @@ def clean_recipe(recipe): for ingredient in step["ingredients"]: ingredient["food"].pop("properties", None) + # sort conversions + recipe.pop("food_properties", None) + for step in recipe["steps"]: + for ingredient in step["ingredients"]: + ingredient["conversions"] = sorted(ingredient["conversions"], key=lambda c: c["unit"]) + return recipe diff --git a/out/json/Bagel.json b/out/json/Bagel.json index bcef831..577e914 100644 --- a/out/json/Bagel.json +++ b/out/json/Bagel.json @@ -132,9 +132,9 @@ "amount": 198.0, "conversions": [ { - "amount": 198.0, + "amount": 0.198, "food": "Wasser", - "unit": "ml" + "unit": "Liter" }, { "amount": 198.0, @@ -142,9 +142,9 @@ "unit": "Milliliter" }, { - "amount": 0.198, + "amount": 198.0, "food": "Wasser", - "unit": "Liter" + "unit": "ml" } ], "food": { @@ -436,9 +436,9 @@ "amount": 17.0, "conversions": [ { - "amount": 17.0, + "amount": 1.0, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 2.4285714285714284, @@ -446,9 +446,9 @@ "unit": "TL" }, { - "amount": 1.0, + "amount": 17.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.017, @@ -586,9 +586,9 @@ "amount": 340.0, "conversions": [ { - "amount": 340.0, + "amount": 0.34, "food": "Wasser", - "unit": "ml" + "unit": "Liter" }, { "amount": 340.0, @@ -596,9 +596,9 @@ "unit": "Milliliter" }, { - "amount": 0.34, + "amount": 340.0, "food": "Wasser", - "unit": "Liter" + "unit": "ml" } ], "food": { @@ -746,7 +746,7 @@ { "amount": 4.0, "food": "Wasser", - "unit": "l" + "unit": "Liter" }, { "amount": 4000.0, @@ -756,7 +756,7 @@ { "amount": 4.0, "food": "Wasser", - "unit": "Liter" + "unit": "l" } ], "food": { diff --git a/out/json/Cashew-Streichkäse.json b/out/json/Cashew-Streichkäse.json index 5a6039c..5a4a4c3 100644 --- a/out/json/Cashew-Streichkäse.json +++ b/out/json/Cashew-Streichkäse.json @@ -142,9 +142,9 @@ "amount": 200.0, "conversions": [ { - "amount": 200.0, + "amount": 0.2, "food": "Wasser", - "unit": "ml" + "unit": "Liter" }, { "amount": 200.0, @@ -152,9 +152,9 @@ "unit": "Milliliter" }, { - "amount": 0.2, + "amount": 200.0, "food": "Wasser", - "unit": "Liter" + "unit": "ml" } ], "food": { @@ -355,9 +355,9 @@ "amount": 5.0, "conversions": [ { - "amount": 5.0, + "amount": 0.2777777777777778, "food": "Paprikapulver", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.7142857142857143, @@ -365,9 +365,9 @@ "unit": "TL" }, { - "amount": 0.2777777777777778, + "amount": 5.0, "food": "Paprikapulver", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.005, @@ -437,9 +437,9 @@ "amount": 10.0, "conversions": [ { - "amount": 10.0, + "amount": 0.5882352941176471, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 1.4285714285714286, @@ -447,9 +447,9 @@ "unit": "TL" }, { - "amount": 0.5882352941176471, + "amount": 10.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.01, diff --git a/out/json/Erbsenhummus.json b/out/json/Erbsenhummus.json index e035876..b9b67eb 100644 --- a/out/json/Erbsenhummus.json +++ b/out/json/Erbsenhummus.json @@ -784,7 +784,7 @@ { "amount": 0.0, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.0, @@ -794,7 +794,7 @@ { "amount": 0.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.0, diff --git a/out/json/Erbsensuppe mit Räuchertofu.json b/out/json/Erbsensuppe mit Räuchertofu.json index 1a35dc4..f418c4b 100644 --- a/out/json/Erbsensuppe mit Räuchertofu.json +++ b/out/json/Erbsensuppe mit Räuchertofu.json @@ -59,15 +59,15 @@ "always_use_plural_unit": false, "amount": 3.0, "conversions": [ - { - "amount": 3.0, - "food": "Zwiebeln, gew\u00fcrfelt (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 3000.0, "food": "Zwiebeln, gew\u00fcrfelt (TK)", "unit": "g / Gramm" + }, + { + "amount": 3.0, + "food": "Zwiebeln, gew\u00fcrfelt (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 1.0, "conversions": [ - { - "amount": 1.0, - "food": "Gem\u00fcsebr\u00fche", - "unit": "kg / Kilogramm" - }, { "amount": 1000.0, "food": "Gem\u00fcsebr\u00fche", "unit": "g / Gramm" + }, + { + "amount": 1.0, + "food": "Gem\u00fcsebr\u00fche", + "unit": "kg / Kilogramm" } ], "food": { @@ -203,15 +203,15 @@ "always_use_plural_unit": false, "amount": 10.0, "conversions": [ - { - "amount": 10.0, - "food": "Kartoffel (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 10000.0, "food": "Kartoffel (frisch)", "unit": "g / Gramm" + }, + { + "amount": 10.0, + "food": "Kartoffel (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -275,15 +275,15 @@ "always_use_plural_unit": false, "amount": 3.5, "conversions": [ - { - "amount": 3.5, - "food": "Erbsen (trocken)", - "unit": "kg / Kilogramm" - }, { "amount": 3500.0, "food": "Erbsen (trocken)", "unit": "g / Gramm" + }, + { + "amount": 3.5, + "food": "Erbsen (trocken)", + "unit": "kg / Kilogramm" } ], "food": { @@ -362,15 +362,15 @@ "always_use_plural_unit": false, "amount": 10.0, "conversions": [ - { - "amount": 10.0, - "food": "Suppengr\u00fcn (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 10000.0, "food": "Suppengr\u00fcn (frisch)", "unit": "g / Gramm" + }, + { + "amount": 10.0, + "food": "Suppengr\u00fcn (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -449,15 +449,15 @@ "always_use_plural_unit": false, "amount": 0.5, "conversions": [ - { - "amount": 0.5, - "food": "Senf", - "unit": "kg / Kilogramm" - }, { "amount": 500.0, "food": "Senf", "unit": "g / Gramm" + }, + { + "amount": 0.5, + "food": "Senf", + "unit": "kg / Kilogramm" } ], "food": { @@ -521,15 +521,15 @@ "always_use_plural_unit": false, "amount": 0.2, "conversions": [ - { - "amount": 0.2, - "food": "Salz", - "unit": "kg / Kilogramm" - }, { "amount": 200.0, "food": "Salz", "unit": "g / Gramm" + }, + { + "amount": 0.2, + "food": "Salz", + "unit": "kg / Kilogramm" } ], "food": { @@ -593,15 +593,15 @@ "always_use_plural_unit": false, "amount": 0.01, "conversions": [ - { - "amount": 0.01, - "food": "Pfeffer (schwarz)", - "unit": "kg / Kilogramm" - }, { "amount": 10.0, "food": "Pfeffer (schwarz)", "unit": "g / Gramm" + }, + { + "amount": 0.01, + "food": "Pfeffer (schwarz)", + "unit": "kg / Kilogramm" } ], "food": { @@ -722,12 +722,12 @@ { "amount": 0.0, "food": "Raucharoma", - "unit": "Milliliter" + "unit": "Liter" }, { "amount": 0.0, "food": "Raucharoma", - "unit": "Liter" + "unit": "Milliliter" } ], "food": { @@ -806,15 +806,15 @@ "always_use_plural_unit": false, "amount": 4.5, "conversions": [ - { - "amount": 4.5, - "food": "R\u00e4uchertofu", - "unit": "kg / Kilogramm" - }, { "amount": 4500.0, "food": "R\u00e4uchertofu", "unit": "g / Gramm" + }, + { + "amount": 4.5, + "food": "R\u00e4uchertofu", + "unit": "kg / Kilogramm" } ], "food": { @@ -878,15 +878,15 @@ "always_use_plural_unit": false, "amount": 9.0, "conversions": [ - { - "amount": 9.0, - "food": "Zwiebeln (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 9000.0, "food": "Zwiebeln (frisch)", "unit": "g / Gramm" + }, + { + "amount": 9.0, + "food": "Zwiebeln (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -953,12 +953,12 @@ { "amount": 0.0, "food": "Zucker", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Zucker", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { @@ -1022,15 +1022,15 @@ "always_use_plural_unit": false, "amount": 1.0, "conversions": [ - { - "amount": 1.0, - "food": "Petersilie (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 1000.0, "food": "Petersilie (frisch)", "unit": "g / Gramm" + }, + { + "amount": 1.0, + "food": "Petersilie (frisch)", + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/GPN-Tomatenbutter.json b/out/json/GPN-Tomatenbutter.json index 8333573..b2fa942 100644 --- a/out/json/GPN-Tomatenbutter.json +++ b/out/json/GPN-Tomatenbutter.json @@ -420,9 +420,9 @@ "amount": 50.0, "conversions": [ { - "amount": 50.0, + "amount": 2.9411764705882355, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 7.142857142857143, @@ -430,9 +430,9 @@ "unit": "TL" }, { - "amount": 2.9411764705882355, + "amount": 50.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.05, @@ -502,9 +502,9 @@ "amount": 50.0, "conversions": [ { - "amount": 50.0, + "amount": 2.6315789473684212, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 8.333333333333334, @@ -512,9 +512,9 @@ "unit": "TL" }, { - "amount": 2.6315789473684212, + "amount": 50.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.05, diff --git a/out/json/Granatapfelcreme.json b/out/json/Granatapfelcreme.json index 50156af..9add0ea 100644 --- a/out/json/Granatapfelcreme.json +++ b/out/json/Granatapfelcreme.json @@ -301,9 +301,9 @@ "amount": 15.0, "conversions": [ { - "amount": 15.0, + "amount": 0.8823529411764706, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 2.142857142857143, @@ -311,9 +311,9 @@ "unit": "TL" }, { - "amount": 0.8823529411764706, + "amount": 15.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.015, @@ -383,9 +383,9 @@ "amount": 2.0, "conversions": [ { - "amount": 2.0, + "amount": 0.10526315789473684, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.3333333333333333, @@ -393,9 +393,9 @@ "unit": "TL" }, { - "amount": 0.10526315789473684, + "amount": 2.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.002, @@ -464,16 +464,16 @@ "always_use_plural_unit": false, "amount": 17.0, "conversions": [ - { - "amount": 17.0, - "food": "Tomatenmark", - "unit": "g / Gramm" - }, { "amount": 1.1333333333333333, "food": "Tomatenmark", "unit": "EL" }, + { + "amount": 17.0, + "food": "Tomatenmark", + "unit": "g / Gramm" + }, { "amount": 0.017, "food": "Tomatenmark", @@ -542,9 +542,9 @@ "amount": 4.0, "conversions": [ { - "amount": 4.0, + "amount": 0.2222222222222222, "food": "Paprikapulver", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.5714285714285714, @@ -552,9 +552,9 @@ "unit": "TL" }, { - "amount": 0.2222222222222222, + "amount": 4.0, "food": "Paprikapulver", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.004, diff --git a/out/json/Gulaschmarmelade.json b/out/json/Gulaschmarmelade.json index 6f2a877..1e5205c 100644 --- a/out/json/Gulaschmarmelade.json +++ b/out/json/Gulaschmarmelade.json @@ -264,9 +264,9 @@ "amount": 150.0, "conversions": [ { - "amount": 150.0, + "amount": 0.15, "food": "Branntweinessig", - "unit": "ml" + "unit": "Liter" }, { "amount": 150.0, @@ -274,9 +274,9 @@ "unit": "Milliliter" }, { - "amount": 0.15, + "amount": 150.0, "food": "Branntweinessig", - "unit": "Liter" + "unit": "ml" } ], "food": { diff --git a/out/json/Kartoffelgulasch.json b/out/json/Kartoffelgulasch.json index 29c899a..9422a23 100644 --- a/out/json/Kartoffelgulasch.json +++ b/out/json/Kartoffelgulasch.json @@ -59,15 +59,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Zwiebeln, gew\u00fcrfelt (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Zwiebeln, gew\u00fcrfelt (TK)", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Zwiebeln, gew\u00fcrfelt (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 1.0, "conversions": [ - { - "amount": 1.0, - "food": "Tomatenmark", - "unit": "kg / Kilogramm" - }, { "amount": 1000.0, "food": "Tomatenmark", "unit": "g / Gramm" + }, + { + "amount": 1.0, + "food": "Tomatenmark", + "unit": "kg / Kilogramm" } ], "food": { @@ -275,15 +275,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Karotten, gew\u00fcrfelt (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Karotten, gew\u00fcrfelt (TK)", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Karotten, gew\u00fcrfelt (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -347,15 +347,15 @@ "always_use_plural_unit": false, "amount": 7.5, "conversions": [ - { - "amount": 7.5, - "food": "Paprikastreifen, rot (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 7500.0, "food": "Paprikastreifen, rot (TK)", "unit": "g / Gramm" + }, + { + "amount": 7.5, + "food": "Paprikastreifen, rot (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -794,15 +794,15 @@ "always_use_plural_unit": false, "amount": 20.0, "conversions": [ - { - "amount": 20.0, - "food": "Kartoffel (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 20000.0, "food": "Kartoffel (frisch)", "unit": "g / Gramm" + }, + { + "amount": 20.0, + "food": "Kartoffel (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -1026,9 +1026,9 @@ "amount": 20.0, "conversions": [ { - "amount": 20.0, + "amount": 1.0526315789473684, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 3.3333333333333335, @@ -1036,9 +1036,9 @@ "unit": "TL" }, { - "amount": 1.0526315789473684, + "amount": 20.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.02, @@ -1326,12 +1326,12 @@ { "amount": 0.0, "food": "Raucharoma", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Raucharoma", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Kattis Hummus.json b/out/json/Kattis Hummus.json index 63c9d16..1c7df7b 100644 --- a/out/json/Kattis Hummus.json +++ b/out/json/Kattis Hummus.json @@ -479,7 +479,7 @@ { "amount": 0.0, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.0, @@ -489,7 +489,7 @@ { "amount": 0.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.0, @@ -561,7 +561,7 @@ { "amount": 0.0, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.0, @@ -571,7 +571,7 @@ { "amount": 0.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.0, diff --git a/out/json/Kräuterquark.json b/out/json/Kräuterquark.json index 63603ed..6f09a6a 100644 --- a/out/json/Kräuterquark.json +++ b/out/json/Kräuterquark.json @@ -49,15 +49,15 @@ "always_use_plural_unit": false, "amount": 5.0, "conversions": [ - { - "amount": 5.0, - "food": "Magerquark", - "unit": "kg / Kilogramm" - }, { "amount": 5000.0, "food": "Magerquark", "unit": "g / Gramm" + }, + { + "amount": 5.0, + "food": "Magerquark", + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Levervurst.json b/out/json/Levervurst.json index 6bf2e4c..cacd60c 100644 --- a/out/json/Levervurst.json +++ b/out/json/Levervurst.json @@ -455,9 +455,9 @@ "amount": 4.0, "conversions": [ { - "amount": 4.0, + "amount": 0.2222222222222222, "food": "Paprikapulver", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.5714285714285714, @@ -465,9 +465,9 @@ "unit": "TL" }, { - "amount": 0.2222222222222222, + "amount": 4.0, "food": "Paprikapulver", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.004, @@ -681,9 +681,9 @@ "amount": 4.0, "conversions": [ { - "amount": 4.0, + "amount": 0.23529411764705882, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.5714285714285714, @@ -691,9 +691,9 @@ "unit": "TL" }, { - "amount": 0.23529411764705882, + "amount": 4.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.004, @@ -763,9 +763,9 @@ "amount": 3.0, "conversions": [ { - "amount": 3.0, + "amount": 0.15789473684210525, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.5, @@ -773,9 +773,9 @@ "unit": "TL" }, { - "amount": 0.15789473684210525, + "amount": 3.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.003, diff --git a/out/json/Matelade Apfel.json b/out/json/Matelade Apfel.json index 66c08ac..877f842 100644 --- a/out/json/Matelade Apfel.json +++ b/out/json/Matelade Apfel.json @@ -69,15 +69,15 @@ "always_use_plural_unit": false, "amount": 10.0, "conversions": [ - { - "amount": 10.0, - "food": "\u00c4pfel (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 10000.0, "food": "\u00c4pfel (frisch)", "unit": "g / Gramm" + }, + { + "amount": 10.0, + "food": "\u00c4pfel (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -406,15 +406,15 @@ "always_use_plural_unit": false, "amount": 11.0, "conversions": [ - { - "amount": 11.0, - "food": "Gelierzucker 1:1", - "unit": "kg / Kilogramm" - }, { "amount": 11000.0, "food": "Gelierzucker 1:1", "unit": "g / Gramm" + }, + { + "amount": 11.0, + "food": "Gelierzucker 1:1", + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Mungobohnenhummus mit Jalapenos und Zatar.json b/out/json/Mungobohnenhummus mit Jalapenos und Zatar.json index ac63a44..71b5104 100644 --- a/out/json/Mungobohnenhummus mit Jalapenos und Zatar.json +++ b/out/json/Mungobohnenhummus mit Jalapenos und Zatar.json @@ -290,15 +290,15 @@ "always_use_plural_unit": false, "amount": 110.0, "conversions": [ - { - "amount": 110.0, - "food": "Zitronensaft", - "unit": "Milliliter" - }, { "amount": 0.11, "food": "Zitronensaft", "unit": "Liter" + }, + { + "amount": 110.0, + "food": "Zitronensaft", + "unit": "Milliliter" } ], "food": { diff --git a/out/json/Ofenkartoffeln.json b/out/json/Ofenkartoffeln.json index 0a27518..b4d1286 100644 --- a/out/json/Ofenkartoffeln.json +++ b/out/json/Ofenkartoffeln.json @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 90.0, "conversions": [ - { - "amount": 90.0, - "food": "Kartoffelspalten (vorgegart)", - "unit": "kg / Kilogramm" - }, { "amount": 90000.0, "food": "Kartoffelspalten (vorgegart)", "unit": "g / Gramm" + }, + { + "amount": 90.0, + "food": "Kartoffelspalten (vorgegart)", + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Rauchige Schwarze Bohnencreme.json b/out/json/Rauchige Schwarze Bohnencreme.json index 12af248..09f3e47 100644 --- a/out/json/Rauchige Schwarze Bohnencreme.json +++ b/out/json/Rauchige Schwarze Bohnencreme.json @@ -494,9 +494,9 @@ "amount": 1.0, "conversions": [ { - "amount": 1.0, + "amount": 0.05263157894736842, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.16666666666666666, @@ -504,9 +504,9 @@ "unit": "TL" }, { - "amount": 0.05263157894736842, + "amount": 1.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.001, @@ -648,9 +648,9 @@ "amount": 5.0, "conversions": [ { - "amount": 5.0, + "amount": 0.29411764705882354, "food": "Salz", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 0.7142857142857143, @@ -658,9 +658,9 @@ "unit": "TL" }, { - "amount": 0.29411764705882354, + "amount": 5.0, "food": "Salz", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.005, @@ -801,16 +801,16 @@ "always_use_plural_unit": false, "amount": 17.0, "conversions": [ - { - "amount": 17.0, - "food": "Tomatenmark", - "unit": "g / Gramm" - }, { "amount": 1.1333333333333333, "food": "Tomatenmark", "unit": "EL" }, + { + "amount": 17.0, + "food": "Tomatenmark", + "unit": "g / Gramm" + }, { "amount": 0.017, "food": "Tomatenmark", @@ -878,15 +878,15 @@ "always_use_plural_unit": false, "amount": 100.0, "conversions": [ - { - "amount": 100.0, - "food": "Wasser", - "unit": "Milliliter" - }, { "amount": 0.1, "food": "Wasser", "unit": "Liter" + }, + { + "amount": 100.0, + "food": "Wasser", + "unit": "Milliliter" } ], "food": { diff --git a/out/json/Rotes Thai Spinat Süßkartoffel-Curry.json b/out/json/Rotes Thai Spinat Süßkartoffel-Curry.json index 00057a7..e85a409 100644 --- a/out/json/Rotes Thai Spinat Süßkartoffel-Curry.json +++ b/out/json/Rotes Thai Spinat Süßkartoffel-Curry.json @@ -59,15 +59,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Zwiebeln, rot (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Zwiebeln, rot (frisch)", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Zwiebeln, rot (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 7.5, "conversions": [ - { - "amount": 7.5, - "food": "S\u00fc\u00dfkartoffeln (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 7500.0, "food": "S\u00fc\u00dfkartoffeln (TK)", "unit": "g / Gramm" + }, + { + "amount": 7.5, + "food": "S\u00fc\u00dfkartoffeln (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -491,15 +491,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Spitzpaprika, rot", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Spitzpaprika, rot", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Spitzpaprika, rot", + "unit": "kg / Kilogramm" } ], "food": { @@ -563,15 +563,15 @@ "always_use_plural_unit": false, "amount": 10.0, "conversions": [ - { - "amount": 10.0, - "food": "Spinat (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 10000.0, "food": "Spinat (TK)", "unit": "g / Gramm" + }, + { + "amount": 10.0, + "food": "Spinat (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -707,15 +707,15 @@ "always_use_plural_unit": false, "amount": 2.0, "conversions": [ - { - "amount": 2.0, - "food": "Erdn\u00fcsse, ungesalzen, ger\u00f6stet", - "unit": "kg / Kilogramm" - }, { "amount": 2000.0, "food": "Erdn\u00fcsse, ungesalzen, ger\u00f6stet", "unit": "g / Gramm" + }, + { + "amount": 2.0, + "food": "Erdn\u00fcsse, ungesalzen, ger\u00f6stet", + "unit": "kg / Kilogramm" } ], "food": { @@ -779,15 +779,15 @@ "always_use_plural_unit": false, "amount": 7.5, "conversions": [ - { - "amount": 7.5, - "food": "Couscous", - "unit": "kg / Kilogramm" - }, { "amount": 7500.0, "food": "Couscous", "unit": "g / Gramm" + }, + { + "amount": 7.5, + "food": "Couscous", + "unit": "kg / Kilogramm" } ], "food": { @@ -926,12 +926,12 @@ { "amount": 0.0, "food": "Limettensaft", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Limettensaft", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Salsa.json b/out/json/Salsa.json index 6cf86b8..1343bbf 100644 --- a/out/json/Salsa.json +++ b/out/json/Salsa.json @@ -49,15 +49,15 @@ "always_use_plural_unit": false, "amount": 4.0, "conversions": [ - { - "amount": 4.0, - "food": "Tomaten, gest\u00fcckelt (Dose)", - "unit": "kg / Kilogramm" - }, { "amount": 4000.0, "food": "Tomaten, gest\u00fcckelt (Dose)", "unit": "g / Gramm" + }, + { + "amount": 4.0, + "food": "Tomaten, gest\u00fcckelt (Dose)", + "unit": "kg / Kilogramm" } ], "food": { @@ -121,15 +121,15 @@ "always_use_plural_unit": false, "amount": 0.5, "conversions": [ - { - "amount": 0.5, - "food": "Paprika (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 500.0, "food": "Paprika (frisch)", "unit": "g / Gramm" + }, + { + "amount": 0.5, + "food": "Paprika (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -193,15 +193,15 @@ "always_use_plural_unit": false, "amount": 0.25, "conversions": [ - { - "amount": 0.25, - "food": "Zwiebeln (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 250.0, "food": "Zwiebeln (frisch)", "unit": "g / Gramm" + }, + { + "amount": 0.25, + "food": "Zwiebeln (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -265,15 +265,15 @@ "always_use_plural_unit": false, "amount": 0.5, "conversions": [ - { - "amount": 0.5, - "food": "Tomatenmark", - "unit": "kg / Kilogramm" - }, { "amount": 500.0, "food": "Tomatenmark", "unit": "g / Gramm" + }, + { + "amount": 0.5, + "food": "Tomatenmark", + "unit": "kg / Kilogramm" } ], "food": { @@ -340,12 +340,12 @@ { "amount": 0.0, "food": "Kreuzk\u00fcmmel (Cumin)", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Kreuzk\u00fcmmel (Cumin)", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { @@ -412,12 +412,12 @@ { "amount": 0.0, "food": "Koriandersamen (gemahlen)", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Koriandersamen (gemahlen)", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { diff --git a/out/json/Soja-Gulasch.json b/out/json/Soja-Gulasch.json index 7bcf037..c9ff7d8 100644 --- a/out/json/Soja-Gulasch.json +++ b/out/json/Soja-Gulasch.json @@ -59,15 +59,15 @@ "always_use_plural_unit": false, "amount": 4.0, "conversions": [ - { - "amount": 4.0, - "food": "Sojaschnetzel", - "unit": "kg / Kilogramm" - }, { "amount": 4000.0, "food": "Sojaschnetzel", "unit": "g / Gramm" + }, + { + "amount": 4.0, + "food": "Sojaschnetzel", + "unit": "kg / Kilogramm" } ], "food": { @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 0.6, "conversions": [ - { - "amount": 0.6, - "food": "Gem\u00fcsebr\u00fche", - "unit": "kg / Kilogramm" - }, { "amount": 600.0, "food": "Gem\u00fcsebr\u00fche", "unit": "g / Gramm" + }, + { + "amount": 0.6, + "food": "Gem\u00fcsebr\u00fche", + "unit": "kg / Kilogramm" } ], "food": { @@ -420,9 +420,9 @@ "amount": 100.0, "conversions": [ { - "amount": 100.0, + "amount": 5.2631578947368425, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 16.666666666666668, @@ -430,9 +430,9 @@ "unit": "TL" }, { - "amount": 5.2631578947368425, + "amount": 100.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.1, @@ -576,12 +576,12 @@ { "amount": 0.0, "food": "Zucker", - "unit": "kg / Kilogramm" + "unit": "g / Gramm" }, { "amount": 0.0, "food": "Zucker", - "unit": "g / Gramm" + "unit": "kg / Kilogramm" } ], "food": { @@ -660,15 +660,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Zwiebeln, gew\u00fcrfelt (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Zwiebeln, gew\u00fcrfelt (TK)", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Zwiebeln, gew\u00fcrfelt (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -732,15 +732,15 @@ "always_use_plural_unit": false, "amount": 1.0, "conversions": [ - { - "amount": 1.0, - "food": "Tomatenmark", - "unit": "kg / Kilogramm" - }, { "amount": 1000.0, "food": "Tomatenmark", "unit": "g / Gramm" + }, + { + "amount": 1.0, + "food": "Tomatenmark", + "unit": "kg / Kilogramm" } ], "food": { @@ -876,15 +876,15 @@ "always_use_plural_unit": false, "amount": 2.5, "conversions": [ - { - "amount": 2.5, - "food": "Karotten, gew\u00fcrfelt (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 2500.0, "food": "Karotten, gew\u00fcrfelt (TK)", "unit": "g / Gramm" + }, + { + "amount": 2.5, + "food": "Karotten, gew\u00fcrfelt (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -948,15 +948,15 @@ "always_use_plural_unit": false, "amount": 7.5, "conversions": [ - { - "amount": 7.5, - "food": "Paprikastreifen, rot (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 7500.0, "food": "Paprikastreifen, rot (TK)", "unit": "g / Gramm" + }, + { + "amount": 7.5, + "food": "Paprikastreifen, rot (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -1395,15 +1395,15 @@ "always_use_plural_unit": false, "amount": 8.0, "conversions": [ - { - "amount": 8.0, - "food": "Kartoffel (frisch)", - "unit": "kg / Kilogramm" - }, { "amount": 8000.0, "food": "Kartoffel (frisch)", "unit": "g / Gramm" + }, + { + "amount": 8.0, + "food": "Kartoffel (frisch)", + "unit": "kg / Kilogramm" } ], "food": { @@ -1627,9 +1627,9 @@ "amount": 20.0, "conversions": [ { - "amount": 20.0, + "amount": 1.0526315789473684, "food": "Pfeffer (schwarz)", - "unit": "g / Gramm" + "unit": "EL" }, { "amount": 3.3333333333333335, @@ -1637,9 +1637,9 @@ "unit": "TL" }, { - "amount": 1.0526315789473684, + "amount": 20.0, "food": "Pfeffer (schwarz)", - "unit": "EL" + "unit": "g / Gramm" }, { "amount": 0.02, @@ -1927,12 +1927,12 @@ { "amount": 0.0, "food": "Raucharoma", - "unit": "Milliliter" + "unit": "Liter" }, { "amount": 0.0, "food": "Raucharoma", - "unit": "Liter" + "unit": "Milliliter" } ], "food": { diff --git a/out/json/Vegane Aioli.json b/out/json/Vegane Aioli.json index da120f2..51d5ac7 100644 --- a/out/json/Vegane Aioli.json +++ b/out/json/Vegane Aioli.json @@ -131,15 +131,15 @@ "always_use_plural_unit": false, "amount": 0.5, "conversions": [ - { - "amount": 0.5, - "food": "Knoblauch (TK)", - "unit": "kg / Kilogramm" - }, { "amount": 500.0, "food": "Knoblauch (TK)", "unit": "g / Gramm" + }, + { + "amount": 0.5, + "food": "Knoblauch (TK)", + "unit": "kg / Kilogramm" } ], "food": { @@ -203,15 +203,15 @@ "always_use_plural_unit": false, "amount": 0.5, "conversions": [ - { - "amount": 0.5, - "food": "Senf, mittelscharf", - "unit": "kg / Kilogramm" - }, { "amount": 500.0, "food": "Senf, mittelscharf", "unit": "g / Gramm" + }, + { + "amount": 0.5, + "food": "Senf, mittelscharf", + "unit": "kg / Kilogramm" } ], "food": {