Merge pull request #1198 from ditorelo/1092

#1092: Fixing Long, Lat order on mouse hover
ushahidi · Aug 18, 2013 · b8f71a1 · b8f71a1
2 parents 369b9ca + fe768a0
commit b8f71a1
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/application/views/admin/manage/actions/actions_js.php b/application/views/admin/manage/actions/actions_js.php
@@ -44,7 +44,9 @@
 
 	map.addControl(new OpenLayers.Control.Navigation());
 	map.addControl(new OpenLayers.Control.Zoom());
-	map.addControl(new OpenLayers.Control.MousePosition());
+	map.addControl(new OpenLayers.Control.MousePosition({
+		formatOutput: Ushahidi.convertLongLat
+	}));
 	map.addControl(new OpenLayers.Control.ScaleLine());
 	map.addControl(new OpenLayers.Control.Scale('mapScale'));
 	map.addControl(new OpenLayers.Control.LayerSwitcher());

diff --git a/application/views/admin/reporters/reporters_js.php b/application/views/admin/reporters/reporters_js.php
@@ -135,7 +135,9 @@ function showMap()
 
 	map.addControl(new OpenLayers.Control.Navigation());
 	map.addControl(new OpenLayers.Control.Zoom());
-	map.addControl(new OpenLayers.Control.MousePosition());
+	map.addControl(new OpenLayers.Control.MousePosition({
+		formatOutput: Ushahidi.convertLongLat	
+	}));
 	map.addControl(new OpenLayers.Control.LayerSwitcher());
 
 	// Create the markers layer

diff --git a/application/views/admin/settings/settings_js.php b/application/views/admin/settings/settings_js.php
@@ -29,7 +29,9 @@
 		mapControls: [
 		    new OpenLayers.Control.Navigation({ dragPanOptions: { enableKinetic: true } }),
 		    new OpenLayers.Control.Zoom(),
-		    new OpenLayers.Control.MousePosition()
+		    new OpenLayers.Control.MousePosition({
+				formatOutput: Ushahidi.convertLongLat
+			})
 		],
 
 		// Base layers

diff --git a/application/views/map_common_js.php b/application/views/map_common_js.php
@@ -50,7 +50,9 @@ function createMap(targetElement, lat, lon, zoomLevel, options, controls)
 				new OpenLayers.Control.Navigation({ dragPanOptions: { enableKinetic: true } }),
 				new OpenLayers.Control.Zoom(),
 				new OpenLayers.Control.Attribution(),
-				new OpenLayers.Control.MousePosition(),
+				new OpenLayers.Control.MousePosition({
+					formatOutput: Ushahidi.convertLongLat
+				}),
 				new OpenLayers.Control.LayerSwitcher()
 			]);
 		} else if (controls.length > 0) {

diff --git a/media/js/ushahidi.js b/media/js/ushahidi.js
@@ -404,7 +404,9 @@
 				new OpenLayers.Control.Navigation({ dragPanOptions: { enableKinetic: true } }),
 				new OpenLayers.Control.Zoom(),
 				new OpenLayers.Control.Attribution(),
-				new OpenLayers.Control.MousePosition(),
+				new OpenLayers.Control.MousePosition({
+					formatOutput: Ushahidi.convertLongLat
+				}),
 				new OpenLayers.Control.LayerSwitcher()
 			];
 		} else {
@@ -1172,4 +1174,12 @@
 		}
 	}
 
+
+	/**
+	 * Helper method: convert LongLat
+	 * Converts LongLat coordinates from Open Layers to "lat, long"
+	 */
+	Ushahidi.convertLongLat = function(longLat) {
+		return longLat.lat.toFixed(5) + ", " + longLat.lon.toFixed(5)
+	}
 })();
diff --git a/themes/default/views/main/main_js.php b/themes/default/views/main/main_js.php
@@ -183,7 +183,7 @@ function refreshTimeline(options) {
 			new OpenLayers.Control.Zoom(),
 			new OpenLayers.Control.MousePosition({
 				div: document.getElementById('mapMousePosition'),
-				numdigits: 5
+				formatOutput: Ushahidi.convertLongLat
 			}),
 			new OpenLayers.Control.Scale('mapScale'),
 			new OpenLayers.Control.ScaleLine(),

diff --git a/themes/default/views/reports/submit_edit_js.php b/themes/default/views/reports/submit_edit_js.php
@@ -86,7 +86,9 @@ function remove() {
 			map.addLayers(<?php echo map::layers_array(FALSE); ?>);
 			map.addControl(new OpenLayers.Control.Navigation());
 			map.addControl(new OpenLayers.Control.Zoom());
-			map.addControl(new OpenLayers.Control.MousePosition());
+			map.addControl(new OpenLayers.Control.MousePosition({
+				formatOutput: Ushahidi.convertLongLat
+			}));
 			map.addControl(new OpenLayers.Control.ScaleLine());
 			map.addControl(new OpenLayers.Control.Scale('mapScale'));
 			map.addControl(new OpenLayers.Control.LayerSwitcher());

diff --git a/themes/default/views/reports/view_js.php b/themes/default/views/reports/view_js.php
@@ -39,7 +39,9 @@
 		mapControls: [
 			new OpenLayers.Control.Navigation({ dragPanOptions: { enableKinetic: true } }),
 			new OpenLayers.Control.Zoom(),
-			new OpenLayers.Control.MousePosition(),
+			new OpenLayers.Control.MousePosition({
+				formatOutput: Ushahidi.convertLongLat
+			}),
 			new OpenLayers.Control.ScaleLine(),
 			new OpenLayers.Control.Scale('mapScale'),
 			new OpenLayers.Control.LayerSwitcher(),