ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MousePosition: numDigits inconsistency, reported by kthy, patch by kthy, additional test by me, r=me (closes #1544)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7163 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2008-05-13 20:52:01 +00:00
parent bc56ec9afa
commit e02e7504c5
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Control/MousePosition.js
+2 -2
View File
@@ -40,7 +40,7 @@ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
* APIProperty: numDigits * APIProperty: numDigits
* {Integer} * {Integer}
*/ */
numdigits: 5, numDigits: 5,
/** /**
* APIProperty: granularity * APIProperty: granularity
@@ -144,7 +144,7 @@ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
* lonLat - {<OpenLayers.LonLat>} Location to display * lonLat - {<OpenLayers.LonLat>} Location to display
*/ */
formatOutput: function(lonLat) { formatOutput: function(lonLat) {
var digits = parseInt(this.numdigits); var digits = parseInt(this.numDigits);
var newHtml = var newHtml =
this.prefix + this.prefix +
lonLat.lon.toFixed(digits) + lonLat.lon.toFixed(digits) +
tests/Control/MousePosition.html
+17 -7
View File
@@ -3,14 +3,14 @@
<script src="../../lib/OpenLayers.js"></script> <script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var map, control; var map, control;
function test_Control_MousePosition_constructor (t) { function test_initialize (t) {
t.plan( 2 ); t.plan( 2 );
control = new OpenLayers.Control.MousePosition(); control = new OpenLayers.Control.MousePosition();
t.ok( control instanceof OpenLayers.Control.MousePosition, "new OpenLayers.Control returns object" ); t.ok( control instanceof OpenLayers.Control.MousePosition, "new OpenLayers.Control returns object" );
t.eq( control.displayClass, "olControlMousePosition", "displayClass is correct" ); t.eq( control.displayClass, "olControlMousePosition", "displayClass is correct" );
} }
function test_Control_MousePosition_redraw_noLayer_displayProjection(t) { function test_redraw_noLayer_displayProjection(t) {
t.plan(2); t.plan(2);
control = new OpenLayers.Control.MousePosition({'displayProjection': new OpenLayers.Projection("WGS84")}); control = new OpenLayers.Control.MousePosition({'displayProjection': new OpenLayers.Projection("WGS84")});
map = new OpenLayers.Map('map'); map = new OpenLayers.Map('map');
@@ -25,7 +25,7 @@
control.redraw({'xy': new OpenLayers.Pixel(12,12)}); control.redraw({'xy': new OpenLayers.Pixel(12,12)});
t.eq(control.div.innerHTML, "-175.78125, 85.78125", "innerHTML set correctly when triggered."); t.eq(control.div.innerHTML, "-175.78125, 85.78125", "innerHTML set correctly when triggered.");
} }
function test_MousePosition_destroy(t) { function test_destroy(t) {
t.plan(1); t.plan(1);
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -38,8 +38,7 @@
t.eq(map.events.listeners.mousemove.length, listeners - 1, "mousemove event is unregistered"); t.eq(map.events.listeners.mousemove.length, listeners - 1, "mousemove event is unregistered");
map.destroy(); map.destroy();
} }
function test_addControl(t) {
function test_MousePosition_addControl(t) {
t.plan(4); t.plan(4);
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -52,8 +51,7 @@
t.eq(parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Viewport div contains control div"); t.eq(parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Viewport div contains control div");
map.destroy(); map.destroy();
} }
function test_redraw_noLayer_displayProjection(t) {
function test_Control_MousePosition_redraw_noLayer_displayProjection(t) {
t.plan(3); t.plan(3);
var control = new OpenLayers.Control.MousePosition(); var control = new OpenLayers.Control.MousePosition();
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -70,6 +68,18 @@
t.eq(control.div.innerHTML, "-175.78125, 85.78125", "innerHTML set correctly when triggered."); t.eq(control.div.innerHTML, "-175.78125, 85.78125", "innerHTML set correctly when triggered.");
map.destroy(); map.destroy();
} }
function test_formatOutput(t) {
t.plan(1);
var control = new OpenLayers.Control.MousePosition({
prefix: 'prefix',
suffix: 'suffix',
separator: 'separator',
numDigits: 3
});
var lonlat = new OpenLayers.LonLat(0.75699, 0.37365);
var val = control.formatOutput(lonlat);
t.eq(val, 'prefix0.757separator0.374suffix', 'formatOutput correctly formats the mouse position output');
}
</script> </script>
</head> </head>
<body> <body>