From 2a3f0f53f32d5a594381c607a7eacbc2b562084e Mon Sep 17 00:00:00 2001
From: Ralph Haussmann <ralph@scanmyfood.de>
Date: Tue, 22 Jul 2014 18:57:58 +0200
Subject: [PATCH 1/3] Use an option control to select a mineral water for
 comparison

- Remove buttons and use an option control instead
- Don't let user compare his tap water with his tap water. That feature was very confusing.
---
 src/data/mineralwaesser.js |  8 ++++----
 src/index.html             | 19 ++++++++++++-------
 src/js/app.js              |  8 ++++++++
 src/js/comparison.js       | 18 +++++++-----------
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/data/mineralwaesser.js b/src/data/mineralwaesser.js
index 7649b3e..67596ff 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,
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 @@ <h1 style="display:none">Was steckt in meinem Leitungswasser?</h1>
 						</div>
 						
 						<div class="section section-compare" style="display:none;margin-top:-32px;">
+
 							<div class="row">
 								<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12 compare-nav">
-									<button type="button" class="btn btn-primary btn-lg btn-block active" data-water="volvic">Volvic</button>
-									<button type="button" class="btn btn-primary btn-lg btn-block" data-water="wueteria">Wüteria Heiligenquelle</button>
-									<button type="button" class="btn btn-primary btn-lg btn-block" data-water="teusser">Teusser Naturell</button>
-									<button type="button" class="btn btn-primary btn-lg btn-block" data-water="vittel">Vittel</button>
-									<button type="button" class="btn btn-primary btn-lg btn-block" data-water="self" style="margin-top:2em;">mein Leitungswasser</button>
+									<p>Wählen Sie ein Mineralwasser aus der Liste aus und vergleichen Sie es mit den Werten von Ihrem Leitungswasser.</p>
 									
+									<form class="form-horizontal form-choose-water" role="form">
+										<div class="form-group select-water">
+											<label for="water" class="col-sm-4 control-label">Mineralwasser</label>
+											<div class="col-sm-8">
+												<select id="water" class="water form-control">
+													<option value="Volvic">Volvic</option>
+												</select>
+											</div>
+										</div>
+									</form>
 									<p><br /></p>
 								</div>
 								<div class="col-lg-7 col-md-7 col-sm-7 col-xs-12">
@@ -372,8 +379,6 @@ <h1 style="display:none">Was steckt in meinem Leitungswasser?</h1>
 							<p><br /></p>
 							<p><br /></p>
 							<p><button type="button" class="btn btn-warning switch-to-section" data-section="explanation"><span class="glyphicon glyphicon-chevron-left"></span> Zurück</button></p>
-							<p><br /></p>
-							<p><small>Beispielhaft wurden zwei überregional bekannte Wasser sowie zwei Wasser aus dem Landkreis Heilbronn ausgewählt. Alle vier sind stille Mineralwasser.</small></p>
 						</div>
 						
 						<div class="section section-map" style="display:none;">
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;
 	};
 

From 69505b3881b5520588b3cbb6f242d756c5a154b8 Mon Sep 17 00:00:00 2001
From: Ralph Haussmann <ralph@scanmyfood.de>
Date: Tue, 22 Jul 2014 19:06:42 +0200
Subject: [PATCH 2/3] Add Krumbach mineral water

---
 src/data/mineralwaesser.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/data/mineralwaesser.js b/src/data/mineralwaesser.js
index 67596ff..0c3c7db 100644
--- a/src/data/mineralwaesser.js
+++ b/src/data/mineralwaesser.js
@@ -38,7 +38,27 @@ 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"]
+	},
 };
 
 tw.data.nutrientDailyDosis = {

From 2790ead508166a543c489a28e08abfa3fb5ed503 Mon Sep 17 00:00:00 2001
From: Ralph Haussmann <ralph@scanmyfood.de>
Date: Tue, 22 Jul 2014 19:07:03 +0200
Subject: [PATCH 3/3] Add Apollinaris mineral water

---
 src/data/mineralwaesser.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/data/mineralwaesser.js b/src/data/mineralwaesser.js
index 0c3c7db..3da30a7 100644
--- a/src/data/mineralwaesser.js
+++ b/src/data/mineralwaesser.js
@@ -59,6 +59,15 @@ tw.data.referenceWaters = {
 		"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 = {