OpenLayers OpenLayers

Changeset 215

Show
Ignore:
Timestamp:
05/20/06 16:39:33 (3 years ago)
Author:
crschmidt
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers/Feature.js

    r212 r215  
    2626            var size = new OpenLayers.Size(this.data.iconW, this.data.iconH); 
    2727            var icon = new OpenLayers.Icon(this.data.iconURL, size); 
    28             var marker = new OpenLayers.Marker(icon,this.lonlat); 
     28            var marker = new OpenLayers.Marker(this.lonlat,icon); 
    2929            if (this.title) {  
    3030                var popup = new OpenLayers.Popup(this.latlon,  

  • trunk/openlayers/lib/OpenLayers/Layer/Text.js

    r172 r215  
    6363                  } 
    6464                  if (set) { 
    65                     this.addMarker(new OpenLayers.Marker(icon, location)); 
     65                    this.addMarker(new OpenLayers.Marker(location,icon)); 
    6666                  } 
    6767              } 

  • trunk/openlayers/lib/OpenLayers/Marker.js

    r199 r215  
    2727    * @param {OpenLayers.LonLat lonlat 
    2828    */ 
    29     initialize: function(icon, lonlat) { 
     29    initialize: function(lonlat, icon) { 
    3030        this.icon = icon; 
    3131        this.lonlat = lonlat; 

  • trunk/openlayers/lib/OpenLayers/Tile/WFS.js

    r209 r215  
    9797 
    9898            //make new marker 
    99             var marker = new OpenLayers.Marker(icon, feature.lonlat); 
     99            var marker = new OpenLayers.Marker(feature.lonlat, icon); 
    100100            this.addMarker(marker); 
    101101        } 

  • trunk/openlayers/markers.html

    r206 r215  
    2626            map.addLayer(newl); 
    2727            var icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png',new OpenLayers.Size(10,17)); 
    28             markers.addMarker(new OpenLayers.Marker(icon, new OpenLayers.LonLat(0,0))); 
    29             markers.addMarker(new OpenLayers.Marker(icon, new OpenLayers.LonLat(0,45))); 
    30             marker = new OpenLayers.Marker(icon, new OpenLayers.LonLat(90,10)); 
     28            markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0),icon)); 
     29            markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,45),icon)); 
     30            marker = new OpenLayers.Marker(new OpenLayers.LonLat(90,10),icon); 
    3131            marker.events.register('mousedown', marker, function(evt) { alert(this.icon.url); Event.stop(evt); }); 
    3232            markers.addMarker(marker);  

  • trunk/openlayers/tests/test_Layer_Marker.html

    r203 r215  
    1818        t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); 
    1919        t.eq( layer.name, "Test Layer", "layer.name is correct" ); 
    20         layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(), new OpenLayers.Size())); 
     20        layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(),new OpenLayers.LonLat(0,0))); 
    2121        t.eq( layer.markers.length, 1, "addLayer adds marker to layer." ); 
    2222    } 

  • trunk/openlayers/tests/test_Marker.html

    r103 r215  
    77    function test_01_Marker_constructor (t) { 
    88        t.plan( 5 ); 
    9         marker = new OpenLayers.Marker(new OpenLayers.Icon(),new OpenLayers.LonLat(2,1)); 
     9        marker = new OpenLayers.Marker(new OpenLayers.LonLat(2,1),new OpenLayers.Icon()); 
    1010        t.ok( marker instanceof OpenLayers.Marker, "new OpenLayers.Marker returns Marker object" ); 
    1111        t.ok( marker.icon instanceof OpenLayers.Icon, "new marker.Icon returns Icon object" );