Change order of Marker creation from icon, latlon to latlon,icon. I don't know why I would have done it the other way.
git-svn-id: http://svn.openlayers.org/trunk/openlayers@215 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -25,7 +25,7 @@ OpenLayers.Feature.prototype= {
|
|||||||
&& this.data.iconH) {
|
&& this.data.iconH) {
|
||||||
var size = new OpenLayers.Size(this.data.iconW, this.data.iconH);
|
var size = new OpenLayers.Size(this.data.iconW, this.data.iconH);
|
||||||
var icon = new OpenLayers.Icon(this.data.iconURL, size);
|
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) {
|
if (this.title) {
|
||||||
var popup = new OpenLayers.Popup(this.latlon,
|
var popup = new OpenLayers.Popup(this.latlon,
|
||||||
this.getContentHTML());
|
this.getContentHTML());
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ OpenLayers.Layer.Text.prototype =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (set) {
|
if (set) {
|
||||||
this.addMarker(new OpenLayers.Marker(icon, location));
|
this.addMarker(new OpenLayers.Marker(location,icon));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ OpenLayers.Marker.prototype = {
|
|||||||
* @param {OpenLayers.Icon} icon
|
* @param {OpenLayers.Icon} icon
|
||||||
* @param {OpenLayers.LonLat lonlat
|
* @param {OpenLayers.LonLat lonlat
|
||||||
*/
|
*/
|
||||||
initialize: function(icon, lonlat) {
|
initialize: function(lonlat, icon) {
|
||||||
this.icon = icon;
|
this.icon = icon;
|
||||||
this.lonlat = lonlat;
|
this.lonlat = lonlat;
|
||||||
this.object = OpenLayers.Util.createImage(
|
this.object = OpenLayers.Util.createImage(
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ OpenLayers.Tile.WFS.prototype =
|
|||||||
var icon = new OpenLayers.Icon(feature.markerImage, feature.size);
|
var icon = new OpenLayers.Icon(feature.markerImage, feature.size);
|
||||||
|
|
||||||
//make new marker
|
//make new marker
|
||||||
var marker = new OpenLayers.Marker(icon, feature.lonlat);
|
var marker = new OpenLayers.Marker(feature.lonlat, icon);
|
||||||
this.addMarker(marker);
|
this.addMarker(marker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -25,9 +25,9 @@
|
|||||||
var newl = new OpenLayers.Layer.Text( "text", "./textfile.txt" );
|
var newl = new OpenLayers.Layer.Text( "text", "./textfile.txt" );
|
||||||
map.addLayer(newl);
|
map.addLayer(newl);
|
||||||
var icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png',new OpenLayers.Size(10,17));
|
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(new OpenLayers.LonLat(0,0),icon));
|
||||||
markers.addMarker(new OpenLayers.Marker(icon, new OpenLayers.LonLat(0,45)));
|
markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,45),icon));
|
||||||
marker = new OpenLayers.Marker(icon, new OpenLayers.LonLat(90,10));
|
marker = new OpenLayers.Marker(new OpenLayers.LonLat(90,10),icon);
|
||||||
marker.events.register('mousedown', marker, function(evt) { alert(this.icon.url); Event.stop(evt); });
|
marker.events.register('mousedown', marker, function(evt) { alert(this.icon.url); Event.stop(evt); });
|
||||||
markers.addMarker(marker);
|
markers.addMarker(marker);
|
||||||
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
|
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
layer = new OpenLayers.Layer.Marker('Test Layer');
|
layer = new OpenLayers.Layer.Marker('Test Layer');
|
||||||
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
|
t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" );
|
||||||
t.eq( layer.name, "Test Layer", "layer.name is correct" );
|
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." );
|
t.eq( layer.markers.length, 1, "addLayer adds marker to layer." );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
function test_01_Marker_constructor (t) {
|
function test_01_Marker_constructor (t) {
|
||||||
t.plan( 5 );
|
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 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.icon instanceof OpenLayers.Icon, "new marker.Icon returns Icon object" );
|
||||||
t.ok( marker.lonlat instanceof OpenLayers.LonLat, "new marker.lonlat returns LonLat object" );
|
t.ok( marker.lonlat instanceof OpenLayers.LonLat, "new marker.lonlat returns LonLat object" );
|
||||||
|
|||||||
Reference in New Issue
Block a user