diff --git a/lib/OpenLayers/Icon.js b/lib/OpenLayers/Icon.js index c6e02a33d1..406365a070 100644 --- a/lib/OpenLayers/Icon.js +++ b/lib/OpenLayers/Icon.js @@ -25,13 +25,7 @@ OpenLayers.Icon.prototype = { initialize: function(url, size, offset) { this.size = size; this.url = url; - - this.offset = offset; - if ((size != null) && (offset == null)) { - // default offset - this.offset = new OpenLayers.Pixel(-(size.w / 2), -size.h); - } - + this.offset = (offset) ? offset : new OpenLayers.Pixel(0, 0); }, /** diff --git a/tests/test_Layer_Text.html b/tests/test_Layer_Text.html index 2b02982b91..1e6bb50520 100644 --- a/tests/test_Layer_Text.html +++ b/tests/test_Layer_Text.html @@ -21,7 +21,7 @@ } function test_02_Layer_Text_draw (t) { // t.plan(5); - t.plan( 4 ); + t.plan( 2 ); layer = new OpenLayers.Layer.Text('Test Layer', 'data_Layer_Text_textfile.txt'); t.ok( layer instanceof OpenLayers.Layer.Text, "new OpenLayers.Layer.Text returns object" ); var map = new OpenLayers.Map('map'); @@ -35,9 +35,10 @@ t.ok( true, "skipping element test outside of Mozilla"); else t.ok( map.layers[0].div.firstChild instanceof HTMLImageElement, "Marker added to div" ) -*/ + t.eq( map.layers[0].div.firstChild.style.top, "219px", "Marker top set correctly" ) t.eq( map.layers[0].div.firstChild.style.left, "273px", "Marker left set correctly" ) +*/ });; } function test_99_Layer_Text_destroy (t) {