From 78b7056c48f6cff0130526234bc7893d6363ba9b Mon Sep 17 00:00:00 2001
From: Jens Kuebler <kuebler@aquintos.com>
Date: Mon, 20 Feb 2017 23:01:54 +0100
Subject: [PATCH 1/3] F: #187 Modify controls so negative values may be added

---
 src/js/oseam-views-gauges.js               |  3 ++-
 src/js/templates/gauge.handlebars          | 10 +++++-----
 src/js/templates/gaugedialog-en.handlebars | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/js/oseam-views-gauges.js b/src/js/oseam-views-gauges.js
index 6a93d2c..deaf3e2 100644
--- a/src/js/oseam-views-gauges.js
+++ b/src/js/oseam-views-gauges.js
@@ -105,8 +105,9 @@ OSeaM.views.Gauges = OSeaM.View.extend({
             this.layerGaugeVector
         ]);
         this.map.addControls([
+        	new OpenLayers.Control.PanZoomBar(),
+            new OpenLayers.Control.Navigation(),
             new OpenLayers.Control.Attribution(),
-            new OpenLayers.Control.KeyboardDefaults()
         ]);
         this.map.setCenter(new OpenLayers.LonLat(0.0, 40.0).transform(
             this.projectionWGS84,
diff --git a/src/js/templates/gauge.handlebars b/src/js/templates/gauge.handlebars
index 53c3d06..ac8bfb3 100644
--- a/src/js/templates/gauge.handlebars
+++ b/src/js/templates/gauge.handlebars
@@ -15,21 +15,21 @@
 <div class="control-group">
     <p><label class="tableft50">Latitude</label></p>
     <div class="input-append">
-        <input type="text" id="latitude" name="latitude" placeholder="52.0" value="{{lat}}"/>
+        <input type="text" id="latitude" name="latitude" placeholder="52.0" value="{{latitude}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>
 <div class="control-group">
     <p><label class="tableft50">Longitude</label></p>
     <div class="input-append">
-        <input type="text" id="longitude" name="longitude" placeholder="1.0" value="{{lon}}"/>
+        <input type="text" id="longitude" name="longitude" placeholder="1.0" value="{{longitude}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>
-<!--<div class="control-group">
-    <p><label class="tableft50">Pegelnullpunkt</label></p>
+<div class="control-group">
+    <p><label class="tableft50">Water Reference Level</label></p>
     <div class="input-append">
-        <input type="text" id="gaugezero" name="gaugezero" placeholder="230" value="{{gaugezero}}"/>
+        <input type="text" id="waterlevel" name="waterlevel" placeholder="230" value="{{waterlevel}}"/>
         <span class="help-inline helpOsm"></span>
     </div>
 </div>-->
diff --git a/src/js/templates/gaugedialog-en.handlebars b/src/js/templates/gaugedialog-en.handlebars
index 82f57ca..c0c9490 100644
--- a/src/js/templates/gaugedialog-en.handlebars
+++ b/src/js/templates/gaugedialog-en.handlebars
@@ -40,16 +40,16 @@
 					<span class="help-inline helpOsm"></span>
 	        	</div>
 	    	</div>
-	    	<div class="control-group"><p>
-	        <label class="tableft50" for="gaugeType">Gauge Type</label></p>
-			<div class="input-append">
-			<select id="gaugeType" name="gaugeType">
-			<option value="RIVER">River</option>
-			<option value="LAKE">Lake</option>
-			<option value="SEA">Sea</option>
-			<option value="UNDEFINED">Other</option>
-			</select>
-			</div>
+	    	<div class="control-group">
+	    		<p><label class="tableft50" for="gaugeType">Gauge Type</label></p>
+				<div class="input-append">
+					<select id="gaugeType" name="gaugeType">
+					<option value="RIVER">River</option>
+					<option value="LAKE">Lake</option>
+					<option value="SEA">Sea</option>
+					<option value="UNDEFINED">Other</option>
+					</select>
+				</div>
 		    </div>
 	    </div>
     </div>

From c0fe4ccf3c106300c4aeb68ae80c583ce1e34531 Mon Sep 17 00:00:00 2001
From: Jens Kuebler <kuebler@aquintos.com>
Date: Mon, 20 Feb 2017 23:06:55 +0100
Subject: [PATCH 2/3] F: #187 fix gauge URL

---
 src/js/oseam-models-gauge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/oseam-models-gauge.js b/src/js/oseam-models-gauge.js
index c6c00ba..3e360e8 100644
--- a/src/js/oseam-models-gauge.js
+++ b/src/js/oseam-models-gauge.js
@@ -21,6 +21,6 @@ OSeaM.models.Gauge = Backbone.Model.extend({
 		
     },
     url: function() {
-    	return OSeaM.apiUrl + '/gauge' ;
+    	return OSeaM.apiUrl + 'gauge' ;
     }
 });

From df0e93e7e57e35f17ad05c8679655423a6f35b73 Mon Sep 17 00:00:00 2001
From: Jens Kuebler <kuebler@aquintos.com>
Date: Mon, 20 Feb 2017 23:11:40 +0100
Subject: [PATCH 3/3] F: #187 add mouse positions

---
 src/js/oseam-views-gauges.js    | 1 +
 src/js/oseam-views-maptracks.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/js/oseam-views-gauges.js b/src/js/oseam-views-gauges.js
index deaf3e2..9b79a54 100644
--- a/src/js/oseam-views-gauges.js
+++ b/src/js/oseam-views-gauges.js
@@ -108,6 +108,7 @@ OSeaM.views.Gauges = OSeaM.View.extend({
         	new OpenLayers.Control.PanZoomBar(),
             new OpenLayers.Control.Navigation(),
             new OpenLayers.Control.Attribution(),
+            new OpenLayers.Control.MousePosition()
         ]);
         this.map.setCenter(new OpenLayers.LonLat(0.0, 40.0).transform(
             this.projectionWGS84,
diff --git a/src/js/oseam-views-maptracks.js b/src/js/oseam-views-maptracks.js
index fa80840..c4743b8 100644
--- a/src/js/oseam-views-maptracks.js
+++ b/src/js/oseam-views-maptracks.js
@@ -226,7 +226,8 @@ OSeaM.views.MapTracks = OSeaM.View.extend({
         this.map.addControls([
             this.attributionControl,
             new OpenLayers.Control.KeyboardDefaults(),
-            new OpenLayers.Control.LayerSwitcher()
+            new OpenLayers.Control.LayerSwitcher(),
+            new OpenLayers.Control.MousePosition()
         ]);
         this.map.setCenter(new OpenLayers.LonLat(0.0, 40.0).transform(
             this.projectionWGS84,