diff --git a/src/data/mineralwaesser.js b/src/data/mineralwaesser.js
index 7649b3e..3da30a7 100644
--- a/src/data/mineralwaesser.js
+++ b/src/data/mineralwaesser.js
@@ -1,5 +1,5 @@
tw.data.referenceWaters = {
- "wueteria": {
+ "Wüteria": {
"natrium": 10.7,
"kalium": 2.6,
"calcium": 118,
@@ -9,7 +9,7 @@ tw.data.referenceWaters = {
"sulfat": 68,
"sources": ["http://www.wueteria.de/unser_wasser/index.php"]
},
- "teusser": {
+ "Teusser": {
"natrium": 53,
"kalium": 8,
"calcium": 565,
@@ -19,7 +19,7 @@ tw.data.referenceWaters = {
"sulfat": 1450,
"sources": ["http://www.teusser.de/index.php?id=225"]
},
- "volvic": {
+ "Volvic": {
"natrium": 11.6,
"kalium": 6.2,
"calcium": 11.5,
@@ -29,7 +29,7 @@ tw.data.referenceWaters = {
"sulfat": 8.1,
"sources": ["http://books.google.de/books?id=lzEoGWyqMBwC&pg=PA198&lpg=PA198&dq=volvic+nitratgehalt&source=bl&ots=pJEE0i9HwK&sig=OI_PeSr_QGBCfpeVCu70N4ohy8g&hl=de&ei=4-yvSuHrJ8jK_gbV0p3ZDA&sa=X&oi=book_result&ct=result&resnum=6#v=onepage&q&f=false"]
},
- "vittel": {
+ "Vittel": {
"natrium": 7.7,
"kalium": 5.2,
"calcium": 94,
@@ -38,7 +38,36 @@ tw.data.referenceWaters = {
"nitrat": 0.1,
"sulfat": 120,
"sources": ["http://books.google.de/books?id=lzEoGWyqMBwC&pg=PA198&lpg=PA198&dq=volvic+nitratgehalt&source=bl&ots=pJEE0i9HwK&sig=OI_PeSr_QGBCfpeVCu70N4ohy8g&hl=de&ei=4-yvSuHrJ8jK_gbV0p3ZDA&sa=X&oi=book_result&ct=result&resnum=6#v=onepage&q&f=false"]
- }
+ },
+ "Krumbach Classic": {
+ "natrium": 9.1,
+ "kalium": 2.3,
+ "calcium": 87,
+ "magnesium": 23.3,
+ "chlorid": 6.4,
+ "nitrat": 0.3,
+ "sulfat": 19,
+ "sources": ["http://www.krumbach-mineralwasser.de/sortiment-sanfter-geschmack-hat-viele-sorten1.html?pid=31&id=sort_classic"]
+ },
+ "Krumbach Medium": {
+ "natrium": 9.1,
+ "kalium": 2.3,
+ "calcium": 87,
+ "magnesium": 23.3,
+ "chlorid": 6.4,
+ "nitrat": 0.3,
+ "sulfat": 19,
+ "sources": ["http://www.krumbach-mineralwasser.de/sortiment-sanfter-geschmack-hat-viele-sorten1.html?pid=31&id=sort_classic"]
+ },
+ "Apollinaris Selection": {
+ "natrium": 0.47,
+ "kalium": 0.03,
+ "calcium": 0.09,
+ "magnesium": 0.12,
+ "chlorid": 0.13,
+ "sulfat": 0.1,
+ "sources": ["http://www.apollinaris.de/de_de/#/produkte/gastronomie/selektion"]
+ },
};
tw.data.nutrientDailyDosis = {
diff --git a/src/index.html b/src/index.html
index 0e41088..b27a60b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -256,14 +256,21 @@
Was steckt in meinem Leitungswasser?
+
-
-
-
-
-
+
Wählen Sie ein Mineralwasser aus der Liste aus und vergleichen Sie es mit den Werten von Ihrem Leitungswasser.
+
@@ -372,8 +379,6 @@
Was steckt in meinem Leitungswasser?
-
-
Beispielhaft wurden zwei überregional bekannte Wasser sowie zwei Wasser aus dem Landkreis Heilbronn ausgewählt. Alle vier sind stille Mineralwasser.
diff --git a/src/js/app.js b/src/js/app.js
index 311347f..052dd4b 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -218,6 +218,13 @@ var tw = {
$('.city').html(generateOptionsHtml(cities, true));
};
+ var setupCompareForm = function() {
+ var waters = Object.keys(tw.data.referenceWaters);
+ waters.sort();
+
+ $('.water').html(generateOptionsHtml(waters));
+ };
+
var updateSection = function() {
$('.section').hide();
$('.section-' + section).show();
@@ -245,6 +252,7 @@ var tw = {
completeReferenceWaters();
setupForm();
setupQuickForm();
+ setupCompareForm();
setupTabs('natrium');
setupSectionSwitch();
tw.gauge.init();
diff --git a/src/js/comparison.js b/src/js/comparison.js
index 35eaec3..ae06e38 100644
--- a/src/js/comparison.js
+++ b/src/js/comparison.js
@@ -113,13 +113,12 @@
};
var bottleInstance = null;
- var referenceWater = 'volvic';
- var valueLabel = 'Volvic';
+ var referenceWater = 'Vittel';
var attribute = null;
var selfValue = null;
var getValue = function() {
- return (referenceWater === 'self') ? selfValue : tw.data.referenceWaters[referenceWater][attribute];
+ return tw.data.referenceWaters[referenceWater][attribute];
};
var getUnit = function() {
@@ -132,7 +131,7 @@
var updateDescription = function() {
d3.selectAll('.comparison-water-value').text(formatValue(tw.utils.getMeanValue(getValue())) + ' ' + getUnit());
- d3.selectAll('.comparison-water-label').text(valueLabel);
+ d3.selectAll('.comparison-water-label').text(referenceWater);
};
var update = function(newAttribute, value) {
@@ -151,12 +150,7 @@
};
var updateReferenceWater = function() {
- d3.select('.compare-nav').selectAll('button').classed('active', false);
-
- var currentElement = d3.select(this);
- currentElement.classed('active', true);
- referenceWater = currentElement.attr('data-water');
- valueLabel = currentElement.text();
+ referenceWater = $('#water option:selected').text();
updateDescription();
bottleInstance.applyValue(getValue());
@@ -164,7 +158,9 @@
var init = function() {
bottleInstance = new Bottle(d3.select('.bottle-img'));
- d3.select('.compare-nav').selectAll('button').on('click', updateReferenceWater);
+ $('#water').on('change', updateReferenceWater);
+ $("#water option[value='" + referenceWater + "']").attr('selected', true);
+
return this;
};