Merge pull request #196 from cleanerx/master

F: #187 Add gauges and improve control
OpenSeaMap · Feb 20, 2017 · 91e1b70 · 91e1b70
2 parents e5b7bd7 + df0e93e
commit 91e1b70
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git 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' ;
     }
 });
diff --git a/src/js/oseam-views-gauges.js b/src/js/oseam-views-gauges.js
@@ -105,8 +105,10 @@ 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()
+            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
@@ -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,

diff --git 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
@@ -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>