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

Change order of Marker creation from icon, latlon to latlon,icon. I don't know why I would have done it the other way.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@215 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2006-05-20 20:39:33 +00:00
parent 334fb4c2ed
commit e7c6d4df19
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Feature.js
View File

@@ -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());

2
lib/OpenLayers/Layer/Text.js
View File

@@ -62,7 +62,7 @@ OpenLayers.Layer.Text.prototype =
}
}
if (set) {
this.addMarker(new OpenLayers.Marker(icon, location));
this.addMarker(new OpenLayers.Marker(location,icon));
}
}
}

2
lib/OpenLayers/Marker.js
View File

@@ -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(

2
lib/OpenLayers/Tile/WFS.js
View File

@@ -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);
}

6
markers.html
View File

@@ -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);

2
tests/test_Layer_Marker.html
View File

@@ -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." );
}

2
tests/test_Marker.html
View File

@@ -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" );