Changeset 3208

Timestamp:

05/30/07 10:13:32 (1 year ago)

Author:

crschmidt

Message:

Add patch from penyaskito for #705, along with tests, a new example, and a new
example georss file (grabbed from the new mapufacture, which is pretty).

Thanks, penyaskito!

Files:

• trunk/openlayers/examples/georss-markers.html (added)
• trunk/openlayers/examples/yelp-georss.xml (added)
• trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js (modified) (3 diffs)
• trunk/openlayers/tests/Layer/test_GeoRSS.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js

@@ -24 +24 @@
-    selectedFeature: null,
-
+    /**@type OpenLayers.Icon */
+    icon: null,
+    
-    /**
-    * @constructor
@@ -30 +33 @@
-    * @param {String} location
-    */
-
-
+, options
+, options
-        this.location = location;
-        this.features = new Array();
@@ -144 +147 @@
-            }
-
-
+
+
+
-            data.popupSize = new OpenLayers.Size(250, 120);
-            if ((title != null) && (description != null)) {

trunk/openlayers/tests/Layer/test_GeoRSS.html

@@ -83 +83 @@
-    }
-
+    function test_04_Layer_GeoRSS_icon(t) {
+        t.plan( 3 );
+        layer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt);
+        var the_icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png');
+        var otherLayer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt,{icon:the_icon});
+        var map = new OpenLayers.Map('map');
+        var baseLayer = new OpenLayers.Layer.WMS("Test Layer", 
+            "http://octo.metacarta.com/cgi-bin/mapserv?",
+            {map: "/mapdata/vmap_wms.map", layers: "basic"});
+        map.addLayer(baseLayer);
+        map.addLayers([layer,otherLayer]);
+        map.setCenter(new OpenLayers.LonLat(0,0),0);
+        var defaultIcon = OpenLayers.Marker.defaultIcon();
+        t.delay_call( 1, function() {
+            t.ok(layer.markers[0].icon, "The layer has a icon");
+            t.eq(layer.markers[0].icon.url, defaultIcon.url, "The layer without icon has the default icon.");
+            t.eq(otherLayer.markers[0].icon.url, the_icon.url,"The layer with an icon has that icon.");
+        });
+    }
+    
-    function test_99_Layer_GeoRSS_destroy (t) {
-        t.plan( 1 );