diff --git a/lib/OpenLayers/Feature.js b/lib/OpenLayers/Feature.js index c1f09e4e06..d7119761da 100644 --- a/lib/OpenLayers/Feature.js +++ b/lib/OpenLayers/Feature.js @@ -25,7 +25,7 @@ OpenLayers.Feature.prototype= { && this.data.iconH) { var size = new OpenLayers.Size(this.data.iconW, this.data.iconH); var icon = new OpenLayers.Icon(this.data.iconURL, size); - var marker = new OpenLayers.Marker(icon,this.lonlat); + var marker = new OpenLayers.Marker(this.lonlat,icon); if (this.title) { var popup = new OpenLayers.Popup(this.latlon, this.getContentHTML()); diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js index 47a0ad8894..d33dc8c37f 100644 --- a/lib/OpenLayers/Layer/Text.js +++ b/lib/OpenLayers/Layer/Text.js @@ -62,7 +62,7 @@ OpenLayers.Layer.Text.prototype = } } if (set) { - this.addMarker(new OpenLayers.Marker(icon, location)); + this.addMarker(new OpenLayers.Marker(location,icon)); } } } diff --git a/lib/OpenLayers/Marker.js b/lib/OpenLayers/Marker.js index ec40b12ccd..2c14c4f8c4 100644 --- a/lib/OpenLayers/Marker.js +++ b/lib/OpenLayers/Marker.js @@ -26,7 +26,7 @@ OpenLayers.Marker.prototype = { * @param {OpenLayers.Icon} icon * @param {OpenLayers.LonLat lonlat */ - initialize: function(icon, lonlat) { + initialize: function(lonlat, icon) { this.icon = icon; this.lonlat = lonlat; this.object = OpenLayers.Util.createImage( diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index 434035daab..b7f115ea97 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -96,7 +96,7 @@ OpenLayers.Tile.WFS.prototype = var icon = new OpenLayers.Icon(feature.markerImage, feature.size); //make new marker - var marker = new OpenLayers.Marker(icon, feature.lonlat); + var marker = new OpenLayers.Marker(feature.lonlat, icon); this.addMarker(marker); } diff --git a/markers.html b/markers.html index 1d83b90359..b13a480fcd 100644 --- a/markers.html +++ b/markers.html @@ -25,9 +25,9 @@ var newl = new OpenLayers.Layer.Text( "text", "./textfile.txt" ); map.addLayer(newl); var icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png',new OpenLayers.Size(10,17)); - markers.addMarker(new OpenLayers.Marker(icon, new OpenLayers.LonLat(0,0))); - markers.addMarker(new OpenLayers.Marker(icon, new OpenLayers.LonLat(0,45))); - marker = new OpenLayers.Marker(icon, new OpenLayers.LonLat(90,10)); + markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0),icon)); + markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,45),icon)); + marker = new OpenLayers.Marker(new OpenLayers.LonLat(90,10),icon); marker.events.register('mousedown', marker, function(evt) { alert(this.icon.url); Event.stop(evt); }); markers.addMarker(marker); map.setCenter(new OpenLayers.LonLat(0, 0), 0); diff --git a/tests/test_Layer_Marker.html b/tests/test_Layer_Marker.html index 2230187aa3..827221f2ca 100644 --- a/tests/test_Layer_Marker.html +++ b/tests/test_Layer_Marker.html @@ -17,7 +17,7 @@ layer = new OpenLayers.Layer.Marker('Test Layer'); t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); t.eq( layer.name, "Test Layer", "layer.name is correct" ); - layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(), new OpenLayers.Size())); + layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(),new OpenLayers.LonLat(0,0))); t.eq( layer.markers.length, 1, "addLayer adds marker to layer." ); } diff --git a/tests/test_Marker.html b/tests/test_Marker.html index 7b680ab900..7a91c1829f 100644 --- a/tests/test_Marker.html +++ b/tests/test_Marker.html @@ -6,7 +6,7 @@ function test_01_Marker_constructor (t) { t.plan( 5 ); - marker = new OpenLayers.Marker(new OpenLayers.Icon(),new OpenLayers.LonLat(2,1)); + marker = new OpenLayers.Marker(new OpenLayers.LonLat(2,1),new OpenLayers.Icon()); t.ok( marker instanceof OpenLayers.Marker, "new OpenLayers.Marker returns Marker object" ); t.ok( marker.icon instanceof OpenLayers.Icon, "new marker.Icon returns Icon object" ); t.ok( marker.lonlat instanceof OpenLayers.LonLat, "new marker.lonlat returns LonLat object" );