diff --git a/package-lock.json b/package-lock.json
index 95ebf9a..4c13739 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -507,41 +507,14 @@
"dev": true
},
"conventional-changelog-conventionalcommits": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.3.0.tgz",
- "integrity": "sha512-oYHydvZKU+bS8LnGqTMlNrrd7769EsuEHKy4fh1oMdvvDi7fem8U+nvfresJ1IDB8K00Mn4LpiA/lR+7Gs6rgg==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz",
+ "integrity": "sha512-ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA==",
"dev": true,
"requires": {
- "compare-func": "^1.3.1",
+ "compare-func": "^2.0.0",
"lodash": "^4.17.15",
"q": "^1.5.1"
- },
- "dependencies": {
- "compare-func": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz",
- "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==",
- "dev": true,
- "requires": {
- "array-ify": "^1.0.0",
- "dot-prop": "^3.0.0"
- }
- },
- "dot-prop": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
- "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
- "dev": true,
- "requires": {
- "is-obj": "^1.0.0"
- }
- },
- "is-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
- "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
- "dev": true
- }
}
},
"conventional-changelog-core": {
@@ -1625,22 +1598,29 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"jest-worker": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
- "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz",
+ "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==",
"dev": true,
"requires": {
+ "@types/node": "*",
"merge-stream": "^2.0.0",
- "supports-color": "^6.1.0"
+ "supports-color": "^7.0.0"
},
"dependencies": {
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
}
}
}
@@ -2246,6 +2226,15 @@
"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
"dev": true
},
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
"read-pkg": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -2509,16 +2498,15 @@
}
},
"rollup-plugin-terser": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz",
- "integrity": "sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.0.tgz",
+ "integrity": "sha512-p/N3lLiFusCjYTLfVkoaiRTOGr5AESEaljMPH12MhOtoMkmTBhIAfuadrcWy4am1U0vU4WTxO9fi0K09O4CboQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.5.5",
- "jest-worker": "^24.9.0",
- "rollup-pluginutils": "^2.8.2",
- "serialize-javascript": "^2.1.2",
- "terser": "^4.6.2"
+ "@babel/code-frame": "^7.10.4",
+ "jest-worker": "^26.2.1",
+ "serialize-javascript": "^4.0.0",
+ "terser": "^5.0.0"
}
},
"rollup-pluginutils": {
@@ -2568,10 +2556,13 @@
"dev": true
},
"serialize-javascript": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
- "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
- "dev": true
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+ "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+ "dev": true,
+ "requires": {
+ "randombytes": "^2.1.0"
+ }
},
"set-blocking": {
"version": "2.0.0",
@@ -2774,6 +2765,44 @@
"semver": "^7.1.1",
"stringify-package": "^1.0.1",
"yargs": "^15.3.1"
+ },
+ "dependencies": {
+ "compare-func": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz",
+ "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==",
+ "dev": true,
+ "requires": {
+ "array-ify": "^1.0.0",
+ "dot-prop": "^3.0.0"
+ }
+ },
+ "conventional-changelog-conventionalcommits": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.3.0.tgz",
+ "integrity": "sha512-oYHydvZKU+bS8LnGqTMlNrrd7769EsuEHKy4fh1oMdvvDi7fem8U+nvfresJ1IDB8K00Mn4LpiA/lR+7Gs6rgg==",
+ "dev": true,
+ "requires": {
+ "compare-func": "^1.3.1",
+ "lodash": "^4.17.15",
+ "q": "^1.5.1"
+ }
+ },
+ "dot-prop": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+ "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+ "dev": true,
+ "requires": {
+ "is-obj": "^1.0.0"
+ }
+ },
+ "is-obj": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+ "dev": true
+ }
}
},
"string-width": {
@@ -2850,9 +2879,9 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"terser": {
- "version": "4.8.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
- "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.0.0.tgz",
+ "integrity": "sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA==",
"dev": true,
"requires": {
"commander": "^2.20.0",
diff --git a/package.json b/package.json
index e656d9e..7eb6f1d 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-livereload": "^1.0.0",
"rollup-plugin-svelte": "^5.0.3",
- "rollup-plugin-terser": "^5.1.2",
+ "rollup-plugin-terser": "^7.0.0",
"standard-version": "^8.0.2",
"svelte": "^3.0.0"
},
diff --git a/scripts/extractData.py b/scripts/extractData.py
index 809eea6..af773b9 100755
--- a/scripts/extractData.py
+++ b/scripts/extractData.py
@@ -15,7 +15,7 @@ def get_value(a, b):
def process_label(label):
if label.startswith('>'):
return "⇓
" + label[2:]
- return label
+ return label.strip()
class Map:
diff --git a/src/App.svelte b/src/App.svelte
index 1a58465..4c77a8f 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -200,7 +200,6 @@
else evaluationEdit();
});
-
@@ -296,10 +295,15 @@
diff --git a/src/Aroma.svelte b/src/Aroma.svelte
index c6908ab..de3c0b7 100644
--- a/src/Aroma.svelte
+++ b/src/Aroma.svelte
@@ -185,7 +185,9 @@
{/each}
diff --git a/src/Beer.svelte b/src/Beer.svelte
index c547002..549ff9f 100644
--- a/src/Beer.svelte
+++ b/src/Beer.svelte
@@ -95,7 +95,7 @@
}
-
+
Which beer deserves feedback?
diff --git a/src/Overall.svelte b/src/Overall.svelte
index 90cec71..5af769f 100644
--- a/src/Overall.svelte
+++ b/src/Overall.svelte
@@ -7,8 +7,10 @@
DRINKABILITY_OPTIONS
} from './js/Overall';
import Score from "./comp/Score.svelte";
+ import {getScore, getScoreDescription} from './js/PdfRenderer';
export let overall;
+ export let score;
function updateHandler() {
overall.updateHandler()
@@ -24,6 +26,16 @@
input {
width: 10em;
}
+
+ div.scoreDescription {
+ font-size: 0.8em;
+ font-style: italic;
+ }
+
+ div.score {
+ margin-top: 1em;
+ margin-bottom: 1em;
+ }
@@ -50,6 +62,8 @@
Intangible
+
+
-
-
- Rank
+
+
+ Rank
diff --git a/src/comp/SvgIcon.svelte b/src/comp/SvgIcon.svelte
index f749ed3..f9bf774 100644
--- a/src/comp/SvgIcon.svelte
+++ b/src/comp/SvgIcon.svelte
@@ -6,7 +6,7 @@
diff --git a/src/data/aroma-data.json b/src/data/aroma-data.json
index c8708e0..d29df6e 100644
--- a/src/data/aroma-data.json
+++ b/src/data/aroma-data.json
@@ -7,9 +7,9 @@
"branchvalues": "total",
"count": "leaves",
"title": "Aroma",
- "ids": ["98535242", "18808070", "97281682", "3340018", "11132264", "82107367", "85686221", "98616861", "86038090", "74375782", "87761046", "43569509", "30571269", "8241644", "23210045", "50786990", "80226839", "82970217", "69448812", "19782146", "16944811", "837457", "43643708", "93876469", "87046704", "36691698", "3383809", "55994819", "88616348", "91715151", "6036000", "18053146", "90640685", "84337214", "57279388", "83345916", "4790550", "17122849", "27638035", "95238569", "57124396", "33415128", "85644059", "19908084", "80219744", "77343812", "62830243", "5538923", "97193762", "2609500", "84780277", "79189167", "78225228", "50319783", "60109740", "8603777", "74213246", "30293665", "54331860", "66979833", "77275810", "37708481", "66414493", "53043016", "95791299", "42978233", "61358968", "72863004", "36477662", "22281138", "19146232", "84924954", "1450850", "6840858", "76551396", "94701770", "19785072", "23784571", "62046026", "84342514", "80236865", "30972623", "53538763", "64746130", "61358968", "99019697", "96865656", "90698612", "10819465", "61751357", "61914382", "3094579", "8625115", "47315702", "30448098", "90454006", "68078031", "49449274", "13978885", "14914974", "8246033", "93752217", "53675490", "59540191", "25171075", "26157035", "69032919", "66939549", "5469236", "86043338", "13823910", "50991614", "2481810", "49765771", "92217556", "49012029", "34135168", "41417665", "30555284", "69733784", "20696215", "68581303", "68826725", "80839957", "72822903", "88646952", "76564228", "67639387", "50691164", "19016994", "80787777", "41287233", "7552065", "22248296", "73333693", "27144900", "39967293", "94023539", "95032019", "6864396", "837457", "11807775", "29565570", "78397501", "52572453", "88057112", "39506507", "97193762", "22889908", "3109141", "34487102", "59234972", "59713536", "62289021", "47315702", "95542542", "9563861", "33690044", "91887852", "34830017", "49206213", "8100092", "95514675", "57344077", "80506688", "73656613", "57776858", "63840878", "43746414", "42331284", "73105812", "26999509", "35789604", "81094893", "38421572", "52581448", "50126773", "99406515", "54966384", "99985949", "23398620", "27169241", "40169638", "19146232", "42604946", "95480289", "91054085", "12744331", "11401184"],
- "labels": ["Aroma", "Malt", "Grainy", "Husky", "Oat", "Rice", "Bready", "Bread", "Bread Crust", "Sourdough", "Biscuit", "Craker", "Toast", "Nutty", "Hazelnut", "Almond", "Walnut", "Sweety", "Honey", "Caramel", "Molasse", "Toffee", "Chocolate", "Roasty", "Coffee", "Burnt Sugar", "Smoke", "Fruity", "Raisin", "Prune", "Date", "Not Found ", "Hops", "Citrusy", "Grapefruit", "Orange", "Mandarin", "Tangerine", "Lemon", "Lime", "Tropical ", "Papaya", "Pineapple", "Mango", "Passion Fruit", "Lychee", "Floral", "Perfumey", "Rose", "Geranium", "Lavender", "Jasmin", "Chamomile", "Herbal", "Hay", "Thyme", "Minty", "Grassy", "Oregano", "Lemongrass", "Woody", "Pine", "Resinous", "Eucalyptus", "Marijuana", "Berry ", "Grape", "Raspberry", "Earthy ", "Cheesy", "Catty", "Spicy", "Not Found ", "Fermentation", "Esters", "Pear", "Banana", "Ripe Apple", "Bubblegum", "Apricot", "Quince", "Berry", "Citrus", "Dried Fruit ", "Grape", "Phenols", "Clove", "Black Pepper", "White Pepper", "Nutmeg", "Hot Spicy ", "Wild", "Brett", "Barnyard", "Musty ", "Soil ", "Beet", "Clean ", "Others", "Acid", "Lactic", "Acetic ", "Cidery", "Citric", "Mineral", "Gypsum ", "Chalky", "Salty", "Sugar", "Turbinado", "Molasse ", "Spicy ", "Coriander", "Celery", "Ginger", "Licorice", "Fennel", "Star anise", "Pepper", "Grains of paradise", "Vanilla", "Vinous ", "Maderized", "Winey ", "Wood", "Oak", "Rosewood", "Flaws", "Acetaldehyde", "Fresh-cut Green Apple", "Notes of Grass", "Notes of Green leaves", "Latex paint", "Alcoholic ", "Spicy ", "Vinous character", "Fusel", "Diacetyl", "Artificial Butter", "Butterscotch ", "Toffee", "DMS/Vegetal", "Cooked Corn", "Cooked Celery", "Cabbage", "Cooked Onion", "Estery", "Rose", "Fruits ", "Grassy ", "Fresh cut grass", "Ligth-Struck", "Earthy", "Soil", "Barnyard", "Mushroom", "Beet ", "Moldy", "Old books", "Decomposing wood", "Oxidized", "Stale", "Winy/vinous", "Cardboard", "Hazelnut/Almond/Marzipan", "Dried fruit", "Sherry like", "Phenolic", "Spicy ", "Smoky", "Plastic", "Adhesive strip", "Medicinal", "Solvent", "Fusel ", "Acetone", "Lacquer thinner", "Sulfur", "Rotten Eggs", "Burning Matches", "Vegetal", "Onion fresh", "Garlic", "Catty", "BlackCurrent leaves", "Yeasty", "Bready ", "Sulfury", "Yeast like"],
- "parents": ["", "98535242", "18808070", "97281682", "97281682", "97281682", "18808070", "85686221", "85686221", "85686221", "85686221", "85686221", "85686221", "18808070", "8241644", "8241644", "8241644", "18808070", "82970217", "82970217", "82970217", "82970217", "82970217", "18808070", "93876469", "93876469", "93876469", "18808070", "55994819", "55994819", "55994819", "18808070", "98535242", "90640685", "84337214", "84337214", "84337214", "84337214", "84337214", "84337214", "90640685", "57124396", "57124396", "57124396", "57124396", "57124396", "90640685", "62830243", "62830243", "62830243", "62830243", "62830243", "62830243", "90640685", "50319783", "50319783", "50319783", "50319783", "50319783", "50319783", "90640685", "77275810", "77275810", "77275810", "77275810", "90640685", "42978233", "42978233", "90640685", "36477662", "36477662", "90640685", "90640685", "98535242", "6840858", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "6840858", "99019697", "99019697", "99019697", "99019697", "99019697", "6840858", "3094579", "3094579", "3094579", "3094579", "3094579", "6840858", "98535242", "13978885", "14914974", "14914974", "14914974", "14914974", "13978885", "25171075", "25171075", "25171075", "13978885", "5469236", "5469236", "13978885", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "13978885", "68581303", "68581303", "13978885", "72822903", "72822903", "98535242", "67639387", "50691164", "50691164", "50691164", "50691164", "67639387", "22248296", "22248296", "22248296", "67639387", "94023539", "94023539", "94023539", "67639387", "11807775", "11807775", "11807775", "11807775", "67639387", "39506507", "39506507", "67639387", "3109141", "67639387", "67639387", "59713536", "59713536", "59713536", "59713536", "59713536", "59713536", "59713536", "67639387", "49206213", "49206213", "49206213", "49206213", "49206213", "49206213", "67639387", "63840878", "63840878", "63840878", "63840878", "63840878", "67639387", "81094893", "81094893", "81094893", "67639387", "99406515", "99406515", "67639387", "23398620", "23398620", "23398620", "23398620", "67639387", "95480289", "95480289", "95480289"],
+ "ids": ["33265904", "96355173", "60400320", "3732974", "95334335", "43622452", "72204108", "1748211", "77695009", "2548959", "95158263", "30498277", "97405738", "67965770", "92695623", "92486603", "46684178", "6718", "32545083", "45506294", "43531085", "98189790", "93306051", "94714937", "49950446", "23302308", "29578008", "30735029", "89331569", "84197496", "94470429", "45770043", "40964040", "3596831", "87234469", "80943455", "29750343", "35847237", "10406848", "21888736", "55674259", "29447422", "50220648", "1886994", "38767840", "876348", "51427810", "29713544", "53688787", "83691850", "46461091", "66557165", "24951459", "15882589", "61758677", "49739322", "13256989", "53072899", "72480806", "67382174", "47380980", "78874825", "56737196", "87685890", "9634268", "57921734", "13193969", "64176671", "61698031", "4659717", "75860963", "11746889", "51408149", "61625628", "7568185", "80103548", "22274205", "21396740", "31626419", "24546108", "11481864", "49989670", "27905370", "6853962", "13193969", "19087894", "64271974", "33907313", "67212344", "37305236", "30257761", "71534318", "98103492", "90823434", "77610836", "92989234", "90960154", "13780271", "76310824", "89661575", "69200209", "20651540", "29349124", "71566945", "55207878", "91073091", "44898221", "54438818", "9399794", "43053394", "42689214", "12379785", "94019550", "52821053", "84319149", "90186411", "43968100", "74088342", "76022339", "75869056", "46478601", "47321707", "85987358", "50844169", "14077454", "2991349", "22965541", "80719780", "50025790", "88296677", "77487425", "42082341", "26232747", "34400156", "27648636", "83188050", "92069893", "29828280", "1365567", "90446049", "98189790", "98209380", "96682296", "62413687", "85996918", "17272399", "84720931", "53688787", "28472578", "26617547", "36694178", "76322850", "99033173", "64191692", "90823434", "30676687", "90352623", "38911938", "60910779", "32453100", "46325855", "92920784", "3427256", "29168279", "55968337", "13241754", "66524831", "9406739", "12204933", "24085106", "95205824", "64572293", "1971261", "1379952", "67950743", "8358570", "73230618", "77660631", "90063304", "46005913", "13727240", "91826018", "50272423", "75860963", "97747505", "75937990", "50720410", "53047720", "89540786"],
+ "labels": ["Aroma", "Malt", "Grainy", "Husky", "Oat", "Rice", "Bready", "Bread", "Bread Crust", "Sourdough", "Biscuit", "Craker", "Toast", "Nutty", "Hazelnut", "Almond", "Walnut", "Sweety", "Honey", "Caramel", "Molasse", "Toffee", "Chocolate", "Roasty", "Coffee", "Burnt Sugar", "Smoke", "Fruity", "Raisin", "Prune", "Date", "Not Found", "Hops", "Citrusy", "Grapefruit", "Orange", "Mandarin", "Tangerine", "Lemon", "Lime", "Tropical", "Papaya", "Pineapple", "Mango", "Passion Fruit", "Lychee", "Floral", "Perfumey", "Rose", "Geranium", "Lavender", "Jasmin", "Chamomile", "Herbal", "Hay", "Thyme", "Minty", "Grassy", "Oregano", "Lemongrass", "Woody", "Pine", "Resinous", "Eucalyptus", "Marijuana", "Berry", "Grape", "Raspberry", "Earthy", "Cheesy", "Catty", "Spicy", "Not Found", "Fermentation", "Esters", "Pear", "Banana", "Ripe Apple", "Bubblegum", "Apricot", "Quince", "Berry", "Citrus", "Dried Fruit", "Grape", "Phenols", "Clove", "Black Pepper", "White Pepper", "Nutmeg", "Hot Spicy", "Wild", "Brett", "Barnyard", "Musty", "Soil", "Beet", "Clean", "Others", "Acid", "Lactic", "Acetic", "Cidery", "Citric", "Mineral", "Gypsum", "Chalky", "Salty", "Sugar", "Turbinado", "Molasse", "Spicy", "Coriander", "Celery", "Ginger", "Licorice", "Fennel", "Star anise", "Pepper", "Grains of paradise", "Vanilla", "Vinous", "Maderized", "Winey", "Wood", "Oak", "Rosewood", "Flaws", "Acetaldehyde", "Fresh-cut Green Apple", "Notes of Grass", "Notes of Green leaves", "Latex paint", "Alcoholic", "Spicy", "Vinous character", "Fusel", "Diacetyl", "Artificial Butter", "Butterscotch", "Toffee", "DMS/Vegetal", "Cooked Corn", "Cooked Celery", "Cabbage", "Cooked Onion", "Estery", "Rose", "Fruits", "Grassy", "Fresh cut grass", "Ligth-Struck", "Earthy", "Soil", "Barnyard", "Mushroom", "Beet", "Moldy", "Old books", "Decomposing wood", "Oxidized", "Stale", "Winy/vinous", "Cardboard", "Hazelnut/Almond/Marzipan", "Dried fruit", "Sherry like", "Phenolic", "Spicy", "Smoky", "Plastic", "Adhesive strip", "Medicinal", "Solvent", "Fusel", "Acetone", "Lacquer thinner", "Sulfur", "Rotten Eggs", "Burning Matches", "Vegetal", "Onion fresh", "Garlic", "Catty", "BlackCurrent leaves", "Yeasty", "Bready", "Sulfury", "Yeast like"],
+ "parents": ["", "33265904", "96355173", "60400320", "60400320", "60400320", "96355173", "72204108", "72204108", "72204108", "72204108", "72204108", "72204108", "96355173", "67965770", "67965770", "67965770", "96355173", "6718", "6718", "6718", "6718", "6718", "96355173", "94714937", "94714937", "94714937", "96355173", "30735029", "30735029", "30735029", "96355173", "33265904", "40964040", "3596831", "3596831", "3596831", "3596831", "3596831", "3596831", "40964040", "55674259", "55674259", "55674259", "55674259", "55674259", "40964040", "51427810", "51427810", "51427810", "51427810", "51427810", "51427810", "40964040", "15882589", "15882589", "15882589", "15882589", "15882589", "15882589", "40964040", "47380980", "47380980", "47380980", "47380980", "40964040", "57921734", "57921734", "40964040", "61698031", "61698031", "40964040", "40964040", "33265904", "61625628", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "61625628", "19087894", "19087894", "19087894", "19087894", "19087894", "61625628", "71534318", "71534318", "71534318", "71534318", "71534318", "61625628", "33265904", "76310824", "89661575", "89661575", "89661575", "89661575", "76310824", "55207878", "55207878", "55207878", "76310824", "9399794", "9399794", "76310824", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "76310824", "47321707", "47321707", "76310824", "14077454", "14077454", "33265904", "80719780", "50025790", "50025790", "50025790", "50025790", "80719780", "34400156", "34400156", "34400156", "80719780", "29828280", "29828280", "29828280", "80719780", "98209380", "98209380", "98209380", "98209380", "80719780", "84720931", "84720931", "80719780", "26617547", "80719780", "80719780", "99033173", "99033173", "99033173", "99033173", "99033173", "99033173", "99033173", "80719780", "46325855", "46325855", "46325855", "46325855", "46325855", "46325855", "80719780", "9406739", "9406739", "9406739", "9406739", "9406739", "80719780", "1379952", "1379952", "1379952", "80719780", "77660631", "77660631", "80719780", "13727240", "13727240", "13727240", "13727240", "80719780", "75937990", "75937990", "75937990"],
"text": ["Aroma", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", " Capsicum", "", "", "", "", "", "", " Clean Fermentation", "", "", "", " Vinegar", "", "", "", " plaster", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""],
"values": [1, 0.19999999000000002, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.19999999000000002, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.005555542777777778, 0.005555542777777778, 0.005555542777777778, 0.005555542777777778, 0.022222211111111112, 0.011111095555555556, 0.011111095555555556, 0.022222211111111112, 0.011111095555555556, 0.011111095555555556, 0.022222211111111112, 0.022222211111111112, 0.19999999000000002, 0.0499999875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.0499999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0499999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0499999875, 0.19999999000000002, 0.033333321666666665, 0.008333320416666666, 0.008333320416666666, 0.008333320416666666, 0.008333320416666666, 0.033333321666666665, 0.011111097222222222, 0.011111097222222222, 0.011111097222222222, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.033333321666666665, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.19999999000000002, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.007142841785714287, 0.007142841785714287, 0.014285703571428573, 0.014285693571428573, 0.014285703571428573, 0.014285703571428573, 0.0020408047959183675, 0.0020408047959183675, 0.0020408047959183675, 0.0020408047959183675, 0.0020408047959183675, 0.0020408047959183675, 0.0020408047959183675, 0.014285703571428573, 0.0023809405952380956, 0.0023809405952380956, 0.0023809405952380956, 0.0023809405952380956, 0.0023809405952380956, 0.0023809405952380956, 0.014285703571428573, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.007142841785714287, 0.007142841785714287, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191]
}]
diff --git a/src/data/flavor-data.json b/src/data/flavor-data.json
index d558284..3841526 100644
--- a/src/data/flavor-data.json
+++ b/src/data/flavor-data.json
@@ -7,9 +7,9 @@
"branchvalues": "total",
"count": "leaves",
"title": "Flavor",
- "ids": ["98535242", "18808070", "97281682", "3340018", "11132264", "82107367", "85686221", "98616861", "86038090", "74375782", "87761046", "43569509", "30571269", "8241644", "23210045", "50786990", "80226839", "82970217", "69448812", "19782146", "16944811", "837457", "43643708", "93876469", "87046704", "36691698", "3383809", "55994819", "88616348", "91715151", "6036000", "18053146", "90640685", "84337214", "57279388", "83345916", "4790550", "17122849", "27638035", "95238569", "57124396", "33415128", "85644059", "19908084", "80219744", "77343812", "62830243", "5538923", "97193762", "2609500", "84780277", "79189167", "78225228", "50319783", "60109740", "8603777", "74213246", "30293665", "54331860", "66979833", "77275810", "37708481", "66414493", "53043016", "95791299", "42978233", "61358968", "72863004", "36477662", "22281138", "19146232", "84924954", "1450850", "6840858", "76551396", "94701770", "19785072", "23784571", "62046026", "84342514", "80236865", "30972623", "53538763", "64746130", "61358968", "99019697", "96865656", "90698612", "10819465", "61751357", "61914382", "3094579", "8625115", "47315702", "30448098", "90454006", "68078031", "49449274", "13978885", "14914974", "8246033", "93752217", "53675490", "59540191", "25171075", "26157035", "69032919", "66939549", "5469236", "86043338", "13823910", "50991614", "2481810", "49765771", "92217556", "49012029", "34135168", "41417665", "30555284", "69733784", "20696215", "68581303", "68826725", "80839957", "72822903", "88646952", "76564228", "67639387", "50691164", "19016994", "80787777", "41287233", "7552065", "22248296", "73333693", "27144900", "39967293", "94023539", "95032019", "6864396", "837457", "11807775", "29565570", "78397501", "52572453", "88057112", "39506507", "97193762", "22889908", "3109141", "34487102", "59234972", "59713536", "95542542", "9563861", "33690044", "49206213", "8100092", "95514675", "57344077", "57776858", "63840878", "43746414", "42331284", "73105812", "26999509", "35789604", "81094893", "38421572", "52581448", "50126773", "99406515", "54966384", "99985949", "23398620", "47519947", "57437157", "86932987", "42016587", "95480289", "91054085", "12744331", "11401184"],
- "labels": ["Flavor", "Malt", "Grainy", "Husky", "Oat", "Rice", "Bready", "Bread", "Bread Crust", "Sourdough", "Biscuit", "Craker", "Toast", "Nutty", "Hazelnut", "Almond", "Walnut", "Sweety", "Honey", "Caramel", "Molasse", "Toffee", "Chocolate", "Roasty", "Coffee", "Burnt Sugar", "Smoke", "Fruity", "Raisin", "Prune", "Date", "Not Found ", "Hops", "Citrusy", "Grapefruit", "Orange", "Mandarin", "Tangerine", "Lemon", "Lime", "Tropical ", "Papaya", "Pineapple", "Mango", "Passion Fruit", "Lychee", "Floral", "Perfumey", "Rose", "Geranium", "Lavender", "Jasmin", "Chamomile", "Herbal", "Hay", "Thyme", "Minty", "Grassy", "Oregano", "Lemongrass", "Woody", "Pine", "Resinous", "Eucalyptus", "Marijuana", "Berry ", "Grape", "Raspberry", "Earthy ", "Cheesy", "Catty", "Spicy", "Not Found ", "Fermentation", "Esters", "Pear", "Banana", "Ripe Apple", "Bubblegum", "Apricot", "Quince", "Berry", "Citrus", "Dried Fruit ", "Grape", "Phenols", "Clove", "Black Pepper", "White Pepper", "Nutmeg", "Hot Spicy ", "Wild", "Brett", "Barnyard", "Musty ", "Soil ", "Beet", "Clean ", "Others", "Acid", "Lactic", "Acetic ", "Cidery", "Citric", "Mineral", "Gypsum ", "Chalky", "Salty", "Sugar", "Turbinado", "Molasse ", "Spicy ", "Coriander", "Celery", "Ginger", "Licorice", "Fennel", "Star anise", "Pepper", "Grains of paradise", "Vanilla", "Vinous ", "Maderized", "Winey ", "Wood", "Oak", "Rosewood", "Flaws", "Acetaldehyde", "Fresh-cut Green Apple", "Notes of Grass", "Notes of Green leaves", "Latex paint", "Alcoholic ", "Spicy ", "Vinous character", "Fusel", "Diacetyl", "Artificial Butter", "Butterscotch ", "Toffee", "DMS/Vegetal", "Cooked Corn", "Cooked Celery", "Cabbage", "Cooked Onion", "Estery", "Rose", "Fruits ", "Grassy ", "Fresh cut grass", "Ligth-Struck", "Earthy", "Mushroom", "Beet ", "Moldy", "Oxidized", "Stale", "Winy/vinous", "Cardboard", "Sherry like", "Phenolic", "Spicy ", "Smoky", "Plastic", "Adhesive strip", "Medicinal", "Solvent", "Fusel ", "Acetone", "Lacquer thinner", "Sulfur", "Rotten Eggs", "Burning Matches", "Vegetal", "Cooked", "Canned", "Rotten", "Cabbage, Onion, Celery", "Yeasty", "Bready ", "Sulfury", "Yeast like"],
- "parents": ["", "98535242", "18808070", "97281682", "97281682", "97281682", "18808070", "85686221", "85686221", "85686221", "85686221", "85686221", "85686221", "18808070", "8241644", "8241644", "8241644", "18808070", "82970217", "82970217", "82970217", "82970217", "82970217", "18808070", "93876469", "93876469", "93876469", "18808070", "55994819", "55994819", "55994819", "18808070", "98535242", "90640685", "84337214", "84337214", "84337214", "84337214", "84337214", "84337214", "90640685", "57124396", "57124396", "57124396", "57124396", "57124396", "90640685", "62830243", "62830243", "62830243", "62830243", "62830243", "62830243", "90640685", "50319783", "50319783", "50319783", "50319783", "50319783", "50319783", "90640685", "77275810", "77275810", "77275810", "77275810", "90640685", "42978233", "42978233", "90640685", "36477662", "36477662", "90640685", "90640685", "98535242", "6840858", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "76551396", "6840858", "99019697", "99019697", "99019697", "99019697", "99019697", "6840858", "3094579", "3094579", "3094579", "3094579", "3094579", "6840858", "98535242", "13978885", "14914974", "14914974", "14914974", "14914974", "13978885", "25171075", "25171075", "25171075", "13978885", "5469236", "5469236", "13978885", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "50991614", "13978885", "68581303", "68581303", "13978885", "72822903", "72822903", "98535242", "67639387", "50691164", "50691164", "50691164", "50691164", "67639387", "22248296", "22248296", "22248296", "67639387", "94023539", "94023539", "94023539", "67639387", "11807775", "11807775", "11807775", "11807775", "67639387", "39506507", "39506507", "67639387", "3109141", "67639387", "67639387", "59713536", "59713536", "59713536", "67639387", "49206213", "49206213", "49206213", "49206213", "67639387", "63840878", "63840878", "63840878", "63840878", "63840878", "67639387", "81094893", "81094893", "81094893", "67639387", "99406515", "99406515", "67639387", "23398620", "23398620", "23398620", "23398620", "67639387", "95480289", "95480289", "95480289"],
+ "ids": ["33265904", "96355173", "60400320", "3732974", "95334335", "43622452", "72204108", "1748211", "77695009", "2548959", "95158263", "30498277", "97405738", "67965770", "92695623", "92486603", "46684178", "6718", "32545083", "45506294", "43531085", "98189790", "93306051", "94714937", "49950446", "23302308", "29578008", "30735029", "89331569", "84197496", "94470429", "45770043", "40964040", "3596831", "87234469", "80943455", "29750343", "35847237", "10406848", "21888736", "55674259", "29447422", "50220648", "1886994", "38767840", "876348", "51427810", "29713544", "53688787", "83691850", "46461091", "66557165", "24951459", "15882589", "61758677", "49739322", "13256989", "53072899", "72480806", "67382174", "47380980", "78874825", "56737196", "87685890", "9634268", "57921734", "13193969", "64176671", "61698031", "4659717", "75860963", "11746889", "51408149", "61625628", "7568185", "80103548", "22274205", "21396740", "31626419", "24546108", "11481864", "49989670", "27905370", "6853962", "13193969", "19087894", "64271974", "33907313", "67212344", "37305236", "30257761", "71534318", "98103492", "90823434", "77610836", "92989234", "90960154", "13780271", "76310824", "89661575", "69200209", "20651540", "29349124", "71566945", "55207878", "91073091", "44898221", "54438818", "9399794", "43053394", "42689214", "12379785", "94019550", "52821053", "84319149", "90186411", "43968100", "74088342", "76022339", "75869056", "46478601", "47321707", "85987358", "50844169", "14077454", "2991349", "22965541", "80719780", "50025790", "88296677", "77487425", "42082341", "26232747", "34400156", "27648636", "83188050", "92069893", "29828280", "1365567", "90446049", "98189790", "98209380", "96682296", "62413687", "85996918", "17272399", "84720931", "53688787", "28472578", "26617547", "36694178", "76322850", "99033173", "30676687", "90352623", "38911938", "46325855", "92920784", "3427256", "29168279", "66524831", "9406739", "12204933", "24085106", "95205824", "64572293", "1971261", "1379952", "67950743", "8358570", "73230618", "77660631", "90063304", "46005913", "13727240", "2850118", "41129081", "1125492", "64424014", "75937990", "50720410", "53047720", "89540786"],
+ "labels": ["Flavor", "Malt", "Grainy", "Husky", "Oat", "Rice", "Bready", "Bread", "Bread Crust", "Sourdough", "Biscuit", "Craker", "Toast", "Nutty", "Hazelnut", "Almond", "Walnut", "Sweety", "Honey", "Caramel", "Molasse", "Toffee", "Chocolate", "Roasty", "Coffee", "Burnt Sugar", "Smoke", "Fruity", "Raisin", "Prune", "Date", "Not Found", "Hops", "Citrusy", "Grapefruit", "Orange", "Mandarin", "Tangerine", "Lemon", "Lime", "Tropical", "Papaya", "Pineapple", "Mango", "Passion Fruit", "Lychee", "Floral", "Perfumey", "Rose", "Geranium", "Lavender", "Jasmin", "Chamomile", "Herbal", "Hay", "Thyme", "Minty", "Grassy", "Oregano", "Lemongrass", "Woody", "Pine", "Resinous", "Eucalyptus", "Marijuana", "Berry", "Grape", "Raspberry", "Earthy", "Cheesy", "Catty", "Spicy", "Not Found", "Fermentation", "Esters", "Pear", "Banana", "Ripe Apple", "Bubblegum", "Apricot", "Quince", "Berry", "Citrus", "Dried Fruit", "Grape", "Phenols", "Clove", "Black Pepper", "White Pepper", "Nutmeg", "Hot Spicy", "Wild", "Brett", "Barnyard", "Musty", "Soil", "Beet", "Clean", "Others", "Acid", "Lactic", "Acetic", "Cidery", "Citric", "Mineral", "Gypsum", "Chalky", "Salty", "Sugar", "Turbinado", "Molasse", "Spicy", "Coriander", "Celery", "Ginger", "Licorice", "Fennel", "Star anise", "Pepper", "Grains of paradise", "Vanilla", "Vinous", "Maderized", "Winey", "Wood", "Oak", "Rosewood", "Flaws", "Acetaldehyde", "Fresh-cut Green Apple", "Notes of Grass", "Notes of Green leaves", "Latex paint", "Alcoholic", "Spicy", "Vinous character", "Fusel", "Diacetyl", "Artificial Butter", "Butterscotch", "Toffee", "DMS/Vegetal", "Cooked Corn", "Cooked Celery", "Cabbage", "Cooked Onion", "Estery", "Rose", "Fruits", "Grassy", "Fresh cut grass", "Ligth-Struck", "Earthy", "Mushroom", "Beet", "Moldy", "Oxidized", "Stale", "Winy/vinous", "Cardboard", "Sherry like", "Phenolic", "Spicy", "Smoky", "Plastic", "Adhesive strip", "Medicinal", "Solvent", "Fusel", "Acetone", "Lacquer thinner", "Sulfur", "Rotten Eggs", "Burning Matches", "Vegetal", "Cooked", "Canned", "Rotten", "Cabbage, Onion, Celery", "Yeasty", "Bready", "Sulfury", "Yeast like"],
+ "parents": ["", "33265904", "96355173", "60400320", "60400320", "60400320", "96355173", "72204108", "72204108", "72204108", "72204108", "72204108", "72204108", "96355173", "67965770", "67965770", "67965770", "96355173", "6718", "6718", "6718", "6718", "6718", "96355173", "94714937", "94714937", "94714937", "96355173", "30735029", "30735029", "30735029", "96355173", "33265904", "40964040", "3596831", "3596831", "3596831", "3596831", "3596831", "3596831", "40964040", "55674259", "55674259", "55674259", "55674259", "55674259", "40964040", "51427810", "51427810", "51427810", "51427810", "51427810", "51427810", "40964040", "15882589", "15882589", "15882589", "15882589", "15882589", "15882589", "40964040", "47380980", "47380980", "47380980", "47380980", "40964040", "57921734", "57921734", "40964040", "61698031", "61698031", "40964040", "40964040", "33265904", "61625628", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "7568185", "61625628", "19087894", "19087894", "19087894", "19087894", "19087894", "61625628", "71534318", "71534318", "71534318", "71534318", "71534318", "61625628", "33265904", "76310824", "89661575", "89661575", "89661575", "89661575", "76310824", "55207878", "55207878", "55207878", "76310824", "9399794", "9399794", "76310824", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "12379785", "76310824", "47321707", "47321707", "76310824", "14077454", "14077454", "33265904", "80719780", "50025790", "50025790", "50025790", "50025790", "80719780", "34400156", "34400156", "34400156", "80719780", "29828280", "29828280", "29828280", "80719780", "98209380", "98209380", "98209380", "98209380", "80719780", "84720931", "84720931", "80719780", "26617547", "80719780", "80719780", "99033173", "99033173", "99033173", "80719780", "46325855", "46325855", "46325855", "46325855", "80719780", "9406739", "9406739", "9406739", "9406739", "9406739", "80719780", "1379952", "1379952", "1379952", "80719780", "77660631", "77660631", "80719780", "13727240", "13727240", "13727240", "13727240", "80719780", "75937990", "75937990", "75937990"],
"text": ["Flavor", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", " Capsicum", "", "", "", "", "", "", " Clean Fermentation", "", "", "", " Vinegar", "", "", "", " plaster", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""],
"values": [1, 0.19999999000000002, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.004761892857142858, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.005714273428571429, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.009523795714285715, 0.009523795714285715, 0.009523795714285715, 0.028571417142857145, 0.19999999000000002, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.004444432222222222, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.003703691851851852, 0.022222211111111112, 0.005555542777777778, 0.005555542777777778, 0.005555542777777778, 0.005555542777777778, 0.022222211111111112, 0.011111095555555556, 0.011111095555555556, 0.022222211111111112, 0.011111095555555556, 0.011111095555555556, 0.022222211111111112, 0.022222211111111112, 0.19999999000000002, 0.0499999875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.00499998875, 0.0499999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0499999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0099999875, 0.0499999875, 0.19999999000000002, 0.033333321666666665, 0.008333320416666666, 0.008333320416666666, 0.008333320416666666, 0.008333320416666666, 0.033333321666666665, 0.011111097222222222, 0.011111097222222222, 0.011111097222222222, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.033333321666666665, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.0037036924074074075, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.033333321666666665, 0.01666665083333333, 0.01666665083333333, 0.19999999000000002, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.007142841785714287, 0.007142841785714287, 0.014285703571428573, 0.014285693571428573, 0.014285703571428573, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.0028571307142857146, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191, 0.014285703571428573, 0.007142841785714287, 0.007142841785714287, 0.014285703571428573, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.0035714158928571433, 0.014285703571428573, 0.004761891190476191, 0.004761891190476191, 0.004761891190476191]
}]
diff --git a/src/js/AppIcons.js b/src/js/AppIcons.js
index dedb0c0..b1e2a29 100644
--- a/src/js/AppIcons.js
+++ b/src/js/AppIcons.js
@@ -1,156 +1,76 @@
exports.userIcon = "M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"
-exports.beerIcon = "M 567.00,31.91" +
- " C 584.63,33.12 601.77,36.15 619.00,40.12" +
- " 629.08,42.44 637.56,44.06 647.00,48.81" +
- " 654.46,52.56 661.69,58.44 668.00,63.87" +
- " 677.21,71.80 685.46,81.47 689.77,93.00" +
- " 693.48,102.94 693.38,111.71 694.09,122.00" +
- " 695.01,135.46 697.33,141.86 692.96,156.00" +
- " 689.90,165.91 681.95,172.56 681.22,182.00" +
- " 680.81,187.28 686.13,207.40 687.58,214.00" +
- " 689.19,221.37 693.29,244.31 692.91,251.00" +
- " 692.91,251.00 692.00,261.00 692.00,261.00" +
- " 691.90,269.86 692.37,276.31 689.30,285.00" +
- " 689.30,285.00 677.49,311.00 677.49,311.00" +
- " 673.98,324.02 675.02,337.66 675.00,351.00" +
- " 675.00,351.00 674.05,363.00 674.05,363.00" +
- " 674.05,363.00 674.05,378.00 674.05,378.00" +
- " 674.05,378.00 675.00,388.00 675.00,388.00" +
- " 675.00,388.00 675.00,397.00 675.00,397.00" +
- " 676.46,417.12 678.90,438.74 685.03,458.00" +
- " 690.40,474.88 698.82,496.55 707.31,512.00" +
- " 707.31,512.00 717.94,528.00 717.94,528.00" +
- " 717.94,528.00 729.42,549.00 729.42,549.00" +
- " 729.42,549.00 751.99,584.00 751.99,584.00" +
- " 763.93,604.33 772.08,624.52 781.42,646.00" +
- " 781.42,646.00 788.58,662.00 788.58,662.00" +
- " 788.58,662.00 795.88,690.00 795.88,690.00" +
- " 795.88,690.00 800.55,707.00 800.55,707.00" +
- " 800.55,707.00 804.42,735.00 804.42,735.00" +
- " 806.24,746.70 808.98,762.39 809.00,774.00" +
- " 809.00,774.00 809.00,804.00 809.00,804.00" +
- " 809.00,804.00 810.04,816.00 810.04,816.00" +
- " 810.04,816.00 810.04,826.00 810.04,826.00" +
- " 811.94,844.57 816.50,862.84 823.87,880.00" +
- " 830.54,895.52 846.02,916.68 854.99,932.00" +
- " 854.99,932.00 871.68,962.00 871.68,962.00" +
- " 871.68,962.00 880.45,984.00 880.45,984.00" +
- " 880.45,984.00 889.56,1006.00 889.56,1006.00" +
- " 889.56,1006.00 900.21,1050.00 900.21,1050.00" +
- " 903.72,1066.50 907.97,1081.86 908.00,1099.00" +
- " 908.00,1099.00 908.00,1163.00 908.00,1163.00" +
- " 908.00,1163.00 907.09,1175.00 907.09,1175.00" +
- " 907.09,1175.00 906.00,1204.00 906.00,1204.00" +
- " 906.00,1204.00 908.82,1231.00 908.82,1231.00" +
- " 908.82,1231.00 905.09,1254.00 905.09,1254.00" +
- " 904.75,1259.36 906.31,1266.49 906.91,1272.00" +
- " 906.91,1272.00 906.91,1291.00 906.91,1291.00" +
- " 906.91,1291.00 906.05,1301.00 906.05,1301.00" +
- " 906.05,1301.00 906.05,1320.00 906.05,1320.00" +
- " 906.05,1320.00 906.90,1332.00 906.90,1332.00" +
- " 906.90,1332.00 906.04,1339.00 906.04,1339.00" +
- " 906.04,1339.00 906.04,1349.00 906.04,1349.00" +
- " 906.04,1349.00 905.00,1369.00 905.00,1369.00" +
- " 905.00,1369.00 906.00,1382.00 906.00,1382.00" +
- " 906.13,1393.42 906.16,1404.66 904.72,1416.00" +
- " 904.72,1416.00 900.00,1448.00 900.00,1448.00" +
- " 900.00,1448.00 900.00,1486.00 900.00,1486.00" +
- " 900.00,1486.00 899.08,1499.00 899.08,1499.00" +
- " 899.08,1499.00 899.95,1507.00 899.95,1507.00" +
- " 899.95,1507.00 899.95,1521.00 899.95,1521.00" +
- " 899.95,1521.00 899.00,1535.00 899.00,1535.00" +
- " 899.00,1535.00 898.00,1553.00 898.00,1553.00" +
- " 898.00,1553.00 898.00,1603.00 898.00,1603.00" +
- " 898.00,1603.00 894.32,1651.00 894.32,1651.00" +
- " 894.32,1651.00 895.00,1661.00 895.00,1661.00" +
- " 895.00,1661.00 895.00,1674.00 895.00,1674.00" +
- " 895.00,1674.00 893.82,1690.42 893.82,1690.42" +
- " 893.82,1690.42 894.79,1707.00 894.79,1707.00" +
- " 894.79,1707.00 891.00,1736.00 891.00,1736.00" +
- " 891.00,1736.00 891.00,1755.00 891.00,1755.00" +
- " 891.00,1755.00 890.00,1771.00 890.00,1771.00" +
- " 890.00,1771.00 890.00,1859.00 890.00,1859.00" +
- " 890.00,1859.00 889.00,1874.00 889.00,1874.00" +
- " 889.00,1874.00 887.91,1900.00 887.91,1900.00" +
- " 887.91,1900.00 887.00,1910.00 887.00,1910.00" +
- " 886.75,1931.63 884.33,1936.63 879.65,1957.00" +
- " 873.54,1983.63 869.20,1998.51 859.00,2024.00" +
- " 849.52,2047.70 840.58,2072.30 823.70,2092.00" +
- " 815.18,2101.94 808.32,2106.51 798.00,2113.86" +
- " 768.19,2135.09 737.19,2146.08 702.00,2154.87" +
- " 702.00,2154.87 677.00,2161.35 677.00,2161.35" +
- " 677.00,2161.35 620.00,2171.72 620.00,2171.72" +
- " 620.00,2171.72 559.00,2178.00 559.00,2178.00" +
- " 559.00,2178.00 542.00,2179.00 542.00,2179.00" +
- " 542.00,2179.00 521.00,2180.00 521.00,2180.00" +
- " 521.00,2180.00 453.00,2180.00 453.00,2180.00" +
- " 442.45,2179.87 413.24,2176.87 403.00,2174.58" +
- " 403.00,2174.58 381.00,2167.43 381.00,2167.43" +
- " 381.00,2167.43 359.00,2162.58 359.00,2162.58" +
- " 359.00,2162.58 346.00,2159.21 346.00,2159.21" +
- " 346.00,2159.21 313.00,2153.99 313.00,2153.99" +
- " 313.00,2153.99 285.00,2144.43 285.00,2144.43" +
- " 285.00,2144.43 266.00,2139.57 266.00,2139.57" +
- " 241.51,2132.59 217.28,2121.62 198.00,2104.71" +
- " 190.73,2098.34 181.10,2086.66 174.58,2079.00" +
- " 166.80,2069.87 158.55,2060.66 152.89,2050.00" +
- " 152.89,2050.00 138.20,2014.00 138.20,2014.00" +
- " 138.20,2014.00 127.03,1986.00 127.03,1986.00" +
- " 121.29,1967.91 118.03,1941.99 118.00,1923.00" +
- " 118.00,1923.00 116.09,1896.00 116.09,1896.00" +
- " 116.09,1896.00 114.83,1875.00 114.83,1875.00" +
- " 114.83,1875.00 112.32,1850.00 112.32,1850.00" +
- " 112.32,1850.00 116.00,1819.00 116.00,1819.00" +
- " 116.00,1819.00 116.00,1778.00 116.00,1778.00" +
- " 116.00,1778.00 117.00,1761.00 117.00,1761.00" +
- " 117.00,1761.00 117.00,1717.00 117.00,1717.00" +
- " 117.00,1717.00 114.08,1690.00 114.08,1690.00" +
- " 114.08,1690.00 119.00,1653.00 119.00,1653.00" +
- " 119.00,1653.00 118.00,1632.00 118.00,1632.00" +
- " 118.00,1632.00 118.00,1479.00 118.00,1479.00" +
- " 118.00,1479.00 119.00,1463.00 119.00,1463.00" +
- " 119.00,1463.00 118.00,1447.00 118.00,1447.00" +
- " 118.00,1447.00 118.00,1421.00 118.00,1421.00" +
- " 118.00,1421.00 119.00,1404.00 119.00,1404.00" +
- " 119.00,1404.00 119.00,1355.00 119.00,1355.00" +
- " 119.00,1355.00 114.15,1318.00 114.15,1318.00" +
- " 113.86,1305.50 112.54,1301.37 114.15,1288.00" +
- " 115.69,1277.27 118.98,1271.03 119.00,1259.00" +
- " 119.00,1259.00 119.00,1142.00 119.00,1142.00" +
- " 119.00,1142.00 116.00,1115.00 116.00,1115.00" +
- " 115.71,1090.21 119.71,1092.37 123.58,1071.00" +
- " 123.58,1071.00 129.25,1040.00 129.25,1040.00" +
- " 129.25,1040.00 132.04,1022.00 132.04,1022.00" +
- " 135.75,1009.20 144.44,991.24 150.22,979.00" +
- " 150.22,979.00 171.26,935.00 171.26,935.00" +
- " 179.33,919.36 185.18,914.94 194.28,902.00" +
- " 203.97,888.22 210.67,875.87 216.31,860.00" +
- " 224.96,835.66 223.87,826.07 226.17,802.00" +
- " 226.17,802.00 227.83,789.00 227.83,789.00" +
- " 227.83,789.00 230.17,755.00 230.17,755.00" +
- " 232.50,730.54 240.04,697.41 247.67,674.00" +
- " 260.43,634.87 276.72,602.85 298.42,568.00" +
- " 298.42,568.00 322.31,532.00 322.31,532.00" +
- " 338.24,507.26 354.31,476.27 362.58,448.00" +
- " 367.99,429.47 370.77,410.20 372.09,391.00" +
- " 372.09,391.00 373.00,381.00 373.00,381.00" +
- " 373.00,381.00 374.00,361.00 374.00,361.00" +
- " 374.00,361.00 375.00,340.00 375.00,340.00" +
- " 375.00,340.00 375.00,312.00 375.00,312.00" +
- " 374.97,295.31 369.17,292.54 365.04,279.00" +
- " 362.45,270.51 362.90,262.77 363.00,254.00" +
- " 363.12,244.09 367.49,217.11 369.88,207.00" +
- " 371.47,200.30 376.21,183.79 376.28,178.00" +
- " 376.40,169.16 371.68,164.37 368.44,157.00" +
- " 365.19,149.60 364.91,144.89 365.00,137.00" +
- " 365.16,123.56 368.99,110.70 372.98,98.00" +
- " 376.93,85.42 381.94,72.35 392.04,63.30" +
- " 409.64,47.52 435.73,42.53 458.00,37.79" +
- " 469.68,35.30 477.63,32.02 490.00,32.00" +
- " 490.00,32.00 508.00,32.00 508.00,32.00" +
- " 508.00,32.00 518.00,31.09 518.00,31.09" +
- " 518.00,31.09 529.00,30.42 529.00,30.42" +
- " 541.65,28.88 554.40,31.05 567.00,31.91 Z";
+exports.beerIcon = "M 270.00,21.00" +
+ " C 274.24,21.06 278.52,21.47 281.26,25.21" +
+ " 284.20,29.22 281.81,32.71 282.96,38.00" +
+ " 284.11,43.24 286.65,46.02 286.96,52.00" +
+ " 287.34,59.47 285.33,61.79 284.75,68.00" +
+ " 284.75,68.00 284.75,81.00 284.75,81.00" +
+ " 285.01,89.12 286.02,108.44 287.66,116.00" +
+ " 291.13,132.00 296.97,144.95 296.95,162.00" +
+ " 296.95,162.00 296.95,170.00 296.95,170.00" +
+ " 296.91,177.09 294.46,186.22 296.95,193.00" +
+ " 299.23,199.82 308.15,206.18 313.08,213.00" +
+ " 321.49,224.64 326.98,241.64 327.00,256.00" +
+ " 327.00,256.00 327.00,410.00 327.00,410.00" +
+ " 327.00,410.00 328.00,426.00 328.00,426.00" +
+ " 328.00,426.00 327.00,446.00 327.00,446.00" +
+ " 326.89,454.92 324.55,467.78 319.07,474.96" +
+ " 313.67,482.04 305.30,484.69 297.04,486.71" +
+ " 280.03,490.86 263.39,491.20 246.00,491.00" +
+ " 235.55,490.87 221.26,488.05 211.00,485.65" +
+ " 203.24,483.84 195.62,481.78 190.64,474.98" +
+ " 186.14,468.85 185.01,461.38 185.00,454.00" +
+ " 185.00,454.00 184.00,434.00 184.00,434.00" +
+ " 184.00,434.00 184.84,416.00 184.84,416.00" +
+ " 184.84,416.00 184.84,407.00 184.84,407.00" +
+ " 184.84,407.00 184.84,375.00 184.84,375.00" +
+ " 184.84,375.00 184.84,324.00 184.84,324.00" +
+ " 184.84,324.00 184.84,313.00 184.84,313.00" +
+ " 184.84,313.00 184.84,297.00 184.84,297.00" +
+ " 184.84,297.00 184.84,291.00 184.84,291.00" +
+ " 184.84,291.00 184.02,283.00 184.02,283.00" +
+ " 184.02,283.00 184.02,268.00 184.02,268.00" +
+ " 183.88,250.22 184.37,232.70 193.93,217.00" +
+ " 200.07,206.90 210.24,200.83 213.09,193.00" +
+ " 215.67,186.42 213.55,179.72 213.09,173.00" +
+ " 213.09,173.00 213.09,162.00 213.09,162.00" +
+ " 213.03,145.41 217.48,136.32 221.12,121.00" +
+ " 222.99,113.10 224.99,96.08 224.91,88.00" +
+ " 224.91,88.00 224.91,67.00 224.91,67.00" +
+ " 224.28,62.49 222.11,58.63 222.38,54.00" +
+ " 222.73,47.80 225.38,43.46 226.87,38.00" +
+ " 228.92,30.52 223.66,26.78 233.00,21.74" +
+ " 238.78,20.34 262.59,20.90 270.00,21.00 Z" +
+ " M 248.00,26.00" +
+ " C 242.33,26.01 236.07,26.14 234.40,33.00" +
+ " 233.77,36.02 235.20,38.36 234.40,42.00" +
+ " 233.51,45.41 230.86,48.54 230.18,54.00" +
+ " 229.03,63.26 231.85,65.85 232.14,71.42" +
+ " 232.74,83.04 232.00,97.41 230.83,109.00" +
+ " 228.59,131.38 219.72,144.50 220.00,169.00" +
+ " 220.09,176.03 223.17,188.08 220.85,194.00" +
+ " 218.89,199.01 208.55,208.29 204.24,214.00" +
+ " 195.98,224.92 192.02,239.42 192.00,253.00" +
+ " 192.00,253.00 192.00,444.00 192.00,444.00" +
+ " 192.01,451.88 193.08,464.53 197.80,470.96" +
+ " 204.61,480.24 227.88,484.76 239.00,485.00" +
+ " 235.84,480.41 222.85,479.79 217.00,476.59" +
+ " 204.43,469.69 203.06,455.91 203.00,443.00" +
+ " 203.00,443.00 203.00,254.00 203.00,254.00" +
+ " 203.02,241.56 206.92,226.00 214.52,216.00" +
+ " 221.71,206.55 233.66,200.40 232.67,187.00" +
+ " 232.05,171.78 229.81,168.61 232.67,152.00" +
+ " 235.67,131.55 242.96,121.78 243.00,95.00" +
+ " 243.00,95.00 243.51,71.00 243.51,71.00" +
+ " 243.20,66.63 240.63,63.77 241.10,57.00" +
+ " 241.52,50.85 244.18,47.47 245.48,43.00" +
+ " 246.46,38.84 245.12,36.67 245.48,34.00" +
+ " 246.35,29.86 249.88,28.18 253.00,26.00" +
+ " 253.00,26.00 248.00,26.00 248.00,26.00 Z" +
+ " M 285.00,490.00" +
+ " C 285.00,490.00 284.00,491.00 284.00,491.00" +
+ " 284.00,491.00 284.00,490.00 284.00,490.00" +
+ " 284.00,490.00 285.00,490.00 285.00,490.00 Z";
exports.lowIcon = "M18.77 13.36a1 1 0 0 0-1.41-.13L13 16.86V5a1 1 0 0 0-2 0v11.86l-4.36-3.63a1 1 0 1 0-1.28 1.54l6 5 .15.09.13.07a1 1 0 0 0 .72 0l.13-.07.15-.09 6-5a1 1 0 0 0 .13-1.41z"
exports.mediumLowIcon = "M17 8a1 1 0 0 0-1 1v5.59l-8.29-8.3a1 1 0 0 0-1.42 1.42l8.3 8.29H9a1 1 0 0 0 0 2h8a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1z"
diff --git a/src/js/Overall.js b/src/js/Overall.js
index 4bfac86..9f6bc30 100644
--- a/src/js/Overall.js
+++ b/src/js/Overall.js
@@ -10,7 +10,7 @@ const ACCURACY_OPTIONS = [
{id: 2, text: 'Style Deficiency'},
{id: 3, text: 'Almost on Target'},
{id: 4, text: 'Classic'},
- {id: 5, text: 'World class'}
+ {id: 5, text: 'World Class'}
];
const TECHNICAL_OPTIONS = [
diff --git a/src/js/PdfRenderer.js b/src/js/PdfRenderer.js
index 691490f..c8ca47c 100644
--- a/src/js/PdfRenderer.js
+++ b/src/js/PdfRenderer.js
@@ -1,5 +1,6 @@
import jsPDF from 'jspdf';
+
function getScore(score) {
if (score === undefined || score == 0) return '';
if (score <= 13) return "Problematic";
@@ -30,6 +31,10 @@ const formatter = new Intl.DateTimeFormat('default', {
second: '2-digit'
});
+function pdfUnescape(value) {
+ return value.replace(/\\\\/g, '\\').replace(/\\\(/g, '(').replace(/\\\)/g, ')');
+}
+
class PdfRenderer {
constructor(title, score) {
@@ -128,7 +133,7 @@ class PdfRenderer {
'author': username,
'subject': 'Entry # ' + entry + ' Category:' + category,
'creator': 'beer-feedback v' + version,
- 'keywords': json
+ 'keywords': escape(json),
});
}
@@ -156,8 +161,13 @@ function parsePDF(text, updateData) {
var lines = text.split('\n');
for (var i = 0; i < lines.length; i++) {
if (lines[i].startsWith('/Keywords (')) {
- console.log("Got: " + lines[i].slice(11, -1));
- updateData(JSON.parse(lines[i].slice(11, -1)));
+ let json = lines[i].slice(11, -1)
+ console.log("Got data: " + json);
+ if (!json.startsWith('{')) {
+ json = unescape(json);
+ console.log("Got json: " + json);
+ }
+ updateData(JSON.parse(json));
return;
}
}